Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

season
2 parents df714a01 266136ab
Showing 4 changed files with 21 additions and 16 deletions
pages/team/team_show/team_show.wxml
pages/team/team_show/team_show.wxss
pages/team/team_success/team_success.js
pages/team/team_success/team_success.wxml
@@ -55,19 +55,15 @@
     </view>
     <!--头像-->
     <view class="flex_tou">
-        <view class='bodyimg flex-level' wx:for="{{ordertx}}" wx:key>
+      <view class='bodyimg flex-level' wx:for="{{ordertx}}" wx:key>
        <view class='d'>
-        <image src='{{item.head_pic}}'></image>
-        <span wx:if="{{item.is_pt_tz==1}}">团长</span>
+          <image src='{{item.head_pic}}'></image>
+           <span wx:if="{{item.is_pt_tz==1}}">团长</span>
+       </view>
       </view>
-       <view class='d'>
-        <image src='{{imageurl}}/miniapp/images/shafa.png'></image>
-      </view>
-   
-         <view class='xc-ellipsis-img'  wx:if="{{length>5}}">
-    <image style='width:56rpx;height:56rpx;margin-left:10rpx;' src="{{imageurl}}/miniapp/images/xc_ellipsis.png"></image>
-    </view>
-    </view>
+       <view class='xc-ellipsis-img'  wx:if="{{length>5}}">
+          <image style='width:56rpx;height:56rpx;margin-left:10rpx;' src="{{imageurl}}/miniapp/images/xc_ellipsis.png"></image>
+        </view>
@@ -102,7 +102,7 @@ page {
   /* display: flex;
   justify-content: center;
   align-items: center; */
-  width:590rpx;
+
 }
@@ -185,7 +185,10 @@ Page({
       //只装5个
-      var ordertx2=[],sf_num=0,ct_nun=teamlist.ct_num;;
+      var ordertx2=[],sf_num=0,ct_nun=teamlist.ct_num;
+      if(max_num){
+         ct_nun=parseInt(max_num);
+      }
       if(ct_nun>5) ct_nun=5;
       for(var i=0;i<ct_nun;i++){
@@ -45,9 +45,15 @@
     <!-- 阶梯团 -->
     <view class='bodytop' wx:if="{{teamlist.kttype==3&& p_status==1}}">
       当前价格
-      <text class="xc-wc">¥{{ct_price}}</text>, 还差
-      <text class="xc-wc">{{max_num-ordertx.length}}</text>人享受最低价格
-      <text class="xc-wc">￥{{min_price}}</text>
+      <text class="xc-wc">¥{{ct_price}}</text>, 
+      <block  wx:if="{{max_num-ordertx.length>0}}">
+          <text class="xc-wc">还差{{max_num-ordertx.length}}</text>人享受最低价格<text class="xc-wc">￥{{min_price}}</text>
+      </block>
+      <block wx:else>
+        该团已经拼购到最低价了哦~
+      </block>
+    
+
     </view>
     <!-- 拼团成功 -->
     <view class="xc-ptcomplete-ladder flex-level fs28" wx:if="{{teamlist.kttype==3&&p_status==2}}">