Commit 7b8676aacbfa17f616e8754dc191be65f9d550a7
Merge branch 'dev' into 'test'
关于支付尾款的修改，和显示 See merge request !34
Showing
4 changed files
with
13 additions
and
9 deletions
pages/team/team_ping/team_ping.wxml
| ... | ... | @@ -36,7 +36,7 @@ |
| 36 | 36 | <view class="flex word-line xc-ash {{item.pt_status==1?'xc-rmbs':'xc-rmb'}}"><text class="fs24 xc-black">零售价:</text><text class="fs24 xc-wc">￥</text><text class="fs26 xc-wc">{{item.order_goods[0].market_price}}</text> </view> |
| 37 | 37 | </view> |
| 38 | 38 | |
| 39 | - <view class="xc-img-frame" wx:if="{{item.pt_status==2 || item.pt_status==4 || item.pt_status==5 }}"> | |
| 39 | + <view class="xc-img-frame" wx:if="{{item.pt_status==2 || item.pt_status==4 || item.pt_status==5 || item.pt_status==6}}"> | |
| 40 | 40 | <image style='width' class=""src="{{iurl}}/miniapp/images/xc_qtcg.png"></image> |
| 41 | 41 | </view> |
| 42 | 42 | <view class="xc-img-frame" wx:if="{{item.pt_status==3}}"> |
| ... | ... | @@ -97,8 +97,8 @@ |
| 97 | 97 | |
| 98 | 98 | <view class='C'> |
| 99 | 99 | <view class='yao' wx:if="{{item.pt_status==1}}">邀请好友</view> |
| 100 | - <view class='s_and_f' wx:if="{{item.pt_status==2 || item.pt_status==4 || item.pt_status==5 }}">查看详情</view> | |
| 101 | - <view class='s_and_f' wx:if="{{item.pt_status==3}}">查看详情</view> | |
| 100 | + <view class='s_and_f' wx:if="{{item.pt_status==2 || item.pt_status==3 || item.pt_status==4 || item.pt_status==5 }}">查看详情</view> | |
| 101 | + <view class='s_and_f' wx:if="{{item.pt_status==6}}">支付尾款失败</view> | |
| 102 | 102 | </view> |
| 103 | 103 | |
| 104 | 104 | </view> | ... | ... |
pages/team/team_ping/team_ping.wxss
| ... | ... | @@ -227,7 +227,6 @@ height:222rpx; |
| 227 | 227 | |
| 228 | 228 | } |
| 229 | 229 | .s_and_f{ |
| 230 | -width:120rpx; | |
| 231 | 230 | display:inline-block; |
| 232 | 231 | height:40rpx; |
| 233 | 232 | margin-top:20rpx; |
| ... | ... | @@ -238,7 +237,6 @@ border-radius:10rpx; |
| 238 | 237 | margin-right:20rpx; |
| 239 | 238 | border: 2rpx solid #646464; |
| 240 | 239 | color: #646464; |
| 241 | - | |
| 242 | 240 | } |
| 243 | 241 | |
| 244 | 242 | .yao{ | ... | ... |
pages/team/team_success/team_success.js
| ... | ... | @@ -140,6 +140,7 @@ Page({ |
| 140 | 140 | p_status = 2; //成功 |
| 141 | 141 | if (order.pt_status < 2 && !this.data.payf) |
| 142 | 142 | p_status = 1; //正在进行 |
| 143 | + if ( order.pt_status == 6) p_status = 4; //支付尾款失败 | |
| 143 | 144 | |
| 144 | 145 | //多少人参团头像 |
| 145 | 146 | await getApp().request.promiseGet("/api/weshop/order/pagePtList", { | ... | ... |
pages/team/team_success/team_success.wxml
| ... | ... | @@ -52,18 +52,19 @@ |
| 52 | 52 | <block wx:else> |
| 53 | 53 | 该团已经拼购到最低价了哦~ |
| 54 | 54 | </block> |
| 55 | - | |
| 56 | - | |
| 57 | 55 | </view> |
| 58 | 56 | <!-- 拼团成功 --> |
| 59 | 57 | <view class="xc-ptcomplete-ladder flex-level fs28" wx:if="{{teamlist.kttype==3&&p_status==2}}"> |
| 60 | - | |
| 61 | 58 | <view class="xc-wc">拼团成功</view>,当前价格 |
| 62 | 59 | <text class="xc-wc">￥{{ct_price}}</text> |
| 63 | 60 | <view class="xc-img-frame oh"> |
| 64 | 61 | <image class="img" src="{{iurl}}/miniapp/images/xc_qtcg.png"></image> |
| 65 | 62 | </view> |
| 66 | 63 | </view> |
| 64 | + | |
| 65 | + <view style="height: 20rpx" wx:if="{{teamlist.kttype==3&&p_status==4}}"></view> | |
| 66 | + | |
| 67 | + | |
| 67 | 68 | <!-- 阶梯团失败 --> |
| 68 | 69 | <view class=".xc-fail-ladder flex-level fs28" wx:if="{{pay_f==1 || order.pt_status==3}}"> |
| 69 | 70 | <view class="xc-wc">拼团失败</view> |
| ... | ... | @@ -128,7 +129,11 @@ |
| 128 | 129 | <span>{{obj.min}}</span>分 |
| 129 | 130 | <span>{{obj.sec}}</span>秒 |
| 130 | 131 | </view> |
| 131 | - | |
| 132 | + | |
| 133 | + <view class='bodytimecen-success' wx:if='{{teamlist.kttype==3&&p_status==4 }}'> | |
| 134 | + 拼团已结束 | |
| 135 | + </view> | |
| 136 | + | |
| 132 | 137 | <!-- </block> --> |
| 133 | 138 | <!-- 阶梯团失败 --> |
| 134 | 139 | <view class='bodytimecen' wx:if='{{p_status==3}}'> | ... | ... |