wxd / MShopWeApp

Merged
Merge Request #1037 · created by 后端研发-苏明海

Dev

From dev into test

Merged by 后端研发-苏明海

1 participants
Inline Side-by-side
Showing 15 changed files
app.js
  Edit  View file @e25276c
@@ -51,7 +51,7 @@ App({ @@ -51,7 +51,7 @@ App({
51 config: null, //门店参数 51 config: null, //门店参数
52 config2: null, //门店配置 52 config2: null, //门店配置
53 code: null, 53 code: null,
54 - user_id:null,//5682094,6520044,6520119 qa 4687 6519901 zs 10153869 54 + user_id:null,//6520119 qa 4687 6519901 zs 10153869
55 buy_now: null, 55 buy_now: null,
56 picklist: null, //门店列表 56 picklist: null, //门店列表
57 wuliuprice: null, //物流价格表 57 wuliuprice: null, //物流价格表
@@ -545,7 +545,8 @@ App({ @@ -545,7 +545,8 @@ App({
545 545
546 //查找会员的注册的地址 546 //查找会员的注册的地址
547 if (th.globalData.userInfo.pickup_id) { 547 if (th.globalData.userInfo.pickup_id) {
548 - pick_id = th.globalData.userInfo.pickup_id 548 + pick_id = th.globalData.userInfo.pickup_id;
  549 + th.globalData.is_dj_pk=1;
549 } 550 }
550 //先找一个会员是否有设置默认的地址 551 //先找一个会员是否有设置默认的地址
551 else if (th.globalData.userInfo.def_pickup_id) { 552 else if (th.globalData.userInfo.def_pickup_id) {
packageA/pages/goodsInfo/goodsInfo.js
  Edit  View file @e25276c
@@ -358,7 +358,7 @@ Page({ @@ -358,7 +358,7 @@ Page({
358 return false; 358 return false;
359 } 359 }
360 360
361 - th.setData({has_def:1}) 361 + if(getApp().globalData.is_dj_pk) th.setData({has_def:1})
362 362
363 var ee=JSON.parse(JSON.stringify(e)); 363 var ee=JSON.parse(JSON.stringify(e));
364 //--定时器推迟一下-- 364 //--定时器推迟一下--
packageA/pages/prom_list/prom_list.js
  Edit  View file @e25276c
@@ -92,7 +92,7 @@ Page({ @@ -92,7 +92,7 @@ Page({
92 return false; 92 return false;
93 } 93 }
94 94
95 - th.setData({has_def:1}) 95 + if(getApp().globalData.is_dj_pk) th.setData({has_def:1})
96 96
97 var appd=getApp().globalData; 97 var appd=getApp().globalData;
98 var w_time = setInterval(function() { 98 var w_time = setInterval(function() {
packageB/pages/zuhegou/index/index.js
  Edit  View file @e25276c
@@ -259,7 +259,7 @@ Page({ @@ -259,7 +259,7 @@ Page({
259 th.data.fir_def_store = {}; //赋值空对象 259 th.data.fir_def_store = {}; //赋值空对象
260 return false; 260 return false;
261 } 261 }
262 - th.setData({has_def:1}) 262 + if(getApp().globalData.is_dj_pk) th.setData({has_def:1})
263 263
264 var ee = JSON.parse(JSON.stringify(e)); 264 var ee = JSON.parse(JSON.stringify(e));
265 var appd = getApp().globalData; 265 var appd = getApp().globalData;
packageB/pages/zuhegou/preindex/index.js
  Edit  View file @e25276c
@@ -260,7 +260,7 @@ Page({ @@ -260,7 +260,7 @@ Page({
260 return false; 260 return false;
261 } 261 }
262 262
263 - th.setData({has_def:1}) 263 + if(getApp().globalData.is_dj_pk) th.setData({has_def:1})
264 264
265 var ee = JSON.parse(JSON.stringify(e)); 265 var ee = JSON.parse(JSON.stringify(e));
266 var appd = getApp().globalData; 266 var appd = getApp().globalData;
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
  Edit  View file @e25276c
@@ -475,7 +475,7 @@ Page({ @@ -475,7 +475,7 @@ Page({
475 return false; 475 return false;
476 } 476 }
477 477
478 - th.setData({has_def:1}) 478 + if(getApp().globalData.is_dj_pk) th.setData({has_def:1})
479 var ee = JSON.parse(JSON.stringify(e)); 479 var ee = JSON.parse(JSON.stringify(e));
480 //--定时器推迟一下-- 480 //--定时器推迟一下--
481 setTimeout(function () { 481 setTimeout(function () {
packageC/pages/presell/goodsInfo/goodsInfo.js
  Edit  View file @e25276c
@@ -679,7 +679,7 @@ Page({ @@ -679,7 +679,7 @@ Page({
679 th.data.fir_def_store = {}; //赋值空对象 679 th.data.fir_def_store = {}; //赋值空对象
680 return false; 680 return false;
681 } 681 }
682 - th.setData({has_def:1}) 682 + if(getApp().globalData.is_dj_pk) th.setData({has_def:1})
683 683
684 var ee = JSON.parse(JSON.stringify(e)); 684 var ee = JSON.parse(JSON.stringify(e));
685 685
packageC/pages/presell/pregoodsInfo/goodsInfo.js
  Edit  View file @e25276c
@@ -676,7 +676,7 @@ Page({ @@ -676,7 +676,7 @@ Page({
676 return false; 676 return false;
677 } 677 }
678 678
679 - th.setData({has_def:1}) 679 + if(getApp().globalData.is_dj_pk) th.setData({has_def:1})
680 680
681 var ee = JSON.parse(JSON.stringify(e)); 681 var ee = JSON.parse(JSON.stringify(e));
682 682
pages/cart/cart_wk/cart_wk.js
  View file @e25276c
@@ -200,6 +200,7 @@ Page({ @@ -200,6 +200,7 @@ Page({
200 distr_type = 0, 200 distr_type = 0,
201 exp_type = 0, 201 exp_type = 0,
202 teamgroup = null, 202 teamgroup = null,
  203 + teamlist=null,
203 th = this; 204 th = this;
204 //---获取订单--- 205 //---获取订单---
205 await getApp().request.promiseGet("/api/weshop/order/get/" + oo.stoid + "/" + ord, {}).then(res => { 206 await getApp().request.promiseGet("/api/weshop/order/get/" + oo.stoid + "/" + ord, {}).then(res => {
@@ -234,8 +235,18 @@ Page({ @@ -234,8 +235,18 @@ Page({
234 teamgroup = res.data.data.pageData[0]; 235 teamgroup = res.data.data.pageData[0];
235 }); 236 });
236 237
  238 + await getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + order.pt_prom_id, {
  239 + data: { }
  240 + }).then(res => {
  241 + if(res.data.code==0) teamlist=res.data.data;
  242 + });
  243 +
  244 +
  245 +
237 var jsarr = JSON.parse(teamgroup.jt_json); 246 var jsarr = JSON.parse(teamgroup.jt_json);
238 var count = teamgroup.jt_ct_num; 247 var count = teamgroup.jt_ct_num;
  248 + if(teamgroup.is_xuni_ct) count=teamlist.ct_num;
  249 +
239 //要计算尾款的价钱 250 //要计算尾款的价钱
240 var price = 0; 251 var price = 0;
241 jsarr.forEach(function (value, index) { 252 jsarr.forEach(function (value, index) {
@@ -275,7 +286,8 @@ Page({ @@ -275,7 +286,8 @@ Page({
275 pickup: pickup, 286 pickup: pickup,
276 exp_type: exp_type, 287 exp_type: exp_type,
277 goods: goods, 288 goods: goods,
278 - teamgroup: teamgroup 289 + teamgroup: teamgroup,
  290 + teamlist: teamlist,
279 }); 291 });
280 292
281 //--计算物流-- 293 //--计算物流--
pages/cart/cart_wk/cart_wk.wxml
  View file @e25276c
@@ -71,7 +71,11 @@ @@ -71,7 +71,11 @@
71 <view class='chentuan bdr14'> 71 <view class='chentuan bdr14'>
72 <view class='ct_one jc_sb'> 72 <view class='ct_one jc_sb'>
73 <view class='ct_one_left'>成团人数</view> 73 <view class='ct_one_left'>成团人数</view>
74 - <view class='ct_one_right'><text class='redwz'>{{teamgroup.jt_ct_num}}</text>人</view> 74 + <view class='ct_one_right'>
  75 + <text wx:if="{{teamgroup.is_xuni_ct}}" class='redwz'>{{teamgroup.jt_ct_num}}</text>
  76 + <text wx:else class='redwz'>{{teamgroup.jt_ct_num}}</text>
  77 + 人
  78 + </view>
75 </view> 79 </view>
76 <view class='ct_one jc_sb'> 80 <view class='ct_one jc_sb'>
77 <view class='ct_one_left'>成团金额</view> 81 <view class='ct_one_left'>成团金额</view>
pages/giftpack/public/buy_com.js
  Edit  View file @e25276c
@@ -45,7 +45,7 @@ module.exports = { @@ -45,7 +45,7 @@ module.exports = {
45 return false; 45 return false;
46 } 46 }
47 47
48 - th.setData({has_def:1}) 48 + if(getApp().globalData.is_dj_pk) th.setData({has_def:1})
49 49
50 var ee = JSON.parse(JSON.stringify(e)); 50 var ee = JSON.parse(JSON.stringify(e));
51 //--定时器推迟一下-- 51 //--定时器推迟一下--
pages/goods/goodsInfo/goodsInfo.js
  Edit  View file @e25276c
@@ -480,7 +480,7 @@ Page({ @@ -480,7 +480,7 @@ Page({
480 th.data.fir_def_store = {}; //赋值空对象 480 th.data.fir_def_store = {}; //赋值空对象
481 return false; 481 return false;
482 } 482 }
483 - th.setData({has_def:1}); 483 + if(getApp().globalData.is_dj_pk) th.setData({has_def:1});
484 484
485 var ee = JSON.parse(JSON.stringify(e)); 485 var ee = JSON.parse(JSON.stringify(e));
486 //--定时器推迟一下-- 486 //--定时器推迟一下--
pages/goods/goodsInfo/goodsInfo.wxss
  Edit  View file @e25276c
@@ -725,6 +725,11 @@ view.cart-btn-lg { @@ -725,6 +725,11 @@ view.cart-btn-lg {
725 color: #333; 725 color: #333;
726 } 726 }
727 727
  728 +
  729 +.spec-name+view{
  730 + flex-wrap: wrap;
  731 +}
  732 +
728 .quhuo { 733 .quhuo {
729 font-size: 30rpx; 734 font-size: 30rpx;
730 color: #000 735 color: #000
pages/team/team_show/team_show.js
  Edit  View file @e25276c
@@ -613,7 +613,7 @@ Page({ @@ -613,7 +613,7 @@ Page({
613 return false; 613 return false;
614 } 614 }
615 615
616 - th.setData({has_def:1}) 616 + if(getApp().globalData.is_dj_pk) th.setData({has_def:1})
617 //--定时器推迟一下-- 617 //--定时器推迟一下--
618 setTimeout(function () { 618 setTimeout(function () {
619 if(!th.data.goods) return false; 619 if(!th.data.goods) return false;
pages/team/team_success/team_success.js
  View file @e25276c
@@ -214,7 +214,7 @@ Page({ @@ -214,7 +214,7 @@ Page({
214 var ct_rylist = JSON.parse(teamlist.ct_rylist); 214 var ct_rylist = JSON.parse(teamlist.ct_rylist);
215 var max=0; var pri=0; 215 var max=0; var pri=0;
216 ct_rylist.forEach(function (val,ind) { 216 ct_rylist.forEach(function (val,ind) {
217 - if(val.rynum>max){ 217 + if(parseInt(val.rynum)>parseInt(max)){
218 max=val.rynum; 218 max=val.rynum;
219 pri = val.price; 219 pri = val.price;
220 } 220 }