Commit 5969ea79f6f4390775fefb70dfe6cef8d9380694
1 parent
a4f59d59
导购业绩归属的bug优化,
秒杀列表 拼单列表 搭配购 参团详情页
Showing
7 changed files
with
94 additions
and
8 deletions
packageA/pages/prom_list/prom_list.js
... | ... | @@ -43,8 +43,20 @@ Page({ |
43 | 43 | //------初始化加载---------- |
44 | 44 | onLoad: function(t) { |
45 | 45 | var goods_id=t.goods_id; |
46 | - this.setData({gid:goods_id}); | |
46 | + this.setData({gid:goods_id}); | |
47 | 47 | var ee=this,th=ee,that=ee; |
48 | + var first_leader=t.first_leader; | |
49 | + if(first_leader){ | |
50 | + getApp().globalData.first_leader=first_leader; | |
51 | + //调用接口判断是不是会员 | |
52 | + getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{ | |
53 | + if(res.data.code==0){ | |
54 | + getApp().globalData.guide_id=res.data.data.id; | |
55 | + } | |
56 | + }) | |
57 | + } | |
58 | + | |
59 | + | |
48 | 60 | //----获取系统参数,并判断等级价格----- |
49 | 61 | getApp().getConfig2(function(e) { |
50 | 62 | var json_d = JSON.parse(e.switch_list); |
... | ... | @@ -323,7 +335,6 @@ Page({ |
323 | 335 | a = 0, |
324 | 336 | o = this.data.data; |
325 | 337 | a = o.goods_id; |
326 | - | |
327 | 338 | //----------添加到购物车时,要判断限购数量,-------- |
328 | 339 | e.get_buy_num(o, function(ee) { |
329 | 340 | //---判断商品是否超出限购--- | ... | ... |
pages/activity/pind_list/pind_list.js
... | ... | @@ -17,6 +17,24 @@ Page({ |
17 | 17 | iurl: os.imghost, |
18 | 18 | }, |
19 | 19 | |
20 | + //------初始化加载---------- | |
21 | + onLoad: function(t) { | |
22 | + var first_leader = t.first_leader; | |
23 | + | |
24 | + console.log("------------"); | |
25 | + console.log(first_leader); | |
26 | + | |
27 | + if (first_leader) { | |
28 | + getApp().globalData.first_leader = first_leader; | |
29 | + //调用接口判断是不是会员 | |
30 | + getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { | |
31 | + if (res.data.code == 0) { | |
32 | + getApp().globalData.guide_id = res.data.data.id; | |
33 | + } | |
34 | + }) | |
35 | + } | |
36 | + }, | |
37 | + | |
20 | 38 | onShow: function(t) { |
21 | 39 | |
22 | 40 | wx.setNavigationBarTitle({ title: "天天拼单",}) |
... | ... | @@ -143,6 +161,9 @@ Page({ |
143 | 161 | pagePath+="?first_leader="+getApp().globalData.user_id; |
144 | 162 | } |
145 | 163 | } |
164 | + | |
165 | + console.log("11"+pagePath); | |
166 | + | |
146 | 167 | return { |
147 | 168 | title: "限时团购", |
148 | 169 | path:pagePath, | ... | ... |
pages/activity/seckill_list/seckill_list.js
... | ... | @@ -12,6 +12,26 @@ Page({ |
12 | 12 | ismore:1, //是否可以加载更多 |
13 | 13 | isshow:0, |
14 | 14 | }, |
15 | + | |
16 | + //------初始化加载---------- | |
17 | + onLoad: function(t) { | |
18 | + var first_leader = t.first_leader; | |
19 | + | |
20 | + console.log("------------"); | |
21 | + console.log(first_leader); | |
22 | + | |
23 | + if (first_leader) { | |
24 | + getApp().globalData.first_leader = first_leader; | |
25 | + //调用接口判断是不是会员 | |
26 | + getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { | |
27 | + if (res.data.code == 0) { | |
28 | + getApp().globalData.guide_id = res.data.data.id; | |
29 | + } | |
30 | + }) | |
31 | + } | |
32 | + }, | |
33 | + | |
34 | + | |
15 | 35 | onShow: function(t) { |
16 | 36 | |
17 | 37 | wx.setNavigationBarTitle({ title: "商品秒杀",}) |
... | ... | @@ -140,6 +160,8 @@ Page({ |
140 | 160 | pagePath+="?first_leader="+getApp().globalData.user_id; |
141 | 161 | } |
142 | 162 | } |
163 | + | |
164 | + console.log("11"+pagePath); | |
143 | 165 | return { |
144 | 166 | title: "限时秒杀", |
145 | 167 | path:pagePath, | ... | ... |
pages/cart/cart2_pt/cart2_pt.js
... | ... | @@ -353,7 +353,7 @@ Page({ |
353 | 353 | }); |
354 | 354 | }, |
355 | 355 | //--------------------提交订单----------------------- |
356 | - submitForm:function(t){ | |
356 | + submitForm: async function(t){ | |
357 | 357 | if(this.data.is_summit_ing==1) return false; //--提交中退出-- |
358 | 358 | this.data.is_summit_ing=1; |
359 | 359 | |
... | ... | @@ -440,6 +440,13 @@ Page({ |
440 | 440 | if(gg.guide_id){ |
441 | 441 | goods.guide_id=gg.guide_id; |
442 | 442 | goods.guide_type=gg.guide_type; |
443 | + //调用接口判断是不是会员 | |
444 | + await getApp().request.promiseGet("/api/weshop/shoppingGuide/getId/"+oo.stoid+"/"+gg.guide_id,{}).then(res=>{ | |
445 | + if(res.data.code==0){ | |
446 | + goods.guide_name=res.data.data.salesman; | |
447 | + goods.guide_sn=res.data.data.salesman_no; | |
448 | + } | |
449 | + }) | |
443 | 450 | } |
444 | 451 | |
445 | 452 | item.order_goods.push(goods); | ... | ... |
pages/goods/goodsInfo/goodsInfo.js
... | ... | @@ -2799,6 +2799,19 @@ Page({ |
2799 | 2799 | sku: o.sku, |
2800 | 2800 | }; |
2801 | 2801 | |
2802 | + //---是不是从收藏夹出来的--- | |
2803 | + if(th.data.c_guide_id){ | |
2804 | + newd['guide_id'] = th.data.c_guide_id; | |
2805 | + newd['guide_type']=2; | |
2806 | + | |
2807 | + }else{ | |
2808 | + if(getApp().globalData.guide_id){ | |
2809 | + newd['guide_id'] = getApp().globalData.guide_id; | |
2810 | + newd['guide_type']=0; | |
2811 | + | |
2812 | + } | |
2813 | + } | |
2814 | + | |
2802 | 2815 | //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------ |
2803 | 2816 | |
2804 | 2817 | if(th.data.is_normal == 1){ |
... | ... | @@ -3196,7 +3209,7 @@ Page({ |
3196 | 3209 | var vpath = res.path; |
3197 | 3210 | var context = wx.createCanvasContext('share'); |
3198 | 3211 | //先画背景 |
3199 | - var pg_path = "/pacj/images/share/share_bg.png"; | |
3212 | + var pg_path = "../../../images/share/share_bg.png"; | |
3200 | 3213 | context.drawImage(pg_path, 0, 0, 554 * unit, 899 * unit); |
3201 | 3214 | //--昵称--- |
3202 | 3215 | context.setFontSize(24 * unit) | ... | ... |
pages/team/team_show/team_show.js
... | ... | @@ -66,7 +66,7 @@ Page({ |
66 | 66 | wx.setNavigationBarTitle({ title: "拼团订单",}) |
67 | 67 | //var postdata=getApp().globalData.to_group; |
68 | 68 | var postdata=options; |
69 | - var tg_id = postdata.tg_id, first_leader=t.first_leader; | |
69 | + var tg_id = postdata.tg_id, first_leader=options.first_leader; | |
70 | 70 | //如果tg_id是空的话 |
71 | 71 | if(tg_id==undefined || tg_id==null || tg_id==""){ |
72 | 72 | var tg_id_str=decodeURIComponent(postdata.scene); |
... | ... | @@ -585,7 +585,6 @@ Page({ |
585 | 585 | }); |
586 | 586 | setTimeout(th.countDown2, 1000); |
587 | 587 | }, |
588 | - | |
589 | 588 | //--获取门店--- |
590 | 589 | async get_sto(e) { |
591 | 590 | var th = this, dd = null,i=getApp().request; |
... | ... | @@ -758,6 +757,20 @@ Page({ |
758 | 757 | goods_name: th.data.goods.goods_name, |
759 | 758 | goods_sn: th.data.goods.goods_sn, |
760 | 759 | }; |
760 | + | |
761 | + //---是不是从收藏夹出来的--- | |
762 | + if(th.data.c_guide_id){ | |
763 | + newd['guide_id'] = th.data.c_guide_id; | |
764 | + newd['guide_type']=2; | |
765 | + | |
766 | + }else{ | |
767 | + if(getApp().globalData.guide_id){ | |
768 | + newd['guide_id'] = getApp().globalData.guide_id; | |
769 | + newd['guide_type']=0; | |
770 | + | |
771 | + } | |
772 | + } | |
773 | + | |
761 | 774 | //-----拼团----- |
762 | 775 | newd.goods_price = th.data.teamlist.price; |
763 | 776 | newd.prom_type = 6; | ... | ... |
pages/team/team_success/team_success.js
... | ... | @@ -674,7 +674,6 @@ Page({ |
674 | 674 | |
675 | 675 | }, |
676 | 676 | |
677 | - | |
678 | 677 | //------ 分享配置 -------- |
679 | 678 | onShareAppMessage: function (e) { |
680 | 679 | var th=this; |
... | ... | @@ -693,7 +692,7 @@ Page({ |
693 | 692 | |
694 | 693 | return { |
695 | 694 | path:url, |
696 | - title: "商品分类", | |
695 | + title: th.data.teamlist.title, | |
697 | 696 | imageUrl: img, |
698 | 697 | } |
699 | 698 | }, | ... | ... |