Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into test

WXD-SEASON\season
2 parents 137fe81e 86c301d8
Showing 4 changed files with 25 additions and 10 deletions
packageE/pages/user/labels/labels.js
pages/cart/cart/cart.js
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsList/goodsList.wxml
@@ -235,6 +235,9 @@ Page({
             title: "处理中.",
             mask: true
         })
+        th.setData({
+          is_check: 1
+        })
         app.request.get("/api/weshop/users/thirdLogin", {
             data: getApp().globalData.zc_dd,
@@ -3854,6 +3854,7 @@ Page({
     //主要判断有没有促销活动
     var is_sele_prom = 0;
     var is_gift_del = 0;
+    
     for (var i = 0; i < list.goods.length; i++) {
       var item = list.goods[i];
       if (item.prom_type == 3 && item.selected && !item.is_gift) {
@@ -3927,6 +3928,7 @@ Page({
         limit_num=prom.limit_num;
         user_pre_buynum = await this.getUserBuyPromNum_pre(prom.id)
       }
+      
       //如果活动已经结束
       if (!prom || prom.is_end || prom.end_time < ut.gettimestamp()) {
         for (var ii in list.goods) {
@@ -3992,6 +3994,8 @@ Page({
             }
           }
         }
+      }else{
+        continue;
       }
@@ -4147,7 +4151,7 @@ Page({
   //优惠促销用户参与次数
   async getUserBuyPromNum_pre(prom_id){
     var userInfo = getApp().globalData.userInfo;
-    var url = `/api/weshop/ordergoods/getUserBuyPromNum?store_id=${os.stoid}&user_id=${userInfo.user_id}&prom_type=3&prom_id=${prom_id}`;
+    var url = `/api/weshop/ordergoods/getUserBuyPromNum?is_all=1&store_id=${os.stoid}&user_id=${userInfo.user_id}&prom_type=3&prom_id=${prom_id}`;
     let res = await getApp().request.promiseGet(url, {
       data:{}
     });
@@ -4529,7 +4533,7 @@ Page({
       store_id: os.stoid, goodsidlist: gd, is_detail: 1, user_id: user_id
     };
-    //获取秒杀的多规格
+    //获取秒杀的多规格 
     getApp().request.promiseGet(url, { data: req_data }).then(res => {
       if (res.data.code == 0 && res.data.data) {
         if (res.data.data.length == 1) {
@@ -1959,6 +1959,7 @@ Page({
         var end = new Date(str);
         end = Date.parse(end) / 1000;
+
         //--如果后台有开启等级价的功能，而且会员的等级没有过期的情况下--
         if (parseInt(s_list.rank_switch) == 2 && end > now) {
           var card_price = o[getApp().globalData.userInfo['card_field']];
@@ -5186,8 +5187,15 @@ Page({
         var conf = th.data.bconfig;
         if (conf.switch_list) {
           var s_list = JSON.parse(conf.switch_list);
+
+          var str = getApp().globalData.userInfo['card_expiredate'].replace(/-/g, '/');
+          var end = new Date(str);
+          end = Date.parse(end) / 1000;
+
+          var now = ut.gettimestamp();
+
           //如果后台有开启等级价的功能
-          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 &&
@@ -119,7 +119,7 @@
                   </view>
                 </view>
                 <view class="comment">
-                  <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb">{{item.market_price}}</view>
+                  <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb no_line_x">{{item.market_price}}</view>
                   <view class="fs24 t-r">
 										<span>评论{{item.comment_count}}</span>
 										<span class="pdl30">已售{{item.sales_sum}}</span>
@@ -160,7 +160,7 @@
               <block wx:else>
 								<view>
 									<view class="price rmb">{{item.shop_price}}</view>
-									<view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb">{{item.market_price}}</view>
+									<view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb no_line_x">{{item.market_price}}</view>
 								</view>
                 <!-- <view class="price">￥{{item.shop_price}}</view> -->
                 <view class="comment pdt10">
@@ -175,7 +175,7 @@
           <view wx:else>
 						<view class="flex ai-center">
 							<view class="price rmb">{{item.shop_price}}</view>
-							<view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>
+							<view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb fs24 mgl10 no_line_x">{{item.market_price}}</view>
 						</view>
             <view class="comment pdt10">
@@ -234,7 +234,7 @@
 		                </view>
 		              </view>
 		              <view class="comment">
-		                <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb">{{item.market_price}}</view>
+		                <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb no_line_x">{{item.market_price}}</view>
 		                <view class="fs24 t-r">
 											<span>评论{{item.comment_count}}</span>
 											<span class="pdl30">已售{{item.sales_sum}}</span>
@@ -275,7 +275,7 @@
 		            <block wx:else>
 									<view>
 										<view class="price rmb">{{item.shop_price}}</view>
-										<view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb">{{item.market_price}}</view>
+										<view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb no_line_x">{{item.market_price}}</view>
 									</view>
 		              <!-- <view class="price">￥{{item.shop_price}}</view> -->
 		              <view class="comment pdt10">
@@ -290,8 +290,8 @@
 		        <view wx:else>
 							<view class="">
 								<view class="price rmb">{{item.shop_price}}</view>
-								<view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>
-							</view>
+								<view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb fs24 mgl10 no_line_x">{{item.market_price}}</view>
+							</view> 
 		          <view class="comment pdt10">
 		            <view class="fs24 t-r">