From 891b5db055a1d27c6bda2e9700aa57f8bacd7cd2 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 15 八月 2024 09:58:44 +0800
Subject: [PATCH] add 部分ui

---
 sub_pages/customer/trade/list.vue |  173 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 160 insertions(+), 13 deletions(-)

diff --git a/sub_pages/customer/trade/list.vue b/sub_pages/customer/trade/list.vue
index 4924d66..6cd22bc 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 || '暂无'}}
@@ -34,11 +36,12 @@
 			<view>
 				<!-- 查询条件 -->
 				<view class="component-filter-container">
-					<view class="flex1" @click.stop="order_show=true">
+					<!-- order_show=true -->
+					<view class="flex1" @click.stop="$refs.popup_column.open()">
 						排序{{ query.columnStr&&('-'+query.columnStr) || '' }}
 						<image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image>
 					</view>
-					<view class="flex1" @click.stop="level_show=true">
+					<view class="flex1" @click.stop="$refs.popup_level.open()">
 						{{ query.levelStr || '级别' }}
 						<image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image>
 					</view>
@@ -74,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>
@@ -103,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">
@@ -121,6 +132,55 @@
 			@cancel="level_show=false"></u-picker>
 		<u-picker :show="order_show" @confirm="select_order" keyName="label" :columns="order_columns"
 			@cancel="order_show=false"></u-picker>
+
+		<uni-popup ref="popup_level" type="bottom">
+			<view class="component-popup_input_all">
+				<view class="text-center m-b-40" style="font-size: 48rpx;font-weight: 600;">点击选择不同级别</view>
+				<view v-for="(item,i) in level_columns" :key="i" class="m-t-20">
+					<view class="m-t-12 flex value-items">
+						<view class="value-item" @click="()=>{
+							if(each.value!==query.value){
+								query.level = each.value
+								query.levelStr = each.label
+								refreshList('post')
+								$refs.popup_level.close()
+							}																																						
+						}" :class="[query.level==each.value?'cur':'']" v-for="(each, j) in item" :key="j">
+							{{ each.label || '-' }}
+						</view>
+					</view>
+				</view>
+				<view class="button-space"></view>
+				<view>
+					<view class="button-green" @click="$refs.popup_level.close()">关闭
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<uni-popup ref="popup_column" type="bottom">
+			<view class="component-popup_input_all">
+				<view class="text-center m-b-40" style="font-size: 48rpx;font-weight: 600;">点击选择不同排序</view>
+				<view v-for="(item,i) in order_columns" :key="i" class="m-t-20">
+					<view class="m-t-12 flex value-items">
+						<view class="value-item" @click="()=>{
+							if(each.value!==query.value){
+								query.column = each.value
+								query.columnStr = each.label
+								refreshList('post')
+								$refs.popup_column.close()
+							}																																						
+						}" :class="[query.column==each.value?'cur':'']" v-for="(each, j) in item" :key="j">
+							{{ each.label || '-' }}
+						</view>
+					</view>
+				</view>
+				<view class="button-space"></view>
+				<view>
+					<view class="button-green" @click="$refs.popup_column.close()">关闭
+					</view>
+				</view>
+			</view>
+		</uni-popup>
 
 		<uni-popup ref="popup_param" type="bottom">
 			<view class="component-popup_input_all" v-if="params">
@@ -163,11 +223,15 @@
 					name: '',
 					category: '',
 					zoneId: '',
+
+
+					params: [],
+					supplierName: '',
+					columnStr: '',
+					column: '',
 					levelStr: '',
 					level: '',
-					column: '',
-					params: [],
-					columnStr: '',
+					supplierId: '',
 				},
 				categoryInfo: {},
 				params: [],
@@ -185,15 +249,48 @@
 				]
 			}
 		},
+		// #ifdef PUB_CUSTOMER
+		onShareAppMessage() {
+			let that = this;
+			var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
+				that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || ''
+			var url =
+				`/sub_pages/customer/trade/list?categoryId=${this.query.category}&zoneId=${this.query.zoneId}&name=${this.query.name}&supplierName=${this.query.supplierName}&shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
+			return {
+				title: "花满芫-商品列表",
+				path: url,
+			}
+		},
+		onShareTimeline() {
+			let that = this;
+			var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
+				that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || ''
+			var url =
+				`/sub_pages/customer/trade/list?categoryId=${this.query.category}&zoneId=${this.query.zoneId}&name=${this.query.name}&supplierName=${this.query.supplierName}&shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
+			return {
+				title: "花满芫-商品列表",
+				path: url,
+			}
+		},
+		// #endif
 		async onLoad(options) {
 			// this.list = [{},{}]
 			console.log('options', options)
-			this.query.category = options.categoryId || ''
+			this.query.category = options.categoryId || options.category || ''
 			this.query.zoneId = options.zoneId || ''
 			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
 				})
 			}
 			this.listApi = '/api/customer/flower/list'
@@ -247,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');
 			},
@@ -338,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}`
@@ -353,9 +473,9 @@
 			// },
 			async addnum(item, addnum) {
 				if (!this.currentInfo.id) {
-					await this.$message.confirm('请前往登录')
+					// await this.$message.confirm('请前往登录')
 					uni.navigateTo({
-						url: '/pages/user/supplier-user'
+						url: '/pages/login/supplier-login?source=jump'
 					})
 					return
 				}
@@ -401,6 +521,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: 22rpx;
+				color: #CD1212;
+				margin-right: 12rpx;
+				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;
@@ -429,6 +574,8 @@
 				}
 			}
 
+
+
 			.info-price {
 				padding: 22rpx;
 				text-align: center;

--
Gitblit v1.9.3