From a587937ce53f79b4680e930b5d5f7fee33de5311 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 14 八月 2024 14:50:40 +0800
Subject: [PATCH] 标签

---
 sub_pages/customer/trade/list.vue |  100 +++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 82 insertions(+), 18 deletions(-)

diff --git a/sub_pages/customer/trade/list.vue b/sub_pages/customer/trade/list.vue
index 929a99a..77af631 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 || '暂无'}}
@@ -75,6 +77,15 @@
 								¥{{item.price||0}}元/扎
 							</view>
 						</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">
 							{{item.supplierName}}
 						</view>
@@ -104,8 +115,7 @@
 			</view>
 
 
-			<view class="icon-shop" v-if="list&&list.length>0"
-				@click="goto('/sub_pages/customer/shopping/shopping',true)">
+			<view class="icon-shop" v-if="list&&list.length>0" @click="toShopping">
 				<!-- 购物图标 -->
 				<!-- 如果有购买的东西,就要附带数字了 -->
 				<view v-if="shoptotal>0" class="number">
@@ -213,12 +223,15 @@
 					name: '',
 					category: '',
 					zoneId: '',
+
+
+					params: [],
+					supplierName: '',
+					columnStr: '',
+					column: '',
 					levelStr: '',
 					level: '',
-					column: '',
-					params: [],
-					supplierName:'',
-					columnStr: '',
+					supplierId: '',
 				},
 				categoryInfo: {},
 				params: [],
@@ -265,19 +278,20 @@
 			console.log('options', options)
 			this.query.category = options.categoryId || options.category || ''
 			this.query.zoneId = options.zoneId || ''
-			this.query.name = options.name || ''
-			this.query.supplierName = options.supplierName || ''
-			
-			
+			this.query.name = options.name || ''
+			this.query.supplierName = options.supplierName || ''
+			this.query.supplierId = options.supplierId || ''
+
+
 			if (this.query.name) {
 				uni.setNavigationBarTitle({
 					title: '商品列表-' + this.query.name
 				})
-			}
-			if (this.query.supplierName) {
-				uni.setNavigationBarTitle({
-					title: '商品列表-' + this.query.supplierName
-				})
+			}
+			if (this.query.supplierName) {
+				uni.setNavigationBarTitle({
+					title: '商品列表-' + this.query.supplierName
+				})
 			}
 			this.listApi = '/api/customer/flower/list'
 			this.getList('post')
@@ -330,7 +344,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');
 			},
@@ -421,6 +445,19 @@
 				this.refreshList('post')
 
 			},
+			toShopping() {
+				if (!this.currentInfo.id) {
+					// await this.$message.confirm('请前往登录')
+					uni.navigateTo({
+						url: '/pages/login/supplier-login?source=jump'
+					})
+					return
+				}
+				//直接强制购物车
+				uni.reLaunch({
+					url: '/sub_pages/customer/shopping/shopping'
+				})
+			},
 			toDetail(item) {
 				uni.navigateTo({
 					url: `/sub_pages/customer/trade/detail?id=${item.id}`
@@ -484,6 +521,31 @@
 	.trade-list {
 		padding: 24rpx 30rpx;
 
+		.tags {
+			margin-top: 12rpx;
+			display: flex;
+
+			.tag {
+				min-width: 80rpx;
+				padding-left: 20rpx;
+				padding-right: 20rpx;
+				line-height: 36rpx;
+				background: #FEE6E6;
+				border-radius: 21rpx;
+				font-size: 24rpx;
+				color: #CD1212;
+				margin-right: 12rpx;
+				text-align: center;
+			}
+
+			.tag.green {
+				color: rgba(110, 159, 102, 1);
+				background: rgba(202, 229, 214, 1);
+				border-radius: 21rpx;
+				// opacity: 0.57;
+			}
+		}
+
 		.category-detail {
 			padding: 22rpx 38rpx;
 			margin-bottom: 10rpx;
@@ -512,6 +574,8 @@
 				}
 			}
 
+
+
 			.info-price {
 				padding: 22rpx;
 				text-align: center;

--
Gitblit v1.9.3