From bfdcaca15ad6587f00cbb6d6195bad2346996fc1 Mon Sep 17 00:00:00 2001
From: abson <antploy.ni@meidd.com>
Date: Tue, 21 Dec 2021 10:55:53 +0800
Subject: [PATCH] 阶梯购商品搜索优化

---
 pages/goods/goodsList/goodsList.js   |  7 ++++++-
 pages/goods/goodsList/goodsList.wxml |  2 +-
 pages/goods/search/search.js         | 53 +++++++++++++++++++++++++++++++++++++++--------------
 3 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js
index 4bd71dd..7cc8bb1 100644
--- a/pages/goods/goodsList/goodsList.js
+++ b/pages/goods/goodsList/goodsList.js
@@ -69,7 +69,12 @@ Page({
      
 	  if (0 != t.is_new && t.is_new != undefined) { url += "&is_new=" + t.is_new; }
 	  if (0 != t.is_hot && t.is_hot != undefined) { url += "&is_hot=" + t.is_hot; }
-	  if (0 != t.ladder_id && t.ladder_id != undefined) { url += "&ladder_id=" + t.ladder_id; }
+      if (0 != t.ladder_id && t.ladder_id != undefined) {
+           url += "&ladder_id=" + t.ladder_id; 
+           this.setData({
+            ladder_id:t.ladder_id,
+           })
+        }
 
 	  var user_id=getApp().globalData.user_id;
       if(!user_id) user_id=0;
diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml
index d8011d4..d42e021 100644
--- a/pages/goods/goodsList/goodsList.wxml
+++ b/pages/goods/goodsList/goodsList.wxml
@@ -19,7 +19,7 @@
 	<view class="pd20 flex ai-center jc_sb">
 		<!-- 搜索框 -->
 		<view class="search-box f1">
-			<navigator hover-class="none" url="/pages/goods/search/search"><text class="iconfont icon-sousuo pdr10"></text>搜索店铺商品</navigator>
+			<navigator hover-class="none" url="/pages/goods/search/search?ladder_id={{ladder_id}}"><text class="iconfont icon-sousuo pdr10"></text>搜索店铺商品</navigator>
 		</view>
 		<!-- 单列/双列 显示切换 -->
 		<text class="iconfont {{isToggle ? 'icon-fenxiang':'icon-fenlie'}} pdl30 fs36" bindtap="bindToggleDisplay"></text>
diff --git a/pages/goods/search/search.js b/pages/goods/search/search.js
index ae5119f..63833ef 100644
--- a/pages/goods/search/search.js
+++ b/pages/goods/search/search.js
@@ -108,7 +108,13 @@ Page({
        if (0 != t.brand_id && t.brand_id!=undefined){ url += "&brand_id=" + t.brand_id;}
        if (0 != t.nation_id && t.nation_id!=undefined) { url += "&nation_id=" + t.nation_id;}
        if (0 != t.max_price && t.max_price!=undefined) { url += "&min_pirce=" + t.min_pirce + "&max_price=" + t.max_price;}
-	      
+       if (0 != t.ladder_id && t.ladder_id != undefined) {
+        url += "&ladder_id=" + t.ladder_id; 
+        this.setData({
+         baseUrl:url,
+
+        })
+     }
        if (url != this.data.baseUrl) return this.requestSearch(url);
        this.openSearchModal();
         // 获取历史搜索记录
@@ -200,20 +206,39 @@ Page({
                             break
                     }
                     if(url!=null && url!=''){
-                        await getApp().request.promiseGet(url, {}).then(res => {
+                        await getApp().request.promiseGet(url, {}).then(async res => {
                             var prom =null;
-                            if(res && res.data) prom=res.data.data;
-                            if (prom != null && prom.is_end==0 && prom.end_time>now && (prom.start_time<now || (prom.show_time && prom.show_time<now)) ) {
-                                item.prom_price = res.data.data.price;
-                                if(res.data.data.user_price) item.prom_price=res.data.data.user_price;
-                                var vNum=res.data.data.virtual_num?res.data.data.virtual_num:0;
-                                var vNum1=res.data.data.virtualNum?res.data.data.virtualNum:0;
-                                var vNum2=res.data.data.virtual?res.data.data.virtual:0;
-                                item.sales_sum=res.data.data.buy_num+(vNum+vNum1+vNum2);
-                            }else{
-                                item.prom_type=0;
-                                item.prom_id=0;
-                                item.prom_price=null;
+                            var flag=null;
+                            if(res.data.code==0 && res.data.data){
+                                prom=res.data.data;
+                                await getApp().request.promiseGet("/api/weshop/teamlist/pageteam/1",{
+                                    data:{
+                                      store_id: oo.stoid,
+                                      is_end: 0,
+                                      is_show: 1,
+                                      user_id: getApp().globalData.user_id,
+                                      pageSize:1000
+                                    }
+                                  }).then(pd=>{
+                                    let pd_list=pd.data.data.pageData;
+                                    if(res.data.code==0 && pd_list.length>0){
+                                      flag =pd_list.some(pd=>{
+                                          return pd.goods_id==item.goods_id
+                                      })
+                                    }
+                                    if (prom != null && prom.is_end==0 && prom.end_time>now && flag  && (prom.start_time<now || (prom.show_time && prom.show_time<now)) ) {
+                                        item.prom_price = res.data.data.price;
+                                        if(res.data.data.user_price) item.prom_price=res.data.data.user_price;
+                                        var vNum=prom.virtual_num?prom.virtual_num:0;
+                                        var vNum1=prom.virtualNum?prom.virtualNum:0;
+                                        var vNum2=prom.virtual?prom.virtual:0;
+                                        item.sales_sum=prom.buy_num+(vNum+vNum1+vNum2);
+                                    }else{
+                                        item.prom_type=0;
+                                        item.prom_id=0;
+                                        item.prom_price=null;
+                                    }
+                                  })
                             }
                         })
                     }
--
libgit2 0.21.4