From 69f8e68c7333a61ef26e78c4b5439938f7974d5b Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Sat, 30 Mar 2024 14:13:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/cloud_warehouse/market/market.vue  |  6 +++---
 pages/columnGoods/goods_search/index.vue |  2 +-
 pages/whole_sale/index.vue               | 21 +++++++++++----------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/pages/cloud_warehouse/market/market.vue b/pages/cloud_warehouse/market/market.vue
index ba69c05..87c6255 100644
--- a/pages/cloud_warehouse/market/market.vue
+++ b/pages/cloud_warehouse/market/market.vue
@@ -44,7 +44,7 @@
     }
 
     .wholeSale-con {
-      margin: 0 30rpx;
+      margin: 0 20rpx;
 
       .wholeSale-nav {
         display: flex;
@@ -202,9 +202,9 @@
 
     .goods_list {
       .goods {
-        width: 690rpx;
+        width: 710rpx;
         height: 200rpx;
-        margin: 30rpx auto;
+        margin: 20rpx auto;
         margin-top: 0;
         background-color: #fff;
         border-radius: 24rpx;
diff --git a/pages/columnGoods/goods_search/index.vue b/pages/columnGoods/goods_search/index.vue
index 50564fd..98c5c5c 100644
--- a/pages/columnGoods/goods_search/index.vue
+++ b/pages/columnGoods/goods_search/index.vue
@@ -178,8 +178,8 @@
 		onLoad(options) {
 			this.searchValue = options.searchVal || ''
       this.back = options.back;
-      this.isShop = options.shop || false;
       if(options.shop=='true'){
+        this.isShop = options.shop;
         uni.setNavigationBarTitle({
           title: '搜索店铺'
         })
diff --git a/pages/whole_sale/index.vue b/pages/whole_sale/index.vue
index 5c7c7d2..a61a819 100644
--- a/pages/whole_sale/index.vue
+++ b/pages/whole_sale/index.vue
@@ -209,9 +209,9 @@
   }
   .goods_list {
       .goods {
-        width: 690rpx;
+        // width: 690rpx;
         height: 200rpx;
-        margin: 30rpx auto;
+        margin: 20rpx auto;
         margin-top: 0;
         background-color: #fff;
         border-radius: 24rpx;
@@ -286,11 +286,11 @@
       <view class="wholeSale-nav">
         <!-- <u-icon class="icon" name="arrow-left" size="20" @click="navBack"></u-icon> -->
         <!-- 搜索 -->
-        <view @click="navTo(`/pages/columnGoods/goods_search/index?back=true&searchVal=${where.keyword}`)"
+        <view @click="navTo(`/pages/columnGoods/goods_search/index?back=true&searchVal=${where.keyword}&shop=${subCurr!=0 || (subCurr==0 && tabsCurr!=2) ? false : true}`)"
           hover-class="none" class="search_content flex_a_c_j_sb">
           <view class="flex_a_c search_content_wrap">
             <view class="iconfont icon-sousuo" style="font-size: 39rpx;"></view>
-            <input type="text" placeholder="搜索您需要批发进货的产品名称" :value="where.keyword"
+            <input type="text" :placeholder="subCurr!=0 || (subCurr==0 && tabsCurr!=2) ? '搜索您需要批发进货的产品名称': '搜索店铺名称'" :value="where.keyword"
               placeholder-style="font-size: 30rpx;color:#999;" disabled style="pointer-events: none;">
           </view>
           <!-- <button class="search_btn">搜索</button> -->
@@ -391,7 +391,7 @@
       
       
       <!-- 列表 -->
-      <view class="goods_list">
+      <view class="goods_list" v-else>
         <view class="goods" v-for="(item, index) in shopList" :key="index" @click="goStore(item.mer_id)">
           <view class="avatar">
             <!-- <image style="width: 100%;height: 100%;" :src="item.mer_avatar" mode="aspectFill" lazy-load>
@@ -493,7 +493,7 @@
           name: '名优特产批发',
           val: 3
         }],
-        tabsCurr: 2,
+        tabsCurr: 1,
         orderCurr: 3, //当前选择的排序类型
         subList: ['批发商户', '批发市场'],
         subCurr: 0,
@@ -551,15 +551,16 @@
         this.getProductslist(true);
       },
       changeSub(e){
+        this.subCurr = e;
         this.where = {
           page: 1,
           limit: this.where.limit,
           sale_type: this.where.sale_type,
           keyword: this.where.keyword,
         }
+        if(this.subCurr!=0) this.where.mer_type = 2;
         this.cate_change = 0;
         this.cate_change_children = 0;
-        this.subCurr = e;
         this.initData(true);
       },
       toOrder(type, index = -1) {
@@ -577,6 +578,7 @@
             uni.$once('searchValue', (e) => {
               this.$nextTick(() => {
                 this.where.keyword = e;
+                if(this.tabsCurr==2&&this.subCurr==0) this.storeMerchantList(true);
                 this.getProductslist(true);
               })
             })
@@ -604,9 +606,8 @@
         }
         this.cate_change = 0;
         this.cate_change_children = 0;
-        this.where.mer_type = e;
-        this.getStoreCategory();
-        this.getProductslist(true);
+        if(this.tabsCurr!=2||(this.tabsCurr==2&&this.subCurr!=0)) this.where.mer_type = e;
+        this.initData(true);
       },
       changeCate(e) {
         this.cate_change = e;