Commit 1d298b94d76a82039846f6fa52521ea7936f56f3

Authored by 前端开发-罗建龙
1 parent f8c10359

OA单预售接口带上user_id

components/diy_luckyGo/diy_luckyGo.js
@@ -106,7 +106,7 @@ Component({ @@ -106,7 +106,7 @@ Component({
106 var user_id=getApp().globalData.user_id; 106 var user_id=getApp().globalData.user_id;
107 if(!user_id){ user_id=0;} 107 if(!user_id){ user_id=0;}
108 // var req={ store_id: os.stoid, is_end: 0, is_show: 1, timetype: 2,user_id:user_id}; 原来的 108 // var req={ store_id: os.stoid, is_end: 0, is_show: 1, timetype: 2,user_id:user_id}; 原来的
109 - var req={ store_id: os.stoid, is_end: 0, timetype: 1}; 109 + var req={ store_id: os.stoid, is_end: 0, timetype: 1,user_id:user_id};
110 getApp().request.promiseGet("/api/weshop/prom/luckyActivity/page", 110 getApp().request.promiseGet("/api/weshop/prom/luckyActivity/page",
111 { isShowLoading: 1, data:req } 111 { isShowLoading: 1, data:req }
112 ).then(res => { 112 ).then(res => {
components/diy_public/diy_public.js
@@ -265,9 +265,9 @@ Component({ @@ -265,9 +265,9 @@ Component({
265 store_id:os.stoid, 265 store_id:os.stoid,
266 is_end:0, 266 is_end:0,
267 timetype:1, 267 timetype:1,
  268 + user_id:user_id,
268 // isuse:1, 269 // isuse:1,
269 // page:1, 270 // page:1,
270 - // user_id:user_id,  
271 // pageSize:9 271 // pageSize:9
272 } 272 }
273 } 273 }
packageA/pages/activity_share/activity_share.js
@@ -572,7 +572,8 @@ Page({ @@ -572,7 +572,8 @@ Page({
572 572
573 case 7: //幸运购 573 case 7: //幸运购
574 url = '/api/weshop/prom/luckyActivity/page'; 574 url = '/api/weshop/prom/luckyActivity/page';
575 - req_data.is_end = 0; 575 + req_data.is_end = 0;
  576 + req_data.user_id = user_id;
576 req_data.timetype = 1; 577 req_data.timetype = 1;
577 if(th.data.key_str && th.data.key_str.trim()){ 578 if(th.data.key_str && th.data.key_str.trim()){
578 req_data.key_str = th.data.key_str.trim(); 579 req_data.key_str = th.data.key_str.trim();
packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js
@@ -69,7 +69,8 @@ Page({ @@ -69,7 +69,8 @@ Page({
69 self.getData(true, '/api/weshop/prom/luckyActivity/page', { 69 self.getData(true, '/api/weshop/prom/luckyActivity/page', {
70 store_id: app.globalData.setting.stoid, 70 store_id: app.globalData.setting.stoid,
71 is_end: 0, 71 is_end: 0,
72 - timetype: 1, 72 + timetype: 1,
  73 + user_id: user ? user.user_id : '0'
73 }); 74 });
74 75
75 76
@@ -97,10 +98,12 @@ Page({ @@ -97,10 +98,12 @@ Page({
97 * 页面上拉触底事件的处理函数 98 * 页面上拉触底事件的处理函数
98 */ 99 */
99 onReachBottom: function () { 100 onReachBottom: function () {
  101 + let user = this.data.user
100 this.scrollToLower('/api/weshop/prom/luckyActivity/page', { 102 this.scrollToLower('/api/weshop/prom/luckyActivity/page', {
101 store_id: app.globalData.setting.stoid, 103 store_id: app.globalData.setting.stoid,
102 is_end: 0, 104 is_end: 0,
103 - timetype: 1, 105 + timetype: 1,
  106 + user_id: user ? user.user_id : '0'
104 }); 107 });
105 }, 108 },
106 109
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
@@ -2167,8 +2167,8 @@ Page({ @@ -2167,8 +2167,8 @@ Page({
2167 var th=this; 2167 var th=this;
2168 let aid = options.aid; 2168 let aid = options.aid;
2169 let store_id = options.store_id; 2169 let store_id = options.store_id;
2170 - let user_id = options.user_id;  
2171 - let url = `/api/weshop/prom/luckyActivity/page?store_id=${store_id}&is_end=0&timetype=1&id=${aid}`; 2170 + let user_id = options.user_id || '0';
  2171 + let url = `/api/weshop/prom/luckyActivity/page?store_id=${store_id}&is_end=0&timetype=1&id=${aid}&user_id=${user_id}`;
2172 getApp().request.get(url, { 2172 getApp().request.get(url, {
2173 success: function (res) { 2173 success: function (res) {
2174 if (res.data.code == 0) { 2174 if (res.data.code == 0) {
packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js
@@ -1166,7 +1166,9 @@ Page({ @@ -1166,7 +1166,9 @@ Page({
1166 var team_id; 1166 var team_id;
1167 var luckyGoInfo; 1167 var luckyGoInfo;
1168 var user_id = getApp().globalData.user_id; 1168 var user_id = getApp().globalData.user_id;
1169 - 1169 + if (!user_id) {
  1170 + user_id=0
  1171 + }
1170 1172
1171 1173
1172 // 邀请链接待完善 1174 // 邀请链接待完善
@@ -1177,6 +1179,7 @@ Page({ @@ -1177,6 +1179,7 @@ Page({
1177 is_end: 0, 1179 is_end: 0,
1178 timetype: 1, 1180 timetype: 1,
1179 id: th.data.param.group_id, 1181 id: th.data.param.group_id,
  1182 + user_id,
1180 } 1183 }
1181 }).then(res => { 1184 }).then(res => {
1182 if(res.data.code == 0) { 1185 if(res.data.code == 0) {
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
@@ -976,6 +976,7 @@ Page({ @@ -976,6 +976,7 @@ Page({
976 is_end: 0, 976 is_end: 0,
977 timetype: 1, 977 timetype: 1,
978 id: this.data.group_id, 978 id: this.data.group_id,
  979 + user_id:getApp().globalData.user_id?getApp().globalData.user_id:0
979 } 980 }
980 }).then(res => { 981 }).then(res => {
981 // console.log() 982 // console.log()
pages/index/index/index.js
@@ -513,6 +513,7 @@ Page({ @@ -513,6 +513,7 @@ Page({
513 store_id: getApp().globalData.setting.stoid, 513 store_id: getApp().globalData.setting.stoid,
514 is_end: 0, 514 is_end: 0,
515 timetype: 1, 515 timetype: 1,
  516 + user_id:getApp().globalData.user_id?getApp().globalData.user_id:0
516 } 517 }
517 }).then(res => { 518 }).then(res => {
518 if (res.data.code == 0) { 519 if (res.data.code == 0) {
pages/user/order_list/order_list.js
@@ -1643,6 +1643,7 @@ Page({ @@ -1643,6 +1643,7 @@ Page({
1643 is_end: 0, 1643 is_end: 0,
1644 timetype: 1, 1644 timetype: 1,
1645 id: goodsinfo.prom_id, 1645 id: goodsinfo.prom_id,
  1646 + user_id:getApp().globalData.user_id?getApp().globalData.user_id:0
1646 } 1647 }
1647 }); 1648 });
1648 1649