From 39b4c032e1b778568ffe08b2fe315380b61c42bf Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Thu, 23 Dec 2021 11:25:46 +0800
Subject: [PATCH] 商品列表的bug，活动未进行的优化

---
 pages/goods/goodsList/goodsList.js   | 15 ++++++++-------
 pages/goods/goodsList/goodsList.wxml |  4 ++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js
index 8270dde..412d0b1 100644
--- a/pages/goods/goodsList/goodsList.js
+++ b/pages/goods/goodsList/goodsList.js
@@ -118,23 +118,19 @@ Page({
                   var arr= res.data.data;
 
                   if(arr.is_end==1){
-                      th.setData({show_all:0});
-                      th.setData({err_txt:'活动已结束'});
+                      th.setData({show_all:0,err_txt:'活动已结束'});
                       return false;
                   }
                   if(arr.start_time>ut.gettimestamp()){
-                      th.setData({show_all:0});
-                      th.setData({err_txt:'活动还未开始'});
+                      th.setData({show_all:0,err_txt:'活动还未开始'});
                       return false;
                   }
                   if(arr.end_time<ut.gettimestamp()){
                       th.setData({show_all:0});
-                      th.setData({err_txt:'活动还未开始'});
+                      th.setData({show_all:0,err_txt:'活动已结束'});
                       return false;
                   }
 
-
-
                   var url1="/api/weshop/prom/ladderList/list?store_id="+oo.stoid+"&form_id="+arr.id;
                   getApp().request.promiseGet(url1, {}).then(rs=>{
                       if(rs.data.code==0 && rs.data.data && rs.data.data.length) {
@@ -151,9 +147,14 @@ Page({
                       }
                   })
               }
+              else{
+                  th.setData({show_all:0,err_txt:'未找到活动或者身份不符'});
+              }
           })
       }
 
+
+
       this.requestGoodsList(url);
 	  getApp().getConfig2(function(rs){  	  
 			  //计算等级价相关
diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml
index 7f97ca7..9f6cb89 100644
--- a/pages/goods/goodsList/goodsList.wxml
+++ b/pages/goods/goodsList/goodsList.wxml
@@ -295,7 +295,7 @@
       <navigator class="lookat" url="/pages/index/index/index">回到首页</navigator>
     </view>
   </view>
-  <view hidden="{{!openFilterModal}}">
+<view hidden="{{!openFilterModal}}">
     <view bindtap="closeFilterModal" class="cover-layer"></view>
     <view class="filter-modal">
       <icon bindtap="closeFilterModal" class="modal-close" color="gray" size="22" type="cancel"></icon>
@@ -334,7 +334,7 @@
 
 <share_box id="share"></share_box>
 <view class="t-c fs32" wx:if="{{err_txt}}">
-	<view class="no-data" wx:if="{{(!requestData||requestData.length==0) && is_go}}">
+	<view class="no-data">
 		<image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
 		<view class="no-data-title">{{err_txt}}</view>
 		<navigator class="lookat" url="/pages/index/index/index">回到首页</navigator>
--
libgit2 0.21.4