wxd / MShopWeApp

Commit e4002f25d46bb1a4e7a5a686513be7cdd810a208

Authored by 前端开发-罗建龙
1 parent 618ce410

企业群 id

Inline Side-by-side
Showing 11 changed files with 148 additions and 36 deletions
packageA/pages/cart2_ser/cart2_ser.js
  View file @e4002f2
... ... @@ -524,7 +524,10 @@ Page({
524 524 goods.guide_sn = res.data.data.salesman_no;
525 525 }
526 526 })
527   - }
  527 + }
  528 + if (gg.groupchat_id) {
  529 + goods.groupchat_id=gg.groupchat_id
  530 + }
528 531 item.list.push(goods);
529 532 }
530 533 }
... ... @@ -566,7 +569,11 @@ Page({
566 569 goods.guide_sn = res.data.data.salesman_no;
567 570 }
568 571 })
569   - }
  572 + }
  573 +
  574 + if(gg.groupchat_id){
  575 + goods.groupchat_id=gg.groupchat_id
  576 + }
570 577 console.log('goooooooooooooooooods', goods);
571 578 item.list.push(goods);
572 579 }
... ...
packageA/pages/goodsInfo/goodsInfo.js
  View file @e4002f2
... ... @@ -981,8 +981,11 @@ Page({
981 981 };
982 982 newd['pick_name'] = th.data.sto_sele_name;
983 983 newd['guide_id'] = getApp().globalData.guide_id;
984   - newd['guide_type']=0;
985   -
  984 + newd['guide_type']=0;
  985 +
  986 + if(getApp().globalData.groupchat_id){
  987 + newd['groupchat_id'] = getApp().globalData.groupchat_id;
  988 + }
986 989 if(this.data.prom_type && this.data.prom_type == 1) {
987 990 newd['prom_type'] = this.data.prom_type;
988 991 newd['prom_id'] = this.data.prom_id;
... ... @@ -1012,6 +1015,9 @@ Page({
1012 1015 newd['guide_id'] = getApp().globalData.guide_id;
1013 1016 newd['guide_type']=0;
1014 1017 };
  1018 + if(getApp().globalData.groupchat_id){
  1019 + newd['groupchat_id'] = getApp().globalData.groupchat_id;
  1020 + }
1015 1021 // 秒杀：单独购买的情况下，加入购物车显示的是零售价，否则显示秒杀活动价
1016 1022 if(th.data.options.prom_type == 1) {
1017 1023 newd['prom_type'] = th.data.options.prom_type;
... ... @@ -1139,6 +1145,9 @@ Page({
1139 1145 updata['guide_id'] = getApp().globalData.guide_id;
1140 1146 updata['guide_type'] = 1;
1141 1147 }
  1148 + if(getApp().globalData.groupchat_id){
  1149 + updata['groupchat_id'] = getApp().globalData.groupchat_id;
  1150 + }
1142 1151 getApp().request.put("/api/weshop/cartService/update", {
1143 1152 data: updata,
1144 1153 success: function(t) {
... ... @@ -1404,7 +1413,9 @@ Page({
1404 1413 d.guide_id=getApp().globalData.guide_id;
1405 1414 d.guide_type=2;
1406 1415 }
1407   -
  1416 + if(getApp().globalData.groupchat_id){
  1417 + d.groupchat_id = getApp().globalData.groupchat_id;
  1418 + }
1408 1419 i.post("/api/weshop/goodscollect/save", { //添加收藏
1409 1420 data: d,
1410 1421 success: function(e) {
... ... @@ -3880,7 +3891,9 @@ Page({
3880 3891 if ("add" == t.currentTarget.dataset.action) newd['guide_type'] = 1;
3881 3892 }
3882 3893 }
3883   -
  3894 + if(getApp().globalData.groupchat_id){
  3895 + newd['groupchat_id'] = getApp().globalData.groupchat_id;
  3896 + }
3884 3897 //让商品带上房间号
3885 3898 //让商品带上房间号
3886 3899 if (th.data.sys_switch.is_skuroom_id == 1) {
... ... @@ -4200,7 +4213,9 @@ Page({
4200 4213 updata['guide_type'] = 0;
4201 4214 }
4202 4215 }
4203   -
  4216 + if(getApp().globalData.groupchat_id){
  4217 + updata['groupchat_id'] = getApp().globalData.groupchat_id;
  4218 + }
4204 4219 i.put("/api/weshop/cart/update", {
4205 4220 data: updata,
4206 4221 success: function (t) {
... ...
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
  View file @e4002f2
... ... @@ -1226,6 +1226,10 @@ Page({
1226 1226 }
1227 1227 })
1228 1228 }
  1229 + if(gg.groupchat_id){
  1230 + goods.groupchat_id=gg.groupchat_id
  1231 + item.groupchat_ids=gg.groupchat_id
  1232 + }
1229 1233  
1230 1234 //--商品的房间号--
1231 1235 if (gg.room_id && gg.room_id > 0) {
... ...
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
  View file @e4002f2
... ... @@ -1436,7 +1436,9 @@ Page({
1436 1436 if ("add" == t.currentTarget.dataset.action) newd['guide_type'] = 1;
1437 1437 }
1438 1438 }
1439   -
  1439 + if(getApp().globalData.groupchat_id){
  1440 + newd['groupchat_id'] = getApp().globalData.groupchat_id;
  1441 + }
1440 1442 //让商品带上房间号
1441 1443 //让商品带上房间号
1442 1444 if (th.data.sys_switch.is_skuroom_id == 1) {
... ... @@ -1542,7 +1544,9 @@ Page({
1542 1544 if ("add" == t.currentTarget.dataset.action) newd['guide_type'] = 1;
1543 1545 }
1544 1546 }
1545   -
  1547 + if(getApp().globalData.groupchat_id){
  1548 + newd['groupchat_id'] = getApp().globalData.groupchat_id;
  1549 + }
1546 1550 //让商品带上房间号
1547 1551 if (th.data.sys_switch.is_skuroom_id == 1) {
1548 1552 if (th.data.data.goods_id == getApp().globalData.room_goods_id) {
... ... @@ -1818,7 +1822,9 @@ Page({
1818 1822 updata['guide_type'] = 0;
1819 1823 }
1820 1824 }
1821   -
  1825 + if(getApp().globalData.groupchat_id){
  1826 + updata['groupchat_id'] = getApp().globalData.groupchat_id;
  1827 + }
1822 1828 i.put("/api/weshop/cart/update", {
1823 1829 data: updata,
1824 1830 success: function (t) {
... ... @@ -2390,7 +2396,9 @@ Page({
2390 2396 d.guide_id = getApp().globalData.guide_id;
2391 2397 d.guide_type = 2;
2392 2398 }
2393   -
  2399 + if(getApp().globalData.groupchat_id){
  2400 + d.groupchat_id = getApp().globalData.groupchat_id;
  2401 + }
2394 2402 i.post("/api/weshop/goodscollect/save", { //添加收藏
2395 2403 data: d,
2396 2404 success: function (e) {
... ... @@ -4363,7 +4371,9 @@ Page({
4363 4371  
4364 4372 }
4365 4373 }
4366   -
  4374 + if(getApp().globalData.groupchat_id){
  4375 + newd['groupchat_id'] = getApp().globalData.groupchat_id;
  4376 + }
4367 4377 //让商品带上房间号
4368 4378 if (th.data.sys_switch.is_skuroom_id == 1) {
4369 4379 if (th.data.data.goods_id == getApp().globalData.room_goods_id) {
... ... @@ -4752,7 +4762,9 @@ Page({
4752 4762 if (getApp().globalData.guide_id) {
4753 4763 pdata.guide_id = getApp().globalData.guide_id;
4754 4764 }
4755   -
  4765 + if(getApp().globalData.groupchat_id){
  4766 + pdata.groupchat_id = getApp().globalData.groupchat_id;
  4767 + }
4756 4768 var app = getApp(),
4757 4769 th = this;
4758 4770 app.request.post("/api/weshop/couponList/saveCouponList", {
... ...
packageC/pages/presell/cart/cart2_pre.js
  View file @e4002f2
... ... @@ -811,7 +811,10 @@ Page({
811 811 }
812 812 })
813 813 }
814   -
  814 + if(gg.groupchat_id){
  815 + goods.groupchat_id=gg.groupchat_id
  816 + item.groupchat_ids=gg.groupchat_id
  817 + }
815 818 //--商品的房间号--
816 819 if (gg.room_id && gg.room_id > 0) {
817 820 item.room_ids = gg.room_id;
... ...
packageC/pages/presell/goodsInfo/goodsInfo.js
  View file @e4002f2
... ... @@ -1054,6 +1054,10 @@ Page({
1054 1054 }
1055 1055 }
1056 1056  
  1057 + if(getApp().globalData.groupchat_id){
  1058 + newd['groupchat_id'] = getApp().globalData.groupchat_id;
  1059 + }
  1060 +
1057 1061 //让商品带上房间号
1058 1062 if (th.data.sys_switch.is_skuroom_id == 1) {
1059 1063 if (th.data.data.goods_id == getApp().globalData.room_goods_id) {
... ... @@ -1133,7 +1137,9 @@ Page({
1133 1137 updata['guide_type'] = 0;
1134 1138 }
1135 1139 }
1136   -
  1140 + if(getApp().globalData.groupchat_id){
  1141 + updata['groupchat_id'] = getApp().globalData.groupchat_id;
  1142 + }
1137 1143 i.put("/api/weshop/cart/update", {
1138 1144 data: updata,
1139 1145 success: function (t) {
... ... @@ -1450,7 +1456,9 @@ Page({
1450 1456 d.guide_id = getApp().globalData.guide_id;
1451 1457 d.guide_type = 2;
1452 1458 }
1453   -
  1459 + if(getApp().globalData.groupchat_id){
  1460 + d.groupchat_id= getApp().globalData.groupchat_id;
  1461 + }
1454 1462 i.post("/api/weshop/goodscollect/save", { //添加收藏
1455 1463 data: d,
1456 1464 success: function (e) {
... ... @@ -2744,7 +2752,9 @@ Page({
2744 2752 if (getApp().globalData.guide_id) {
2745 2753 pdata.guide_id = getApp().globalData.guide_id;
2746 2754 }
2747   -
  2755 + if(getApp().globalData.groupchat_id){
  2756 + pdata.groupchat_id = getApp().globalData.groupchat_id;
  2757 + }
2748 2758 var app = getApp(),
2749 2759 th = this;
2750 2760 app.request.post("/api/weshop/couponList/saveCouponList", {
... ...
packageE/pages/cart/cart2/cart2.js
  View file @e4002f2
... ... @@ -1441,6 +1441,9 @@ Page({
1441 1441 t.data.data.guide_id = gg.guide_id;
1442 1442 t.data.data.guide_type = gg.guide_type;
1443 1443 }
  1444 + if(gg.groupchat_id){
  1445 + t.data.data.groupchat_id=groupchat_id;
  1446 + }
1444 1447 //搭配购如果原来就有勾选，不能直接赋值，旧的要保留
1445 1448 if(!th.data.collocation_goods){
1446 1449 th.setData({ collocation_goods: gg.collocation_goods });
... ... @@ -3517,7 +3520,9 @@ Page({
3517 3520 df_goods[index].df_room_ids += room_id + ",";
3518 3521  
3519 3522 }
3520   -
  3523 + if(getApp().globalData.groupchat_id){
  3524 + df_goods[index].groupchat_id=getApp().globalData.groupchat_id
  3525 + }
3521 3526 } else {
3522 3527 var e = {
3523 3528 whsle_id: whsle_id,
... ... @@ -3525,7 +3530,9 @@ Page({
3525 3530 df_goods: []
3526 3531 }
3527 3532 if (room_id) e.df_room_ids = room_id + ','
3528   -
  3533 + if(getApp().globalData.groupchat_id){
  3534 + e.groupchat_id=getApp().globalData.groupchat_id
  3535 + }
3529 3536 e.df_goods.push(good);
3530 3537 df_goods.push(e);
3531 3538 }
... ... @@ -3698,7 +3705,11 @@ Page({
3698 3705 if (gg.room_id && gg.room_id > 0) {
3699 3706 item.room_ids = gg.room_id;
3700 3707 }
3701   -
  3708 + //群id
  3709 +
  3710 + if(gg.groupchat_id){
  3711 + item.groupchat_ids=gg.groupchat_id;
  3712 + }
3702 3713 var order_prom_list = {};
3703 3714 //--判断有没有优惠活动--
3704 3715 if (th.data.formData.order_prom_amount > 0) {
... ... @@ -3795,6 +3806,9 @@ Page({
3795 3806 }
3796 3807 })
3797 3808 }
  3809 + if(gg.groupchat_id){
  3810 + goods.groupchat_id=gg.groupchat_id
  3811 + }
3798 3812  
3799 3813 //--商品的房间号--
3800 3814 if (gg.room_id && gg.room_id > 0) {
... ... @@ -3902,6 +3916,9 @@ Page({
3902 3916 }
3903 3917 })
3904 3918 }
  3919 + if(gg.groupchat_id){
  3920 + g_goods.groupchat_id=gg.groupchat_id;
  3921 + }
3905 3922 item.order_goods.push(g_goods);
3906 3923  
3907 3924 }
... ... @@ -4176,7 +4193,10 @@ Page({
4176 4193 }
4177 4194 })
4178 4195 }
4179   -
  4196 +
  4197 + if(g_item.groupchat_id){
  4198 + goods.groupchat_id=g_item.groupchat_id;
  4199 + }
4180 4200 //如果有阶梯促销
4181 4201 if (g_item.ladder_list_id) {
4182 4202 goods.ladder_list_id = g_item.ladder_list_id;
... ... @@ -4198,22 +4218,24 @@ Page({
4198 4218 item.is_whsle = 1;
4199 4219 item.whsle_id = g_item.whsle_id
4200 4220 }
4201   -
4202   - item.order_goods.push(goods);
4203 4221 //如果房间号不为空的时候
4204 4222 if (g_item.room_id) {
4205 4223 goods.room_id = g_item.room_id;
4206 4224 room_ids += g_item.room_id + ",";
4207 4225 }
  4226 +
  4227 + item.order_goods.push(goods);
  4228 +
4208 4229 }
4209 4230 }
4210 4231  
4211 4232  
4212   -
  4233 +
4213 4234  
4214 4235 //如果房间号不为空的时候
4215 4236 if (room_ids != "") item.room_ids = ut.sub_last(room_ids);
4216   -
  4237 + if (getApp().globalData.groupchat_id) item.groupchat_ids = getApp().globalData.groupchat_id;
  4238 + // if (getApp().globalData.groupchat_id) {item.groupchat_id = getApp().globalData.groupchat_id;}
4217 4239 //处理代发商品的拆分
4218 4240 if (df_goods.length > 0) {
4219 4241  
... ... @@ -4265,6 +4287,10 @@ Page({
4265 4287  
4266 4288 if (ddff_item.df_room_ids)
4267 4289 df_item.room_ids = ut.sub_last(ddff_item.df_room_ids);
  4290 +
  4291 + if (getApp().globalData.groupchat_id){
  4292 + df_item.groupchat_ids = getApp().globalData.groupchat_id;
  4293 + }
4268 4294 df_item.order_goods = ddff_item.df_goods;
4269 4295 pdata.push(df_item);
4270 4296 }
... ... @@ -4302,6 +4328,7 @@ Page({
4302 4328 })
4303 4329 // pdata.keyid = th.data.bn_goods.keyid
4304 4330 }
  4331 +
4305 4332 var str = JSON.stringify(pdata);
4306 4333  
4307 4334 wx.showLoading({ title: "加载中" });
... ...
pages/cart/cart2_inte/cart2_inte.js
  View file @e4002f2
... ... @@ -1035,6 +1035,9 @@ Page({
1035 1035 if (gg.room_id && gg.room_id > 0) {
1036 1036 item.room_ids = gg.room_id;
1037 1037 }
  1038 + if(gg.groupchat_id){
  1039 + item.groupchat_ids=gg.groupchat_id
  1040 + }
1038 1041  
1039 1042 //老会员成为分销下线需要的参数
1040 1043 if (getApp().globalData.first_leader && !getApp().globalData.userInfo.first_leader) {
... ... @@ -1085,7 +1088,9 @@ Page({
1085 1088 }
1086 1089 })
1087 1090 }
1088   -
  1091 + if(gg.groupchat_id){
  1092 + goods.groupchat_id=gg.groupchat_id
  1093 + }
1089 1094 //--商品的房间号--
1090 1095 if (gg.room_id && gg.room_id > 0) {
1091 1096 goods.room_id = gg.room_id;
... ...
pages/cart/cart2_pt/cart2_pt.js
  View file @e4002f2
... ... @@ -1185,7 +1185,10 @@ Page({
1185 1185 }
1186 1186 })
1187 1187 }
1188   -
  1188 + if(gg.groupchat_id){
  1189 + goods.groupchat_id=gg.groupchat_id
  1190 + item.groupchat_ids=gg.groupchat_id
  1191 + }
1189 1192  
1190 1193 //--商品的房间号--
1191 1194 if (gg.room_id && gg.room_id > 0) {
... ...
pages/goods/goodsInfo/goodsInfo.js
  View file @e4002f2
... ... @@ -1418,6 +1418,9 @@ Page({
1418 1418 if ("add" == t.currentTarget.dataset.action) newd['guide_type'] = 1;
1419 1419 }
1420 1420 }
  1421 + if(getApp().globalData.groupchat_id){
  1422 + newd['groupchat_id'] = getApp().globalData.groupchat_id;
  1423 + }
1421 1424  
1422 1425 //让商品带上房间号
1423 1426 //让商品带上房间号
... ... @@ -1568,7 +1571,9 @@ Page({
1568 1571 if ("add" == t.currentTarget.dataset.action) newd['guide_type'] = 1;
1569 1572 }
1570 1573 }
1571   -
  1574 + if(getApp().globalData.groupchat_id){
  1575 + newd['groupchat_id'] = getApp().globalData.groupchat_id;
  1576 + }
1572 1577 //让商品带上房间号
1573 1578 //让商品带上房间号
1574 1579 if (!th.data.sys_switch.is_skuroom_id && th.data.sys_switch.is_skuroom_id == 1) {
... ... @@ -1867,6 +1872,9 @@ Page({
1867 1872  
1868 1873 //---加入购物车的最后一步---
1869 1874 add_cart_next(e, t, a, o, newd, CanOutQty) {
  1875 + if (getApp().globalData.groupchat_id) {
  1876 + newd.groupchat_id=getApp().globalData.groupchat_id
  1877 + }
1870 1878 var th = this, i = getApp().request;
1871 1879 //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------
1872 1880 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({
1997 2005 updata['guide_type'] = 0;
1998 2006 }
1999 2007 }
  2008 + if(getApp().globalData.groupchat_id){
  2009 + updata['groupchat_id'] = getApp().globalData.groupchat_id;
  2010 + }
2000 2011  
2001 2012  
2002 2013 getApp().request.put("/api/weshop/cart/update", {
... ... @@ -2846,7 +2857,10 @@ Page({
2846 2857 d.guide_id = getApp().globalData.guide_id;
2847 2858 d.guide_type = 2;
2848 2859 }
2849   -
  2860 + if(getApp().globalData.groupchat_id){
  2861 + d.groupchat_id = getApp().globalData.groupchat_id;
  2862 + }
  2863 +
2850 2864 i.post("/api/weshop/goodscollect/save", { //添加收藏
2851 2865 data: d,
2852 2866 success: function (e) {
... ... @@ -5069,11 +5083,11 @@ Page({
5069 5083 if (getApp().globalData.guide_id) {
5070 5084 newd['guide_id'] = getApp().globalData.guide_id;
5071 5085 newd['guide_type'] = 0;
5072   -
5073   -
5074 5086 }
5075 5087 }
5076   -
  5088 + if(getApp().globalData.groupchat_id){
  5089 + newd['groupchat_id'] = getApp().globalData.groupchat_id;
  5090 + }
5077 5091 //让商品带上房间号
5078 5092 if (!th.data.sys_switch.is_skuroom_id && th.data.sys_switch.is_skuroom_id == 1) {
5079 5093 if (th.data.data.goods_id == getApp().globalData.room_goods_id) {
... ... @@ -5524,6 +5538,9 @@ Page({
5524 5538 if (getApp().globalData.guide_id) {
5525 5539 pdata.guide_id = getApp().globalData.guide_id;
5526 5540 }
  5541 + if(getApp().globalData.groupchat_id){
  5542 + pdata.groupchat_id = getApp().globalData.groupchat_id;
  5543 + }
5527 5544  
5528 5545 var app = getApp(),
5529 5546 th = this;
... ...
pages/index/index/index.js
  View file @e4002f2
... ... @@ -96,7 +96,8 @@ Page({
96 96 menus:['shareAppMessage','shareTimeline']
97 97 })
98 98 var th = this;
99   - var first_leader = tt.first_leader;
  99 + var first_leader = tt.first_leader;
  100 +
100 101 if (!first_leader && tt.scene) {
101 102 var first_leader_str = decodeURIComponent(tt.scene);
102 103 var f_arr = first_leader_str.split("_");
... ... @@ -104,9 +105,17 @@ Page({
104 105 //注册门店
105 106 if (f_arr[1] && parseFloat(f_arr[1]) > 0) {
106 107 getApp().globalData.store_number = f_arr[1];
107   - }
108   - }
109   -
  108 + }
  109 + //企业微信群id
  110 + if (f_arr[2] && parseFloat(f_arr[2]) > 0) {
  111 + getApp().globalData.groupchat_id = f_arr[2];
  112 + }
  113 +
  114 + }
  115 + // console.error('群id------------------------------------------');
  116 + // console.error(getApp().globalData.groupchat_id);
  117 + // console.error('群id------------------------------------------2222222222222222222222');
  118 + // getApp().globalData.groupchat_id=1
110 119 console.log("first_leader:"+first_leader,"onload");
111 120  
112 121  
... ...