Merge remote-tracking branch 'remote-v2/master-2.0' into master-2.0

xuxueyang

2024-09-29 ce4b9391a433cad82a636ec8a66071880022db42

Merge remote-tracking branch 'remote-v2/master-2.0' into master-2.0

 pages/order/order-detail.vue

@@ -551,9 +551,11 @@
        <view v-for="(item,index) of list" :key="index">
            <view class="flower-info m-b-20 m-t-12 br-4"
                v-if="!showSales||showSales&&(submitForm.orderItemId == item.id)">
                <view class="supplier-name " @click.stop="openbrand(item)">
                    <image class="icon-dp" src="/static/common/icon-dp.png"></image>
                    {{ item.supplierName || ''}}
                <view class="supplier-name " >
                    <view  @click.stop="openbrand(item)" style="display: inline-block;">
                        <image class="icon-dp br-4" src="/static/common/icon-dp.png"></image>
                        {{ item.supplierName|| '' }} > 
                    </view>
                </view>
                <!-- submitForm.orderItemId:{{submitForm.orderItemId}} -->
                <!-- itemId:{{item.id}} -->
@@ -562,9 +564,8 @@
                    <!-- @click="changeSalesOrderItem(item)" -->
                    <!-- :checked="submitForm.orderItems.indexOf(item.id)>=0" -->

                    <image class="flower-img img100 br-4 m-r-6" :src="item.flowerCover"
                        @click="previewImg(item.flowerCover)">
                    </image>
                    <!-- <image class="flower-img img100 br-4 m-r-6" :src="item.flowerCover" @click="previewImg(item.flowerCover)"></image> -->
                    <image class="flower-img img100 br-4 m-r-6" :src="item.flowerCover" @click="toFlowerDetail(item)"></image>
                    <view class="flex1" @click.stop="toFlowerDetail(item)">
                        <view class=" flex">
                            <view class="title"><span class="level">{{ item.flowerCategory || ''}}</span><span

 pages/order/order.vue

@@ -488,7 +488,7 @@

                    <view class="supplier-name w-fit m-l-0 m-r-a" @click.stop="openbrand(item)">
                        <image class="icon-dp br-4" src="/static/common/icon-dp.png"></image>
                        {{ item.supplierName }}
                        {{ item.supplierName|| '' }} > 
                    </view>
                    <view class="flex m-t-12 flex-wrap-normal">
                        <!-- @click="previewImg(item.flowerCover)" -->

 sub_pages/supplier/order-manage/order-manage-settlement.vue

@@ -245,7 +245,8 @@
                if (this.list) {
                    for (var item of this.list) {
                        if (!item.status) {
                            v += item.totalAmount || 0
                            // v += item.totalAmount || 0
                            v += item.income || 0
                        } else {
                            v += (item.income || 0)
                        }