From a8d4cedfd8601c15401dbda253608bb7bcea2eb7 Mon Sep 17 00:00:00 2001
From: F5VT98DI7XY4X12\Administrator <765199919@qq.com>
Date: Wed, 4 Sep 2019 18:55:46 +0800
Subject: [PATCH] 购物车，拼团详情页，拼团参团页的修改

---
 pages/cart/cart2/cart2.js               |  7 +++++++
 pages/cart/cart2/cart2.wxml             |  5 +++--
 pages/cart/cart2_pt/cart2_pt.js         | 10 +++++++++-
 pages/cart/cart2_pt/cart2_pt.wxml       |  3 ++-
 pages/team/team_show/team_show.js       | 39 +++++++++++++++++++++++++++++++++++++++
 pages/team/team_show/team_show.wxml     | 10 ++++++----
 pages/team/team_success/team_success.js |  1 +
 7 files changed, 67 insertions(+), 8 deletions(-)

diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 6529af5..13a8eb4 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -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);
   }
 
 });
diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml
index 36f99a4..f8491a3 100644
--- a/pages/cart/cart2/cart2.wxml
+++ b/pages/cart/cart2/cart2.wxml
@@ -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>
diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js
index b89c832..190a2d6 100644
--- a/pages/cart/cart2_pt/cart2_pt.js
+++ b/pages/cart/cart2_pt/cart2_pt.js
@@ -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);
+  }
+
 });
diff --git a/pages/cart/cart2_pt/cart2_pt.wxml b/pages/cart/cart2_pt/cart2_pt.wxml
index 04b2851..a6a51a1 100644
--- a/pages/cart/cart2_pt/cart2_pt.wxml
+++ b/pages/cart/cart2_pt/cart2_pt.wxml
@@ -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>
diff --git a/pages/team/team_show/team_show.js b/pages/team/team_show/team_show.js
index 9675390..8432fdc 100644
--- a/pages/team/team_show/team_show.js
+++ b/pages/team/team_show/team_show.js
@@ -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();
 	  //---设置门店---
diff --git a/pages/team/team_show/team_show.wxml b/pages/team/team_show/team_show.wxml
index 6e0a5ba..38a8090 100644
--- a/pages/team/team_show/team_show.wxml
+++ b/pages/team/team_show/team_show.wxml
@@ -55,18 +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>
        </view>
       </view>
-       <view class='xc-ellipsis-img'  wx:if="{{length>5}}">
+      <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>
 
    
-  
     </view>
 
     <view class='bodytime'>
diff --git a/pages/team/team_success/team_success.js b/pages/team/team_success/team_success.js
index 57c5c0f..cc637a3 100644
--- a/pages/team/team_success/team_success.js
+++ b/pages/team/team_success/team_success.js
@@ -188,6 +188,7 @@ Page({
       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;
--
libgit2 0.21.4