wxd / MShopWeApp

Commit ec47459e8844efe86beb64dd110e858e6fd5743b

Authored by 后端研发-苏明海
2 parents 61ad26dd e23780b8

Merge branch 'dev' into 'test' 

Dev

See merge request !480
Inline Side-by-side
Showing 5 changed files with 19 additions and 14 deletions
packageA/pages/quan_list/quan_list.wxml
  View file @ec47459
... ... @@ -19,11 +19,11 @@
19 19 <view class="fs28 co_b" style="margin-top: 15rpx">{{item.name}}</view>
20 20 <view style="margin-top: 5rpx">所有门店通用</view>
21 21 <view wx:if="{{item.endtype==0}}">有效期
22   - <text wx:if="{{item.starttype==1 && item.startdays>0}}">{{filters.format_time(getcurday+3600*24*item.startdays)}}</text>
  22 + <text wx:if="{{item.starttype==1}}">{{filters.format_time(getcurday+3600*24*item.startdays)}}</text>
23 23 <text wx:if="{{item.starttype==0 && item.use_start_time>0}}"> {{filters.format_time(item.use_start_time)}}</text>至
24 24 <text wx:if="{{item.use_start_time>0}}"> {{filters.format_time(item.use_end_time)}}</text><text wx:else>不限</text>
25 25 </view>
26   - <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>
  26 + <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>
27 27 <view>每人限领：<text wx:if="{{item.everyone_num>0}}">{{item.everyone_num}}</text><text wx:else>不限</text></view>
28 28 <!-- 领取按钮 -->
29 29 <view data-ind="{{index}}" data-cid="{{item.id}}" catchtap="get_quan">
... ...
packageA/pages/quan_pro/quan_pro.js
  View file @ec47459
... ... @@ -96,10 +96,8 @@ Page({
96 96 th.data.linging = 0;
97 97 if (res.data.code == 0) {
98 98 item.lqnum++;
99   - var text = "dataList[" + index + "].is_get";
100   - var text2 = "dataList[" + index + "].linging";
101 99 var text3="q_data";
102   - var obj = {};obj[text] = 1; obj[text2] = 0;obj[text3] = item;obj['show_success']=1;
  100 + var obj = {};obj[text3] = item;obj['show_success']=1;
103 101 th.setData(obj);
104 102 } else {
105 103 app.confirmBox(res.data.msg);
... ...
packageA/pages/quan_pro/quan_pro.wxml
  View file @ec47459
... ... @@ -13,7 +13,7 @@
13 13 <image style="width: 70rpx; height: 70rpx; vertical-align: middle; margin-right: 20rpx" src="{{iurl}}/miniapp/images/coupon_img/coupon_logo.png"></image>
14 14 {{q_data.name}}
15 15 </view>
16   - <view class="flex ai-center ellipsis-1" style="margin-top: 24rpx; margin-right: 20rpx"><view class="t_circle"></view>
  16 + <view class="flex ai-center" style="margin-top: 24rpx; margin-right: 20rpx; width: 440rpx"><view class="t_circle"></view>
17 17 <text wx:if="{{q_data.useobjecttype==0}}">全场通用</text>
18 18 <text wx:else>仅限{{q_data.useobjectname}}使用</text>
19 19 </view>
... ... @@ -24,13 +24,13 @@
24 24 </view>
25 25 </view>
26 26 <view wx:if="{{q_data.endtype==0}}" class="lower fs30">有效期
27   - <text wx:if="{{q_data.startdays>0 && q_data.starttype==1}}"> {{filters.format_time(getcurday+3600*24*q_data.startdays)}}</text>
  27 + <text wx:if="{{q_data.starttype==1}}"> {{filters.format_time(getcurday+3600*24*q_data.startdays)}}</text>
28 28 <text wx:if="{{q_data.use_start_time>0 && q_data.starttype==0}}"> {{filters.format_time(q_data.use_start_time)}}</text>至
29 29 <text wx:if="{{q_data.use_end_time>0}}"> {{filters.format_time(q_data.use_end_time)}}</text><text wx:else>不限</text>
30 30 </view>
31 31 <view wx:else class="lower fs30">有效期
32 32  
33   - <text wx:if="{{q_data.startdays>0 && q_data.starttype==1}}"> {{filters.format_time(getcurday+3600*24*q_data.startdays)}}至</text>
  33 + <text wx:if="{{ q_data.starttype==1}}"> {{filters.format_time(getcurday+3600*24*q_data.startdays)}}至</text>
34 34 <text wx:if="{{q_data.days>0}}"> {{filters.format_time(getcurday+3600*24*q_data.days)}}</text><text wx:else>不限</text></view>
35 35  
36 36 </view>
... ... @@ -57,7 +57,7 @@
57 57 <view class="up flex jc-center">
58 58 <view class="t-c">
59 59 <image src="{{iurl}}/miniapp/images/coupon_img/success.png"></image>
60   - <view style="margin-top:32rpx;color:#4e220b" class="fs36 ellipsis-1">恭喜您获得【{{get_item.name}}】优惠券</view>
  60 + <view style="margin-top:32rpx;color:#4e220b" class="fs36 ellipsis-1">恭喜您获得【{{q_data.name}}】优惠券</view>
61 61 </view>
62 62 </view>
63 63 <view class="down co-w t-c fs35" bindtap="go_quan">查看我的优惠券</view>
... ...
pages/cart/cart2/cart2.js
  View file @ec47459
... ... @@ -2200,8 +2200,8 @@ Page({
2200 2200 var by_cart_list=this.data.by_quan_list_cart;
2201 2201 if(by_cart_list){
2202 2202 //---所有的券的显示红色选择都清理一遍---
2203   - for(var ind in by_cart_list){
2204   - by_cart_list[ind].show_red=0;
  2203 + for(var inc in by_cart_list){
  2204 + by_cart_list[inc].show_red=0;
2205 2205 }
2206 2206 this.setData({by_quan_list_cart:by_cart_list});
2207 2207 }
... ...
pages/user/plus/plus.js
  View file @ec47459
... ... @@ -172,9 +172,8 @@ Page({
172 172 var arr = [1219, 2089, 3031];
173 173 var new_arr = new Array();
174 174 for (var i = 0; i < plusCard.length; i++) {
175   - //plusCard[i].free=arr[i];
176   -
177   -
  175 + //plusCard[i].free=arr[i];
  176 + if(plusCard[i].IsStopBuy) { continue; }
178 177 if (plusCard[i].CardImg == "") plusCard[i].CardImg = th.data.url + "/miniapp/images/plus/bg"+(i + 1)+ ".jpg?v=1";
179 178 var item = {"fee": plusCard[i].CardFee, 'index': i}
180 179 new_arr.push(item);
... ... @@ -190,6 +189,14 @@ Page({
190 189 return 1;
191 190 }
192 191 });
  192 +
  193 + //里面和外面要显示统一
  194 + switch (new_arr.length) {
  195 + case 1:arr=[3031]; break;
  196 + case 2: arr = [2089, 3031]; break;
  197 + case 3: arr = [1219, 2089, 3031];break;
  198 + }
  199 +
193 200 //---给数组添加立省多少钱---
194 201 for (i = 0; i < plusCard.length; i++) {
195 202 //判断是否停用
... ...