From 4b68b41822b8da02c9a9ceba3bc6e30d4445d324 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 26 九月 2024 08:54:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'remote-v2/master-2.0' into master-2.0

---
 pages/home/components/home-top-flow.vue |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/pages/home/components/home-top-flow.vue b/pages/home/components/home-top-flow.vue
index 20f5236..735d2ce 100644
--- a/pages/home/components/home-top-flow.vue
+++ b/pages/home/components/home-top-flow.vue
@@ -13,9 +13,14 @@
 				<view class="title">
 					{{ item.name || '-' }}
 					<!-- <span v-if="item.categoryStr" class="m-l-10">{{item.categoryStr || '-'}}</span> -->
-					<view class="price">
-						¥{{ item.price || 0 }}/扎
+					
+					<view class="price component-price-new">
+						<span class="tip">会员价</span>¥<span class="p">{{item.priceMember||item.price}}</span>/扎
+						<view class="component-price-old">
+							¥{{item.price}}/扎
+						</view>
 					</view>
+				
 				</view>
 				<view class="tags" v-if="item.tags">
 					<view class="tag red" v-for="(tag,k) of item.tagArr" :class="[k===0?'red':'green']" :key="tag">{{
@@ -30,7 +35,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 }}
@@ -64,7 +69,14 @@
 			this.page.current = 1
 			this.getList('post')
 		},
+		
 		methods: {
+			init(){
+				this.refreshList('post')
+			},
+			fun_GetMore(){
+				this.getMore('post')
+			},
 			getList_after() {
 				if (this.list) {
 					for (var item of this.list) {

--
Gitblit v1.9.3