Commit 0995e647b240751462fdb3297938c30e4d7abfab
1 parent
6b130349
提交订单页
Showing
2 changed files
with
3 additions
and
12 deletions
pages/cart/cart2/cart2.js
| ... | ... | @@ -1097,7 +1097,6 @@ Page({ |
| 1097 | 1097 | |
| 1098 | 1098 | //--------购物车购买时，选择自提和物流----------- |
| 1099 | 1099 | setexptype_w:function(t){ |
| 1100 | - | |
| 1101 | 1100 | var def_exp_code= getApp().globalData.userInfo.def_exp_code,th=this; |
| 1102 | 1101 | var ty = t.currentTarget.dataset.t, txt = t.currentTarget.dataset.txt, |
| 1103 | 1102 | wl_txt = t.currentTarget.dataset.wl_txt, |
| ... | ... | @@ -1107,7 +1106,6 @@ Page({ |
| 1107 | 1106 | var iszt=1; |
| 1108 | 1107 | |
| 1109 | 1108 | if(ty==0){ |
| 1110 | - | |
| 1111 | 1109 | th.setData({ is_all_zt: 0 }); |
| 1112 | 1110 | }else{ |
| 1113 | 1111 | for(var i=0;i<th.data.cartlist.length;i++){ |
| ... | ... | @@ -1128,11 +1126,6 @@ Page({ |
| 1128 | 1126 | } |
| 1129 | 1127 | } |
| 1130 | 1128 | } |
| 1131 | - }else{ | |
| 1132 | - //判断是不是快递 | |
| 1133 | - if (ont == 66) { | |
| 1134 | - this.express_name(); | |
| 1135 | - } | |
| 1136 | 1129 | } |
| 1137 | 1130 | //----计算此时购物车的价格---- |
| 1138 | 1131 | th.calculatePrice(); |
| ... | ... | @@ -1159,10 +1152,8 @@ Page({ |
| 1159 | 1152 | } |
| 1160 | 1153 | } |
| 1161 | 1154 | } |
| 1155 | + th.calculatePrice2() | |
| 1162 | 1156 | |
| 1163 | - | |
| 1164 | - th.calculatePrice2() | |
| 1165 | - console.log('setexptype'); | |
| 1166 | 1157 | }, |
| 1167 | 1158 | |
| 1168 | 1159 | //--------立即购买时，使用余额-------- | ... | ... |
pages/cart/cart2/cart2.wxml
| ... | ... | @@ -101,7 +101,7 @@ |
| 101 | 101 | <view bindtap='setexptype_w' data-t='1' data-txt='cartlist[{{pidx}}].exp_type' class="yu_er">门店自提</view> |
| 102 | 102 | </view> |
| 103 | 103 | |
| 104 | - <view data-t='0'data-ont="66"data-txt='cartlist[{{pidx}}].exp_type' bindtap="setexptype_w" style="display:{{item.distr_t==1?'none':'flex;align-items: center'}};"> | |
| 104 | + <view data-t='0' data-txt='cartlist[{{pidx}}].exp_type' bindtap="setexptype_w" style="display:{{item.distr_t==1?'none':'flex;align-items: center'}};"> | |
| 105 | 105 | <!-- <icon bindtap='setexptype_w' data-t='0' data-txt='cartlist[{{pidx}}].exp_type' color="{{item.exp_type==0?'red':'gray'}}" size="16" type="success"></icon> --> |
| 106 | 106 | <block wx:if="{{item.exp_type==0}}"> |
| 107 | 107 | <!-- <view class="circle white xc-hookt fs20 red-b sn"><text>Γ</text></view> --> |
| ... | ... | @@ -118,7 +118,7 @@ |
| 118 | 118 | </view> |
| 119 | 119 | </view> |
| 120 | 120 | <block wx:if="{{item.exp_type==0}}"> |
| 121 | - <view class="flex-vertical"> | |
| 121 | + <view class="flex-vertical" bindtap="show" data-txt='cartlist[{{pidx}}].wind'> | |
| 122 | 122 | <view >{{wu_arr[item.wind].name}}</view> |
| 123 | 123 | <view class="xc-right"></view> |
| 124 | 124 | </view> | ... | ... |