diff --git a/app.js b/app.js index efe8c1c..b0064fb 100644 --- a/app.js +++ b/app.js @@ -51,7 +51,7 @@ App({ config: null, //门店参数 config2: null, //门店配置 code: null, - user_id:null,//10153869,//6520352,// 10153869,// 6520352,// qa-6519858,// + user_id:null,//6520390,//6520352 // user_id:6520314,// qa-6519858,// // user_id:14148118,// qa-6519858,// buy_now: null, @@ -511,47 +511,60 @@ App({ get_user_store: function (func) { var th = this; this.getConfig2(function (conf) { + + var is_pricing_open_store=0; + var is_regstores=0; + var is_guide_storage=0; + if (conf.switch_list) { + var t_swi = JSON.parse(conf.switch_list); + //--购买门店是否默认登记门店-- + is_regstores=t_swi.is_regstores; + is_pricing_open_store=t_swi.is_pricing_open_store; + is_guide_storage=t_swi.is_guide_storage; + } + //---空会员的情况--- if (!th.globalData.userInfo) { - return func(null); + //没有导购门店 和 没有开启默认导购 + if(!th.globalData.guide_pick_id || !is_guide_storage) { + return func(null); + } } if (!th.globalData.pk_store) { var pick_id = 0; - var is_pricing_open_store=0; - var is_regstores=0; - if (conf.switch_list) { - var t_swi = JSON.parse(conf.switch_list); - //--购买门店是否默认登记门店-- - is_regstores=t_swi.is_regstores; - is_pricing_open_store=t_swi.is_pricing_open_store; - } + //-- 如果有导购的时候，后台有默认门店只能是导购的门店的时候 -- + if(th.globalData.guide_pick_id && is_guide_storage){ + pick_id = th.globalData.guide_pick_id + }else { - //-- 如果是区域价格提现，现在注册门店是默认 -- - if(is_pricing_open_store){ + //-- 如果是区域价格提现，现在注册门店是默认 -- + if (is_pricing_open_store) { - //查找会员的注册的地址 - if (th.globalData.userInfo.pickup_id) { - pick_id = th.globalData.userInfo.pickup_id; - th.globalData.is_dj_pk=1; - } - //先找一个会员是否有设置默认的地址 - else if (th.globalData.userInfo.def_pickup_id) { - pick_id = th.globalData.userInfo.def_pickup_id - } + //查找会员的注册的地址 + if (th.globalData.userInfo.pickup_id) { + pick_id = th.globalData.userInfo.pickup_id; + th.globalData.is_dj_pk = 1; + } + //先找一个会员是否有设置默认的地址 + else if (th.globalData.userInfo.def_pickup_id) { + pick_id = th.globalData.userInfo.def_pickup_id + } - }else{ - //先找一个会员是否有设置默认的地址 - if (th.globalData.userInfo.def_pickup_id) { - pick_id = th.globalData.userInfo.def_pickup_id - } - //查找会员的注册的地址 - else if (th.globalData.userInfo.pickup_id && is_regstores) { - pick_id = th.globalData.userInfo.pickup_id + } else { + //先找一个会员是否有设置默认的地址 + if (th.globalData.userInfo.def_pickup_id) { + pick_id = th.globalData.userInfo.def_pickup_id + } + //查找会员的注册的地址 + else if (th.globalData.userInfo.pickup_id && is_regstores) { + pick_id = th.globalData.userInfo.pickup_id + } } } + //---如果会员没有设置默认门店，同时也没有再注册的时候选择门店-- if (pick_id == 0) return func(null); @@ -704,6 +717,7 @@ App({ } }, + //清空登录时候缓存的值 onHide: function () { var th = this; @@ -725,6 +739,7 @@ App({ th.globalData.dis_buy_obj = null; //等级卡的购买记录 th.globalData.storeFooter = null; //底部的导航 th.globalData.full_screen = null; //全屏 + th.globalData.guide_pick_id = null; //分享导购门店的优化 } else { th.globalData.no_clear = 0; } diff --git a/app.json b/app.json index 38f0062..69bb6e6 100644 --- a/app.json +++ b/app.json @@ -30,6 +30,7 @@ "pages/cart/cart2_pt/cart2_pt", "pages/cart/cart_wk/cart_wk", + "pages/user/userqy/userqy", "pages/user/user_spsy/user_spsy", @@ -217,7 +218,8 @@ "pages/user/grow_value/grow_value", "pages/user/labels/labels", "pages/cart/cart2/cart2", - "pages/barCodeBank/barCodeBank" + "pages/barCodeBank/barCodeBank", + "pages/qy/contactMe/contactMe" ] } diff --git a/components/diy_store_select/diy_store_select.js b/components/diy_store_select/diy_store_select.js index 97a8f04..f4d8b61 100644 --- a/components/diy_store_select/diy_store_select.js +++ b/components/diy_store_select/diy_store_select.js @@ -54,7 +54,8 @@ Component({ fail: function(res) { if(res.errCode == 2) { getApp().confirmBox("请开启GPS定位", null, 25000, !1); - } + } + th.set_fir_store_to_def(); } }) 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..982243c 100644 --- a/packageA/pages/goodsInfo/goodsInfo.js +++ b/packageA/pages/goodsInfo/goodsInfo.js @@ -231,7 +231,9 @@ Page({ that = ee, th = ee, gid = t.goods_id, - first_leader=t.first_leader; + first_leader=t.first_leader, + room_id = t.room_id, + room_user_share = t.room_user_share; //如果是会员分享带有room_id的话，那么接下来会员分享就不传room_id //检查测肤 getApp().check_skin_face(t,1,gid); @@ -259,212 +261,154 @@ Page({ //调用接口判断是不是会员 getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{ if(res.data.code==0) { - getApp().globalData.guide_id=res.data.data.id; + getApp().globalData.guide_id=res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id } }) } - - var c_guide_id=t.c_guide_id; - if(c_guide_id){ - th.data.c_guide_id=c_guide_id; - } + + //-- 如果有房间号 -- + if (room_id) { + getApp().globalData.room_id = room_id; + getApp().globalData.room_goods_id = gid; + //如果是会员分享过来的要记录 + if (room_user_share) + getApp().globalData.room_user_share = room_user_share; + + if (share_openid) { + this.get_room_share_guide(share_openid); + } + } + + + var c_guide_id=t.c_guide_id; + if(c_guide_id){ + th.data.c_guide_id=c_guide_id; + } getApp().getConfig(function(e) { ee.setData({sto_sele_name_1:e.store_name}) }) - //----获取系统参数----- - getApp().getConfig2(function (e) { - ee.setData({ - bconfig: e, - sales_rules: e.sales_rules, - }); - - if (e.categoryset.indexOf("," + 1 + ",") != -1) { - ee.setData({ - is_show_pl: 1 - }); - } - if (e.categoryset.indexOf("," + 3 + ",") != -1) { - ee.setData({ - is_show_pp: 1 - }); - } - if (e.categoryset.indexOf("," + 2 + ",") != -1) { - ee.setData({ - is_show_gb: 1 - }); - } - // console.log(e); - var json_d = JSON.parse(e.switch_list); - ee.setData({ - store_config: e, - sys_switch: json_d, - is_closecoupon: json_d.is_closecoupon, - is_newsales_rules: json_d.is_newsales_rules - }); - ee.init(gid); - - //------几人评价------- - //n.init(th, "", "comments"); - - th.requestCardNum(), wx.pageScrollTo && th.setData({ - supportPageScroll: !0 - }); - - //计算等级价相关 - // var swithc_list = e.switch_list; - // var sw_arr = JSON.parse(swithc_list); - // //---如果后台又开等级卡的开关--- - // if (sw_arr.rank_switch && sw_arr.rank_switch == "2") { - // th.setData({ rank_switch: true }); - // //---回调卡的列表--- - // th.getPlusCardType(function (ob) { - // th.setData({ card_list: ob.card_list }); - // var ti = setInterval(function () { - // var user = getApp().globalData.userInfo; - // if (!user) return false; - // clearInterval(ti); - // if (user.card_field && user['card_expiredate']) { - // var str = user['card_expiredate'].replace(/-/g, '/'); - // var end = new Date(str); - // end = Date.parse(end) / 1000; - // var now = ut.gettimestamp(); - // //--- 判断是等级会员，且在有效期范围内 --- - // if (user.card_field && now < end) { - // var card_name = ob.name_map.get(user.card_field); - // //if(card_name.length>6) card_name=card_name.substring(0,6); - - // var is_near_date = 0; - // if (end - now < 60 * 60 * 30 * 24) is_near_date = 1; //如果小于30天 - // th.setData({ card_field: user.card_field, card_name: card_name, card_list: ob.card_list, is_near_date: is_near_date }); - // } - // } - // }, 500) - // }) - // } - - }, 1); + //----获取系统参数----- + getApp().getConfig2(function (e) { + ee.setData({ + bconfig: e, + sales_rules: e.sales_rules, + }); - //获取用户设备信息，屏幕宽度 - wx.getSystemInfo({ - success: res => { - that.setData({ - screenWidth: res.screenWidth - }) - } - }); - - //获取用户的默认门店 - getApp().get_user_store(function(e) { - console.log('get_user_store'); - console.log("999999999"); + if (e.categoryset.indexOf("," + 1 + ",") != -1) { + ee.setData({ + is_show_pl: 1 + }); + } + if (e.categoryset.indexOf("," + 3 + ",") != -1) { + ee.setData({ + is_show_pp: 1 + }); + } + if (e.categoryset.indexOf("," + 2 + ",") != -1) { + ee.setData({ + is_show_gb: 1 + }); + } + // console.log(e); + var json_d = JSON.parse(e.switch_list); + ee.setData({ + store_config: e, + sys_switch: json_d, + is_closecoupon: json_d.is_closecoupon, + is_newsales_rules: json_d.is_newsales_rules + }); + ee.init(gid); + //------几人评价------- + //n.init(th, "", "comments"); - if(!e) { - th.data.fir_def_store={}; //赋值空对象 - return false; - } + th.requestCardNum(), wx.pageScrollTo && th.setData({ + supportPageScroll: !0 + }); - console.log("000000"); + //计算等级价相关 + // var swithc_list = e.switch_list; + // var sw_arr = JSON.parse(swithc_list); + // //---如果后台又开等级卡的开关--- + // if (sw_arr.rank_switch && sw_arr.rank_switch == "2") { + // th.setData({ rank_switch: true }); + // //---回调卡的列表--- + // th.getPlusCardType(function (ob) { + // th.setData({ card_list: ob.card_list }); + // var ti = setInterval(function () { + // var user = getApp().globalData.userInfo; + // if (!user) return false; + // clearInterval(ti); + // if (user.card_field && user['card_expiredate']) { + // var str = user['card_expiredate'].replace(/-/g, '/'); + // var end = new Date(str); + // end = Date.parse(end) / 1000; + // var now = ut.gettimestamp(); + // //--- 判断是等级会员，且在有效期范围内 --- + // if (user.card_field && now < end) { + // var card_name = ob.name_map.get(user.card_field); + // //if(card_name.length>6) card_name=card_name.substring(0,6); + + // var is_near_date = 0; + // if (end - now < 60 * 60 * 30 * 24) is_near_date = 1; //如果小于30天 + // th.setData({ card_field: user.card_field, card_name: card_name, card_list: ob.card_list, is_near_date: is_near_date }); + // } + // } + // }, 500) + // }) + // } + + }, 1); + + //获取用户设备信息，屏幕宽度 + wx.getSystemInfo({ + success: res => { + that.setData({ + screenWidth: res.screenWidth + }) + } + }); - if(getApp().globalData.is_dj_pk) th.setData({has_def:1}) + }, - var ee=JSON.parse(JSON.stringify(e)); + //-- 获取直播的分享人的导购信息 -- + async get_room_share_guide(share_openid) { + var url = "/api/weshop/users/page"; + var first_leader = 0; - console.log(e); + //调用接口判断是不是会员 + await getApp().request.promiseGet(url, { + data: { + stoid: os.stoid, + weapp_openid: share_openid + } + }).then(res => { + if (ut.ajax_ok(res)) { + first_leader = res.data.data.pageData[0].user_id; + getApp().globalData.guide_id = res.data.data.id; + } + }) - //--定时器推迟一下-- - setTimeout(function () { - if(!th.data.data){ - return false; - } - var ser_card=th.data.data; - //--如果默认门店不在等级卡的默认们店以内 - if(ser_card.storageId!=null && ser_card.storageId!="" && ser_card.storageId.indexOf(ee.keyid)==-1){ - ee.is_no_dis=1; - } + if (!first_leader) return false; - var appd=getApp().globalData; - var w_time = setInterval(function() { - if (that.data.is_get_local_ok == 0) return false; - clearInterval(w_time); - var distance = null; - var e=JSON.parse(JSON.stringify(ee)); - - //如果有开启近距离的话,同时距离优不一样了 - if (that.data.lat != null) { - //如果经纬度有变化的话 - if(e && appd.lat==that.data.lat && appd.lon==that.data.lon && e.distance>0 ){ - that.data.fir_def_store=e; - that.setData({ - def_pick_store: e, - sto_sele_name: e.pickup_name, - sto_sele_id: e.pickup_id, - sto_sele_distr: e.distr_type, - sto_sele_keyid:e.keyid, - }) - }else{ - //要用接口是获取距离，js的计算不准 - getApp().request.promiseGet("/api/weshop/pickup/list",{ - data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon, is_pos: 1}, - }).then(res=>{ - if(ut.ajax_ok(res)){ - e=res.data.data.pageData[0]; - if (e){ - e.is_no_dis=ee.is_no_dis; - appd.pk_store=e; - that.data.fir_def_store=e; - - console.log('get_user_store--2'); - console.log(e); - - that.setData({ - def_pick_store: e, - sto_sele_name: e.pickup_name, - sto_sele_id: e.pickup_id, - sto_sele_distr: e.distr_type, - sto_sele_keyid:e.keyid, - }) - } + getApp().globalData.first_leader = first_leader; - } - }) + //调用接口判断是不是会员 + await getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { + if (res.data.code == 0) { + getApp().globalData.guide_id = res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id } + }) - //e.distance = distance; - appd.lat=that.data.lat; - appd.lon=that.data.lon; - - } else { - if (e) { - + }, - console.log('get_user_store3---'); - console.log(e); - e.distance = null; - that.data.fir_def_store=e; - that.setData({ - def_pick_store: e, - sto_sele_name: e.pickup_name, - sto_sele_id: e.pickup_id, - sto_sele_distr: e.distr_type, - sto_sele_keyid:e.keyid, - }) - } - } - }, 500) - },1500) - - }); - - - }, - - - onReady() { + onReady() { // 用于控制保障服务折叠图标的显示 setTimeout(() => { wx.createSelectorQuery().selectAll(".showArea, .hideArea").boundingClientRect(res => { @@ -671,19 +615,150 @@ Page({ }, + //检测有没有导购分享的门店 + check_guide(func){ + var first_leader=getApp().globalData.first_leader; + if(!first_leader){ + func(); + return false; + } + if(this.data.is_geted_guide_pick){ + func(); + return false; + } + + if(getApp().globalData.guide_pick_id){ + func(); + return false; + } + var th=this; + getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { + if (res.data.code == 0) { + getApp().globalData.guide_pick_id= res.data.data.pickup_id; + } + th.data.is_geted_guide_pick=1; + func(); + }) + }, + //---展示--- // gid 在onload阶段已经保存在this.data中 onShow: function() { getApp().check_can_share(); - var that=this; + var that=this;var th=this; var ee = this,gid = this.data.gid, i = getApp().request; this.data.is_timer = 1; - this.wait_for_store_config(); - - + //获取用户的默认门店 + th.check_guide(()=>{ + getApp().get_user_store(function(e) { + console.log('get_user_store'); + console.log("999999999"); + + + if(!e) { + th.data.fir_def_store={}; //赋值空对象 + return false; + } + + console.log("000000"); + + if(getApp().globalData.is_dj_pk) th.setData({has_def:1}) + + var ee=JSON.parse(JSON.stringify(e)); + + + console.log(e); + + //--定时器推迟一下-- + setTimeout(function () { + if(!th.data.data){ + return false; + } + var ser_card=th.data.data; + //--如果默认门店不在等级卡的默认们店以内 + if(ser_card.storageId!=null && ser_card.storageId!="" && ser_card.storageId.indexOf(ee.keyid)==-1){ + ee.is_no_dis=1; + } + + var appd=getApp().globalData; + var w_time = setInterval(function() { + if (that.data.is_get_local_ok == 0) return false; + clearInterval(w_time); + var distance = null; + var e=JSON.parse(JSON.stringify(ee)); + + //如果有开启近距离的话,同时距离优不一样了 + if (that.data.lat != null) { + //如果经纬度有变化的话 + if(e && appd.lat==that.data.lat && appd.lon==that.data.lon && e.distance>0 ){ + that.data.fir_def_store=e; + that.setData({ + def_pick_store: e, + sto_sele_name: e.pickup_name, + sto_sele_id: e.pickup_id, + sto_sele_distr: e.distr_type, + sto_sele_keyid:e.keyid, + }) + }else{ + //要用接口是获取距离，js的计算不准 + getApp().request.promiseGet("/api/weshop/pickup/list",{ + data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon, is_pos: 1}, + }).then(res=>{ + if(ut.ajax_ok(res)){ + e=res.data.data.pageData[0]; + if (e){ + e.is_no_dis=ee.is_no_dis; + appd.pk_store=e; + that.data.fir_def_store=e; + + console.log('get_user_store--2'); + console.log(e); + + that.setData({ + def_pick_store: e, + sto_sele_name: e.pickup_name, + sto_sele_id: e.pickup_id, + sto_sele_distr: e.distr_type, + sto_sele_keyid:e.keyid, + }) + } + + } + }) + } + + //e.distance = distance; + appd.lat=that.data.lat; + appd.lon=that.data.lon; + + } else { + if (e) { + + + console.log('get_user_store3---'); + console.log(e); + + e.distance = null; + that.data.fir_def_store=e; + that.setData({ + def_pick_store: e, + sto_sele_name: e.pickup_name, + sto_sele_id: e.pickup_id, + sto_sele_distr: e.distr_type, + sto_sele_keyid:e.keyid, + }) + } + } + }, 500) + },1500) + + }); + }) + + this.wait_for_store_config(); i.get("/api/weshop/serviceCard/get/" + o.stoid + "/" + ee.data.gid, { failRollback: !0, @@ -981,8 +1056,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 +1090,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 +1220,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 +1488,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) { @@ -2494,6 +2580,15 @@ Page({ var ind=ee.currentTarget.dataset.ind; var bconfig = th.data.bconfig; + //--先判断会员状态-- + var user_info = getApp().globalData.userInfo; + if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { + wx.navigateTo({ + url: '/packageE/pages/togoin/togoin', + }) + return false; + } + //如果开启了，则不在选择门店 if(this.data.sys_switch.is_pricing_open_store && getApp().globalData.pk_store){ @@ -3880,7 +3975,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 +4297,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/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/liveStreamDetails/liveStreamDetails.js b/packageA/pages/liveStreamDetails/liveStreamDetails.js index c5bcc82..686b656 100644 --- a/packageA/pages/liveStreamDetails/liveStreamDetails.js +++ b/packageA/pages/liveStreamDetails/liveStreamDetails.js @@ -523,7 +523,8 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un if(res.data.code==0){ getApp().globalData.guide_id=res.data.data.id; getApp().globalData.staffId=staffId; - getApp().globalData.storageId=storageId; + getApp().globalData.storageId=storageId; + getApp().globalData.guide_pick_id= res.data.data.pickup_id } }) } diff --git a/packageA/pages/my_service/appment_main.js b/packageA/pages/my_service/appment_main.js index 977611f..0460e93 100644 --- a/packageA/pages/my_service/appment_main.js +++ b/packageA/pages/my_service/appment_main.js @@ -344,6 +344,16 @@ Page({ }, //确认选择门店 choice_store: function() { + + //--先判断会员状态-- + var user_info = getApp().globalData.userInfo; + if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { + wx.navigateTo({ + url: '/packageE/pages/togoin/togoin', + }) + return false; + } + var th = this; var index = th.data.fir_pick_index; var store_name = th.data.store_list[index].StorageName; @@ -575,6 +585,7 @@ Page({ getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+a.stoid+"/"+options.firstleader,{}).then(res=>{         if(res.data.code==0){           getApp().globalData.guide_id=res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id getApp().request.promiseGet('/api/weshop/shoppingGuide/geIdStaffInfo', { data: { diff --git a/packageA/pages/prom_list/prom_list.js b/packageA/pages/prom_list/prom_list.js index 24dcd80..254846a 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; @@ -59,6 +63,7 @@ Page({ getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{ if(res.data.code==0){ getApp().globalData.guide_id=res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id } }) } @@ -85,91 +90,128 @@ Page({ } }); - //获取用户的默认门店 - getApp().get_user_store(function(ee) { - if(!ee) { - th.data.fir_def_store={}; //赋值空对象 - return false; - } - if(getApp().globalData.is_dj_pk) th.setData({has_def:1}) - - var appd=getApp().globalData; - var w_time = setInterval(function() { - if (that.data.is_get_local_ok == 0) return false; - if (!that.data.data) return false; - clearInterval(w_time); - var distance = null; - var e=JSON.parse(JSON.stringify(ee)); - - if(th.data.data) var g_distr_type=th.data.data.distr_type; - e.is_no_dis=0; - if(e.distr_type!=0 && g_distr_type!=0 && e.distr_type!=g_distr_type ){ - e.is_no_dis=1; + + }, + + //检测有没有导购分享的门店 + check_guide(func){ + var first_leader=getApp().globalData.first_leader; + if(!first_leader){ + func(); + return false; + } + if(this.data.is_geted_guide_pick){ + func(); + return false; + } + + if(getApp().globalData.guide_pick_id){ + func(); + return false; + } + var th=this; + getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { + if (res.data.code == 0) { + getApp().globalData.guide_pick_id= res.data.data.pickup_id; + } + th.data.is_geted_guide_pick=1; + func(); + }) + }, + + //---展示--- + onShow: function() { + + getApp().check_can_share(); + var ee=this,th=ee,that=ee; + + //先获取一下导购的门店 + this.check_guide(()=> { + //获取用户的默认门店 + getApp().get_user_store(function (ee) { + if (!ee) { + th.data.fir_def_store = {}; //赋值空对象 + return false; } - //如果有开启近距离的话,同时距离优不一样了 - if (that.data.lat != null) { - //如果经纬度有变化的话 - if( appd.lat==that.data.lat && appd.lon==that.data.lon && e.distance>0 ){ - that.data.fir_def_store=e; - that.setData({ - def_pick_store: e, - sto_sele_name: e.pickup_name, - sto_sele_id: e.pickup_id, - sto_sele_distr: e.distr_type - }) - }else{ - //要用接口是获取距离，js的计算不准 - getApp().request.promiseGet("/api/weshop/pickup/list",{ - data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon,is_pos: 1}, - }).then(res=>{ - if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){ - e=res.data.data.pageData[0]; - if (e){ - appd.pk_store=e; - that.data.fir_def_store=e; - that.setData({ - def_pick_store: e, - sto_sele_name: e.pickup_name, - sto_sele_id: e.pickup_id, - sto_sele_distr: e.distr_type - }) - } + if (getApp().globalData.is_dj_pk) th.setData({has_def: 1}) - } - }) + var appd = getApp().globalData; + var w_time = setInterval(function () { + if (that.data.is_get_local_ok == 0) return false; + if (!that.data.data) return false; + clearInterval(w_time); + var distance = null; + var e = JSON.parse(JSON.stringify(ee)); + + if (th.data.data) var g_distr_type = th.data.data.distr_type; + e.is_no_dis = 0; + if (e.distr_type != 0 && g_distr_type != 0 && e.distr_type != g_distr_type) { + e.is_no_dis = 1; } - //e.distance = distance; - appd.lat=that.data.lat; - appd.lon=that.data.lon; + //如果有开启近距离的话,同时距离优不一样了 + if (that.data.lat != null) { + //如果经纬度有变化的话 + if (appd.lat == that.data.lat && appd.lon == that.data.lon && e.distance > 0) { + that.data.fir_def_store = e; + that.setData({ + def_pick_store: e, + sto_sele_name: e.pickup_name, + sto_sele_id: e.pickup_id, + sto_sele_distr: e.distr_type + }) + } else { + //要用接口是获取距离，js的计算不准 + getApp().request.promiseGet("/api/weshop/pickup/list", { + data: { + store_id: os.stoid, + pickup_id: e.pickup_id, + lat: th.data.lat, + lon: th.data.lon, + is_pos: 1 + }, + }).then(res => { + if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length) { + e = res.data.data.pageData[0]; + if (e) { + appd.pk_store = e; + that.data.fir_def_store = e; + that.setData({ + def_pick_store: e, + sto_sele_name: e.pickup_name, + sto_sele_id: e.pickup_id, + sto_sele_distr: e.distr_type + }) + } - }else{ - if (e) { - e.distance = null; - that.data.fir_def_store=e; - that.setData({ - def_pick_store: e, - sto_sele_name: e.pickup_name, - sto_sele_id: e.pickup_id, - sto_sele_distr: e.distr_type - }) - } - } + } + }) + } - }, 500) - }); - - }, + //e.distance = distance; + appd.lat = that.data.lat; + appd.lon = that.data.lon; - //---展示--- - onShow: function() { + } else { + if (e) { + e.distance = null; + that.data.fir_def_store = e; + that.setData({ + def_pick_store: e, + sto_sele_name: e.pickup_name, + sto_sele_id: e.pickup_id, + sto_sele_distr: e.distr_type + }) + } + } - getApp().check_can_share(); + }, 500) + }); + }) - var ee=this,th=ee,that=ee; - var gid = this.data.gid,i = getApp().request; + var gid = this.data.gid,i = getApp().request; ee.data.g_buy_num = new Map(); this.wait_for_store_config(); clearTimeout(ot); @@ -821,8 +863,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); @@ -1403,6 +1456,16 @@ Page({ // 选择门店 choice_store: function(ee) { + + //--先判断会员状态-- + var user_info = getApp().globalData.userInfo; + if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { + wx.navigateTo({ + url: '/packageE/pages/togoin/togoin', + }) + return false; + } + var th = this; var ind=ee.currentTarget.dataset.ind; var bconfig = th.data.bconfig; diff --git a/packageA/pages/quan_list/quan_list.js b/packageA/pages/quan_list/quan_list.js index 304a1dd..4406fb6 100644 --- a/packageA/pages/quan_list/quan_list.js +++ b/packageA/pages/quan_list/quan_list.js @@ -24,6 +24,20 @@ Page({ //------初始化加载---------- onLoad: function (t) { var th = this; + + var first_leader=t.first_leader; + if(first_leader){ + //-- user_id代过来免登录 -- + getApp().globalData.first_leader=first_leader; + //调用接口判断是不是会员 + getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{ + if(res.data.code==0){ + getApp().globalData.guide_id=res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id + } + }) + } + getApp().getConfig2(function (conf) { if (conf.couponset) conf.couponset = conf.couponset.replace(/\{ if(res.data.code==0){ getApp().globalData.guide_id=res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id } }) } diff --git a/packageB/pages/zuhegou/index/index.js b/packageB/pages/zuhegou/index/index.js index bff9738..d91cd25 100644 --- a/packageB/pages/zuhegou/index/index.js +++ b/packageB/pages/zuhegou/index/index.js @@ -153,11 +153,39 @@ Page({ getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { if (res.data.code == 0) { getApp().globalData.guide_id = res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id } }) } }, + //检测有没有导购分享的门店 + check_guide(func){ + var first_leader=getApp().globalData.first_leader; + if(!first_leader){ + func(); + return false; + } + if(this.data.is_geted_guide_pick){ + func(); + return false; + } + + if(getApp().globalData.guide_pick_id){ + func(); + return false; + } + var th=this; + getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { + if (res.data.code == 0) { + getApp().globalData.guide_pick_id= res.data.data.pickup_id; + } + th.data.is_geted_guide_pick=1; + func(); + }) + }, + + /** * 生命周期函数--监听页面显示 */ @@ -259,59 +287,61 @@ Page({ }) }) - //获取用户的默认门店 - getApp().get_user_store(function (e) { - if (!e) { - th.data.fir_def_store = {}; //赋值空对象 - return false; - } - if(getApp().globalData.is_dj_pk) th.setData({has_def:1}) + th.check_guide(()=>{ + //获取用户的默认门店 + getApp().get_user_store(function (e) { + if (!e) { + th.data.fir_def_store = {}; //赋值空对象 + return false; + } + if(getApp().globalData.is_dj_pk) th.setData({has_def:1}) - var ee = JSON.parse(JSON.stringify(e)); - var appd = getApp().globalData; - //-- 等待定位系统的开启 -- - th.waitfor2(15, 'is_get_local_ok', function () { + var ee = JSON.parse(JSON.stringify(e)); + var appd = getApp().globalData; + //-- 等待定位系统的开启 -- + th.waitfor2(15, 'is_get_local_ok', function () { - if (!th.data.is_get_local_ok) return false; + if (!th.data.is_get_local_ok) return false; - var e = JSON.parse(JSON.stringify(ee)); - //如果有开启近距离的话,同时距离优不一样了 - if (that.data.lat != null) { - //如果经纬度有变化的话 - if (e && appd.lat == that.data.lat && appd.lon == that.data.lon && e.distance > 0) { - that.set_def_storage(e); - } else { - //要用接口是获取距离，js的计算不准 - getApp().request.promiseGet("/api/weshop/pickup/list", { - data: { - store_id: os.stoid, - pickup_id: e.pickup_id, - is_pos: 1, - lat: th.data.lat, - lon: th.data.lon - }, - }).then(res => { - if (res.data.code == 0) { - e = res.data.data.pageData[0]; - if (e) { - e.is_no_dis = ee.is_no_dis; - appd.pk_store = e; - that.set_def_storage(e); - } + var e = JSON.parse(JSON.stringify(ee)); + //如果有开启近距离的话,同时距离优不一样了 + if (that.data.lat != null) { + //如果经纬度有变化的话 + if (e && appd.lat == that.data.lat && appd.lon == that.data.lon && e.distance > 0) { + that.set_def_storage(e); + } else { + //要用接口是获取距离，js的计算不准 + getApp().request.promiseGet("/api/weshop/pickup/list", { + data: { + store_id: os.stoid, + pickup_id: e.pickup_id, + is_pos: 1, + lat: th.data.lat, + lon: th.data.lon + }, + }).then(res => { + if (res.data.code == 0) { + e = res.data.data.pageData[0]; + if (e) { + e.is_no_dis = ee.is_no_dis; + appd.pk_store = e; + that.set_def_storage(e); + } - } - }) - } - appd.lat = that.data.lat; - appd.lon = that.data.lon; - } else { - if (e) { - e.distance = null; - that.set_def_storage(e); + } + }) + } + appd.lat = that.data.lat; + appd.lon = that.data.lon; + } else { + if (e) { + e.distance = null; + that.set_def_storage(e); + } } - } - }) - }); + }) + }); + }) //----获取系统参数----- getApp().getConfig2(function (e) { diff --git a/packageB/pages/zuhegou/list/list.js b/packageB/pages/zuhegou/list/list.js index 494267c..efdac38 100644 --- a/packageB/pages/zuhegou/list/list.js +++ b/packageB/pages/zuhegou/list/list.js @@ -36,6 +36,7 @@ Page({ getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { if (res.data.code == 0) { getApp().globalData.guide_id = res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id } }) } diff --git a/packageB/pages/zuhegou/preindex/index.js b/packageB/pages/zuhegou/preindex/index.js index fa0b9da..a0731d3 100644 --- a/packageB/pages/zuhegou/preindex/index.js +++ b/packageB/pages/zuhegou/preindex/index.js @@ -150,11 +150,39 @@ Page({ getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { if (res.data.code == 0) { getApp().globalData.guide_id = res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id } }) } }, + + //检测有没有导购分享的门店 + check_guide(func){ + var first_leader=getApp().globalData.first_leader; + if(!first_leader){ + func(); + return false; + } + if(this.data.is_geted_guide_pick){ + func(); + return false; + } + + if(getApp().globalData.guide_pick_id){ + func(); + return false; + } + var th=this; + getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { + if (res.data.code == 0) { + getApp().globalData.guide_pick_id= res.data.data.pickup_id; + } + th.data.is_geted_guide_pick=1; + func(); + }) + }, + /** * 生命周期函数--监听页面显示 */ @@ -253,60 +281,63 @@ Page({ }) }) - //获取用户的默认门店 - getApp().get_user_store(function (e) { - if (!e) { - th.data.fir_def_store = {}; //赋值空对象 - return false; - } + //先获取一下导购的门店 + th.check_guide(()=> { + //获取用户的默认门店 + getApp().get_user_store(function (e) { + if (!e) { + th.data.fir_def_store = {}; //赋值空对象 + return false; + } - if(getApp().globalData.is_dj_pk) th.setData({has_def:1}) + if (getApp().globalData.is_dj_pk) th.setData({has_def: 1}) - var ee = JSON.parse(JSON.stringify(e)); - var appd = getApp().globalData; - //-- 等待定位系统的开启 -- - th.waitfor2(15, 'is_get_local_ok', function () { + var ee = JSON.parse(JSON.stringify(e)); + var appd = getApp().globalData; + //-- 等待定位系统的开启 -- + th.waitfor2(15, 'is_get_local_ok', function () { - if (!th.data.is_get_local_ok) return false; + if (!th.data.is_get_local_ok) return false; - var e = JSON.parse(JSON.stringify(ee)); - //如果有开启近距离的话,同时距离优不一样了 - if (that.data.lat != null) { - //如果经纬度有变化的话 - if (e && appd.lat == that.data.lat && appd.lon == that.data.lon && e.distance > 0) { - that.set_def_storage(e); - } else { - //要用接口是获取距离，js的计算不准 - getApp().request.promiseGet("/api/weshop/pickup/list", { - data: { - store_id: os.stoid, - pickup_id: e.pickup_id, - is_pos: 1, - lat: th.data.lat, - lon: th.data.lon - }, - }).then(res => { - if (res.data.code == 0) { - e = res.data.data.pageData[0]; - if (e) { - e.is_no_dis = ee.is_no_dis; - appd.pk_store = e; - that.set_def_storage(e); - } + var e = JSON.parse(JSON.stringify(ee)); + //如果有开启近距离的话,同时距离优不一样了 + if (that.data.lat != null) { + //如果经纬度有变化的话 + if (e && appd.lat == that.data.lat && appd.lon == that.data.lon && e.distance > 0) { + that.set_def_storage(e); + } else { + //要用接口是获取距离，js的计算不准 + getApp().request.promiseGet("/api/weshop/pickup/list", { + data: { + store_id: os.stoid, + pickup_id: e.pickup_id, + is_pos: 1, + lat: th.data.lat, + lon: th.data.lon + }, + }).then(res => { + if (res.data.code == 0) { + e = res.data.data.pageData[0]; + if (e) { + e.is_no_dis = ee.is_no_dis; + appd.pk_store = e; + that.set_def_storage(e); + } - } - }) - } - appd.lat = that.data.lat; - appd.lon = that.data.lon; - } else { - if (e) { - e.distance = null; - that.set_def_storage(e); + } + }) + } + appd.lat = that.data.lat; + appd.lon = that.data.lon; + } else { + if (e) { + e.distance = null; + that.set_def_storage(e); + } } - } - }) - }); + }) + }); + }) //----获取系统参数----- getApp().getConfig2(function (e) { diff --git a/packageC/pages/goods/goodsList/goodsList.js b/packageC/pages/goods/goodsList/goodsList.js index 76b6de1..e7dbf14 100644 --- a/packageC/pages/goods/goodsList/goodsList.js +++ b/packageC/pages/goods/goodsList/goodsList.js @@ -38,6 +38,7 @@ Page({ getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + oo.stoid + "/" + first_leader, {}).then(res => { if (res.data.code == 0) { getApp().globalData.guide_id = res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id } }) } diff --git a/packageC/pages/goods/search/search.js b/packageC/pages/goods/search/search.js index f843a16..21160ec 100644 --- a/packageC/pages/goods/search/search.js +++ b/packageC/pages/goods/search/search.js @@ -46,6 +46,7 @@ Page({ getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + oo.stoid + "/" + first_leader, {}).then(res => { if (res.data.code == 0) { getApp().globalData.guide_id = res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id } }) } diff --git a/packageC/pages/group_list/group_list.js b/packageC/pages/group_list/group_list.js index 43c6bbf..7ee5141 100644 --- a/packageC/pages/group_list/group_list.js +++ b/packageC/pages/group_list/group_list.js @@ -26,7 +26,25 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function (options) { + self = this; + //群id + if(options && options.groupchat_id){ + getApp().globalData.groupchat_id=options.groupchat_id + } + self = this; + var first_leader = options.first_leader; + + if (first_leader) { + getApp().globalData.first_leader = first_leader; + //调用接口判断是不是会员 + getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { + if (res.data.code == 0) { + getApp().globalData.guide_id = res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id + } + }) + } app.isLogin().then(function(data) {//进入页面前已经授权登录成功 self.setData({ @@ -153,7 +171,66 @@ 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, + } + }, + + onShareAppMessage: function () { + getApp().globalData.no_clear=1; + var curPage = this; + var pagePath = curPage.route; //当前页面url + 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; + } + } + + console.log("11" + pagePath); + return { + title: "团购", + path: pagePath, + } + + }, + /** diff --git a/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js b/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js index 9940f77..c90b7be 100644 --- a/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js +++ b/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js @@ -15,16 +15,20 @@ 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; //调用接口判断是不是会员 - // app.request.promiseGet("/api/weshop/shoppingGuide/get/" + app.globalData.setting.stoid + "/" + first_leader, {}).then(res => { - // if (res.data.code == 0) { - // getApp().globalData.guide_id = res.data.data.id; - // } - // }) + app.request.promiseGet("/api/weshop/shoppingGuide/get/" + app.globalData.setting.stoid + "/" + first_leader, {}).then(res => { + if (res.data.code == 0) { + getApp().globalData.guide_id = res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id + } + }) }; app.isLogin().then(function(data) { @@ -204,7 +208,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_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..a8f25c2 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js @@ -283,7 +283,8 @@ Page({ canBuy: false, btnHidden: false, - hiddenCS: true, + hiddenCS: true, + is_get_guide:0, }, //------初始化加载---------- @@ -294,6 +295,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, @@ -305,6 +310,8 @@ Page({ prom_type = t.prom_type, prom_id = t.group_id; //活动ID + var share_openid = t.share_openid; + if (prom_type) { // this.data.prom_type = prom_type; // this.data.prom_id = prom_id; @@ -393,6 +400,7 @@ Page({ getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { if (res.data.code == 0) { getApp().globalData.guide_id = res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id } }) } @@ -404,6 +412,10 @@ Page({ //如果是会员分享过来的要记录 if (room_user_share) getApp().globalData.room_user_share = room_user_share; + + if (share_openid) { + this.get_room_share_guide(share_openid); + } } var c_guide_id = t.c_guide_id; @@ -502,64 +514,7 @@ Page({ } }); - //获取用户的默认门店 - getApp().get_user_store(function (e) { - if (!e) { - th.data.fir_def_store = {}; //赋值空对象 - return false; - } - - if(getApp().globalData.is_dj_pk) th.setData({has_def:1}) - var ee = JSON.parse(JSON.stringify(e)); - //--定时器推迟一下-- - setTimeout(function () { - if (th.data.fir_goods) var g_distr_type = th.data.fir_goods.distr_type; - //--如果默认门店的配送方式不对，就不能被选择，这里不控制，如果不一样，就说明配送方式不对-- - if (ee.distr_type != 0 && g_distr_type != 0 && ee.distr_type != g_distr_type) { - ee.is_no_dis = 1; - } - - var appd = getApp().globalData; - var w_time = setInterval(function () { - if (that.data.is_get_local_ok == 0) return false; - clearInterval(w_time); - var distance = null; - var e = JSON.parse(JSON.stringify(ee)); - - //如果有开启近距离的话,同时距离优不一样了 - if (that.data.lat != null) { - //如果经纬度有变化的话 - if (e && appd.lat == that.data.lat && appd.lon == that.data.lon && e.distance > 0) { - that.set_def_storage(e); - } else { - //要用接口是获取距离，js的计算不准 - getApp().request.promiseGet("/api/weshop/pickup/list", { - data: { store_id: os.stoid, pickup_id: e.pickup_id, lat: th.data.lat, lon: th.data.lon, is_pos: 1 }, - }).then(res => { - if (res.data.code == 0) { - e = res.data.data.pageData[0]; - if (e) { - e.is_no_dis = ee.is_no_dis; - appd.pk_store = e; - that.set_def_storage(e); - } - - } - }) - } - //e.distance = distance; - appd.lat = that.data.lat; - appd.lon = that.data.lon; - } else { - if (e) { - e.distance = null; - that.set_def_storage(e); - } - } - }, 500) - }, 700) - }); //更新点击量 //noinspection JSUnresolvedFunction @@ -581,6 +536,39 @@ Page({ } }, + //-- 获取直播的分享人的导购信息 -- + async get_room_share_guide(share_openid) { + + var url = "/api/weshop/users/page"; + var first_leader = 0; + + //调用接口判断是不是会员 + await getApp().request.promiseGet(url, { + data: { + stoid: os.stoid, + weapp_openid: share_openid + } + }).then(res => { + if (ut.ajax_ok(res)) { + first_leader = res.data.data.pageData[0].user_id; + getApp().globalData.guide_id = res.data.data.id; + } + }) + + if (!first_leader) return false; + + getApp().globalData.first_leader = first_leader; + + //调用接口判断是不是会员 + await getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { + if (res.data.code == 0) { + getApp().globalData.guide_id = res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id + } + }) + + }, + //--- 设置一下默认库存的数量 ---- set_def_storage(ee) { @@ -801,15 +789,6 @@ Page({ }) - - - - - - - - - ee.setData({ gallery: gallery, is_collect: is_collect, @@ -823,10 +802,99 @@ Page({ }, + //检测有没有导购分享的门店 + check_guide(func){ + var first_leader=getApp().globalData.first_leader; + if(!first_leader){ + func(); + return false; + } + if(this.data.is_geted_guide_pick){ + func(); + return false; + } + + if(getApp().globalData.guide_pick_id){ + func(); + return false; + } + var th=this; + getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { + if (res.data.code == 0) { + getApp().globalData.guide_pick_id= res.data.data.pickup_id; + } + th.data.is_geted_guide_pick=1; + func(); + }) + }, + + + get_user_sto(){ + var th=this;var that=this; + //获取用户的默认门店 + getApp().get_user_store(function (e) { + if (!e) { + th.data.fir_def_store = {}; //赋值空对象 + return false; + } + + if(getApp().globalData.is_dj_pk) th.setData({has_def:1}) + var ee = JSON.parse(JSON.stringify(e)); + //--定时器推迟一下-- + setTimeout(function () { + if (th.data.fir_goods) var g_distr_type = th.data.fir_goods.distr_type; + //--如果默认门店的配送方式不对，就不能被选择，这里不控制，如果不一样，就说明配送方式不对-- + if (ee.distr_type != 0 && g_distr_type != 0 && ee.distr_type != g_distr_type) { + ee.is_no_dis = 1; + } + + var appd = getApp().globalData; + var w_time = setInterval(function () { + if (that.data.is_get_local_ok == 0) return false; + clearInterval(w_time); + var distance = null; + var e = JSON.parse(JSON.stringify(ee)); + + //如果有开启近距离的话,同时距离优不一样了 + if (that.data.lat != null) { + //如果经纬度有变化的话 + if (e && appd.lat == that.data.lat && appd.lon == that.data.lon && e.distance > 0) { + that.set_def_storage(e); + } else { + //要用接口是获取距离，js的计算不准 + getApp().request.promiseGet("/api/weshop/pickup/list", { + data: { store_id: os.stoid, pickup_id: e.pickup_id, lat: th.data.lat, lon: th.data.lon, is_pos: 1 }, + }).then(res => { + if (res.data.code == 0) { + e = res.data.data.pageData[0]; + if (e) { + e.is_no_dis = ee.is_no_dis; + appd.pk_store = e; + that.set_def_storage(e); + } + + } + }) + } + //e.distance = distance; + appd.lat = that.data.lat; + appd.lon = that.data.lon; + + } else { + if (e) { + e.distance = null; + that.set_def_storage(e); + } + } + }, 500) + }, 700) + }); + }, + //---展示--- onShow: async function () { - getApp().check_can_share(); + getApp().check_can_share(); // console.log('onshow'); var goods_list = null, th = this, that = this; var show_prew_img = this.data.show_prew_img @@ -835,6 +903,16 @@ Page({ return false; } + if (this.data.show_video) { + this.data.show_video = 0; + return false; + } + + //先获取一下导购的门店 + th.check_guide(()=> { + th.get_user_sto(); + }) + // 判断活动是否暂停 //获取单个活动成团信息 await getApp().request.promiseGet('/api/weshop/prom/luckyActivity/page', { @@ -1436,7 +1514,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 +1622,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 +1900,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 +2474,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) { @@ -2608,6 +2694,11 @@ Page({ } } + //群id分享 + if (getApp().globalData.groupchat_id) { + pagePath+="&groupchat_id="+getApp().globalData.groupchat_id + } + return { title: "邀您一起参加幸运购", path: pagePath, @@ -4363,7 +4454,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 +4845,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", { @@ -5452,6 +5547,16 @@ Page({ // 选择门店 choice_store: function (ee) { + + //--先判断会员状态-- + var user_info = getApp().globalData.userInfo; + if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { + wx.navigateTo({ + url: '/packageE/pages/togoin/togoin', + }) + return false; + } + var th = this; var ind = ee.currentTarget.dataset.ind; var bconfig = th.data.bconfig; @@ -6161,6 +6266,14 @@ Page({ getApp().pre_img(this.data.sele_g.original_img); }, + screenChange: function (e) { + let fullScreen = e.detail.fullScreen //值true为进入全屏，false为退出全屏 + if (fullScreen) { //退出全屏 + getApp().globalData.no_clear = 1; + this.data.show_video = 1; + } + }, + is_show_more_buy: function () { var prom_goods = this.data.prom_goods; var per_price = this.data.sele_g.shop_price @@ -6243,6 +6356,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/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml index 5dbbfe7..196893a 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml @@ -47,7 +47,7 @@ - + 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..4378e30 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.js +++ b/packageC/pages/presell/goodsInfo/goodsInfo.js @@ -267,8 +267,16 @@ Page({ first_leader = t.first_leader, room_id = t.room_id, room_user_share = t.room_user_share; //如果是会员分享带有room_id的话，那么接下来会员分享就不传room_id + + var share_openid = t.share_openid; + //检查测肤 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", { @@ -327,6 +335,7 @@ Page({ getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { if (res.data.code == 0) { getApp().globalData.guide_id = res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id } }) } @@ -338,6 +347,11 @@ Page({ //如果是会员分享过来的要记录 if (room_user_share) getApp().globalData.room_user_share = room_user_share; + + if (share_openid) { + this.get_room_share_guide(share_openid); + } + } var c_guide_id = t.c_guide_id; @@ -438,6 +452,38 @@ Page({ }) }, + async get_room_share_guide(share_openid) { + + var url = "/api/weshop/users/page"; + var first_leader = 0; + + //调用接口判断是不是会员 + await getApp().request.promiseGet(url, { + data: { + stoid: os.stoid, + weapp_openid: share_openid + } + }).then(res => { + if (ut.ajax_ok(res)) { + first_leader = res.data.data.pageData[0].user_id; + getApp().globalData.guide_id = res.data.data.id; + } + }) + + if (!first_leader) return false; + + getApp().globalData.first_leader = first_leader; + + //调用接口判断是不是会员 + await getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { + if (res.data.code == 0) { + getApp().globalData.guide_id = res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id + } + }) + + }, + //--- 设置一下默认库存的数量 ---- set_def_storage(ee) { var that = this, th = this; @@ -622,6 +668,32 @@ Page({ }, + //检验导购门店 + check_guide(func){ + var first_leader=getApp().globalData.first_leader; + if(!first_leader){ + func(); + return false; + } + if(this.data.is_geted_guide_pick){ + func(); + return false; + } + + if(getApp().globalData.guide_pick_id){ + func(); + return false; + } + var th=this; + getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { + if (res.data.code == 0) { + getApp().globalData.guide_pick_id= res.data.data.pickup_id; + } + th.data.is_geted_guide_pick=1; + func(); + }) + }, + //---展示--- onShow: function () { getApp().check_can_share(); @@ -702,68 +774,70 @@ Page({ ee.data.sele_g_id = t.data.data.goods_id; ee.data.sele_g = t.data.data; - //获取用户的默认门店 - getApp().get_user_store(function (e) { - if (!e) { - th.data.fir_def_store = {}; //赋值空对象 - return false; - } - if (getApp().globalData.is_dj_pk) th.setData({ has_def: 1 }) + //检测一下分享导购的门店 + ee.check_guide(() => { + //获取用户的默认门店 + getApp().get_user_store(function (e) { + if (!e) { + th.data.fir_def_store = {}; //赋值空对象 + return false; + } + if (getApp().globalData.is_dj_pk) th.setData({has_def: 1}) - var ee = JSON.parse(JSON.stringify(e)); + var ee = JSON.parse(JSON.stringify(e)); - if (th.data.fir_goods) var g_distr_type = th.data.fir_goods.distr_type; - //--如果默认门店的配送方式不对，就不能被选择，这里不控制，如果不一样，就说明配送方式不对-- - if (ee.distr_type != 0 && g_distr_type != 0 && ee.distr_type != g_distr_type) { - ee.is_no_dis = 1; - } + if (th.data.fir_goods) var g_distr_type = th.data.fir_goods.distr_type; + //--如果默认门店的配送方式不对，就不能被选择，这里不控制，如果不一样，就说明配送方式不对-- + if (ee.distr_type != 0 && g_distr_type != 0 && ee.distr_type != g_distr_type) { + ee.is_no_dis = 1; + } - var appd = getApp().globalData; - var w_time = setInterval(function () { - if (that.data.is_get_local_ok == 0) return false; - clearInterval(w_time); - var e = JSON.parse(JSON.stringify(ee)); + var appd = getApp().globalData; + var w_time = setInterval(function () { + if (that.data.is_get_local_ok == 0) return false; + clearInterval(w_time); + var e = JSON.parse(JSON.stringify(ee)); - //如果有开启近距离的话,同时距离优不一样了 - if (that.data.lat != null) { - //如果经纬度有变化的话 - if (e && appd.lat == that.data.lat && appd.lon == that.data.lon && e.distance > 0) { - that.set_def_storage(e); + //如果有开启近距离的话,同时距离优不一样了 + if (that.data.lat != null) { + //如果经纬度有变化的话 + if (e && appd.lat == that.data.lat && appd.lon == that.data.lon && e.distance > 0) { + that.set_def_storage(e); - } else { - //要用接口是获取距离，js的计算不准 - getApp().request.promiseGet("/api/weshop/pickup/list", { - data: { - store_id: os.stoid, - pickup_id: e.pickup_id, - is_pos: 1, - lat: th.data.lat, - lon: th.data.lon - }, - }).then(res => { - if (res.data.code == 0) { - e = res.data.data.pageData[0]; - if (e) { - e.is_no_dis = ee.is_no_dis; - appd.pk_store = e; - that.set_def_storage(e); - } + } else { + //要用接口是获取距离，js的计算不准 + getApp().request.promiseGet("/api/weshop/pickup/list", { + data: { + store_id: os.stoid, + pickup_id: e.pickup_id, + is_pos: 1, + lat: th.data.lat, + lon: th.data.lon + }, + }).then(res => { + if (res.data.code == 0) { + e = res.data.data.pageData[0]; + if (e) { + e.is_no_dis = ee.is_no_dis; + appd.pk_store = e; + that.set_def_storage(e); + } - } - }) - } - appd.lat = that.data.lat; - appd.lon = that.data.lon; + } + }) + } + appd.lat = that.data.lat; + appd.lon = that.data.lon; - } else { - if (e) { - e.distance = null; - that.set_def_storage(e); + } else { + if (e) { + e.distance = null; + that.set_def_storage(e); + } } - } - }, 500) - }); - + }, 500) + }); + }) t.data.data.on_time = ut.formatTime(t.data.data.on_time, 'yyyy-MM-dd hh:mm:ss'); @@ -1054,6 +1128,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 +1211,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 +1530,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) { @@ -1603,6 +1685,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, @@ -2744,7 +2831,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", { @@ -3544,6 +3633,16 @@ Page({ }, // 选择门店 choice_store: function (ee) { + + //--先判断会员状态-- + var user_info = getApp().globalData.userInfo; + if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { + wx.navigateTo({ + url: '/packageE/pages/togoin/togoin', + }) + return false; + } + var th = this; var ind = ee.currentTarget.dataset.ind; var bconfig = th.data.bconfig; @@ -4182,8 +4281,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..70fdceb 100644 --- a/packageC/pages/presell/list/list.js +++ b/packageC/pages/presell/list/list.js @@ -20,13 +20,17 @@ 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; //调用接口判断是不是会员 getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { if (res.data.code == 0) { getApp().globalData.guide_id = res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id } }) } @@ -299,7 +303,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/packageC/pages/presell/pregoodsInfo/goodsInfo.js b/packageC/pages/presell/pregoodsInfo/goodsInfo.js index f2978e8..109d39e 100644 --- a/packageC/pages/presell/pregoodsInfo/goodsInfo.js +++ b/packageC/pages/presell/pregoodsInfo/goodsInfo.js @@ -263,6 +263,7 @@ Page({ room_id = t.room_id, room_user_share = t.room_user_share; //如果是会员分享带有room_id的话，那么接下来会员分享就不传room_id + var share_openid = t.share_openid; //-- 自定义海报 -- getApp().request.promiseGet("/api/weshop/goods/poster/page", { data: { store_id: os.stoid, type: 1, is_use: 1 } @@ -316,11 +317,14 @@ Page({ if (first_leader) { console.log("log---".first_leader); getApp().globalData.first_leader = first_leader; + //调用接口判断是不是会员 getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { if (res.data.code == 0) { getApp().globalData.guide_id = res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id } + }) } @@ -331,6 +335,10 @@ Page({ //如果是会员分享过来的要记录 if (room_user_share) getApp().globalData.room_user_share = room_user_share; + + if (share_openid) { + this.get_room_share_guide(share_openid); + } } var c_guide_id = t.c_guide_id; @@ -429,6 +437,38 @@ Page({ }) }, + async get_room_share_guide(share_openid) { + + var url = "/api/weshop/users/page"; + var first_leader = 0; + + //调用接口判断是不是会员 + await getApp().request.promiseGet(url, { + data: { + stoid: os.stoid, + weapp_openid: share_openid + } + }).then(res => { + if (ut.ajax_ok(res)) { + first_leader = res.data.data.pageData[0].user_id; + getApp().globalData.guide_id = res.data.data.id; + } + }) + + if (!first_leader) return false; + + getApp().globalData.first_leader = first_leader; + + //调用接口判断是不是会员 + await getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { + if (res.data.code == 0) { + getApp().globalData.guide_id = res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id + } + }) + + }, + //--- 设置一下默认库存的数量 ---- set_def_storage(ee) { @@ -606,6 +646,30 @@ Page({ }, + check_guide(func){ + var first_leader=getApp().globalData.first_leader; + if(!first_leader){ + func(); + return false; + } + if(this.data.is_geted_guide_pick){ + func(); + return false; + } + + if(getApp().globalData.guide_pick_id){ + func(); + return false; + } + var th=this; + getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { + if (res.data.code == 0) { + getApp().globalData.guide_pick_id= res.data.data.pickup_id; + } + th.data.is_geted_guide_pick=1; + func(); + }) + }, //---展示--- onShow: function () { @@ -687,70 +751,71 @@ Page({ ee.data.sele_g_id=t.data.data.goods_id; ee.data.sele_g=t.data.data; - //获取用户的默认门店 - getApp().get_user_store(function (e) { - if (!e) { - th.data.fir_def_store = {}; //赋值空对象 - return false; - } - - if(getApp().globalData.is_dj_pk) th.setData({has_def:1}) + //检测一下分享导购的门店 + ee.check_guide(() => { + //获取用户的默认门店 + getApp().get_user_store(function (e) { + if (!e) { + th.data.fir_def_store = {}; //赋值空对象 + return false; + } - var ee = JSON.parse(JSON.stringify(e)); + if (getApp().globalData.is_dj_pk) th.setData({has_def: 1}) - if (th.data.fir_goods) var g_distr_type = th.data.fir_goods.distr_type; - //--如果默认门店的配送方式不对，就不能被选择，这里不控制，如果不一样，就说明配送方式不对-- - if (ee.distr_type != 0 && g_distr_type != 0 && ee.distr_type != g_distr_type) { - ee.is_no_dis = 1; - } + var ee = JSON.parse(JSON.stringify(e)); - var appd = getApp().globalData; - var w_time = setInterval(function () { - if (that.data.is_get_local_ok == 0) return false; - clearInterval(w_time); - var e = JSON.parse(JSON.stringify(ee)); + if (th.data.fir_goods) var g_distr_type = th.data.fir_goods.distr_type; + //--如果默认门店的配送方式不对，就不能被选择，这里不控制，如果不一样，就说明配送方式不对-- + if (ee.distr_type != 0 && g_distr_type != 0 && ee.distr_type != g_distr_type) { + ee.is_no_dis = 1; + } - //如果有开启近距离的话,同时距离优不一样了 - if (that.data.lat != null) { - //如果经纬度有变化的话 - if (e && appd.lat == that.data.lat && appd.lon == that.data.lon && e.distance > 0) { - that.set_def_storage(e); + var appd = getApp().globalData; + var w_time = setInterval(function () { + if (that.data.is_get_local_ok == 0) return false; + clearInterval(w_time); + var e = JSON.parse(JSON.stringify(ee)); + + //如果有开启近距离的话,同时距离优不一样了 + if (that.data.lat != null) { + //如果经纬度有变化的话 + if (e && appd.lat == that.data.lat && appd.lon == that.data.lon && e.distance > 0) { + that.set_def_storage(e); + + } else { + //要用接口是获取距离，js的计算不准 + getApp().request.promiseGet("/api/weshop/pickup/list", { + data: { + store_id: os.stoid, + pickup_id: e.pickup_id, + is_pos: 1, + lat: th.data.lat, + lon: th.data.lon + }, + }).then(res => { + if (res.data.code == 0) { + e = res.data.data.pageData[0]; + if (e) { + e.is_no_dis = ee.is_no_dis; + appd.pk_store = e; + that.set_def_storage(e); + } - } else { - //要用接口是获取距离，js的计算不准 - getApp().request.promiseGet("/api/weshop/pickup/list", { - data: { - store_id: os.stoid, - pickup_id: e.pickup_id, - is_pos: 1, - lat: th.data.lat, - lon: th.data.lon - }, - }).then(res => { - if (res.data.code == 0) { - e = res.data.data.pageData[0]; - if (e) { - e.is_no_dis = ee.is_no_dis; - appd.pk_store = e; - that.set_def_storage(e); } + }) + } + appd.lat = that.data.lat; + appd.lon = that.data.lon; - } - }) - } - appd.lat = that.data.lat; - appd.lon = that.data.lon; - - } else { - if (e) { - e.distance = null; - that.set_def_storage(e); + } else { + if (e) { + e.distance = null; + that.set_def_storage(e); + } } - } - }, 500) - }); - - + }, 500) + }); + }) t.data.data.on_time = ut.formatTime(t.data.data.on_time, 'yyyy-MM-dd hh:mm:ss'); @@ -3208,6 +3273,16 @@ Page({ }, // 选择门店 choice_store: function (ee) { + + //--先判断会员状态-- + var user_info = getApp().globalData.userInfo; + if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { + wx.navigateTo({ + url: '/packageE/pages/togoin/togoin', + }) + return false; + } + var th = this; var ind = ee.currentTarget.dataset.ind; var bconfig = th.data.bconfig; diff --git a/packageD/pages/AI-test-skin/success_result/success_result.js b/packageD/pages/AI-test-skin/success_result/success_result.js index 4d839e4..6ab6db3 100644 --- a/packageD/pages/AI-test-skin/success_result/success_result.js +++ b/packageD/pages/AI-test-skin/success_result/success_result.js @@ -107,6 +107,7 @@ Page({ getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + setting.stoid + "/" + first_leader, {}).then(res => { if (res.data.code == 0) { getApp().globalData.guide_id = res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id } }) } diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js index f4ee4c2..d1d58a7 100644 --- a/packageE/pages/cart/cart2/cart2.js +++ b/packageE/pages/cart/cart2/cart2.js @@ -1149,15 +1149,17 @@ Page({ } - - //----- 判断每一个商品的配送方式，和门店的配送方式 ------- - for (var ik = 0; ik < arr.length; ik++) { - if (!arr[ik].sto.is_same_city) continue; - var fd = arr[ik].goods.filter(function (e) { - return e.is_same_city != 1 || e.whsle_id > 0 - }) - if (!fd || fd.length == 0) { - arr[ik].show_same_city = 1; + //-- 要判断总开关有没有同城配送 -- + if(th.data.is_same_city) { + //----- 判断每一个商品的配送方式，和门店的配送方式 ------- + for (var ik = 0; ik < arr.length; ik++) { + if (!arr[ik].sto.is_same_city) continue; + var fd = arr[ik].goods.filter(function (e) { + return e.is_same_city != 1 || e.whsle_id > 0 + }) + if (!fd || fd.length == 0) { + arr[ik].show_same_city = 1; + } } } @@ -1258,12 +1260,8 @@ Page({ et = 0; break; } - - var m_wind = 0, def_exp_code = getApp().globalData.userInfo.def_exp_code; - - if (et == 0 && def_exp_code && !th.data.is_default_logistics) { for (var k = 0; k < th.data.wu_arr.length; k++) { var item = th.data.wu_arr[k]; @@ -1427,10 +1425,10 @@ Page({ if (gg.prom_type == 5) { t.data.data.prom_id = gg.prom_id; t.data.data.prom_type = 5; - th.is_coupon = gg.is_coupon; - th.setData({ - is_coupon: gg.is_coupon - }); + // th.is_coupon = gg.is_coupon; + // th.setData({ + // is_coupon: gg.is_coupon + // }); if (gg.room_id) { t.data.data.room_id = gg.room_id; } @@ -1439,6 +1437,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 }); @@ -3515,7 +3516,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, @@ -3523,7 +3526,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); } @@ -3696,7 +3701,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) { @@ -3793,6 +3802,9 @@ Page({ } }) } + if(gg.groupchat_id){ + goods.groupchat_id=gg.groupchat_id + } //--商品的房间号-- if (gg.room_id && gg.room_id > 0) { @@ -3900,6 +3912,9 @@ Page({ } }) } + if(gg.groupchat_id){ + g_goods.groupchat_id=gg.groupchat_id; + } item.order_goods.push(g_goods); } @@ -4068,7 +4083,7 @@ Page({ var check_map = {}; - + let groupchat_ids=[] //-------------让商品添加到商品列表-------------------- for (var k = 0; k < t_item.goods.length; k++) { @@ -4174,7 +4189,11 @@ 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) { goods.ladder_list_id = g_item.ladder_list_id; @@ -4196,22 +4215,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 (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) { @@ -4263,6 +4284,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); } @@ -4300,6 +4325,7 @@ Page({ }) // pdata.keyid = th.data.bn_goods.keyid } + var str = JSON.stringify(pdata); wx.showLoading({ title: "加载中" }); @@ -5248,7 +5274,7 @@ Page({ continue; } - if(gd.prom_type==5 && !th.data.coll_prom[gd.prom_id].is_coupon){ + if(gd.prom_type==5 && !th.data.coll_prom[gd.prom_id].is_coupon && th.has_dp(goodlist,gd.prom_id)){ continue; } //--如果是团购，要判断有没有限制使用优惠券 @@ -5358,6 +5384,8 @@ Page({ arr[ind].ckeck_quan_price = ckeck_quan_price - (cut_price ? cut_price : 0); arr[ind].check_quan_ware_list = check_quan_ware_list; arr[ind].check_quan_price_list = check_quan_price_list; + arr[ind].quan_list=null; + //-- 是否关闭使用优惠券,循环有找到商品 -- if (th.data.is_close_quan != 1 && check_quan_ware_list) { //--调用接口，获取优惠券的列表，3秒钟内控制接口请求-- @@ -5377,8 +5405,13 @@ Page({ } }) } + + } + + + //如果是搭配购的立即购买的时候 if (th.data.is_b_now) { if (arr && arr.length > 0) { @@ -6489,6 +6522,9 @@ Page({ var th = this; //--按钮变灰色 -- th.setData({ submit: 1 }); + var txt = 'using_quan[' + th.data.bn_pick + ']'; + th.setData({[txt]: null}) + //如果是选中 if (e.selected) { var item = this.data.all_collocation_list[e.index]; @@ -6529,6 +6565,7 @@ Page({ th.setData({is_coupon:item.is_coupon}) + var coll_arr = []; if (this.data.collocation_goods && this.data.collocation_goods.length) { coll_arr = this.data.collocation_goods; @@ -6567,11 +6604,16 @@ Page({ if (!coll_arr || coll_arr.length < 1) { //让主商品的活动变成0,取消搭配购 this.setData({ 'bn_goods.prom_type': 0, 'bn_goods.prom_id': 0, collocation_goods: [] }); + + th.setData({is_coupon:1}) + //计算价格 th.calculatePrice2(); //获取优惠券 th.get_buy_now_quan(); + + } else { this.setData({ collocation_goods: coll_arr }); //要进行深拷贝 @@ -6597,6 +6639,11 @@ Page({ var txt = 'cartlist[' + cart_index + '].goods'; var txt2 = 'cartlist[' + cart_index + '].collocationList[' + index + '].selected'; + //有改，都强制把券选择清理一下 + var pickup_id = this.data.cartlist[cart_index].pickup_id; + var txt='using_quan['+pickup_id+']'; + th.setData({[txt]:null}); + //-- 如果是选中 -- if (e.selected) { @@ -6736,6 +6783,17 @@ Page({ } th.data.old_cartlist = cart_arr; + }, + + //-- 获取到搭配 -- + has_dp:function (list,prom_id){ + for (let i in list) { + var it=list[i]; + if(it.prom_id==prom_id && it.is_collocation==1){ + return true; + } + } + return false; } diff --git a/packageE/pages/qy/contactMe/contactMe.js b/packageE/pages/qy/contactMe/contactMe.js new file mode 100644 index 0000000..183847e --- /dev/null +++ b/packageE/pages/qy/contactMe/contactMe.js @@ -0,0 +1,652 @@ +var t = require("../../../../utils/common.js"); +const app = getApp(); +var os = app.globalData.setting; +var regeneratorRuntime = require('../../../../utils/runtime.js'); + +Page({ + data: { + user: null, + show_bind: 0, + imghots: os.imghost, + store_logo: '', + first_leader: '', //-- 邀请人 -- + config2: null, + sub: 0, + phone:'', + id:"", + openuserid:'', + skip_verify:1, + error_arr:{ + '81012':'缺失可见范围', + '81013':'UserID、部门ID、标签ID全部非法或无权限', + '40031':'不合法的UserID列表', + '0032': '不合法的UserID列表长度', + '40058':'不合法的参数', + '40063':'参数为空', + '40094':'不合法的URL', + '40096':'不合法的外部联系人userid', + '40099':'外部联系人的数量已达上限', + '40100':'此用户的外部联系人已经在转移流程中', + '40125':'无效的openuserid参数', + '41001':'缺少access_token参数', + '41009':'缺少userid参数', + '41010':'缺少url参数', + '41035':'缺少外部联系人userid参数', + "41037":'缺少「联系我」type参数', + "41038":'缺少「联系我」scene参数', + "41039":'无效的「联系我」type参数', + "41040":'无效的「联系我」scene参数', + "41041":'「联系我」使用人数超过限制', + "41042":'无效的「联系我」style参数', + "41043":'缺少「联系我」config_id参数', + "41044":'无效的「联系我」config_id参数', + "41045":'API添加「联系我」达到数量上限', + "42001":'access_token已过期', + '43009': '企业未验证主体', + '45009': '接口调用超过限制', + '45022': '应用name参数长度不符合系统限制', + '45024': '帐号数量超过上限', + '45034': 'url必须有协议头', + '46004': '指定的用户不存在', + '48001': 'API功能未授权', + '48002': 'API接口无权限调用', + '48003': '不合法的suite_id', + '48004': '授权关系无效', + '48005': 'API接口已废弃', + '48006': '接口权限被收回', + '60102': 'UserID已存在', + '670010': '负责人数量超出限制', + '81014': '标签添加成员，单次添加user或party过多', + '82001':' 指定的成员/部门/标签全部为空', + '84072': '应用未配置客服', + '84073': '客服userid不在应用配置的客服列表中', + '84074': '没有外部联系人权限', + '84075': '不合法或过期的authcode', + '84076': '缺失authcode', + '84083': '非服务人员', + '84084': '非跟进用户', + '84085': '应用已下架', + '84144': '确认者的gid不在当前服务商的通讯录中', + '84145': '确认者gid所在的企业数不能超过5个', + '84146': '确认者gid最多只能在3个企业下确认合同', + '86001': '参数 chatid 不合法', + '86003': '参数 chatid 不存在', + '86004': '参数 群名不合法', + '86005': '参数 群主不合法', + '86006': '群成员数过多或过少', + '86007': '不合法的群成员', + }, + }, + onLoad: function (tt) { + // tt.scene="0_0_22" + if (tt && tt.scene) { + var first_leader_str = decodeURIComponent(tt.scene); + var f_arr = first_leader_str.split("_"); + // first_leader = f_arr[0] && parseFloat(f_arr[0]) > 0 ? f_arr[0] : null; + //注册门店 + // if (f_arr[1] && parseFloat(f_arr[1]) > 0) { + // getApp().globalData.store_number = f_arr[1]; + // } + //企业微信群id + if (f_arr && f_arr[2] && parseFloat(f_arr[2]) > 0) { + this.setData({ + id:f_arr[2] + }) + this.getopenuserid(f_arr[2]) + // getApp().globalData.groupchat_id = f_arr[2]; + } + + } + // if (wx.getUserProfile) { + // this.setData({ + // canIUseGetUserProfile: true + // }) + // } + // getApp().globalData.isLoad_ad = 1; + //--判断是否有接受到邀请人的ID-- + // if (options.first_leader) { + // this.setData({ first_leader: options.first_leader }); + // } else if (getApp().globalData.first_leader) { + // this.setData({ first_leader: getApp().globalData.first_leader }); + // } + var th = this; + app.getConfig(function (e) { + var logo = th.data.imghots + e.store_logo; + th.setData({ store: e, store_logo: logo }); + }) + + //判断注册的条件 + // app.getConfig2(function (e) { + // if (e.reg_type == 1) { + // var arr = JSON.parse(e.reg_info); + // if (arr['name_state'] == 1) th.data.name_need_go = 1; + // if (arr['birthday_state'] == 1) th.data.birth_need_go = 1; + // if (arr['idcard_state'] == 1) th.data.idcard_need_go = 1; + // if (arr['address_state'] == 1) th.data.address_need_go = 1; + // if (arr['pick_state'] == 1) th.data.pick_need_go = 1; + // if (arr['sex_state'] == 1) th.data.sex_need_go = 1; + // if (arr['introducer_state'] == 1) th.data.introducer_need_go = 1; + // } + // var json_d = JSON.parse(e.switch_list); + // if (json_d.user_label_set == 1) { + // th.data.is_lable_set = 1 + // } + // }, 1) + + // getApp().promiseGet("/api/wx/weappSendlist/page", { + // data: { + // store_id: os.stoid, + // typeid: "1007" + // } + // }).then(res => { + // if (res.data.code == 0 && res.data.data.pageData.length > 0) { + // var template_id = res.data.data.pageData[0].template_id; + // th.setData({ template_id: template_id }); + // } + // }) + }, + + getopenuserid(id){ + let url=`/api/weshop/qyWeChat/qywxStaffcode/get/${id}` + getApp().request.promiseGet(url,{data:{}}).then(res => { + console.log(res); + if (res.data.code == 0) { + // let resdata=JSON.parse(res.data.data); + let openuserid=res.data.data.openuserid; + let skip_verify=res.data.data.skip_verify; + this.setData({ + openuserid, + skip_verify + }) + // if (this.data.phone) { + // this.getqy() + // } + } + }) + }, + async getqy(){ + // wx.showLoading({ + // title: '加载中', + // mask:true + // }) + let openuserid=this.data.openuserid + let skip_verify=this.data.skip_verify ? true : false + let res = await getApp().request.promisePost(`/apib/weshop/admin/qyWeChat/qyWeChatCorpInfo/postAdminQyApi?accdb=${this.data.store.erpid}&url=externalcontact/add_contact_way`, { + data: { + // accdb: getApp().globalData.config.erpid, + // ApiName: 'api.pos.shop.advancesum.seek', + // url:'externalcontact/add_contact_way', + user:openuserid, + type:1, + scene:2, + style:1, + state:'手店_'+this.data.phone, + skip_verify + // is_temp:true, + // store_id: getApp().globalData.setting.stoid, + // usercode: "admin", + // vipid: this.data.userinfo.erpvipid, + // oddsum: "0", + // advancesum: cartList.order_amount, + // storageid: storageid, + // listform + }, + is_json: 1 + }) + wx.hideLoading() + if(res.data && res.data.errcode==0){ + this.setData({ + qr_code:res.data.qr_code + }) + this.saveqy(res.data.config_id,res.data.qr_code) + }else{ + let errcode=res.data.errcode + let msg=errcode + if (this.data.error_arr[errcode]) { + msg+=this.data.error_arr[errcode] + } + wx.showModal({ + title: '提示', + content: '获取失败,错误码:'+msg, + showCancel:false, + success (res) { + if (res.confirm) { + console.log('用户点击确定') + } else if (res.cancel) { + console.log('用户点击取消') + } + } + }) + } + console.log('获取企业二维码'); + console.log(res); + }, + + //绑定手机号 + getphone: function (e) { + //接下来写业务代码登录 + console.log(e); + // return + e = e.detail; + if (e.code == undefined) { + this.setData({ show_bind: 0 }) + return app.my_warnning("登录需要授权手机号码！", 0, this); + return false; + } + // var sessionKey = getApp().globalData.sessionKey; + var req_data = { + js_code: e.code, + store_id: getApp().globalData.setting.stoid, + } + //-- 获取一下手机 --/api/weshop/users/getCodeMobile?store_id=1&js_code=b8451556dd98b2eebec5aa6775625bce192a68fc1a4b15b0c6bf3ed046f90da4 + getApp().request.promiseGet("/api/weshop/users/getCodeMobile", { data: req_data }).then(res => { + // console.log('手机号码'); + // console.log(res); + if (res.data.code == 0) { + let resdata=JSON.parse(res.data.data); + this.setData({ + phone:resdata.phoneNumber + }) + this.befgetqy() + // getApp().globalData.zc_dd = dd; + // wx.redirectTo({ + // url: "/packageA/pages/profile/profile?is_back=1" + // }) + } + }) + // var sessionKey = getApp().globalData.sessionKey; + // var openid = getApp().globalData.openid; + // var r = getApp().globalData.getu; + // this.save_the_data(r, e, sessionKey, openid) + }, + async befgetqy(){ + wx.showLoading({ + title: '加载中', + mask:true + }) + let openuserid=this.data.openuserid + let res = await getApp().request.promiseGet(`/api/weshop/qyWeChat/qywxConfigList/getMobileInfo/${getApp().globalData.setting.stoid}/${openuserid}/${this.data.phone}`, { data: {} }) + console.log('获取数据库表'); + console.log(res); + if (res.data && res.data.code==0) { + this.setData({ + qr_code:res.data.data.qrcode + }) + wx.hideLoading() + }else{ + this.getqy() + } + + }, + async saveqy(config_id,qrcode){ + let openuserid=this.data.openuserid + let mobile=this.data.phone + let addtime=((Date.now())/1000).toFixed(0) + let req_data = { + store_id: getApp().globalData.setting.stoid, + openuserid, + config_id, + qrcode, + mobile, + addtime + } + let res = await getApp().request.promisePost(`/api/weshop/qyWeChat/qywxConfigList/save`, { + data: req_data, + // is_json: 1 + }) + // wx.hideLoading() + }, + + + + //-- 会员授权 -- + bindGetUserInfo: function (ee) { + if (!this.data.isAgree) { + wx.showToast({ + title: '请您先阅读和勾选指定的内容', + icon: 'none', + }); + return false; + } + var that = this; + //-- 点击授权 -- + that.getUserProfile(function (res) { + var user = res; + //--拿下code-- + wx.login({ + success: function (o) { + var dd = { + js_code: o.code, + store_id: os.stoid, + nickname: app.clear_word(app.globalData.getu.nickName), + head_pic: app.clear_word(app.globalData.getu.avatarUrl) + }; + //-- 导购会员ID -- + if (getApp().globalData.guide_id) { + dd.guide_id = getApp().globalData.guide_id; + } + + getApp().request.get("/api/weshop/users/openidandkey", { + data: dd, + success: function (e) { + if (e.data.code == 0) { + that.setData({ user: user }) + //如果有会员的话,没有sessionKey + if (!e.data.data.sessionKey) { + // getApp().showWarning("登录成功"); + wx.showToast({ + title: '登录成功', + icon: 'success', + duration: 2000 + }); + getApp().globalData.userInfo = e.data.data; + getApp().globalData.user_id = e.data.data.user_id; + getApp().globalData.openid = e.data.data.weapp_openid; + //把会员的信息存在内存 + wx.setStorageSync("userinfo", e.data.data); + + //调用接口判断是不是会员 + app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => { + if (res.data.code == 0) { + getApp().globalData.guide_id = res.data.data.id; + } + }) + + + setTimeout(function () { + getApp().globalData.login_back = 1; + wx.navigateBack({ delta: 1 }) //返回上一页 + }, 1000) + } else { + getApp().globalData.sessionKey = e.data.data.sessionKey; + getApp().globalData.openid = e.data.data.openid; + that.setData({ show_bind: 1 }); + } + } else { + getApp().confirmBox(e.data.msg); + } + } + }); + } + }) + + }) + }, + + //-- 调整后的获取会员信息 -- + getUserProfile: function (func) { + var that = this; + wx.getUserProfile({ + desc: '获取用户相关信息', + success: res => { + console.log("getUserProfile", res); + //此处授权得到userInfo + getApp().globalData.getu = res.userInfo; + func(res.userInfo); + } + }); + }, + + //暂不登录，返回上一页 + cancle_bind: function () { + wx.navigateBack({ delta: 1 }) + }, + + close_pop: function () { + this.setData({ show_bind: 0 }) + }, + show_bind_mobile: function () { + let th = this; + th.sendsm(function () { + th.setData({ show_bind: 1 }) + }) + }, + + + save_the_data: async function (r, e, sessionKey, openid) { + var app = getApp(), a = app, th = this; + var dd = { + oauth: "miniapp", + nickname: a.clear_word(r.nickName), + head_pic: r.avatarUrl, + sex: r.gender, + terminal: "miniapp", + sessionKey: sessionKey, + openid: openid, + encryptedData: e.encryptedData, + iv: e.iv, + store_id: getApp().globalData.setting.stoid, + }; + //--如果有邀请人的时候-- + if (th.data.first_leader) { + dd.first_leader = th.data.first_leader; + } + //-- 导购会员ID -- + if (getApp().globalData.guide_id) { + dd.guide_id = getApp().globalData.guide_id; + } + + //门店的扫描识别码 + if (getApp().globalData.store_number) { + dd.SunCode = encodeURIComponent(getApp().globalData.store_number.trim()); + } + + console.log("-----会员注册的信息-------"); + console.log(dd); + + + var need_go = 0; + //如果有需要完善的信息没有完善，就需要跳转 + if (th.data.name_need_go) { need_go = 1; } + if (th.data.birth_need_go) { need_go = 1; } + if (th.data.idcard_need_go) { need_go = 1; } + if (th.data.address_need_go) { need_go = 1; } + if (th.data.pick_need_go) { need_go = 1; } + if (th.data.sex_need_go) { need_go = 1; } + if (th.data.introducer_need_go) { need_go = 1; } + + if (need_go) { + + var req_data = { + sessionKey: sessionKey, + encryptedData: e.encryptedData, + iv: e.iv, + store_id: getApp().globalData.setting.stoid, + } + //-- 获取一下手机 -- + getApp().request.promiseGet("/api/weshop/users/getmobile", { data: req_data }).then(res => { + if (res.data.code == 0) { + dd.mobile = res.data.data; + getApp().globalData.zc_dd = dd; + wx.redirectTo({ + url: "/packageA/pages/profile/profile?is_back=1" + }) + } + }) + + } else { + if (th.data.is_lable_set) { + var req_data = { + sessionKey: sessionKey, + encryptedData: e.encryptedData, + iv: e.iv, + store_id: getApp().globalData.setting.stoid, + } + //-- 获取一下手机 -- + getApp().request.promiseGet("/api/weshop/users/getmobile", { data: req_data }).then(res => { + if (res.data.code == 0) { + dd.mobile = res.data.data; + getApp().globalData.zc_dd = dd; + wx.redirectTo({ + url: "/packageE/pages/user/labels/labels?pageType=1" + }) + } + }) + } else { + this.setData({ sub: 1 }); + wx.showLoading({ + title: '处理中.', + mask: true + }) + this.zu_ce(dd); //调用注册的函数 + } + } + + }, + + zu_ce: function (dd) { + var th = this; + app.request.get("/api/weshop/users/thirdLogin", { + data: dd, + success: function (e) { + if (e.data.code == 0) { + app.globalData.user_id = e.data.data.user_id; + } else { + return app.showWarning("授权登入失败！" + e.data.msg); + } + getApp().globalData.login_back = 1; + wx.setStorageSync("userinfo", e.data.data); + wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = t.getFullUrl(app.globalData.userInfo.head_pic); + //调用接口判断是不是会员 + app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => { + if (res.data.code == 0) { + getApp().globalData.guide_id = res.data.data.id; + } + }) + + }, + failStatus: function (t) { + th.setData({ sub: 0 }); + return app.my_warnning("授权登入失败,请稍后再试!", 0, th); + }, + fail: function (t) { + th.setData({ sub: 0 }); + return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1; + } + }); + }, + + + bind_bnerr: function (e) { + var _errImg = e.target.dataset.errorimg; + var _errObj = {}; + _errObj[_errImg] = this.data.imghots + "/miniapp/images/logo.png"; + this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; + }, + + //-- 会员授权 -- + bindUserInfo: function (ee) { + var that = this; + var user = ee.detail.userInfo; + //此处授权得到userInfo + getApp().globalData.getu = user; + + //--拿下code-- + wx.login({ + success: function (o) { + var dd = { + js_code: o.code, + store_id: os.stoid, + nickname: app.clear_word(app.globalData.getu.nickName), + head_pic: app.clear_word(app.globalData.getu.avatarUrl) + }; + //-- 导购会员ID -- + if (getApp().globalData.guide_id) { + dd.guide_id = getApp().globalData.guide_id; + } + + getApp().request.get("/api/weshop/users/openidandkey", { + data: dd, + success: function (e) { + if (e.data.code == 0) { + that.setData({ user: user }) + //如果有会员的话,没有sessionKey + if (!e.data.data.sessionKey) { + // getApp().showWarning("登录成功"); + wx.showToast({ + title: '登录成功', + icon: 'success', + duration: 2000 + }); + + getApp().globalData.userInfo = e.data.data; + getApp().globalData.user_id = e.data.data.user_id; + getApp().globalData.openid = e.data.data.weapp_openid; + //把会员的信息存在内存 + wx.setStorageSync("userinfo", e.data.data); + + //调用接口判断是不是会员 + app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => { + if (res.data.code == 0) { + getApp().globalData.guide_id = res.data.data.id; + } + }) + + + setTimeout(function () { + getApp().globalData.login_back = 1; + wx.navigateBack({ delta: 1 }) //返回上一页 + }, 1000) + } else { + getApp().globalData.sessionKey = e.data.data.sessionKey; + getApp().globalData.openid = e.data.data.openid; + that.setData({ show_bind: 1 }); + } + } else { + getApp().confirmBox(e.data.msg); + } + } + }); + } + }) + + + }, + + + close_pop_back: function () { + this.close_pop(); + wx.navigateBack({ delta: 1 }) + }, + + + // 是否同意协议 + isAgree(e) { + let isAgree = null; + if (e.detail.value[0]) { + isAgree = true; + } else { + isAgree = false; + }; + // this.data.isAgree = isAgree; + this.setData({ + isAgree, + }); + }, + + + //通过路径跳转到其他页面 + goto: function (e) { + console.log('xxxx', e); + var url = e.currentTarget.dataset.url; + getApp().goto(url); + }, + + //订阅消息提醒 + sendsm: function (func) { + var template_id = this.data.template_id; + // //授权订阅 + wx.requestSubscribeMessage({ + tmplIds: [template_id], + success(res) { + func(); + }, + fail(res) { + func(); + } + }) + + }, + + +}) diff --git a/packageE/pages/qy/contactMe/contactMe.json b/packageE/pages/qy/contactMe/contactMe.json new file mode 100644 index 0000000..3f01b7c --- /dev/null +++ b/packageE/pages/qy/contactMe/contactMe.json @@ -0,0 +1,7 @@ +{ + "usingComponents": { + "warn": "/components/long_warn/long_warn" + }, + "navigationBarTitleText": "联系我", + "enablePullDownRefresh": false +} \ No newline at end of file diff --git a/packageE/pages/qy/contactMe/contactMe.wxml b/packageE/pages/qy/contactMe/contactMe.wxml new file mode 100644 index 0000000..c41a26c --- /dev/null +++ b/packageE/pages/qy/contactMe/contactMe.wxml @@ -0,0 +1,80 @@ + + + + + + + + + {{store.store_name}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 长按识别二维码 + 添加我的企业微信 + + + + + diff --git a/packageE/pages/qy/contactMe/contactMe.wxss b/packageE/pages/qy/contactMe/contactMe.wxss new file mode 100644 index 0000000..656c6a5 --- /dev/null +++ b/packageE/pages/qy/contactMe/contactMe.wxss @@ -0,0 +1,87 @@ +page{ + border-top: 3rpx solid #EAEAEC; + background-color: #fff; +} +.logins { + width: 100%; + /* padding-bottom: 130rpx; */ + background-position: center; + background-repeat: no-repeat; + background-size: cover +} + +.login_img { + width: 192rpx; + height: 192rpx; + border-radius: 50%; +} +.phones{ + margin-bottom: 48rpx; +} +.getPhoneNumber { + width: 600rpx; + height: 94rpx; + line-height: 94rpx; + background-color: #57b837; + border-radius: 48rpx; + color: rgb(255,255,255); + font-size: 32rpx; + margin-top: 40rpx; +} +.we_chat{ + width: 55rpx; + height: 45rpx; + margin-right: 15rpx; +} +.userlongin{ + color: #767f8e; +} +button{ + border:none; +} +.login_img_back{ width: 100%;} +.p_content{ + margin: 10%; + width: 80%; + height:340rpx; + top:50%; + margin-top: -180rpx; + background-color: #fff; + z-index: 12; + position: fixed; +} + +.btn_view { height: 120rpx; line-height: 120rpx; border-top:1rpx solid #e9e9e9;} +.p_title{ height:220rpx; padding: 0 40rpx; line-height: 50rpx;} +.g_mobile{ background: none;line-height: normal;} +.b_right{border-right:1rpx solid #e9e9e9;} + +.ali-c{align-items: center;} +.flex-center2{ justify-content: center;} +.f2 { + flex: 2 0; +} + +.middle_view{ + position: absolute; left: 0; width: 100%; text-align: center; +} + +/*checkbox 选项框大小 */ +checkbox .wx-checkbox-input { + width: 30rpx; + height: 30rpx; +} + +.gray { + color: #767f8e; +} + +.meBox{ + color: rgb(127, 128, 132); + font-size: 50rpx; + height: 80vh; + display: flex; + align-items: center; + flex-direction: column; + justify-content: center; +} \ No newline at end of file diff --git a/packageE/pages/togoin/togoin.js b/packageE/pages/togoin/togoin.js index f9999dd..ce5910b 100644 --- a/packageE/pages/togoin/togoin.js +++ b/packageE/pages/togoin/togoin.js @@ -134,6 +134,7 @@ Page({ app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => { if (res.data.code == 0) { getApp().globalData.guide_id = res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id } }) @@ -297,6 +298,7 @@ Page({ app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => { if (res.data.code == 0) { getApp().globalData.guide_id = res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id } }) @@ -367,6 +369,7 @@ Page({ app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => { if (res.data.code == 0) { getApp().globalData.guide_id = res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id } }) diff --git a/pages/activity/pind_list/pind_list.js b/pages/activity/pind_list/pind_list.js index ec3b10d..257f307 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: "天天拼单", }) @@ -46,6 +50,7 @@ Page({ getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { if (res.data.code == 0) { getApp().globalData.guide_id = res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id } }) } @@ -220,6 +225,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 +283,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..fecefef 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: "商品秒杀", }) @@ -54,6 +58,7 @@ Page({ getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { if (res.data.code == 0) { getApp().globalData.guide_id = res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id } }) } @@ -245,7 +250,7 @@ Page({ //---------分享配置-------- onShareAppMessage: function (e) { - getApp().globalData.no_clear=1; + getApp().globalData.no_clear=1; var curPage = this; var pagePath = curPage.route; //当前页面url if (pagePath.indexOf('/') != 0) { @@ -258,8 +263,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 +302,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/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/giftpack/buygiftpack/giftpackbuy.js b/pages/giftpack/buygiftpack/giftpackbuy.js index 040bc72..ae13af1 100644 --- a/pages/giftpack/buygiftpack/giftpackbuy.js +++ b/pages/giftpack/buygiftpack/giftpackbuy.js @@ -64,7 +64,9 @@ Page({ default_store: {}, //创建添加默认门店地址的对象 store:0, - openSpecModal:0 + openSpecModal:0, + + is_get_guide:0, }, onLoad: function (options) { @@ -96,6 +98,8 @@ Page({ //-- 获取分享人的ID -- var first_leader = options.first_leader || getApp().globalData.first_leader; if (first_leader) { + + this.data.is_get_guide=1; this.setData({ first_leader, }) @@ -104,10 +108,16 @@ Page({ //调用接口判断是不是会员 getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { if (res.data.code == 0) { - getApp().globalData.guide_id = res.data.data.id; + getApp().globalData.guide_id = res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id } + + com.wait_for_store_config(th); + com.set_user_mo_store(th,os); + }) } + getApp().request.promiseGet("/api/weshop/ad/page?pid=902&store_id=" + os.stoid, { data: { enabled: 1 @@ -138,8 +148,12 @@ Page({ getApp().goto('/packageE/pages/togoin/togoin'); return false; } - com.wait_for_store_config(th); - com.set_user_mo_store(th,os); + + if(!th.data.is_get_guide) { + com.wait_for_store_config(th); + com.set_user_mo_store(th, os); + } + th.data.is_get_guide=0; }) this.init(); @@ -368,6 +382,15 @@ Page({ }, // 选择门店 choice_store: function (ee) { + //--先判断会员状态-- + var user_info = getApp().globalData.userInfo; + if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { + wx.navigateTo({ + url: '/packageE/pages/togoin/togoin', + }) + return false; + } + var th = this; var ind = ee.currentTarget.dataset.ind; var bconfig = th.data.bconfig; diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js index 53ac4f3..4338b56 100644 --- a/pages/giftpack/giftpacklist/giftpacklist.js +++ b/pages/giftpack/giftpacklist/giftpacklist.js @@ -144,6 +144,7 @@ Page({ getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { if (res.data.code == 0) { getApp().globalData.guide_id = res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id } }) } @@ -338,6 +339,31 @@ Page({ }); }, + + check_guide(func){ + var first_leader=this.data.first_leader; + if(!first_leader){ + func(); + return false; + } + if(this.data.is_geted_guide_pick){ + func(); + return false; + } + if(getApp().globalData.guide_pick_id){ + func(); + return false; + } + var th=this; + getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { + if (res.data.code == 0) { + getApp().globalData.guide_pick_id= res.data.data.pickup_id; + } + th.data.is_geted_guide_pick=1; + func(); + }) + }, + GetBuyGiftList: function () { var _this2 = this; var th = this.data; @@ -393,14 +419,16 @@ Page({ //需不需要门店，不需要门店返回 if (!sele_g.is_pickup) return false; - com.wait_for_store_config(_this2); - com.set_user_mo_store(_this2, os, function () { - if (sele_g.pickup_list && _this2.data.def_pick_store) { - com.check_def_pk(_this2); - } - }); - com.get_sto(_this2, os); - + //-- 检测一下有没有门店 -- + _this2.check_guide(function (){ + com.wait_for_store_config(_this2); + com.set_user_mo_store(_this2, os, function () { + if (sele_g.pickup_list && _this2.data.def_pick_store) { + com.check_def_pk(_this2); + } + }); + com.get_sto(_this2, os); + }) } else { getApp().my_warnning(res.data.msg, 0, _this2); @@ -653,6 +681,16 @@ Page({ }, // 选择门店 choice_store: function (ee) { + + //--先判断会员状态-- + var user_info = getApp().globalData.userInfo; + if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { + wx.navigateTo({ + url: '/packageE/pages/togoin/togoin', + }) + return false; + } + var th = this; var ind = ee.currentTarget.dataset.ind; var bconfig = th.data.bconfig; diff --git a/pages/giftpack/mygiftpack/mygiftpack.js b/pages/giftpack/mygiftpack/mygiftpack.js index 1b080ea..3ff1ea1 100644 --- a/pages/giftpack/mygiftpack/mygiftpack.js +++ b/pages/giftpack/mygiftpack/mygiftpack.js @@ -55,6 +55,7 @@ Page({ getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { if (res.data.code == 0) { getApp().globalData.guide_id = res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id } }) } 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 7c0a36b..0ce8086 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; @@ -377,11 +382,14 @@ Page({ if (first_leader) { console.log("gd onload--3"); console.log("log---" + first_leader); + getApp().globalData.first_leader = first_leader; //调用接口判断是不是会员 getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { if (res.data.code == 0) { getApp().globalData.guide_id = res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id; + } }) @@ -492,74 +500,6 @@ Page({ } }); - //获取用户的默认门店 - getApp().get_user_store(function (e) { - if (!e) { - th.data.fir_def_store = {}; //赋值空对象 - return false; - } - if (getApp().globalData.is_dj_pk) th.setData({ - has_def: 1 - }); - - var ee = JSON.parse(JSON.stringify(e)); - //--定时器推迟一下-- - setTimeout(function () { - if (th.data.fir_goods) var g_distr_type = th.data.fir_goods.distr_type; - //--如果默认门店的配送方式不对，就不能被选择，这里不控制，如果不一样，就说明配送方式不对-- - if (ee.distr_type != 0 && g_distr_type != 0 && ee.distr_type != g_distr_type) { - ee.is_no_dis = 1; - } - - var appd = getApp().globalData; - var w_time = setInterval(function () { - if (that.data.is_get_local_ok == 0) return false; - clearInterval(w_time); - var distance = null; - var e = JSON.parse(JSON.stringify(ee)); - - //如果有开启近距离的话,同时距离优不一样了 - if (that.data.lat != null) { - //如果经纬度有变化的话 - if (e && appd.lat == that.data.lat && appd.lon == that.data.lon && e.distance > 0) { - that.set_def_storage(e); - } else { - //要用接口是获取距离，js的计算不准 - getApp().request.promiseGet("/api/weshop/pickup/list", { - data: { - store_id: os.stoid, - pickup_id: e.pickup_id, - lat: th.data.lat, - lon: th.data.lon, - isstop: 0, - is_pos: 1 - }, - }).then(res => { - if (res.data.code == 0) { - e = res.data.data.pageData[0]; - if (e) { - e.is_no_dis = ee.is_no_dis; - appd.pk_store = e; - that.set_def_storage(e); - } - - } - }) - } - //e.distance = distance; - appd.lat = that.data.lat; - appd.lon = that.data.lon; - - } else { - if (e) { - e.distance = null; - that.set_def_storage(e); - } - } - }, 500) - }, 700) - }); - //更新点击量 //noinspection JSUnresolvedFunction getApp().request.put("/api/weshop/goods/updateClick", { @@ -600,6 +540,7 @@ Page({ await getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { if (res.data.code == 0) { getApp().globalData.guide_id = res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id } }) @@ -857,6 +798,102 @@ Page({ }, + check_guide(func){ + var first_leader=getApp().globalData.first_leader; + if(!first_leader){ + func(); + return false; + } + if(this.data.is_geted_guide_pick){ + func(); + return false; + } + + if(getApp().globalData.guide_pick_id){ + func(); + return false; + } + var th=this; + getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { + if (res.data.code == 0) { + getApp().globalData.guide_pick_id= res.data.data.pickup_id; + } + th.data.is_geted_guide_pick=1; + func(); + }) + }, + + get_user_store(){ + var th=this; var that=this; + //--获取用户的默认门店 + getApp().get_user_store(function (e) { + if (!e) { + th.data.fir_def_store = {}; //赋值空对象 + return false; + } + if (getApp().globalData.is_dj_pk) th.setData({ + has_def: 1 + }); + + var ee = JSON.parse(JSON.stringify(e)); + //--定时器推迟一下-- + setTimeout(function () { + if (th.data.fir_goods) var g_distr_type = th.data.fir_goods.distr_type; + //--如果默认门店的配送方式不对，就不能被选择，这里不控制，如果不一样，就说明配送方式不对-- + if (ee.distr_type != 0 && g_distr_type != 0 && ee.distr_type != g_distr_type) { + ee.is_no_dis = 1; + } + + var appd = getApp().globalData; + var w_time = setInterval(function () { + if (that.data.is_get_local_ok == 0) return false; + clearInterval(w_time); + var distance = null; + var e = JSON.parse(JSON.stringify(ee)); + + //如果有开启近距离的话,同时距离优不一样了 + if (that.data.lat != null) { + //如果经纬度有变化的话 + if (e && appd.lat == that.data.lat && appd.lon == that.data.lon && e.distance > 0) { + that.set_def_storage(e); + } else { + //要用接口是获取距离，js的计算不准 + getApp().request.promiseGet("/api/weshop/pickup/list", { + data: { + store_id: os.stoid, + pickup_id: e.pickup_id, + lat: th.data.lat, + lon: th.data.lon, + isstop: 0, + is_pos: 1 + }, + }).then(res => { + if (res.data.code == 0) { + e = res.data.data.pageData[0]; + if (e) { + e.is_no_dis = ee.is_no_dis; + appd.pk_store = e; + that.set_def_storage(e); + } + + } + }) + } + //e.distance = distance; + appd.lat = that.data.lat; + appd.lon = that.data.lon; + + } else { + if (e) { + e.distance = null; + that.set_def_storage(e); + } + } + }, 500) + }, 700) + }); + }, + //---展示--- onShow: function () { @@ -876,6 +913,11 @@ Page({ return false; } + //先获取一下导购的门店 + th.check_guide(()=>{ + th.get_user_store(); + }) + //优惠券要实时更新 getApp().getConfig2(function (e) { var json_d = JSON.parse(e.switch_list); @@ -1154,6 +1196,9 @@ Page({ + + + }, onReady() { @@ -1418,6 +1463,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 +1616,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 +1917,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 +2050,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 +2902,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) { @@ -3007,6 +3066,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, @@ -5069,11 +5133,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 +5588,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; @@ -6585,6 +6652,15 @@ Page({ var ind = ee.currentTarget.dataset.ind; var bconfig = th.data.bconfig; + //--先判断会员状态-- + var user_info = getApp().globalData.userInfo; + if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { + wx.navigateTo({ + url: '/packageE/pages/togoin/togoin', + }) + return false; + } + //如果开启了，则不在选择门店 if (this.data.sys_switch.is_pricing_open_store && getApp().globalData.pk_store) { @@ -7468,6 +7544,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/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js index dc63abb..dbe1a0e 100644 --- a/pages/goods/goodsList/goodsList.js +++ b/pages/goods/goodsList/goodsList.js @@ -55,6 +55,7 @@ Page({ getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+oo.stoid+"/"+first_leader,{}).then(res=>{ if(res.data.code==0){ getApp().globalData.guide_id=res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id } }) if(!getApp().globalData.user_id){ diff --git a/pages/goods/search/search.js b/pages/goods/search/search.js index 1bfc900..4edb05c 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); }; @@ -77,6 +80,7 @@ Page({ getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + oo.stoid + "/" + first_leader, {}).then(res => { if (res.data.code == 0) { getApp().globalData.guide_id = res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id } }) } @@ -430,6 +434,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 d0f064a..80be721 100644 --- a/pages/index/index/index.js +++ b/pages/index/index/index.js @@ -91,12 +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; + 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("_"); @@ -104,9 +111,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"); @@ -181,6 +196,7 @@ Page({ getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { if (res.data.code == 0) { getApp().globalData.guide_id = res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id } }) @@ -254,18 +270,17 @@ Page({ }).then(res => { if (ut.ajax_ok(res)) { first_leader=res.data.data.pageData[0].user_id; - getApp().globalData.guide_id = res.data.data.id; + // getApp().globalData.guide_id = res.data.data.id; } }) - if(!first_leader) return false; getApp().globalData.first_leader = first_leader; - //调用接口判断是不是会员 await getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { if (res.data.code == 0) { getApp().globalData.guide_id = res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id } }) @@ -920,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 = "商城首页" //分享 @@ -929,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, @@ -1327,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 } }, diff --git a/pages/team/team_show/team_show.js b/pages/team/team_show/team_show.js index e817ea0..52d85ec 100644 --- a/pages/team/team_show/team_show.js +++ b/pages/team/team_show/team_show.js @@ -126,6 +126,7 @@ Page({ getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{ if(res.data.code==0){ getApp().globalData.guide_id=res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id } }) } @@ -607,7 +608,7 @@ Page({ }); //-- 获取用户的默认门店 -- - getApp().get_user_store(function(ee) { + getApp().get_user_store(function(ee) { if(!ee) { th.data.fir_def_store={}; //赋值空对象 return false; @@ -624,14 +625,14 @@ Page({ //return false; ee.is_no_dis=1; } - + var appd=getApp().globalData; var w_time = setInterval(function() { if (that.data.is_get_local_ok == 0) return false; clearInterval(w_time); var distance = null; var e=JSON.parse(JSON.stringify(ee)); - + //如果有开启近距离的话,同时距离优不一样了 if (that.data.lat != null) { //如果经纬度有变化的话 @@ -660,15 +661,15 @@ Page({ sto_sele_distr: e.distr_type }) } - + } }) } - + //e.distance = distance; appd.lat=that.data.lat; appd.lon=that.data.lon; - + }else{ if (e) { e.distance = null; @@ -681,11 +682,11 @@ Page({ }) } } - + }, 500) - },1000) + },1000) }); - + //获取下redis长度，如果团已经弄完，或者拼单已经卖完 //设置值 ee.setData({ @@ -1008,6 +1009,15 @@ Page({ //-- 选择门店。此时的门店选择与门店有关系 -- choice_store: function(ee) { + + //--先判断会员状态-- + var user_info = getApp().globalData.userInfo; + if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { + wx.navigateTo({ + url: '/packageE/pages/togoin/togoin', + }) + return false; + } var th = this; var bconfig = th.data.bconfig; diff --git a/pages/template/index.js b/pages/template/index.js index 11800b3..dc190c7 100644 --- a/pages/template/index.js +++ b/pages/template/index.js @@ -30,6 +30,7 @@ Page({ getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { if (res.data.code == 0) { getApp().globalData.guide_id = res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id } }) } diff --git a/pages/user/index/index.js b/pages/user/index/index.js index 1603aff..b7027c5 100644 --- a/pages/user/index/index.js +++ b/pages/user/index/index.js @@ -95,6 +95,7 @@ Page({ getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { if (res.data.code == 0) { getApp().globalData.guide_id = res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id } }) diff --git a/pages/user/plus/plus.js b/pages/user/plus/plus.js index 455fce3..7a11fcc 100644 --- a/pages/user/plus/plus.js +++ b/pages/user/plus/plus.js @@ -81,6 +81,7 @@ Page({ getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + fir_leader, {}).then(res => { if (res.data.code == 0) { getApp().globalData.guide_id = res.data.data.id; + getApp().globalData.guide_pick_id= res.data.data.pickup_id } }) }