From c9ece393fc028ffecca0915d1b9af62d51b5aef6 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 13 八月 2024 17:21:19 +0800
Subject: [PATCH] 1

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

diff --git a/sub_pages/customer/trade/list.vue b/sub_pages/customer/trade/list.vue
index 929a99a..64ba348 100644
--- a/sub_pages/customer/trade/list.vue
+++ b/sub_pages/customer/trade/list.vue
@@ -3,9 +3,11 @@
 	<view class="trade-list">
 		<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>
+				<view class="title flex">
+					<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 || '暂无'}}
@@ -104,8 +106,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 +214,15 @@
 					name: '',
 					category: '',
 					zoneId: '',
-					levelStr: '',
-					level: '',
-					column: '',
-					params: [],
-					supplierName:'',
+
+
+					params: [],
+					supplierName: '',
 					columnStr: '',
+					column: '',
+					levelStr: '',
+					level: '',
+					supplierId:'',
 				},
 				categoryInfo: {},
 				params: [],
@@ -265,19 +269,20 @@
 			console.log('options', options)
 			this.query.category = options.categoryId || options.category || ''
 			this.query.zoneId = options.zoneId || ''
-			this.query.name = options.name || ''
+			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')
@@ -421,6 +426,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}`

--
Gitblit v1.9.3