Authored by 毕凯

Merge branch 'hotfix/uidRaffle' into 'gray'

Hotfix/uid raffle



See merge request !356
@@ -18,6 +18,9 @@ const _activity = () => { @@ -18,6 +18,9 @@ const _activity = () => {
18 }; 18 };
19 19
20 const _user = (params) => { 20 const _user = (params) => {
  21 + if (!params.uid) {
  22 + return Promise.resolve({});
  23 + }
21 return api.get('', { 24 return api.get('', {
22 method: 'app.passport.profile', 25 method: 'app.passport.profile',
23 uid: params.uid 26 uid: params.uid
@@ -384,6 +387,9 @@ const order = (params) => { @@ -384,6 +387,9 @@ const order = (params) => {
384 const getOrders = (params) => { 387 const getOrders = (params) => {
385 let finalResult = []; 388 let finalResult = [];
386 389
  390 + if (!params.uid) {
  391 + return Promise.resolve({});
  392 + }
387 return _getOrderData(params).then(result => { 393 return _getOrderData(params).then(result => {
388 if (result.data && result.data.page_total && params.page <= result.data.page_total && result.data.order_list) { 394 if (result.data && result.data.page_total && params.page <= result.data.page_total && result.data.order_list) {
389 let count = 0; 395 let count = 0;
@@ -335,7 +335,9 @@ $(window).scroll(function() { @@ -335,7 +335,9 @@ $(window).scroll(function() {
335 }); 335 });
336 336
337 // 初始化请求第一页数据 337 // 初始化请求第一页数据
338 -getOrders(); 338 +if ($('.order-page').length > 0) {
  339 + getOrders();
  340 +}
339 341
340 $(function() { 342 $(function() {
341 // 适配背景图 343 // 适配背景图