Merge branch 'dev' into 'test'

Dev See merge request !15

Merge branch 'dev' into 'test'
Dev See merge request !15
后端研发-苏明海
2 parents 08f402a7 128fab16
Showing 12 changed files with 116 additions and 44 deletions
components/nav_box/nav_box.wxss
pages/cart/cart2/cart2.js
pages/cart/cart2/cart2.wxml
pages/cart/cart2_pt/cart2_pt.js
pages/cart/cart2_pt/cart2_pt.wxml
pages/team/team_ping/team_ping.wxml
pages/team/team_ping/team_ping.wxss
pages/team/team_show/team_show.js
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
 .box_main{
-    width:100rpx;
-    height:100rpx;
+    width:80rpx;
+    height:80rpx;
     background:#272636;
     transition:width 0.8s;
     -moz-transition:width 0.8s; /* Firefox 4 */
@@ -18,16 +18,19 @@
 }
 .box_main .dian{
-    text-align: center;
-    width:100rpx;
-    height:100rpx;  
-    color: #ffff;
-    font-size: 70rpx;
-    background: none;
+  text-align: center;
+width: 50rpx;
+height: 50rpx;
+color: #ffff;
+font-size: 50rpx;
+background: none;
+
 }
 .box_main .dian image{
-   width:75rpx; height:30rpx;margin-top:36rpx;
+  width: 60rpx;
+height: 20rpx;
+margin: 30rpx 0 0 10rpx;
 }
 .box_main.box_isopen  .dian{
@@ -46,14 +49,18 @@
 .box_main .cl_list .item{
     display: inline-block;
     width:100rpx;
-    height:100rpx;
+    height:80rpx;
     text-align: center;
-    line-height: 100rpx;
+    line-height: 80rpx;
     color: #fff;
     vertical-align: top;
+    font-size: 32rpx;
+
 }
 .box_main .cl_list .item.big{
-    font-size: 70rpx;line-height: 90rpx;
+  font-size: 70rpx;
+line-height: 70rpx;
+
 }
@@ -1192,6 +1192,13 @@ Page({
           th.calculatePrice();
         }
         th.setData({open_quan:0});
+  },
+
+  cart_set_err:function(e){
+       var txt = e.currentTarget.dataset.err;
+       var ob={};
+       ob[txt] = this.data.imgUrl + "/miniapp/images/default_g_img.gif";
+       this.setData(ob);
   }
 });
@@ -34,7 +34,8 @@
                 <view class="order-detail" wx:for="{{item.goods}}" wx:for-index="idx"  wx:for-item="items">
                     <!----商品图片----->
                     <view class="goods-img">
-                        <image class="wh100" src="{{items.original_img}}"></image>
+                        <image class="wh100" src="{{items.original_img}}"  binderror='cart_set_err'
+                         data-err='cartlist[{{pidx}}].goods[{{idx}}].original_img' ></image>
                     </view>
                     <!----商品名称规格---->
                     <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{items.goods_id}}">
@@ -108,7 +109,7 @@
                       <image class="dp" src='{{imgUrl}}/miniapp/images/dianpu.png'> </image> <view>门店：{{bn_pickname}}</view></view>
                 <view class="order-detail">
                       <view class="goods-img">
-                          <image class="wh100" src="{{bn_goods.original_img}}"></image>
+                          <image class="wh100" src="{{bn_goods.original_img}}" binderror='cart_set_err' data-err="bn_goods.original_img"></image>
                       </view>
                       <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{bn_goods.goods_id}}">
                           <view class="goods-name">{{bn_goods.goods_name}}</view>
@@ -617,5 +617,13 @@ Page({
         var ind=e.detail.value, txt = e.currentTarget.dataset.txt;
         this.setData({ [txt]: ind });
         this.calculatePrice();
-   }
+   },
+   
+  cart_set_err: function (e) {
+    var txt = e.currentTarget.dataset.err;
+    var ob = {};
+    ob[txt] = this.data.imgUrl + "/miniapp/images/default_g_img.gif";
+    this.setData(ob);
+  }
+
 });
