Commit 71d8574ead2e8abca0e3d2530007c88fe0ccaefa
1 parent
6e76da51
1. 报警错误的优化
2. 测肤的优化
Showing
3 changed files
with
32 additions
and
16 deletions
components/serviceCard_list/serviceCard_list.js
| @@ -70,7 +70,7 @@ Component({ | @@ -70,7 +70,7 @@ Component({ | ||
| 70 | //--- 判断是等级会员，且在有效期范围内 --- | 70 | //--- 判断是等级会员，且在有效期范围内 --- |
| 71 | if (user.card_field && now < end) { | 71 | if (user.card_field && now < end) { |
| 72 | var card_name = ob.name_map.get(user.card_field); | 72 | var card_name = ob.name_map.get(user.card_field); |
| 73 | - if (card_name.length > 4) card_name = card_name.substring(0, 8); | 73 | + if (card_name && card_name.length > 4) card_name = card_name.substring(0, 8); |
| 74 | th.setData({ | 74 | th.setData({ |
| 75 | card_field: user.card_field, | 75 | card_field: user.card_field, |
| 76 | card_name: card_name, | 76 | card_name: card_name, |
packageD/pages/AI-test-skin/analyse/analyse.js
| @@ -370,8 +370,21 @@ Page({ | @@ -370,8 +370,21 @@ Page({ | ||
| 370 | } | 370 | } |
| 371 | th.analyse_by_bd(data); | 371 | th.analyse_by_bd(data); |
| 372 | } else { | 372 | } else { |
| 373 | - var msg = th.data.err_map[res.data.code + ""]; | ||
| 374 | - th.go_error1(msg); | 373 | + var msg = th.data.err_map[res.data.code + ""]; |
| 374 | + if(msg){ | ||
| 375 | + th.go_error1(msg); | ||
| 376 | + }else{ | ||
| 377 | + wx.showToast({ | ||
| 378 | + title:res.data.msg, | ||
| 379 | + icon: 'none', | ||
| 380 | + duration: 3000 | ||
| 381 | + }) | ||
| 382 | + | ||
| 383 | + setTimeout(function () { | ||
| 384 | + ut.wx_back() | ||
| 385 | + },2000) | ||
| 386 | + | ||
| 387 | + } | ||
| 375 | } | 388 | } |
| 376 | }) | 389 | }) |
| 377 | }, | 390 | }, |
pages/user/index/index.js
| @@ -560,19 +560,22 @@ Page({ | @@ -560,19 +560,22 @@ Page({ | ||
| 560 | pageSize: 10 | 560 | pageSize: 10 |
| 561 | }, | 561 | }, |
| 562 | success: function (ee) { | 562 | success: function (ee) { |
| 563 | - var recommend_list = ee.data.data.pageData; | ||
| 564 | - if (recommend_list && recommend_list.length > 0) { | ||
| 565 | - var dd = [...th_recommend_list, ...recommend_list]; | ||
| 566 | - e.setData({ | ||
| 567 | - recommend_list, | ||
| 568 | - dd | ||
| 569 | - }); | ||
| 570 | - e.data.currentPage++; | ||
| 571 | - } else { | ||
| 572 | - e.setData({ | ||
| 573 | - nomore: 1 | ||
| 574 | - }); | ||
| 575 | - } | 563 | + |
| 564 | + if(ut.ajax_ok(ee)) { | ||
| 565 | + var recommend_list = ee.data.data.pageData; | ||
| 566 | + if (recommend_list && recommend_list.length > 0) { | ||
| 567 | + var dd = [...th_recommend_list, ...recommend_list]; | ||
| 568 | + e.setData({ | ||
| 569 | + recommend_list, | ||
| 570 | + dd | ||
| 571 | + }); | ||
| 572 | + e.data.currentPage++; | ||
| 573 | + } else { | ||
| 574 | + e.setData({ | ||
| 575 | + nomore: 1 | ||
| 576 | + }); | ||
| 577 | + } | ||
| 578 | + } | ||
| 576 | } | 579 | } |
| 577 | }) | 580 | }) |
| 578 | }, | 581 | }, |