From ab5ff1c8b0b28f3e624830676747859e05daafa1 Mon Sep 17 00:00:00 2001 From: taiwan Date: Thu, 9 Dec 2021 16:27:26 +0800 Subject: [PATCH] 幸运购修改 --- packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js | 2 +- packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js | 55 ++++++++++++++++++++++++++++++++++++++++--------------- packageC/pages/luckyGo/luckyGo_members/luckyGo_members.js | 2 ++ packageC/pages/luckyGo/luckyGo_winners/luckyGo_winners.js | 4 +++- 4 files changed, 46 insertions(+), 17 deletions(-) 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..ddf7dab 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js @@ -1868,7 +1868,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 +2462,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 +4863,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_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, }); }, -- libgit2 0.21.4