diff --git a/packageA/pages/jfbuy/jfbuy.js b/packageA/pages/jfbuy/jfbuy.js index 0391e40..90d1341 100644 --- a/packageA/pages/jfbuy/jfbuy.js +++ b/packageA/pages/jfbuy/jfbuy.js @@ -73,7 +73,10 @@ Page({ page:th.data.currentPage2, pageSize:th.data.pageSize }; - + //群id + if(options && options.groupchat_id){ + getApp().globalData.groupchat_id=options.groupchat_id + } var clientHeight = wx.getSystemInfoSync().windowHeight; var clientWidth = wx.getSystemInfoSync().windowWidth; this.data.clientHeight=clientHeight; @@ -204,8 +207,20 @@ Page({ pagePath += '&first_leader=' + getApp().globalData.user_id; }else{ pagePath += '?first_leader=' + getApp().globalData.user_id; - } - } + } + //群id分享 + if (getApp().globalData.groupchat_id) { + pagePath+="&groupchat_id="+getApp().globalData.groupchat_id + } + }else{ + if(pagePath.indexOf("?")>0){ + pagePath+="&groupchat_id="+getApp().globalData.groupchat_id + }else{ + pagePath+="?groupchat_id="+getApp().globalData.groupchat_id + } + + } + return { title: store_name + '-积分购', path: pagePath, @@ -276,10 +291,15 @@ Page({ var user_id=getApp().globalData.user_id; if(!user_id) user_id=0; if(!store_name) store_name = getApp().globalData.setting.appName; + var url='' + //群id分享 + if (getApp().globalData.groupchat_id) { + url+="&groupchat_id="+getApp().globalData.groupchat_id + } return { title: store_name + '-积分购', - query: 'first_leader='+user_id + query: 'first_leader='+user_id+url } }, diff --git a/packageA/pages/prom_list/prom_list.js b/packageA/pages/prom_list/prom_list.js index 24dcd80..27e32ca 100644 --- a/packageA/pages/prom_list/prom_list.js +++ b/packageA/pages/prom_list/prom_list.js @@ -50,6 +50,10 @@ Page({ var room_id=t.room_id; this.setData({gid:goods_id}); + //群id + if(t && t.groupchat_id){ + getApp().globalData.groupchat_id=t.groupchat_id + } if(room_id) this.data.room_id=room_id; //房间号要存起来 var ee=this,th=ee,that=ee; var first_leader=t.first_leader; @@ -821,8 +825,19 @@ Page({ pagePath+="&goods_id="+this.data.gid+" &first_leader="+getApp().globalData.user_id; }else{ pagePath+="?goods_id="+this.data.gid+"&first_leader="+getApp().globalData.user_id; - } - } + } + //群id分享 + if (getApp().globalData.groupchat_id) { + pagePath+="&groupchat_id="+getApp().globalData.groupchat_id + } + }else{ + if(pagePath.indexOf("?")>0){ + pagePath+="&groupchat_id="+getApp().globalData.groupchat_id + }else{ + pagePath+="?groupchat_id="+getApp().globalData.groupchat_id + } + + } console.log("111"); console.log(pagePath); diff --git a/packageC/pages/group_list/group_list.js b/packageC/pages/group_list/group_list.js index 43c6bbf..fe5e55a 100644 --- a/packageC/pages/group_list/group_list.js +++ b/packageC/pages/group_list/group_list.js @@ -27,7 +27,10 @@ Page({ */ onLoad: function (options) { self = this; - + //群id + if(options && options.groupchat_id){ + getApp().globalData.groupchat_id=options.groupchat_id + } app.isLogin().then(function(data) {//进入页面前已经授权登录成功 self.setData({ userInfo: data, @@ -153,7 +156,41 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage: function () { getApp().globalData.no_clear=1; }, + onShareAppMessage: function () { + getApp().globalData.no_clear=1; + var store_name = getApp().globalData.config ? getApp().globalData.config.store_name:''; + + var pagePath = this.route; //当前页面url + + if(!store_name) store_name = getApp().globalData.setting.appName; + + if(pagePath.indexOf('/') != 0) { + pagePath = '/' + pagePath; + } + + if(getApp().globalData.user_id){ + if(pagePath.indexOf('?')>0){ + pagePath += '&first_leader=' + getApp().globalData.user_id; + }else{ + pagePath += '?first_leader=' + getApp().globalData.user_id; + } + //群id分享 + if (getApp().globalData.groupchat_id) { + pagePath+="&groupchat_id="+getApp().globalData.groupchat_id + } + }else{ + if(pagePath.indexOf("?")>0){ + pagePath+="&groupchat_id="+getApp().globalData.groupchat_id + }else{ + pagePath+="?groupchat_id="+getApp().globalData.groupchat_id + } + } + + return { + title: store_name + '-团购', + path: pagePath, + } + }, /** diff --git a/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js b/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js index 9940f77..f83be64 100644 --- a/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js +++ b/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js @@ -15,7 +15,10 @@ Page({ onLoad: function (options) { self = this; - + //群id + if(options && options.groupchat_id){ + getApp().globalData.groupchat_id=options.groupchat_id + } var first_leader = options.first_leader; if(first_leader) { app.globalData.first_leader = first_leader; @@ -204,7 +207,18 @@ Page({ }else{ pagePath+="?first_leader="+getApp().globalData.user_id; } - } + //群id分享 + if (getApp().globalData.groupchat_id) { + pagePath+="&groupchat_id="+getApp().globalData.groupchat_id + } + }else{ + if(pagePath.indexOf("?")>0){ + pagePath+="&groupchat_id="+getApp().globalData.groupchat_id + }else{ + pagePath+="?groupchat_id="+getApp().globalData.groupchat_id + } + + } return { title: "幸运购活动列表", path: pagePath, diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js index 5bb7765..d2663e5 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js @@ -294,6 +294,10 @@ Page({ this.data.group_id = t.group_id; }; + //群id + if(t && t.groupchat_id){ + getApp().globalData.groupchat_id=t.groupchat_id + } var ee = this, that = ee, @@ -2616,6 +2620,11 @@ Page({ } } + //群id分享 + if (getApp().globalData.groupchat_id) { + pagePath+="&groupchat_id="+getApp().globalData.groupchat_id + } + return { title: "邀您一起参加幸运购", path: pagePath, @@ -6255,6 +6264,10 @@ Page({ if(getApp().globalData.user_id){ pagePath+="&first_leader="+getApp().globalData.user_id; } + //群id分享 + if (getApp().globalData.groupchat_id) { + pagePath+="&groupchat_id="+getApp().globalData.groupchat_id + } return { title: this.data.data.goods_name + '-' + store_name, diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js index 43408be..ca083a1 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.js +++ b/packageC/pages/presell/goodsInfo/goodsInfo.js @@ -269,6 +269,11 @@ Page({ room_user_share = t.room_user_share; //如果是会员分享带有room_id的话,那么接下来会员分享就不传room_id //检查测肤 getApp().check_skin_face(t, 0, gid); + //群id + if(t && t.groupchat_id){ + getApp().globalData.groupchat_id=t.groupchat_id + } + //-- 自定义海报 -- getApp().request.promiseGet("/api/weshop/goods/poster/page", { @@ -1611,6 +1616,11 @@ Page({ url += "&room_id=" + getApp().globalData.room_id + "&room_user_share=1"; } + //群id分享 + if (getApp().globalData.groupchat_id) { + url+="&groupchat_id="+getApp().globalData.groupchat_id + } + var ob = { title: price + "元 " + title, path: url, @@ -4192,8 +4202,18 @@ Page({ var store_name = getApp().globalData.config ? getApp().globalData.config.store_name : ''; if (!store_name) store_name = getApp().globalData.setting.appName; + + var user_id=getApp().globalData.user_id; + if(!user_id) user_id=0; + var url='' + //群id分享 + if (getApp().globalData.groupchat_id) { + url+="&groupchat_id="+getApp().globalData.groupchat_id + } + return { title: this.data.data.goods_name + '-' + store_name, + query: 'first_leader='+user_id+url, imageUrl: this.data.gallery[0].image_url, } }, diff --git a/packageC/pages/presell/list/list.js b/packageC/pages/presell/list/list.js index 3408844..1924c4f 100644 --- a/packageC/pages/presell/list/list.js +++ b/packageC/pages/presell/list/list.js @@ -20,7 +20,10 @@ Page({ var th = this; getApp().getConfig(); this.data.act_id=t.act_id; - + //群id + if(t && t.groupchat_id){ + getApp().globalData.groupchat_id=t.groupchat_id + } if (first_leader) { getApp().globalData.first_leader = first_leader; //调用接口判断是不是会员 @@ -299,7 +302,17 @@ Page({ url += "?first_leader=" + getApp().globalData.user_id; else url += "&first_leader=" + getApp().globalData.user_id; - } + + url+="&groupchat_id="+getApp().globalData.groupchat_id + + }else{ + if(url.indexOf("?")>0){ + url+="&groupchat_id="+getApp().globalData.groupchat_id + }else{ + url+="?groupchat_id="+getApp().globalData.groupchat_id + } + + } //-- 如果房间分享,且不是会员分享的 -- if (getApp().globalData.room_id && this.data.data.goods_id == getApp().globalData.room_goods_id && diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js index d8f51ad..9a1bc45 100644 --- a/packageE/pages/cart/cart2/cart2.js +++ b/packageE/pages/cart/cart2/cart2.js @@ -4087,7 +4087,7 @@ Page({ var check_map = {}; - + let groupchat_ids=[] //-------------让商品添加到商品列表-------------------- for (var k = 0; k < t_item.goods.length; k++) { @@ -4196,6 +4196,7 @@ Page({ if(g_item.groupchat_id){ goods.groupchat_id=g_item.groupchat_id; + groupchat_ids.push(g_item.groupchat_id); } //如果有阶梯促销 if (g_item.ladder_list_id) { @@ -4234,7 +4235,7 @@ Page({ //如果房间号不为空的时候 if (room_ids != "") item.room_ids = ut.sub_last(room_ids); - if (getApp().globalData.groupchat_id) item.groupchat_ids = getApp().globalData.groupchat_id; + if (groupchat_ids && groupchat_ids.length>0) item.groupchat_ids = groupchat_ids.join(','); // if (getApp().globalData.groupchat_id) {item.groupchat_id = getApp().globalData.groupchat_id;} //处理代发商品的拆分 if (df_goods.length > 0) { diff --git a/pages/activity/pind_list/pind_list.js b/pages/activity/pind_list/pind_list.js index ec3b10d..569d88f 100644 --- a/pages/activity/pind_list/pind_list.js +++ b/pages/activity/pind_list/pind_list.js @@ -23,6 +23,10 @@ Page({ //------初始化加载---------- onLoad: function (t) { + //群id + if(t && t.groupchat_id){ + getApp().globalData.groupchat_id=t.groupchat_id + } wx.setNavigationBarTitle({ title: "天天拼单", }) @@ -220,6 +224,17 @@ Page({ } else { pagePath += "?first_leader=" + getApp().globalData.user_id; } + //群id分享 + if (getApp().globalData.groupchat_id) { + pagePath+="&groupchat_id="+getApp().globalData.groupchat_id + } + }else{ + if(pagePath.indexOf("?")>0){ + pagePath+="&groupchat_id="+getApp().globalData.groupchat_id + }else{ + pagePath+="?groupchat_id="+getApp().globalData.groupchat_id + } + } console.log("11" + pagePath); @@ -267,9 +282,14 @@ Page({ store_name = getApp().globalData.setting.appName; var user_id=getApp().globalData.user_id; if(!user_id) user_id=0; + var url='' + //群id分享 + if (getApp().globalData.groupchat_id) { + url+="&groupchat_id="+getApp().globalData.groupchat_id + } return { title: '拼团活动-' + store_name, - query: 'first_leader='+user_id + query: 'first_leader='+user_id+url } }, diff --git a/pages/activity/seckill_list/seckill_list.js b/pages/activity/seckill_list/seckill_list.js index 8ad5dbe..155c310 100644 --- a/pages/activity/seckill_list/seckill_list.js +++ b/pages/activity/seckill_list/seckill_list.js @@ -22,6 +22,10 @@ Page({ //------初始化加载---------- onLoad: function (t) { + //群id + if(t && t.groupchat_id){ + getApp().globalData.groupchat_id=t.groupchat_id + } wx.setNavigationBarTitle({ title: "商品秒杀", }) @@ -258,8 +262,19 @@ Page({ } else { pagePath += "?first_leader=" + getApp().globalData.user_id; } + //群id分享 + if (getApp().globalData.groupchat_id) { + pagePath+="&groupchat_id="+getApp().globalData.groupchat_id + } + }else{ + if(pagePath.indexOf("?")>0){ + pagePath+="&groupchat_id="+getApp().globalData.groupchat_id + }else{ + pagePath+="?groupchat_id="+getApp().globalData.groupchat_id + } } + console.log("11" + pagePath); return { title: "限时秒杀", @@ -286,10 +301,16 @@ Page({ var user_id=getApp().globalData.user_id; if(!user_id) user_id=0; + var url="" + //群id分享 + if (getApp().globalData.groupchat_id) { + url+="&groupchat_id="+getApp().globalData.groupchat_id + } + return { title: '秒杀活动-' + store_name, - query: 'first_leader='+user_id + query: 'first_leader='+user_id+url } }, diff --git a/pages/goods/categoryList/categoryList.js b/pages/goods/categoryList/categoryList.js index d325583..c0377af 100644 --- a/pages/goods/categoryList/categoryList.js +++ b/pages/goods/categoryList/categoryList.js @@ -105,6 +105,11 @@ Page({ // console.log(rect); // }).exec() + //群id + if(tt && tt.groupchat_id){ + getApp().globalData.groupchat_id=tt.groupchat_id + } + var that = this; var first_leader = tt.first_leader; if (first_leader) { @@ -678,7 +683,19 @@ Page({ //是分销商才带 if (userInfo) { url += "?first_leader=" + userInfo.user_id; + //群id分享 + if (getApp().globalData.groupchat_id) { + url+="&groupchat_id="+getApp().globalData.groupchat_id + } + }else{ + //群id分享 + if (getApp().globalData.groupchat_id) { + url+="?groupchat_id="+getApp().globalData.groupchat_id + } } + + + console.log("--分类分享---分享--"); console.log(url); @@ -1237,10 +1254,14 @@ Page({ var user_id = getApp().globalData.user_id; if (!user_id) user_id = 0; - + var url='' + //群id分享 + if (getApp().globalData.groupchat_id) { + url+="&groupchat_id="+getApp().globalData.groupchat_id + } return { title: '商品分类-' + store_name, - query: "first_leader=" + user_id + query: "first_leader=" + user_id+url } } diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 037aa8c..0f144a8 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -275,13 +275,18 @@ Page({ th = ee, gid = t.goods_id, first_leader = t.first_leader, + room_id = t.room_id, room_user_share = t.room_user_share, //如果是会员分享带有room_id的话,那么接下来会员分享就不传room_id prom_type = t.prom_type || 0, prom_id = t.prom_id || 0; //活动ID var share_openid = t.share_openid; - + //群id + if(t && t.groupchat_id){ + getApp().globalData.groupchat_id=t.groupchat_id + } + self = this; @@ -3021,6 +3026,11 @@ Page({ url += "&room_id=" + getApp().globalData.room_id + "&room_user_share=1"; } + //群id分享 + if (getApp().globalData.groupchat_id) { + url+="&groupchat_id="+getApp().globalData.groupchat_id + } + var ob = { title: price + "元 " + title, path: url, @@ -7485,6 +7495,11 @@ Page({ url += "&room_id=" + getApp().globalData.room_id + "&room_user_share=1"; } + //群id分享 + if (getApp().globalData.groupchat_id) { + url+="&groupchat_id="+getApp().globalData.groupchat_id + } + return { title: this.data.data.goods_name + '-' + store_name, imageUrl: this.data.gallery[0].image_url, diff --git a/pages/goods/search/search.js b/pages/goods/search/search.js index 1bfc900..1cac2a1 100644 --- a/pages/goods/search/search.js +++ b/pages/goods/search/search.js @@ -44,7 +44,10 @@ Page({ onLoad: function (t) { this.data.rq_data = t; - + //群id + if(t && t.groupchat_id){ + getApp().globalData.groupchat_id=t.groupchat_id + } if (t.o) { this.data.rq_data.o = JSON.parse(t.o); }; @@ -430,6 +433,10 @@ Page({ pagePath += "?first_leader=" + getApp().globalData.user_id; } } + //群id分享 + if (getApp().globalData.groupchat_id) { + pagePath+="&groupchat_id="+getApp().globalData.groupchat_id + } // console.log("11-11"+pagePath); return { diff --git a/pages/index/index/index.js b/pages/index/index/index.js index 3efaf61..1cc2631 100644 --- a/pages/index/index/index.js +++ b/pages/index/index/index.js @@ -91,13 +91,19 @@ Page({ onLoad: async function (tt) { + console.error('分享群id'); + console.error(tt); + console.error('...................................'); wx.showShareMenu({ withShareTicket:true, menus:['shareAppMessage','shareTimeline'] }) var th = this; var first_leader = tt.first_leader; - + //群id + if(tt && tt.groupchat_id){ + getApp().globalData.groupchat_id=tt.groupchat_id + } if (!first_leader && tt.scene) { var first_leader_str = decodeURIComponent(tt.scene); var f_arr = first_leader_str.split("_"); @@ -929,8 +935,17 @@ Page({ var userInfo = getApp().globalData.userInfo; //是分销商才带 if (userInfo) { - url += "?first_leader=" + userInfo.user_id; - } + url += "?first_leader=" + userInfo.user_id; + //群id分享 + if (getApp().globalData.groupchat_id) { + url+="&groupchat_id="+getApp().globalData.groupchat_id + } + }else{ + //群id分享 + if (getApp().globalData.groupchat_id) { + url+="?groupchat_id="+getApp().globalData.groupchat_id + } + } console.log("---首页---分享--"); var title = "商城首页" //分享 @@ -938,7 +953,9 @@ Page({ title = getApp().globalData.config.store_name; } else if (getApp().globalData.setting.appName) { title = getApp().globalData.setting.appName; - } + } + + var ob = { title: title, @@ -1336,9 +1353,14 @@ Page({ } var user_id=getApp().globalData.user_id; if(!user_id) user_id=0; + var url='' + //群id分享 + if (getApp().globalData.groupchat_id) { + url+="&groupchat_id="+getApp().globalData.groupchat_id + } return { title: '首页-' + '-' + store_name, - query: 'first_leader='+user_id + query: 'first_leader='+user_id+url } },