diff --git a/packageA/pages/cart2_ser/cart2_ser.js b/packageA/pages/cart2_ser/cart2_ser.js index 33d35d4..86e3ee0 100644 --- a/packageA/pages/cart2_ser/cart2_ser.js +++ b/packageA/pages/cart2_ser/cart2_ser.js @@ -524,7 +524,10 @@ Page({ goods.guide_sn = res.data.data.salesman_no; } }) - } + } + if (gg.groupchat_id) { + goods.groupchat_id=gg.groupchat_id + } item.list.push(goods); } } @@ -566,7 +569,11 @@ Page({ goods.guide_sn = res.data.data.salesman_no; } }) - } + } + + if(gg.groupchat_id){ + goods.groupchat_id=gg.groupchat_id + } console.log('goooooooooooooooooods', goods); item.list.push(goods); } diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js index b6c19a6..f226fbd 100644 --- a/packageA/pages/goodsInfo/goodsInfo.js +++ b/packageA/pages/goodsInfo/goodsInfo.js @@ -981,8 +981,11 @@ Page({ }; newd['pick_name'] = th.data.sto_sele_name; newd['guide_id'] = getApp().globalData.guide_id; - newd['guide_type']=0; - + newd['guide_type']=0; + + if(getApp().globalData.groupchat_id){ + newd['groupchat_id'] = getApp().globalData.groupchat_id; + } if(this.data.prom_type && this.data.prom_type == 1) { newd['prom_type'] = this.data.prom_type; newd['prom_id'] = this.data.prom_id; @@ -1012,6 +1015,9 @@ Page({ newd['guide_id'] = getApp().globalData.guide_id; newd['guide_type']=0; }; + if(getApp().globalData.groupchat_id){ + newd['groupchat_id'] = getApp().globalData.groupchat_id; + } // 秒杀:单独购买的情况下,加入购物车显示的是零售价,否则显示秒杀活动价 if(th.data.options.prom_type == 1) { newd['prom_type'] = th.data.options.prom_type; @@ -1139,6 +1145,9 @@ Page({ updata['guide_id'] = getApp().globalData.guide_id; updata['guide_type'] = 1; } + if(getApp().globalData.groupchat_id){ + updata['groupchat_id'] = getApp().globalData.groupchat_id; + } getApp().request.put("/api/weshop/cartService/update", { data: updata, success: function(t) { @@ -1404,7 +1413,9 @@ Page({ d.guide_id=getApp().globalData.guide_id; d.guide_type=2; } - + if(getApp().globalData.groupchat_id){ + d.groupchat_id = getApp().globalData.groupchat_id; + } i.post("/api/weshop/goodscollect/save", { //添加收藏 data: d, success: function(e) { @@ -3880,7 +3891,9 @@ Page({ if ("add" == t.currentTarget.dataset.action) newd['guide_type'] = 1; } } - + if(getApp().globalData.groupchat_id){ + newd['groupchat_id'] = getApp().globalData.groupchat_id; + } //让商品带上房间号 //让商品带上房间号 if (th.data.sys_switch.is_skuroom_id == 1) { @@ -4200,7 +4213,9 @@ Page({ updata['guide_type'] = 0; } } - + if(getApp().globalData.groupchat_id){ + updata['groupchat_id'] = getApp().globalData.groupchat_id; + } i.put("/api/weshop/cart/update", { data: updata, success: function (t) { diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js index a84e4fc..d80dc0a 100644 --- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js +++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js @@ -1226,6 +1226,10 @@ Page({ } }) } + if(gg.groupchat_id){ + goods.groupchat_id=gg.groupchat_id + item.groupchat_ids=gg.groupchat_id + } //--商品的房间号-- if (gg.room_id && gg.room_id > 0) { diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js index 3e69caa..5bb7765 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js @@ -1436,7 +1436,9 @@ Page({ if ("add" == t.currentTarget.dataset.action) newd['guide_type'] = 1; } } - + if(getApp().globalData.groupchat_id){ + newd['groupchat_id'] = getApp().globalData.groupchat_id; + } //让商品带上房间号 //让商品带上房间号 if (th.data.sys_switch.is_skuroom_id == 1) { @@ -1542,7 +1544,9 @@ Page({ if ("add" == t.currentTarget.dataset.action) newd['guide_type'] = 1; } } - + if(getApp().globalData.groupchat_id){ + newd['groupchat_id'] = getApp().globalData.groupchat_id; + } //让商品带上房间号 if (th.data.sys_switch.is_skuroom_id == 1) { if (th.data.data.goods_id == getApp().globalData.room_goods_id) { @@ -1818,7 +1822,9 @@ Page({ updata['guide_type'] = 0; } } - + if(getApp().globalData.groupchat_id){ + updata['groupchat_id'] = getApp().globalData.groupchat_id; + } i.put("/api/weshop/cart/update", { data: updata, success: function (t) { @@ -2390,7 +2396,9 @@ Page({ d.guide_id = getApp().globalData.guide_id; d.guide_type = 2; } - + if(getApp().globalData.groupchat_id){ + d.groupchat_id = getApp().globalData.groupchat_id; + } i.post("/api/weshop/goodscollect/save", { //添加收藏 data: d, success: function (e) { @@ -4363,7 +4371,9 @@ Page({ } } - + if(getApp().globalData.groupchat_id){ + newd['groupchat_id'] = getApp().globalData.groupchat_id; + } //让商品带上房间号 if (th.data.sys_switch.is_skuroom_id == 1) { if (th.data.data.goods_id == getApp().globalData.room_goods_id) { @@ -4752,7 +4762,9 @@ Page({ if (getApp().globalData.guide_id) { pdata.guide_id = getApp().globalData.guide_id; } - + if(getApp().globalData.groupchat_id){ + pdata.groupchat_id = getApp().globalData.groupchat_id; + } var app = getApp(), th = this; app.request.post("/api/weshop/couponList/saveCouponList", { diff --git a/packageC/pages/presell/cart/cart2_pre.js b/packageC/pages/presell/cart/cart2_pre.js index 51f4636..7ff56ae 100644 --- a/packageC/pages/presell/cart/cart2_pre.js +++ b/packageC/pages/presell/cart/cart2_pre.js @@ -811,7 +811,10 @@ Page({ } }) } - + if(gg.groupchat_id){ + goods.groupchat_id=gg.groupchat_id + item.groupchat_ids=gg.groupchat_id + } //--商品的房间号-- if (gg.room_id && gg.room_id > 0) { item.room_ids = gg.room_id; diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js index d044818..43408be 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.js +++ b/packageC/pages/presell/goodsInfo/goodsInfo.js @@ -1054,6 +1054,10 @@ Page({ } } + if(getApp().globalData.groupchat_id){ + newd['groupchat_id'] = getApp().globalData.groupchat_id; + } + //让商品带上房间号 if (th.data.sys_switch.is_skuroom_id == 1) { if (th.data.data.goods_id == getApp().globalData.room_goods_id) { @@ -1133,7 +1137,9 @@ Page({ updata['guide_type'] = 0; } } - + if(getApp().globalData.groupchat_id){ + updata['groupchat_id'] = getApp().globalData.groupchat_id; + } i.put("/api/weshop/cart/update", { data: updata, success: function (t) { @@ -1450,7 +1456,9 @@ Page({ d.guide_id = getApp().globalData.guide_id; d.guide_type = 2; } - + if(getApp().globalData.groupchat_id){ + d.groupchat_id= getApp().globalData.groupchat_id; + } i.post("/api/weshop/goodscollect/save", { //添加收藏 data: d, success: function (e) { @@ -2744,7 +2752,9 @@ Page({ if (getApp().globalData.guide_id) { pdata.guide_id = getApp().globalData.guide_id; } - + if(getApp().globalData.groupchat_id){ + pdata.groupchat_id = getApp().globalData.groupchat_id; + } var app = getApp(), th = this; app.request.post("/api/weshop/couponList/saveCouponList", { diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js index 2229f26..d8f51ad 100644 --- a/packageE/pages/cart/cart2/cart2.js +++ b/packageE/pages/cart/cart2/cart2.js @@ -1441,6 +1441,9 @@ Page({ t.data.data.guide_id = gg.guide_id; t.data.data.guide_type = gg.guide_type; } + if(gg.groupchat_id){ + t.data.data.groupchat_id=groupchat_id; + } //搭配购如果原来就有勾选,不能直接赋值,旧的要保留 if(!th.data.collocation_goods){ th.setData({ collocation_goods: gg.collocation_goods }); @@ -3517,7 +3520,9 @@ Page({ df_goods[index].df_room_ids += room_id + ","; } - + if(getApp().globalData.groupchat_id){ + df_goods[index].groupchat_id=getApp().globalData.groupchat_id + } } else { var e = { whsle_id: whsle_id, @@ -3525,7 +3530,9 @@ Page({ df_goods: [] } if (room_id) e.df_room_ids = room_id + ',' - + if(getApp().globalData.groupchat_id){ + e.groupchat_id=getApp().globalData.groupchat_id + } e.df_goods.push(good); df_goods.push(e); } @@ -3698,7 +3705,11 @@ Page({ if (gg.room_id && gg.room_id > 0) { item.room_ids = gg.room_id; } - + //群id + + if(gg.groupchat_id){ + item.groupchat_ids=gg.groupchat_id; + } var order_prom_list = {}; //--判断有没有优惠活动-- if (th.data.formData.order_prom_amount > 0) { @@ -3795,6 +3806,9 @@ Page({ } }) } + if(gg.groupchat_id){ + goods.groupchat_id=gg.groupchat_id + } //--商品的房间号-- if (gg.room_id && gg.room_id > 0) { @@ -3902,6 +3916,9 @@ Page({ } }) } + if(gg.groupchat_id){ + g_goods.groupchat_id=gg.groupchat_id; + } item.order_goods.push(g_goods); } @@ -4176,7 +4193,10 @@ Page({ } }) } - + + if(g_item.groupchat_id){ + goods.groupchat_id=g_item.groupchat_id; + } //如果有阶梯促销 if (g_item.ladder_list_id) { goods.ladder_list_id = g_item.ladder_list_id; @@ -4198,22 +4218,24 @@ Page({ item.is_whsle = 1; item.whsle_id = g_item.whsle_id } - - item.order_goods.push(goods); //如果房间号不为空的时候 if (g_item.room_id) { goods.room_id = g_item.room_id; room_ids += g_item.room_id + ","; } + + item.order_goods.push(goods); + } } - + //如果房间号不为空的时候 if (room_ids != "") item.room_ids = ut.sub_last(room_ids); - + if (getApp().globalData.groupchat_id) item.groupchat_ids = getApp().globalData.groupchat_id; + // if (getApp().globalData.groupchat_id) {item.groupchat_id = getApp().globalData.groupchat_id;} //处理代发商品的拆分 if (df_goods.length > 0) { @@ -4265,6 +4287,10 @@ Page({ if (ddff_item.df_room_ids) df_item.room_ids = ut.sub_last(ddff_item.df_room_ids); + + if (getApp().globalData.groupchat_id){ + df_item.groupchat_ids = getApp().globalData.groupchat_id; + } df_item.order_goods = ddff_item.df_goods; pdata.push(df_item); } @@ -4302,6 +4328,7 @@ Page({ }) // pdata.keyid = th.data.bn_goods.keyid } + var str = JSON.stringify(pdata); wx.showLoading({ title: "加载中" }); diff --git a/pages/cart/cart2_inte/cart2_inte.js b/pages/cart/cart2_inte/cart2_inte.js index dbb0d14..1eafbf4 100644 --- a/pages/cart/cart2_inte/cart2_inte.js +++ b/pages/cart/cart2_inte/cart2_inte.js @@ -1035,6 +1035,9 @@ Page({ if (gg.room_id && gg.room_id > 0) { item.room_ids = gg.room_id; } + if(gg.groupchat_id){ + item.groupchat_ids=gg.groupchat_id + } //老会员成为分销下线需要的参数 if (getApp().globalData.first_leader && !getApp().globalData.userInfo.first_leader) { @@ -1085,7 +1088,9 @@ Page({ } }) } - + if(gg.groupchat_id){ + goods.groupchat_id=gg.groupchat_id + } //--商品的房间号-- if (gg.room_id && gg.room_id > 0) { goods.room_id = gg.room_id; diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js index 021ebf9..e517ac3 100644 --- a/pages/cart/cart2_pt/cart2_pt.js +++ b/pages/cart/cart2_pt/cart2_pt.js @@ -1185,7 +1185,10 @@ Page({ } }) } - + if(gg.groupchat_id){ + goods.groupchat_id=gg.groupchat_id + item.groupchat_ids=gg.groupchat_id + } //--商品的房间号-- if (gg.room_id && gg.room_id > 0) { diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 7c0a36b..037aa8c 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -1418,6 +1418,9 @@ Page({ if ("add" == t.currentTarget.dataset.action) newd['guide_type'] = 1; } } + if(getApp().globalData.groupchat_id){ + newd['groupchat_id'] = getApp().globalData.groupchat_id; + } //让商品带上房间号 //让商品带上房间号 @@ -1568,7 +1571,9 @@ Page({ if ("add" == t.currentTarget.dataset.action) newd['guide_type'] = 1; } } - + if(getApp().globalData.groupchat_id){ + newd['groupchat_id'] = getApp().globalData.groupchat_id; + } //让商品带上房间号 //让商品带上房间号 if (!th.data.sys_switch.is_skuroom_id && th.data.sys_switch.is_skuroom_id == 1) { @@ -1867,6 +1872,9 @@ Page({ //---加入购物车的最后一步--- add_cart_next(e, t, a, o, newd, CanOutQty) { + if (getApp().globalData.groupchat_id) { + newd.groupchat_id=getApp().globalData.groupchat_id + } var th = this, i = getApp().request; //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------ if ((o.prom_type != 6 && o.prom_type != 4 && o.prom_type != 2 && o.prom_type != 1) || th.data.is_normal) { @@ -1997,6 +2005,9 @@ Page({ updata['guide_type'] = 0; } } + if(getApp().globalData.groupchat_id){ + updata['groupchat_id'] = getApp().globalData.groupchat_id; + } getApp().request.put("/api/weshop/cart/update", { @@ -2846,7 +2857,10 @@ Page({ d.guide_id = getApp().globalData.guide_id; d.guide_type = 2; } - + if(getApp().globalData.groupchat_id){ + d.groupchat_id = getApp().globalData.groupchat_id; + } + i.post("/api/weshop/goodscollect/save", { //添加收藏 data: d, success: function (e) { @@ -5069,11 +5083,11 @@ Page({ if (getApp().globalData.guide_id) { newd['guide_id'] = getApp().globalData.guide_id; newd['guide_type'] = 0; - - } } - + if(getApp().globalData.groupchat_id){ + newd['groupchat_id'] = getApp().globalData.groupchat_id; + } //让商品带上房间号 if (!th.data.sys_switch.is_skuroom_id && th.data.sys_switch.is_skuroom_id == 1) { if (th.data.data.goods_id == getApp().globalData.room_goods_id) { @@ -5524,6 +5538,9 @@ Page({ if (getApp().globalData.guide_id) { pdata.guide_id = getApp().globalData.guide_id; } + if(getApp().globalData.groupchat_id){ + pdata.groupchat_id = getApp().globalData.groupchat_id; + } var app = getApp(), th = this; diff --git a/pages/index/index/index.js b/pages/index/index/index.js index d0f064a..3efaf61 100644 --- a/pages/index/index/index.js +++ b/pages/index/index/index.js @@ -96,7 +96,8 @@ Page({ menus:['shareAppMessage','shareTimeline'] }) var th = this; - var first_leader = tt.first_leader; + var first_leader = tt.first_leader; + if (!first_leader && tt.scene) { var first_leader_str = decodeURIComponent(tt.scene); var f_arr = first_leader_str.split("_"); @@ -104,9 +105,17 @@ Page({ //注册门店 if (f_arr[1] && parseFloat(f_arr[1]) > 0) { getApp().globalData.store_number = f_arr[1]; - } - } - + } + //企业微信群id + if (f_arr[2] && parseFloat(f_arr[2]) > 0) { + getApp().globalData.groupchat_id = f_arr[2]; + } + + } + // console.error('群id------------------------------------------'); + // console.error(getApp().globalData.groupchat_id); + // console.error('群id------------------------------------------2222222222222222222222'); + // getApp().globalData.groupchat_id=1 console.log("first_leader:"+first_leader,"onload");