From ce4b9391a433cad82a636ec8a66071880022db42 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期日, 29 九月 2024 16:36:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'remote-v2/master-2.0' into master-2.0
---
sub_pages/supplier/order-manage/order-manage-settlement.vue | 3 ++-
pages/order/order.vue | 2 +-
pages/order/order-detail.vue | 13 +++++++------
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index 1463d27..3da6543 100644
--- a/pages/order/order-detail.vue
+++ b/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
diff --git a/pages/order/order.vue b/pages/order/order.vue
index ecbd85d..2781cb6 100644
--- a/pages/order/order.vue
+++ b/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)" -->
diff --git a/sub_pages/supplier/order-manage/order-manage-settlement.vue b/sub_pages/supplier/order-manage/order-manage-settlement.vue
index a79379d..bb5c1ab 100644
--- a/sub_pages/supplier/order-manage/order-manage-settlement.vue
+++ b/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)
}
--
Gitblit v1.9.3