diff --git a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js index 00d494a..7405e0f 100644 --- a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js +++ b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js @@ -973,7 +973,7 @@ Page({ //------ 分享配置 -------- onShareAppMessage: function (e) { var pagePath = `packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=${this.data.param.goods_id}&prom_type=9&group_id=${this.data.param.group_id}`; //当前页面url - console.log('pagePath=====xxxxxx>', pagePath); + // console.log('pagePath=====xxxxxx>', pagePath); var imgPath = this.data.iurl + this.data.luckyGoInfo.original_img; if (pagePath.indexOf('/') != 0) { pagePath = '/' + pagePath; diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js index daba113..4c3a0c0 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js @@ -315,54 +315,8 @@ Page({ prom_id, }); } + - - - // api/weshop/prom/luckyOrder/getUserOrderInfo/{store_id}/{user_id}/{aid} - // 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); - // } - - // } - // }) - - - // console.log('type********>>',this.data.prom_type); - //-- 自定义海报 -- - // getApp().request.promiseGet("/api/weshop/goods/poster/page", { - // data: { store_id: os.stoid, type: 1, is_use: 1 } - // }).then(res => { - // if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0]) { - - // var poster_data = res.data.data.pageData[0]; - // var json_str = poster_data.jsonStr; - - // if (json_str) { - // var json_data = JSON.parse(json_str); - // if (json_data.bg_img) { - - // //-- 把图片那到本地 -- - // wx.getImageInfo({ - // src: json_data.bg_img, - // success: function (res) { - // var path = res.path; - // th.setData({ share_b_img: path }) - // }, - // fail: function (res) { } - // }); - // } - // th.setData({ poster: json_data }) - - // } - // } - // }) //---获取手机地址坐标-- @@ -570,6 +524,16 @@ Page({ getApp().request.put("/api/weshop/goods/updateClick", { data: { store_id: os.stoid, goods_id: gid } }); + + + //--先判断会员登陆状态-- + var user_info = getApp().globalData.userInfo; + if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { + wx.navigateTo({ + url: '/pages/togoin/togoin', + }) + return false; + } }, @@ -1868,7 +1832,7 @@ Page({ url: "/pages/cart/cart2/cart2?is_bnow=1&goods_id=" + e.goods_id, });--*/ - console.log('11111111111111111111111111======》'); + // console.log('11111111111111111111111111======》'); // getApp().goto("/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart?is_bnow=1&goods_id=" + e.goods_id); getApp().goto("/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart?is_bnow=1&group_id=" + th.data.group_id +"&goods_id=" + e.goods_id + "&alert=" + th.data.luckGoInfo.lc_alert); @@ -2462,23 +2426,47 @@ Page({ // ob.title = text + " " + name; // } - var title = th.data.sele_g.goods_name; - var img = th.data.sele_g.original_img; + // var title = th.data.sele_g.goods_name; + // var img = th.data.sele_g.original_img; - var url = `packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=${th.data.sele_g.goods_id}&prom_type=9&group_id=${th.data.group_id}`; //当前页面url - if (getApp().globalData.user_id) { - url += "&first_leader=" + getApp().globalData.user_id; - } + // var url = `packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=${th.data.sele_g.goods_id}&prom_type=9&group_id=${th.data.group_id}`; //当前页面url + // if (getApp().globalData.user_id) { + // url += "&first_leader=" + getApp().globalData.user_id; + // } - console.log(url) + // console.log(url) - var ob = { - title: price + "元 " + title, - path: url, - imageUrl: img, - }; + // var ob = { + // title: price + "元 " + title, + // path: url, + // imageUrl: img, + // }; - return ob; + // return ob; + + + var pagePath = `packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=${this.data.sele_g.goods_id}&prom_type=9&group_id=${this.data.group_id}`; //当前页面url + // console.log('pagePath=====xxxxxx>', pagePath); + var imgPath = this.data.iurl + this.data.luckGoInfo.original_img; + 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; + // } + // } + return { + title: "邀您一起参加幸运购", + path: pagePath, + imageUrl: imgPath, + } + + + }, //-----图片失败，默认图片----- @@ -4839,7 +4827,8 @@ Page({ context.setFillStyle("red") - var pri0 = th.data.luckGoInfo.group_price; + var pri0 = th.data.luckGoInfo.group_price/100; + // console.log('pri0========>>>>>', pri0); // if (th.data.prom_act) // pri0 = th.data.prom_act.price; pri0 = parseFloat(pri0).toFixed(2); diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml index 96b23fc..c27efe2 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml @@ -1644,3 +1644,6 @@ + + + diff --git a/packageC/pages/luckyGo/luckyGo_members/luckyGo_members.js b/packageC/pages/luckyGo/luckyGo_members/luckyGo_members.js index 8d64802..78e8384 100644 --- a/packageC/pages/luckyGo/luckyGo_members/luckyGo_members.js +++ b/packageC/pages/luckyGo/luckyGo_members/luckyGo_members.js @@ -47,6 +47,7 @@ Page({ self.getData(true, '/api/weshop/prom/luckyOrder/page', { store_id: app.globalData.setting.stoid, team_id: self.data.team_id, + pageSize: 20, }); @@ -84,6 +85,7 @@ Page({ this.scrollToLower('/api/weshop/prom/luckyOrder/page', { store_id: app.globalData.setting.stoid, team_id: self.data.team_id, + pageSize: 20, }); }, diff --git a/packageC/pages/luckyGo/luckyGo_winners/luckyGo_winners.js b/packageC/pages/luckyGo/luckyGo_winners/luckyGo_winners.js index a1e4b4e..e3c1c24 100644 --- a/packageC/pages/luckyGo/luckyGo_winners/luckyGo_winners.js +++ b/packageC/pages/luckyGo/luckyGo_winners/luckyGo_winners.js @@ -68,6 +68,7 @@ Page({ store_id: app.globalData.setting.stoid, team_status: 2, goods_id: self.data.options.goods_id, + pageSize: 20, }); @@ -104,8 +105,9 @@ Page({ onReachBottom: function () { this.scrollToLower('/api/weshop/prom/luckyOrder/page', { store_id: app.globalData.setting.stoid, - team_status: 1, + team_status: 2, goods_id: this.data.options.goods_id, + pageSize: 20, }); },