From ce9456a0d853e7bc35a4e81f83db720b1f333ab9 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Sun, 23 Apr 2023 11:45:39 +0800
Subject: [PATCH] 1、  幸运购单独购买的时候，要判断商品价格 2、  分类页面的优化

---
 packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js | 11 +++++++++--
 pages/goods/categoryList/categoryList.wxml                    |  3 +++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
index 852d395..f810665 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
@@ -4579,10 +4579,17 @@ Page({
 
       if (th.data.is_normal == 1) {
         var conf = th.data.bconfig;
-        if (conf.switch_list) {
+        if (conf.switch_list && getApp().globalData.userInfo['card_field'] && getApp().globalData.userInfo['card_expiredate']) {
           var s_list = JSON.parse(conf.switch_list);
+
+          var now = ut.gettimestamp();
+
+          var str = getApp().globalData.userInfo['card_expiredate'].replace(/-/g, '/');
+          var end = new Date(str);
+          end = Date.parse(end) / 1000;
+
           //如果后台有开启等级价的功能
-          if (parseInt(s_list.rank_switch) == 2) {
+          if (parseInt(s_list.rank_switch) == 2 && end > now) {
             var card_price = o[getApp().globalData.userInfo['card_field']];
             //如果会员有等级价
             if (getApp().globalData.userInfo['card_field'] != undefined && getApp().globalData.userInfo['card_field'] != null
diff --git a/pages/goods/categoryList/categoryList.wxml b/pages/goods/categoryList/categoryList.wxml
index 7c5e7c1..0f69613 100644
--- a/pages/goods/categoryList/categoryList.wxml
+++ b/pages/goods/categoryList/categoryList.wxml
@@ -37,6 +37,7 @@
               </view>
             </view>
           </block>
+          <view style="height: 80rpx"></view>
         </scroll-view>
       </swiper-item>
       <!-------国别---------->
@@ -53,6 +54,7 @@
               </view>
             </view>
           </view>
+          <view style="height: 80rpx"></view>
         </scroll-view>
       </swiper-item>
       <!--  品牌  -->
@@ -68,6 +70,7 @@
               </view>
             </view>
           </block>
+          <view style="height: 80rpx"></view>
         </scroll-view>
 
         <view class="nav box box-tb my-nav" catchtouchmove="touchmove" catchtouchend="touchend">
--
libgit2 0.21.4