From ded34e37fca5e2e05e17693d2524c3d664ebf017 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 14 八月 2024 11:20:18 +0800
Subject: [PATCH] update 搜索历史

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

diff --git a/sub_pages/customer/trade/list.vue b/sub_pages/customer/trade/list.vue
index 5831078..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,11 +214,15 @@
 					name: '',
 					category: '',
 					zoneId: '',
-					levelStr: '',
-					level: '',
-					column: '',
+
+
 					params: [],
+					supplierName: '',
 					columnStr: '',
+					column: '',
+					levelStr: '',
+					level: '',
+					supplierId:'',
 				},
 				categoryInfo: {},
 				params: [],
@@ -238,9 +243,10 @@
 		// #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 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?category=${this.query.category}&zoneId=${this.query.zoneId}&name=${this.query.name}&shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
+				`/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,
@@ -248,9 +254,10 @@
 		},
 		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 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?category=${this.query.category}&zoneId=${this.query.zoneId}&name=${this.query.name}&shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
+				`/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,
@@ -260,12 +267,21 @@
 		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'
@@ -410,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