Merge branch 'dev' into 'test'

Dev See merge request !480

Merge branch 'dev' into 'test'
Dev See merge request !480
后端研发-苏明海
2 parents 61ad26dd e23780b8
Showing 5 changed files with 19 additions and 14 deletions
packageA/pages/quan_list/quan_list.wxml
packageA/pages/quan_pro/quan_pro.js
packageA/pages/quan_pro/quan_pro.wxml
pages/cart/cart2/cart2.js
pages/user/plus/plus.js
@@ -19,11 +19,11 @@
               <view class="fs28 co_b" style="margin-top: 15rpx">{{item.name}}</view>
               <view style="margin-top: 5rpx">所有门店通用</view>
               <view wx:if="{{item.endtype==0}}">有效期              
-                 <text wx:if="{{item.starttype==1 && item.startdays>0}}">{{filters.format_time(getcurday+3600*24*item.startdays)}}</text>
+                 <text wx:if="{{item.starttype==1}}">{{filters.format_time(getcurday+3600*24*item.startdays)}}</text>
                   <text wx:if="{{item.starttype==0 && item.use_start_time>0}}"> {{filters.format_time(item.use_start_time)}}</text>至
                   <text wx:if="{{item.use_start_time>0}}"> {{filters.format_time(item.use_end_time)}}</text><text wx:else>不限</text>
               </view>
-              <view wx:else>有效期 <text wx:if="{{item.starttype==1 && item.startdays>0}}">{{filters.format_time(getcurday+3600*24*item.startdays)}}至</text> <text wx:if="{{item.days>0}}">{{filters.format_time(getcurday+3600*24*item.days)}}</text><text wx:else>不限</text></view>
+              <view wx:else>有效期 <text wx:if="{{item.starttype==1}}">{{filters.format_time(getcurday+3600*24*item.startdays)}}至</text> <text wx:if="{{item.days>0}}">{{filters.format_time(getcurday+3600*24*item.days)}}</text><text wx:else>不限</text></view>
               <view>每人限领：<text wx:if="{{item.everyone_num>0}}">{{item.everyone_num}}</text><text wx:else>不限</text></view>
               <!-- 领取按钮 -->
               <view data-ind="{{index}}"  data-cid="{{item.id}}" catchtap="get_quan">
@@ -96,10 +96,8 @@ Page({
         th.data.linging = 0;
         if (res.data.code == 0) {
           item.lqnum++;
-          var text = "dataList[" + index + "].is_get";
-          var text2 = "dataList[" + index + "].linging";
           var text3="q_data";
-          var obj = {};obj[text] = 1; obj[text2] = 0;obj[text3] = item;obj['show_success']=1;
+          var obj = {};obj[text3] = item;obj['show_success']=1;
           th.setData(obj);
         } else {
           app.confirmBox(res.data.msg);
@@ -13,7 +13,7 @@
                          <image style="width: 70rpx; height: 70rpx; vertical-align: middle; margin-right: 20rpx" src="{{iurl}}/miniapp/images/coupon_img/coupon_logo.png"></image>
                          {{q_data.name}}
                      </view>
-                     <view class="flex ai-center ellipsis-1" style="margin-top: 24rpx; margin-right: 20rpx"><view class="t_circle"></view>
+                     <view class="flex ai-center" style="margin-top: 24rpx; margin-right: 20rpx; width: 440rpx"><view class="t_circle"></view>
                              <text wx:if="{{q_data.useobjecttype==0}}">全场通用</text>
                              <text wx:else>仅限{{q_data.useobjectname}}使用</text>
                      </view>
@@ -24,13 +24,13 @@
                 </view>
             </view>
             <view wx:if="{{q_data.endtype==0}}" class="lower fs30">有效期
-                 <text wx:if="{{q_data.startdays>0 && q_data.starttype==1}}">  {{filters.format_time(getcurday+3600*24*q_data.startdays)}}</text>
+                 <text wx:if="{{q_data.starttype==1}}">  {{filters.format_time(getcurday+3600*24*q_data.startdays)}}</text>
                 <text wx:if="{{q_data.use_start_time>0 && q_data.starttype==0}}"> {{filters.format_time(q_data.use_start_time)}}</text>至
                 <text wx:if="{{q_data.use_end_time>0}}"> {{filters.format_time(q_data.use_end_time)}}</text><text wx:else>不限</text>
             </view>
             <view wx:else class="lower fs30">有效期 
-              <text wx:if="{{q_data.startdays>0 && q_data.starttype==1}}"> {{filters.format_time(getcurday+3600*24*q_data.startdays)}}至</text>
+              <text wx:if="{{ q_data.starttype==1}}"> {{filters.format_time(getcurday+3600*24*q_data.startdays)}}至</text>
             <text wx:if="{{q_data.days>0}}">  {{filters.format_time(getcurday+3600*24*q_data.days)}}</text><text wx:else>不限</text></view>
         </view>
@@ -57,7 +57,7 @@
         <view class="up flex jc-center">
             <view class="t-c">
                 <image src="{{iurl}}/miniapp/images/coupon_img/success.png"></image>
-                <view style="margin-top:32rpx;color:#4e220b" class="fs36 ellipsis-1">恭喜您获得【{{get_item.name}}】优惠券</view>
+                <view style="margin-top:32rpx;color:#4e220b" class="fs36 ellipsis-1">恭喜您获得【{{q_data.name}}】优惠券</view>
             </view>
         </view>
         <view class="down co-w t-c fs35" bindtap="go_quan">查看我的优惠券</view>
@@ -2200,8 +2200,8 @@ Page({
     var by_cart_list=this.data.by_quan_list_cart;
     if(by_cart_list){
       //---所有的券的显示红色选择都清理一遍---
-      for(var ind in by_cart_list){
-        by_cart_list[ind].show_red=0;
+      for(var inc in by_cart_list){
+        by_cart_list[inc].show_red=0;
       }
       this.setData({by_quan_list_cart:by_cart_list});
     }
@@ -172,9 +172,8 @@ Page({
       var arr = [1219, 2089, 3031];
       var new_arr = new Array();
       for (var i = 0; i < plusCard.length; i++) {
-        //plusCard[i].free=arr[i];
-       
-        
+           //plusCard[i].free=arr[i];
+            if(plusCard[i].IsStopBuy) {  continue; }
             if (plusCard[i].CardImg == "") plusCard[i].CardImg =  th.data.url + "/miniapp/images/plus/bg"+(i + 1)+ ".jpg?v=1";
             var item = {"fee": plusCard[i].CardFee, 'index': i}
             new_arr.push(item);
@@ -190,6 +189,14 @@ Page({
           return 1;
         }
       });
+
+      //里面和外面要显示统一
+      switch (new_arr.length) {
+        case 1:arr=[3031]; break;
+        case 2: arr = [2089, 3031]; break;
+        case 3: arr = [1219, 2089, 3031];break;
+      }
+
       //---给数组添加立省多少钱---
       for (i = 0; i < plusCard.length; i++) {
          //判断是否停用