Commit ab5ff1c8b0b28f3e624830676747859e05daafa1

Authored by 后端研发-苏泰源
1 parent d592e97b

幸运购修改

packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js
@@ -973,7 +973,7 @@ Page({ @@ -973,7 +973,7 @@ Page({
973 //------ 分享配置 -------- 973 //------ 分享配置 --------
974 onShareAppMessage: function (e) { 974 onShareAppMessage: function (e) {
975 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 975 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
976 - console.log('pagePath=====xxxxxx>', pagePath); 976 + // console.log('pagePath=====xxxxxx>', pagePath);
977 var imgPath = this.data.iurl + this.data.luckyGoInfo.original_img; 977 var imgPath = this.data.iurl + this.data.luckyGoInfo.original_img;
978 if (pagePath.indexOf('/') != 0) { 978 if (pagePath.indexOf('/') != 0) {
979 pagePath = '/' + pagePath; 979 pagePath = '/' + pagePath;
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
@@ -1868,7 +1868,7 @@ Page({ @@ -1868,7 +1868,7 @@ Page({
1868 url: "/pages/cart/cart2/cart2?is_bnow=1&goods_id=" + e.goods_id, 1868 url: "/pages/cart/cart2/cart2?is_bnow=1&goods_id=" + e.goods_id,
1869 });--*/ 1869 });--*/
1870 1870
1871 - console.log('11111111111111111111111111======》'); 1871 + // console.log('11111111111111111111111111======》');
1872 // getApp().goto("/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart?is_bnow=1&goods_id=" + e.goods_id); 1872 // getApp().goto("/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart?is_bnow=1&goods_id=" + e.goods_id);
1873 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); 1873 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);
1874 1874
@@ -2462,23 +2462,47 @@ Page({ @@ -2462,23 +2462,47 @@ Page({
2462 // ob.title = text + " " + name; 2462 // ob.title = text + " " + name;
2463 // } 2463 // }
2464 2464
2465 - var title = th.data.sele_g.goods_name;  
2466 - var img = th.data.sele_g.original_img; 2465 + // var title = th.data.sele_g.goods_name;
  2466 + // var img = th.data.sele_g.original_img;
2467 2467
2468 - 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  
2469 - if (getApp().globalData.user_id) {  
2470 - url += "&first_leader=" + getApp().globalData.user_id;  
2471 - } 2468 + // 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
  2469 + // if (getApp().globalData.user_id) {
  2470 + // url += "&first_leader=" + getApp().globalData.user_id;
  2471 + // }
2472 2472
2473 - console.log(url) 2473 + // console.log(url)
2474 2474
2475 - var ob = {  
2476 - title: price + "元 " + title,  
2477 - path: url,  
2478 - imageUrl: img,  
2479 - }; 2475 + // var ob = {
  2476 + // title: price + "元 " + title,
  2477 + // path: url,
  2478 + // imageUrl: img,
  2479 + // };
2480 2480
2481 - return ob; 2481 + // return ob;
  2482 +
  2483 +
  2484 + 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
  2485 + // console.log('pagePath=====xxxxxx>', pagePath);
  2486 + var imgPath = this.data.iurl + this.data.luckGoInfo.original_img;
  2487 + if (pagePath.indexOf('/') != 0) {
  2488 + pagePath = '/' + pagePath;
  2489 + }
  2490 + // if(getApp().globalData.user_id){
  2491 +
  2492 + // if(pagePath.indexOf("?")>0){
  2493 + // pagePath+="&first_leader="+getApp().globalData.user_id;
  2494 + // }else{
  2495 + // pagePath+="?first_leader="+getApp().globalData.user_id;
  2496 + // }
  2497 + // }
  2498 + return {
  2499 + title: "邀您一起参加幸运购",
  2500 + path: pagePath,
  2501 + imageUrl: imgPath,
  2502 + }
  2503 +
  2504 +
  2505 +
2482 }, 2506 },
2483 2507
2484 //-----图片失败,默认图片----- 2508 //-----图片失败,默认图片-----
@@ -4839,7 +4863,8 @@ Page({ @@ -4839,7 +4863,8 @@ Page({
4839 context.setFillStyle("red") 4863 context.setFillStyle("red")
4840 4864
4841 4865
4842 - var pri0 = th.data.luckGoInfo.group_price; 4866 + var pri0 = th.data.luckGoInfo.group_price/100;
  4867 + // console.log('pri0========>>>>>', pri0);
4843 // if (th.data.prom_act) 4868 // if (th.data.prom_act)
4844 // pri0 = th.data.prom_act.price; 4869 // pri0 = th.data.prom_act.price;
4845 pri0 = parseFloat(pri0).toFixed(2); 4870 pri0 = parseFloat(pri0).toFixed(2);
packageC/pages/luckyGo/luckyGo_members/luckyGo_members.js
@@ -47,6 +47,7 @@ Page({ @@ -47,6 +47,7 @@ Page({
47 self.getData(true, '/api/weshop/prom/luckyOrder/page', { 47 self.getData(true, '/api/weshop/prom/luckyOrder/page', {
48 store_id: app.globalData.setting.stoid, 48 store_id: app.globalData.setting.stoid,
49 team_id: self.data.team_id, 49 team_id: self.data.team_id,
  50 + pageSize: 20,
50 }); 51 });
51 52
52 53
@@ -84,6 +85,7 @@ Page({ @@ -84,6 +85,7 @@ Page({
84 this.scrollToLower('/api/weshop/prom/luckyOrder/page', { 85 this.scrollToLower('/api/weshop/prom/luckyOrder/page', {
85 store_id: app.globalData.setting.stoid, 86 store_id: app.globalData.setting.stoid,
86 team_id: self.data.team_id, 87 team_id: self.data.team_id,
  88 + pageSize: 20,
87 }); 89 });
88 }, 90 },
89 91
packageC/pages/luckyGo/luckyGo_winners/luckyGo_winners.js
@@ -68,6 +68,7 @@ Page({ @@ -68,6 +68,7 @@ Page({
68 store_id: app.globalData.setting.stoid, 68 store_id: app.globalData.setting.stoid,
69 team_status: 2, 69 team_status: 2,
70 goods_id: self.data.options.goods_id, 70 goods_id: self.data.options.goods_id,
  71 + pageSize: 20,
71 }); 72 });
72 73
73 74
@@ -104,8 +105,9 @@ Page({ @@ -104,8 +105,9 @@ Page({
104 onReachBottom: function () { 105 onReachBottom: function () {
105 this.scrollToLower('/api/weshop/prom/luckyOrder/page', { 106 this.scrollToLower('/api/weshop/prom/luckyOrder/page', {
106 store_id: app.globalData.setting.stoid, 107 store_id: app.globalData.setting.stoid,
107 - team_status: 1, 108 + team_status: 2,
108 goods_id: this.data.options.goods_id, 109 goods_id: this.data.options.goods_id,
  110 + pageSize: 20,
109 }); 111 });
110 }, 112 },
111 113