diff --git a/app.js b/app.js index 4eb2d7e..c4c2913 100644 --- a/app.js +++ b/app.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) { diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js index 73e58cb..f2952b0 100644 --- a/packageA/pages/goodsInfo/goodsInfo.js +++ b/packageA/pages/goodsInfo/goodsInfo.js @@ -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)); //--定时器推迟一下-- diff --git a/packageA/pages/prom_list/prom_list.js b/packageA/pages/prom_list/prom_list.js index 9a22c10..a6ef4e5 100644 --- a/packageA/pages/prom_list/prom_list.js +++ b/packageA/pages/prom_list/prom_list.js @@ -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() { diff --git a/packageB/pages/zuhegou/index/index.js b/packageB/pages/zuhegou/index/index.js index 2205f89..bdff1a9 100644 --- a/packageB/pages/zuhegou/index/index.js +++ b/packageB/pages/zuhegou/index/index.js @@ -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; diff --git a/packageB/pages/zuhegou/preindex/index.js b/packageB/pages/zuhegou/preindex/index.js index 1c773d1..280ecb7 100644 --- a/packageB/pages/zuhegou/preindex/index.js +++ b/packageB/pages/zuhegou/preindex/index.js @@ -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; diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js index 9055067..bfc7ab7 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js @@ -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 () { diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js index a9b679a..285b3b3 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.js +++ b/packageC/pages/presell/goodsInfo/goodsInfo.js @@ -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)); diff --git a/packageC/pages/presell/pregoodsInfo/goodsInfo.js b/packageC/pages/presell/pregoodsInfo/goodsInfo.js index 40c8888..99d6490 100644 --- a/packageC/pages/presell/pregoodsInfo/goodsInfo.js +++ b/packageC/pages/presell/pregoodsInfo/goodsInfo.js @@ -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)); diff --git a/pages/cart/cart_wk/cart_wk.js b/pages/cart/cart_wk/cart_wk.js index 0d0d3cb..7e613c2 100644 --- a/pages/cart/cart_wk/cart_wk.js +++ b/pages/cart/cart_wk/cart_wk.js @@ -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, }); //--计算物流-- diff --git a/pages/cart/cart_wk/cart_wk.wxml b/pages/cart/cart_wk/cart_wk.wxml index 3db2b84..dca4ecd 100644 --- a/pages/cart/cart_wk/cart_wk.wxml +++ b/pages/cart/cart_wk/cart_wk.wxml @@ -71,7 +71,11 @@ 成团人数 - {{teamgroup.jt_ct_num}}人 + + {{teamgroup.jt_ct_num}} + {{teamgroup.jt_ct_num}} + 人 + 成团金额 diff --git a/pages/giftpack/public/buy_com.js b/pages/giftpack/public/buy_com.js index 06bc375..064d8a5 100644 --- a/pages/giftpack/public/buy_com.js +++ b/pages/giftpack/public/buy_com.js @@ -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)); //--定时器推迟一下-- diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 16a22c0..753ba52 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -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)); //--定时器推迟一下-- diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss index 027b2d2..ca2dc4b 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxss +++ b/pages/goods/goodsInfo/goodsInfo.wxss @@ -725,6 +725,11 @@ view.cart-btn-lg { color: #333; } + +.spec-name+view{ + flex-wrap: wrap; +} + .quhuo { font-size: 30rpx; color: #000 diff --git a/pages/team/team_show/team_show.js b/pages/team/team_show/team_show.js index 761a97f..97babf8 100644 --- a/pages/team/team_show/team_show.js +++ b/pages/team/team_show/team_show.js @@ -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; diff --git a/pages/team/team_success/team_success.js b/pages/team/team_success/team_success.js index 38d7dc9..c1d4bfd 100644 --- a/pages/team/team_success/team_success.js +++ b/pages/team/team_success/team_success.js @@ -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; }