Merge branch 'dev' into 'test'

Dev See merge request !1037

Merge branch 'dev' into 'test'
Dev See merge request !1037
后端研发-苏明海
2 parents e3f6d3cd e25276ca
Showing 15 changed files with 37 additions and 15 deletions
app.js
packageA/pages/goodsInfo/goodsInfo.js
packageA/pages/prom_list/prom_list.js
packageB/pages/zuhegou/index/index.js
packageB/pages/zuhegou/preindex/index.js
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
packageC/pages/presell/goodsInfo/goodsInfo.js
packageC/pages/presell/pregoodsInfo/goodsInfo.js
pages/cart/cart_wk/cart_wk.js
pages/cart/cart_wk/cart_wk.wxml
pages/giftpack/public/buy_com.js
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxss
pages/team/team_show/team_show.js
pages/team/team_success/team_success.js
@@ -51,7 +51,7 @@ App({
         config: null,   //门店参数
         config2: null,  //门店配置
         code: null,
-        user_id:null,//5682094,6520044,6520119   qa  4687  6519901  zs 10153869
+        user_id:null,//6520119   qa  4687  6519901  zs 10153869
         buy_now: null,
         picklist: null,    //门店列表
         wuliuprice: null, //物流价格表
@@ -545,7 +545,8 @@ App({
  
                     //查找会员的注册的地址
                     if (th.globalData.userInfo.pickup_id) {
-                        pick_id = th.globalData.userInfo.pickup_id
+                        pick_id = th.globalData.userInfo.pickup_id;
+                        th.globalData.is_dj_pk=1;
                     }
                     //先找一个会员是否有设置默认的地址
                     else if (th.globalData.userInfo.def_pickup_id) {
@@ -358,7 +358,7 @@ Page({
         return false;
       }
  
-        th.setData({has_def:1})
+       if(getApp().globalData.is_dj_pk)  th.setData({has_def:1})
  
       var ee=JSON.parse(JSON.stringify(e));
       //--定时器推迟一下--
@@ -92,7 +92,7 @@ Page({
 			  return false;
 		  }
  
-          th.setData({has_def:1})
+          if(getApp().globalData.is_dj_pk) th.setData({has_def:1})
  
 		  var appd=getApp().globalData;
 		  var w_time = setInterval(function() {
@@ -259,7 +259,7 @@ Page({
                             th.data.fir_def_store = {}; //赋值空对象
                             return false;
                         }
-                        th.setData({has_def:1})
+                        if(getApp().globalData.is_dj_pk) th.setData({has_def:1})
  
                         var ee = JSON.parse(JSON.stringify(e));
                         var appd = getApp().globalData;
@@ -260,7 +260,7 @@ Page({
                             return false;
                         }
  
-                        th.setData({has_def:1})
+                        if(getApp().globalData.is_dj_pk) th.setData({has_def:1})
  
                         var ee = JSON.parse(JSON.stringify(e));
                         var appd = getApp().globalData;
@@ -475,7 +475,7 @@ Page({
         return false;
       }
  
-      th.setData({has_def:1})
+       if(getApp().globalData.is_dj_pk) th.setData({has_def:1})
       var ee = JSON.parse(JSON.stringify(e));
       //--定时器推迟一下--
       setTimeout(function () {
@@ -679,7 +679,7 @@ Page({
                 th.data.fir_def_store = {}; //赋值空对象
                 return false;
               }
-              th.setData({has_def:1})
+                if(getApp().globalData.is_dj_pk) th.setData({has_def:1})
  
               var ee = JSON.parse(JSON.stringify(e));
  
@@ -676,7 +676,7 @@ Page({
                 return false;
               }
  
-              th.setData({has_def:1})
+               if(getApp().globalData.is_dj_pk) th.setData({has_def:1})
  
               var ee = JSON.parse(JSON.stringify(e));
  
@@ -200,6 +200,7 @@ Page({
       distr_type = 0,
       exp_type = 0,
       teamgroup = null,
+      teamlist=null,
       th = this;
     //---获取订单---
     await getApp().request.promiseGet("/api/weshop/order/get/" + oo.stoid + "/" + ord, {}).then(res => {
@@ -234,8 +235,18 @@ Page({
       teamgroup = res.data.data.pageData[0];
     });
  
+    await getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + order.pt_prom_id, {
+          data: { }
+      }).then(res => {
+          if(res.data.code==0) teamlist=res.data.data;
+      });
+
+
+
     var jsarr = JSON.parse(teamgroup.jt_json);
     var count = teamgroup.jt_ct_num;
+    if(teamgroup.is_xuni_ct) count=teamlist.ct_num;
+
     //要计算尾款的价钱
     var price = 0;
     jsarr.forEach(function (value, index) {
@@ -275,7 +286,8 @@ Page({
       pickup: pickup,
       exp_type: exp_type,
       goods: goods,
-      teamgroup: teamgroup
+      teamgroup: teamgroup,
+      teamlist: teamlist,
     });
  
     //--计算物流--
@@ -71,7 +71,11 @@
 <view class='chentuan bdr14'>
   <view class='ct_one jc_sb'>
     <view class='ct_one_left'>成团人数</view>
-    <view class='ct_one_right'><text class='redwz'>{{teamgroup.jt_ct_num}}</text>人</view>
+    <view class='ct_one_right'>
+         <text wx:if="{{teamgroup.is_xuni_ct}}" class='redwz'>{{teamgroup.jt_ct_num}}</text>
+         <text wx:else class='redwz'>{{teamgroup.jt_ct_num}}</text>
+         人
+    </view>
   </view>
   <view class='ct_one jc_sb'>
     <view class='ct_one_left'>成团金额</view>
@@ -45,7 +45,7 @@ module.exports = {
                 return false;
             }
  
-            th.setData({has_def:1})
+            if(getApp().globalData.is_dj_pk) th.setData({has_def:1})
  
             var ee = JSON.parse(JSON.stringify(e));
             //--定时器推迟一下--
@@ -480,7 +480,7 @@ Page({
                 th.data.fir_def_store = {}; //赋值空对象
                 return false;
             }
-            th.setData({has_def:1});
+            if(getApp().globalData.is_dj_pk) th.setData({has_def:1});
  
             var ee = JSON.parse(JSON.stringify(e));
             //--定时器推迟一下--
@@ -725,6 +725,11 @@ view.cart-btn-lg {
 	color: #333;
 }
  
+
+.spec-name+view{
+  flex-wrap: wrap;
+}
+
 .quhuo {
 	font-size: 30rpx;
 	color: #000
@@ -613,7 +613,7 @@ Page({
         return false;
       }
  
-      th.setData({has_def:1})
+      if(getApp().globalData.is_dj_pk) th.setData({has_def:1})
       //--定时器推迟一下--
       setTimeout(function () {
         if(!th.data.goods) return false;
@@ -214,7 +214,7 @@ Page({
             var ct_rylist = JSON.parse(teamlist.ct_rylist);
             var max=0; var pri=0;
             ct_rylist.forEach(function (val,ind) {
-              if(val.rynum>max){
+              if(parseInt(val.rynum)>parseInt(max)){
                   max=val.rynum;
                    pri = val.price;
               }