From f0ed0a02286246080fe92f6855bf2ee9b2dea2c6 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期日, 08 九月 2024 01:19:33 +0800
Subject: [PATCH] update 销量问题

---
 sub_pages/customer/trade/list.vue       |    2 +-
 sub_pages/customer/self/history.vue     |   16 ++++++++--------
 sub_pages/customer/self/collect.vue     |    3 +++
 pages/home/components/home-top-flow.vue |    2 +-
 sub_pages/customer/shop/shop.vue        |    2 +-
 sub_pages/customer/trade/detail.vue     |    2 +-
 6 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/pages/home/components/home-top-flow.vue b/pages/home/components/home-top-flow.vue
index 20f5236..a658721 100644
--- a/pages/home/components/home-top-flow.vue
+++ b/pages/home/components/home-top-flow.vue
@@ -30,7 +30,7 @@
 				</view>
 				<view class="other-info flex">
 					<view class="m-r-15">
-						已售:{{ item.sales || 0 }}
+						已售:{{ ((item.sales||0) +(item.realSales||0))  || 0 }}
 					</view>
 					<view class="m-r-15">
 						剩余:{{ item.stock || 0 }}
diff --git a/sub_pages/customer/self/collect.vue b/sub_pages/customer/self/collect.vue
index f652d88..6328131 100644
--- a/sub_pages/customer/self/collect.vue
+++ b/sub_pages/customer/self/collect.vue
@@ -24,6 +24,9 @@
 				]
 			}
 		},
+		onShow() {
+			this.refreshList()
+		},
 		onLoad() {
 			this.listApi = '/api/collect/list'
 			this.getList()
diff --git a/sub_pages/customer/self/history.vue b/sub_pages/customer/self/history.vue
index 1664760..f855a3b 100644
--- a/sub_pages/customer/self/history.vue
+++ b/sub_pages/customer/self/history.vue
@@ -26,7 +26,7 @@
 		},
 		onLoad() {
 			this.listApi = '/api/browse/history/list'
-			this.page.size =30
+			this.page.size = 30
 			this.getList()
 
 			this.$http.request('get', '/api/code/value', {
@@ -55,13 +55,13 @@
 				})
 			})
 		},
-		  onShow() {
-		    // 页面显示时重新加载浏览记录数据
-		    this.listApi = '/api/browse/history/list'
-		    this.page.size =30
-		    this.getList()
-		  },
-		  
+		onShow() {
+			// 页面显示时重新加载浏览记录数据
+			this.listApi = '/api/browse/history/list'
+			this.page.size = 30
+			this.refreshList()
+		},
+
 		methods: {
 
 			async deleteExpired() {
diff --git a/sub_pages/customer/shop/shop.vue b/sub_pages/customer/shop/shop.vue
index 598586b..8d27426 100644
--- a/sub_pages/customer/shop/shop.vue
+++ b/sub_pages/customer/shop/shop.vue
@@ -123,7 +123,7 @@
 							</view> -->
 								<view class="other-info flex" @click.stop="toDetail(item)">
 									<view class="m-r-15">
-										已售:{{item.sales || 0}}
+										已售:{{ ((item.sales||0) +(item.realSales||0)) || 0}}
 									</view>
 									<view class="m-r-15">
 										剩余:{{item.stock || 0}}
diff --git a/sub_pages/customer/trade/detail.vue b/sub_pages/customer/trade/detail.vue
index ded7a1f..24cd783 100644
--- a/sub_pages/customer/trade/detail.vue
+++ b/sub_pages/customer/trade/detail.vue
@@ -67,7 +67,7 @@
 				</view>
 			</view>
 			<view class="desc m-t-12">
-				<view class="m-r-15">已售:{{ dto.sales || 0 }}</view>
+				<view class="m-r-15">已售:{{ ((dto.sales||0) +(dto.realSales||0)) || 0 }}</view>
 				<view class="m-r-15">剩余:{{ dto.stock || 0 }}</view>
 				<view class=" ">{{ dto.unit || '-' }}</view>
 			</view>
diff --git a/sub_pages/customer/trade/list.vue b/sub_pages/customer/trade/list.vue
index 77f7c5b..c433172 100644
--- a/sub_pages/customer/trade/list.vue
+++ b/sub_pages/customer/trade/list.vue
@@ -91,7 +91,7 @@
 						</view>
 						<view class="other-info flex">
 							<view class="m-r-15">
-								已售:{{item.sales||0}}
+								已售:{{ ((item.sales||0) +(item.realSales||0))   ||0}}
 							</view>
 							<view class="m-r-15">
 								剩余:{{item.stock||0}}

--
Gitblit v1.9.3