From 7506a3c04c531ff25e9be980f18bd73760601a93 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 06 八月 2024 17:18:18 +0800
Subject: [PATCH] 1

---
 sub_pages/customer/shopping/shopping.vue |    2 +
 sub_pages/customer/trade/trade.vue       |   74 +++++++++++++++++++++++++-----------
 2 files changed, 53 insertions(+), 23 deletions(-)

diff --git a/sub_pages/customer/shopping/shopping.vue b/sub_pages/customer/shopping/shopping.vue
index 015667c..2723829 100644
--- a/sub_pages/customer/shopping/shopping.vue
+++ b/sub_pages/customer/shopping/shopping.vue
@@ -186,6 +186,8 @@
 				})
 				this.$message.hideLoading()
 				if (code === 0) {
+					this.$store.dispatch('sign_add', 'shopnum');
+					
 					if (this.ids.indexOf(item.id) >= 0) {
 						this.ids.splice(this.ids.indexOf(item.id), 1)
 					}
diff --git a/sub_pages/customer/trade/trade.vue b/sub_pages/customer/trade/trade.vue
index b702cbf..ff15aae 100644
--- a/sub_pages/customer/trade/trade.vue
+++ b/sub_pages/customer/trade/trade.vue
@@ -1,8 +1,15 @@
 <template>
 	<view class="container-trade" :style="{'min-height':hidefooter?'':'calc(100vh - 20rpx)'}">
 		<view class="search-container m-t-12 flex" v-if="!hidefooter">
+			<view class="flex m-r-20">
+				<view class="m-r-10" style="line-height: 80rpx;" @click="changeSearchType">
+					{{type=='category'?'按分类':'按店铺'}}
+				</view>
+				<u-icon name="arrow-down"></u-icon>
+
+			</view>
 			<view class="flex1 input">
-				<u-input placeholder="请输入分类名称" v-model="query.name" clearable @confirm="buttonSearchFlow" @clear="()=>{
+				<u-input :placeholder="type==='category'?'请输入分类名称':'请输入店铺名称'" v-model="query.name" clearable @confirm="buttonSearchFlow" @clear="()=>{
 					$nextTick(()=>{buttonSearchFlow()})
 				}">
 					<template slot="suffix">
@@ -108,14 +115,17 @@
 					name: '',
 					categoryId: '',
 				},
-				currentCategory: {}
+				currentCategory: {},
+				type: 'category', //supplier
+
 
 			}
 		},
 		// #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 =
 				`/pages/home/home?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
 			return {
@@ -125,7 +135,8 @@
 		},
 		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 =
 				`/pages/home/home?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
 			return {
@@ -172,6 +183,15 @@
 			})
 		},
 		methods: {
+			changeSearchType() {
+				if (this.type == 'category') {
+					this.type = 'supplier'
+					this.query.name = ''
+				} else {
+					this.type = 'category'
+					this.query.name = ''
+				}
+			},
 			maxWeightPrice(item) {
 				var p = 0
 				if (item.weightA && item.weightA > p) {
@@ -239,25 +259,33 @@
 				this.$refs.popup_param.close()
 			},
 			buttonSearchFlow() {
-				//根据名称查询
-				this.$message.showLoading()
-				this.$http.request('get', '/api/customer/flower/category/tree', {
-					params: {
-						name: this.query.name || ''
-					}
-				}).then(res => {
-					var data = res.data
-					this.list = data || []
-					if (this.list.length > 0) {
-						this.query.categoryId = this.list[0].id || ''
-						this.currentCategory = this.list[0] || {}
-					} else {
-						this.query.categoryId = ''
-						this.currentCategory = {}
-					}
-				}).finally(() => {
-					this.$message.hideLoading()
-				})
+
+				if (this.type == 'category') {
+					//根据分类名称查询
+					this.$message.showLoading()
+					this.$http.request('get', '/api/customer/flower/category/tree', {
+						params: {
+							name: this.query.name || ''
+						}
+					}).then(res => {
+						var data = res.data
+						this.list = data || []
+						if (this.list.length > 0) {
+							this.query.categoryId = this.list[0].id || ''
+							this.currentCategory = this.list[0] || {}
+						} else {
+							this.query.categoryId = ''
+							this.currentCategory = {}
+						}
+					}).finally(() => {
+						this.$message.hideLoading()
+					})
+				} else {
+					uni.navigateTo({
+						url: '/sub_pages/customer/trade/list?' + 'supplierName=' + this.query.name
+					})
+
+				}
 			},
 			toDetailList(item) {
 				//去商品列表页面

--
Gitblit v1.9.3