diff --git a/components/diy_luckyGo/diy_luckyGo.js b/components/diy_luckyGo/diy_luckyGo.js index a40cf99..ba50a93 100644 --- a/components/diy_luckyGo/diy_luckyGo.js +++ b/components/diy_luckyGo/diy_luckyGo.js @@ -106,7 +106,7 @@ Component({ var user_id=getApp().globalData.user_id; if(!user_id){ user_id=0;} // var req={ store_id: os.stoid, is_end: 0, is_show: 1, timetype: 2,user_id:user_id}; 原来的 - var req={ store_id: os.stoid, is_end: 0, timetype: 1}; + var req={ store_id: os.stoid, is_end: 0, timetype: 1,user_id:user_id}; getApp().request.promiseGet("/api/weshop/prom/luckyActivity/page", { isShowLoading: 1, data:req } ).then(res => { diff --git a/components/diy_public/diy_public.js b/components/diy_public/diy_public.js index 1c616a5..7583dde 100644 --- a/components/diy_public/diy_public.js +++ b/components/diy_public/diy_public.js @@ -265,9 +265,9 @@ Component({ store_id:os.stoid, is_end:0, timetype:1, + user_id:user_id, // isuse:1, // page:1, - // user_id:user_id, // pageSize:9 } } diff --git a/packageA/pages/activity_share/activity_share.js b/packageA/pages/activity_share/activity_share.js index 8d774ed..19a66d9 100644 --- a/packageA/pages/activity_share/activity_share.js +++ b/packageA/pages/activity_share/activity_share.js @@ -572,7 +572,8 @@ Page({ case 7: //幸运购 url = '/api/weshop/prom/luckyActivity/page'; - req_data.is_end = 0; + req_data.is_end = 0; + req_data.user_id = user_id; req_data.timetype = 1; if(th.data.key_str && th.data.key_str.trim()){ req_data.key_str = th.data.key_str.trim(); diff --git a/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js b/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js index d6c4b6f..c61c689 100644 --- a/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js +++ b/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js @@ -69,7 +69,8 @@ Page({ self.getData(true, '/api/weshop/prom/luckyActivity/page', { store_id: app.globalData.setting.stoid, is_end: 0, - timetype: 1, + timetype: 1, + user_id: user ? user.user_id : '0' }); @@ -97,10 +98,12 @@ Page({ * 页面上拉触底事件的处理函数 */ onReachBottom: function () { + let user = this.data.user this.scrollToLower('/api/weshop/prom/luckyActivity/page', { store_id: app.globalData.setting.stoid, is_end: 0, - timetype: 1, + timetype: 1, + user_id: user ? user.user_id : '0' }); }, 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 ffab368..2303053 100644 --- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js +++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js @@ -2167,8 +2167,8 @@ Page({ var th=this; let aid = options.aid; let store_id = options.store_id; - let user_id = options.user_id; - let url = `/api/weshop/prom/luckyActivity/page?store_id=${store_id}&is_end=0&timetype=1&id=${aid}`; + let user_id = options.user_id || '0'; + let url = `/api/weshop/prom/luckyActivity/page?store_id=${store_id}&is_end=0&timetype=1&id=${aid}&user_id=${user_id}`; getApp().request.get(url, { success: function (res) { if (res.data.code == 0) { diff --git a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js index 57666a2..2c63d4b 100644 --- a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js +++ b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js @@ -1166,7 +1166,9 @@ Page({ var team_id; var luckyGoInfo; var user_id = getApp().globalData.user_id; - + if (!user_id) { + user_id=0 + } // 邀请链接待完善 @@ -1177,6 +1179,7 @@ Page({ is_end: 0, timetype: 1, id: th.data.param.group_id, + user_id, } }).then(res => { if(res.data.code == 0) { diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js index eb01416..8c00b81 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js @@ -976,6 +976,7 @@ Page({ is_end: 0, timetype: 1, id: this.data.group_id, + user_id:getApp().globalData.user_id?getApp().globalData.user_id:0 } }).then(res => { // console.log() diff --git a/pages/index/index/index.js b/pages/index/index/index.js index 6ece82d..4796e70 100644 --- a/pages/index/index/index.js +++ b/pages/index/index/index.js @@ -513,6 +513,7 @@ Page({ store_id: getApp().globalData.setting.stoid, is_end: 0, timetype: 1, + user_id:getApp().globalData.user_id?getApp().globalData.user_id:0 } }).then(res => { if (res.data.code == 0) { diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index ff01b1d..33e723c 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -1643,6 +1643,7 @@ Page({ is_end: 0, timetype: 1, id: goodsinfo.prom_id, + user_id:getApp().globalData.user_id?getApp().globalData.user_id:0 } });