@@ -31,7 +31,8 @@
                       <image class="dp" src='{{imgUrl}}/miniapp/images/dianpu.png'> </image> <view>门店：{{bn_pickname}}</view></view>
                 <view class="order-detail">
                       <view class="goods-img">
-                          <image class="wh100" src="{{bn_goods.original_img}}"></image>
+                          <image class="wh100" src="{{bn_goods.original_img}}" 
+                            binderror='cart_set_err' data-err="bn_goods.original_img"></image>
                       </view>
                       <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{bn_goods.goods_id}}">
                           <view class="goods-name">{{bn_goods.goods_name}}</view>
@@ -15,7 +15,7 @@
     <!--top-->
     <view class='pd-list-top'>
       <!-- <image src='{{iurl}}/miniapp/images/dianpu.png'></image> -->
-      <text class='pd-wz'>订单编号:{{item.order_sn}}</text>
+      <text class='pd-wz'>订单编号：{{item.order_sn}}</text>
       <image class='jt' src='{{iurl}}/miniapp/images/icojiantou1.png'></image>
     </view>
     <!--image-->
@@ -25,7 +25,7 @@
        <image src='{{item.gimage}}' binderror='images_err' data-err="order[{{index}}].gimage"></image>
     </view>
     <view>
-       <view class='pd-img-wz1 ellipsis-2'>{{item.goods.goods_name}}
+       <view class='pd-img-wz1 ellipsis-2'>{{item.order_goods[0].goods_name}}
       </view>
@@ -33,7 +33,7 @@
       <view class="flex">
       <text  class='fs24 xc-wc {{item.pt_status==1?"xc-rmbs":"xc-rmb"}}'>￥</text>
         <view class='pd-jg xc-wc'>{{item.order_goods[0].goods_price}}</view>
-        <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 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-still-bad flex fs24" wx:if="{{item.pt_status==1}}">   
            <block wx:if="{{item.ct_num-item.tx.length>0}}">     
@@ -70,9 +70,9 @@
             </block>       
             <block wx:else>
                   <view class='foot-l-wz fs35' wx:if="item.is_zsorder==4">
-                       定金:￥{{filters.toFix(item.order_amount+item.user_money,2)}}</view>     
-                  <view class='foot-l-wz fs35' wx:else>金额:￥{{filters.toFix(item.order_amount+item.user_money,2)}}</view>
-                  <view class='foot-l-wz2 fs35'  wx:if="{{item.pt_tail_money>0}}">尾款:￥{{item.pt_tail_money}}</view>
+                       定金：￥{{filters.toFix(item.order_amount+item.user_money,2)}}</view>     
+                  <view class='foot-l-wz fs35' wx:else>金额：￥{{filters.toFix(item.order_amount+item.user_money,2)}}</view>
+                  <view class='foot-l-wz2 fs35'  wx:if="{{item.pt_tail_money>0}}">尾款：￥{{item.pt_tail_money}}</view>
             </block>
         </block>
@@ -106,7 +106,7 @@
     </view>
       <view class='bodytimecen flex' wx:if="{{item.pt_status==1}}">
-       剩余:
+       剩余：
         <span>{{item.djs.day}}</span>天
         <span>{{item.djs.hou}}</span>时
         <span>{{item.djs.min}}</span>分
@@ -91,7 +91,7 @@
 .pd-wz{
     display: inline-block;
-    font-size: 25rpx;
+    font-size: 28rpx;
     line-height: 76rpx;
     color: #000;
     font-weight: normal;
@@ -188,7 +188,7 @@ height:222rpx;
 .foot-l-wz{
     padding-right: 10rpx;
     display: inline-block;
-    font-size: 34rpx;  
+    font-size: 30rpx;  
     color: #e4374d;
     font-weight: normal;
 }
@@ -325,6 +325,7 @@ margin-right: 20rpx;
 justify-content:flex-end;
 width:97%;
 margin-bottom:40rpx;
+ line-height: 36rpx;
 }
