From c3319db3d83f2d4fa7fdf06e3792496ce77d90aa Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期一, 09 九月 2024 02:24:16 +0800
Subject: [PATCH] update 提及的修复问题和会员信息相关的

---
 sub_pages/customer/trade/list.vue |   74 ++++++++++++++++++++++++++++++++++---
 1 files changed, 68 insertions(+), 6 deletions(-)

diff --git a/sub_pages/customer/trade/list.vue b/sub_pages/customer/trade/list.vue
index 6b961df..b43d3f7 100644
--- a/sub_pages/customer/trade/list.vue
+++ b/sub_pages/customer/trade/list.vue
@@ -4,8 +4,10 @@
 		<view class="category-detail flex" v-if="query.category">
 			<view class="flex1 info">
 				<view class="title flex">
-					{{categoryInfo.name||'-'}}
-					<image src="../../../static/common/icon-kf.png" class="icon-kf m-l-15 img100"></image>
+					<button open-type="contact" class="component-button-contact">
+						{{categoryInfo.name||'-'}}
+						<image src="../../../static/common/icon-kf.png" class="icon-kf m-l-15 img100"></image>
+					</button>
 				</view>
 				<view class="desc">
 					规格:{{categoryInfo.unit || '暂无'}}
@@ -71,8 +73,29 @@
 					<view @click.stop="toDetail(item)">
 						<view class="title">
 							{{item.name||'-'}}
-							<view class="price">
-								¥{{item.price||0}}元/扎
+							
+							<!-- #ifdef PUB_CUSTOMER_DEV -->
+							<view class="price component-price-new">
+								¥{{item.priceMember||item.price}}/扎<span class="tip">会员价</span>
+								<view class="component-price-old">
+									¥{{item.price}}/扎
+								</view>
+							</view>
+							<!-- #endif -->
+							<!-- #ifndef PUB_CUSTOMER_DEV -->
+							<view class="price">
+								¥{{item.price||0}}元/扎
+							</view>
+							<!-- #endif -->
+							
+						</view>
+						<view class="tags" v-if="item.tags">
+							<!-- 	<view class="tag red">限时抢购</view>
+							<view class="tag green">品质严选</view> -->
+							<view class="tag red" v-for="(tag,k) of item.tagArr" :class="[k===0?'red':'green']"
+								:key="tag">{{
+							  tag
+							}}
 							</view>
 						</view>
 						<view class="shop-name">
@@ -80,7 +103,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}}
@@ -220,6 +243,7 @@
 					column: '',
 					levelStr: '',
 					level: '',
+					supplierId: '',
 				},
 				categoryInfo: {},
 				params: [],
@@ -268,6 +292,7 @@
 			this.query.zoneId = options.zoneId || ''
 			this.query.name = options.name || ''
 			this.query.supplierName = options.supplierName || ''
+			this.query.supplierId = options.supplierId || ''
 
 
 			if (this.query.name) {
@@ -331,7 +356,17 @@
 			}
 			this.refreshShopNum()
 		},
-		methods: {
+		methods: {
+			getList_after() {
+				if (this.list) {
+					for (var item of this.list) {
+						item.tagArr = []
+						if (item.tags) {
+							item.tagArr = item.tags.split(",") || []
+						}
+					}
+				}
+			},
 			async refreshShopNum() {
 				this.shoptotal = await this.$store.dispatch('countShopping');
 			},
@@ -498,6 +533,31 @@
 	.trade-list {
 		padding: 24rpx 30rpx;
 
+		.tags {
+			margin-top: 12rpx;
+			display: flex;
+
+			.tag {
+				// min-width: 60rpx;
+				padding-left: 10rpx;
+				padding-right: 10rpx;
+				line-height: 30rpx;
+				background: #FEE6E6;
+				border-radius: 10rpx;
+				font-size: 18rpx;
+				color: #CD1212;
+				margin-right: 6rpx;
+				text-align: center;
+			}
+			
+			.tag.green {
+				color: rgba(110, 159, 102, 1);
+				background: rgba(202, 229, 214, 1);
+				border-radius: 10rpx;
+				// opacity: 0.57;
+			}
+		}
+
 		.category-detail {
 			padding: 22rpx 38rpx;
 			margin-bottom: 10rpx;
@@ -526,6 +586,8 @@
 				}
 			}
 
+
+
 			.info-price {
 				padding: 22rpx;
 				text-align: center;

--
Gitblit v1.9.3