Merge branch 'test' into 'qa'

Test See merge request !35

Merge branch 'test' into 'qa'
Test See merge request !35
后端研发-苏明海
2 parents 42464d23 7b8676aa
Showing 4 changed files with 13 additions and 9 deletions
pages/team/team_ping/team_ping.wxml
pages/team/team_ping/team_ping.wxss
pages/team/team_success/team_success.js
pages/team/team_success/team_success.wxml
@@ -36,7 +36,7 @@
         <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>
 </view>
-   <view class="xc-img-frame" wx:if="{{item.pt_status==2 || item.pt_status==4 || item.pt_status==5 }}">
+   <view class="xc-img-frame" wx:if="{{item.pt_status==2 || item.pt_status==4 || item.pt_status==5 || item.pt_status==6}}">
    <image style='width' class=""src="{{iurl}}/miniapp/images/xc_qtcg.png"></image>
    </view>
     <view class="xc-img-frame" wx:if="{{item.pt_status==3}}">
@@ -97,8 +97,8 @@
           <view class='C'>
              <view class='yao' wx:if="{{item.pt_status==1}}">邀请好友</view>
-             <view class='s_and_f' wx:if="{{item.pt_status==2 || item.pt_status==4 || item.pt_status==5 }}">查看详情</view>
-             <view class='s_and_f' wx:if="{{item.pt_status==3}}">查看详情</view>
+             <view class='s_and_f' wx:if="{{item.pt_status==2 || item.pt_status==3 || item.pt_status==4 || item.pt_status==5 }}">查看详情</view>
+             <view class='s_and_f' wx:if="{{item.pt_status==6}}">支付尾款失败</view>
           </view>
         </view>
@@ -227,7 +227,6 @@ height:222rpx;
 }
 .s_and_f{
-width:120rpx;
 display:inline-block;
 height:40rpx;
 margin-top:20rpx;
@@ -238,7 +237,6 @@ border-radius:10rpx;
 margin-right:20rpx;
 border: 2rpx solid #646464;
 color: #646464;
-
 }
 .yao{
@@ -140,6 +140,7 @@ Page({
        p_status = 2;  //成功
     if (order.pt_status < 2 && !this.data.payf)
        p_status = 1; //正在进行
+    if ( order.pt_status == 6)   p_status = 4; //支付尾款失败
     //多少人参团头像
     await getApp().request.promiseGet("/api/weshop/order/pagePtList", {
@@ -52,18 +52,19 @@
       <block wx:else>
         该团已经拼购到最低价了哦~
       </block>
-    
-
     </view>
     <!-- 拼团成功 -->
     <view class="xc-ptcomplete-ladder flex-level fs28" wx:if="{{teamlist.kttype==3&&p_status==2}}">
-
       <view class="xc-wc">拼团成功</view>,当前价格
       <text class="xc-wc">￥{{ct_price}}</text>
       <view class="xc-img-frame oh">
         <image class="img" src="{{iurl}}/miniapp/images/xc_qtcg.png"></image>
       </view>
     </view>
+
+    <view style="height: 20rpx" wx:if="{{teamlist.kttype==3&&p_status==4}}"></view>
+
+
     <!-- 阶梯团失败 -->
     <view class=".xc-fail-ladder flex-level fs28" wx:if="{{pay_f==1 || order.pt_status==3}}">
       <view class="xc-wc">拼团失败</view>
@@ -128,7 +129,11 @@
         <span>{{obj.min}}</span>分
         <span>{{obj.sec}}</span>秒
       </view>
-     
+
+      <view class='bodytimecen-success' wx:if='{{teamlist.kttype==3&&p_status==4 }}'>
+         拼团已结束
+      </view>
+      
       <!-- </block> -->
       <!-- 阶梯团失败 -->
       <view class='bodytimecen' wx:if='{{p_status==3}}'>