@@ -333,7 +334,7 @@ margin-bottom:40rpx;
   border-radius: 7rpx;
   font-size: 25rpx;
   margin-right:8rpx;
-  line-height: 46rpx
+  line-height: 36rpx
 }
 .xc-price-sn{
   height:73rpx;
@@ -372,9 +373,9 @@ margin-left:5rpx;
 }
 .foot-l-wz2{
-    font-size: 34rpx;  
+    font-size: 30rpx;  
     color: #e4374d;
     font-weight: normal;
     margin-top:-40rpx; 
-    margin-left:80rpx 
+    margin-left:98rpx 
 }
 \ No newline at end of file
@@ -293,6 +293,8 @@ Page({
       teamlist = null,  //活动表
       goods = null,     //商品
       teamgroup = null, //活動从表
+      max_num = 0,
+      min_price = 0,
       th=this;
     //获取活动从表信息team_id,listno团编号（券号）
@@ -365,6 +367,21 @@ Page({
       if (res.data.code == 0) {
         teamlist = res.data.data;
         goods_id = res.data.data.goods_id;
+
+        //----------查看阶梯团------------
+        if (teamlist.ct_rylist != "" && teamlist.ct_rylist != null && teamlist.ct_rylist != undefined) {
+          var ct_rylist = JSON.parse(teamlist.ct_rylist);
+          var max = 0; var pri = 0;
+          ct_rylist.forEach(function (val, ind) {
+            if (val.rynum > max) {
+              max = val.rynum;
+              pri = val.price;
+            }
+          })
+          max_num = max;
+          min_price = pri;
+        }
+
       }
     })
@@ -403,6 +420,26 @@ Page({
         goods = res.data.data
     })
+    //只装5个
+    var ordertx2 = [], sf_num = 0, ct_nun = teamlist.ct_num;
+    if (max_num) {
+      ct_nun = parseInt(max_num);
+      if (ct_nun < ordertx.length) ct_nun = ordertx.length;
+    }
+
+    if (ct_nun > 5) ct_nun = 5;
+    for (var i = 0; i < ct_nun; i++) {
+      if (i >= ordertx.length) sf_num++
+      else
+        ordertx2.push(ordertx[i]);
+    }
+
+    var sf_arr = [];
+    for (var i = 0; i < sf_num; i++) {
+      sf_arr.push(i);
+    }
+
+
     if(th.data.is_group_end==1 || th.data.is_group_end==2 ){
         getApp().confirmBox(th.data.end_text);
@@ -446,6 +483,7 @@ Page({
     //获取下redis长度，如果团已经弄完，或者拼单已经卖完
     //设置值
     ee.setData({
+      ordertx2: ordertx2,
       ordertx: ordertx,
       teamlist: teamlist,
       teamgroup: teamgroup,
@@ -453,6 +491,7 @@ Page({
       pageteam: pageteam,
       image: original_img,
       is_show:1,
+      sf_arr: sf_arr
     });
     ee.countDown2();
 	  //---设置门店---
@@ -55,22 +55,20 @@
     </view>
     <!--头像-->
     <view class="flex_tou">
-        <view class='bodyimg flex-level' wx:for="{{ordertx}}" wx:key>
+      <view class='bodyimg flex-level' wx:for="{{ordertx2}}" 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 class='d' wx:for="{{sf_arr}}" >
+          <image  src='{{iurl}}/miniapp/images/shafa.png'></image>
+      </view>
+      <view class='xc-ellipsis-img'  wx:if="{{ordertx.length>5}}">
+          <image style='width:56rpx;height:56rpx;margin-left:10rpx;' src="{{imageurl}}/miniapp/images/xc_ellipsis.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>
     <view class='bodytime'>
@@ -102,7 +102,7 @@ page {
   /* display: flex;
   justify-content: center;
   align-items: center; */
-  width:590rpx;
+
 }
@@ -185,7 +185,11 @@ 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 < ordertx.length) ct_nun = ordertx.length;
+      }
       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}}">