Commit adef3daeb1787f341d2d67d11ae303ca1a5acde6
1 parent
f874dd65
生日的显示 报错的显示
Showing
3 changed files
with
7 additions
and
11 deletions
pages/user/labels/labels.js
| ... | ... | @@ -117,7 +117,7 @@ Page({ |
| 117 | 117 | }) |
| 118 | 118 | th.query_checklabels(); |
| 119 | 119 | } else { |
| 120 | - getApp().my_warnning("系统繁忙,请稍后再试", 0, th); | |
| 120 | + getApp().my_warnning("系统未设置兴趣标签集合", 0, th); | |
| 121 | 121 | th.setData({ |
| 122 | 122 | isread: 1 |
| 123 | 123 | }) |
| ... | ... | @@ -165,7 +165,7 @@ Page({ |
| 165 | 165 | interest_lables: interest_lables |
| 166 | 166 | }) |
| 167 | 167 | } else { |
| 168 | - getApp().my_warnning("系统繁忙,请稍后再试", 0, th); | |
| 168 | + //getApp().my_warnning("系统繁忙,请稍后再试", 0, th); | |
| 169 | 169 | return false; |
| 170 | 170 | } |
| 171 | 171 | }) | ... | ... |
pages/user/userinfo/userinfo.js
| ... | ... | @@ -127,8 +127,6 @@ Page({ |
| 127 | 127 | th.setData({ |
| 128 | 128 | check_label: VipLabel |
| 129 | 129 | }) |
| 130 | - } else { | |
| 131 | - getApp().my_warnning("系统繁忙,请稍后再试", 0, th); | |
| 132 | 130 | } |
| 133 | 131 | }) |
| 134 | 132 | }, |
| ... | ... | @@ -708,9 +706,9 @@ Page({ |
| 708 | 706 | user2:a, |
| 709 | 707 | datet:a.birthday |
| 710 | 708 | }); |
| 711 | - | |
| 712 | 709 | } |
| 713 | 710 | }) |
| 711 | + | |
| 714 | 712 | a.getUserInfo(function(a) { |
| 715 | 713 | var txt = util.formatTime(a.birthday, 'yyyy-M-d'), |
| 716 | 714 | arr = txt.split(' '); |
| ... | ... | @@ -718,7 +716,7 @@ Page({ |
| 718 | 716 | var txt2 = util.formatTime(a.reg_time, 'yyyy-M-d'), |
| 719 | 717 | arr2 = txt.split(' '); |
| 720 | 718 | a.reg_time = arr2[0]; |
| 721 | - if (a.pickup_id != null) { | |
| 719 | + if (a.pickup_id && a.pickup_id>0) { | |
| 722 | 720 | req.get("/api/weshop/pickup/get/" + r.stoid + "/" + a.pickup_id, { |
| 723 | 721 | success: function(da) { |
| 724 | 722 | if(da.data.data){ |
| ... | ... | @@ -891,10 +889,8 @@ Page({ |
| 891 | 889 | } |
| 892 | 890 | |
| 893 | 891 | if(this.data.confirmed) return false; |
| 894 | - this.data.confirmed=1; | |
| 895 | - | |
| 892 | + this.data.confirmed=1; | |
| 896 | 893 | |
| 897 | - | |
| 898 | 894 | var datas = { |
| 899 | 895 | mobile: phone, //手机号码 |
| 900 | 896 | store_id: r.stoid, |
| ... | ... | @@ -907,7 +903,7 @@ Page({ |
| 907 | 903 | address: address, //地址 |
| 908 | 904 | pickup_id: sto_sele_id ,//自提门店 所属门店 |
| 909 | 905 | islunar:th.data.iscalendar, |
| 910 | - birthday:th.data.datet | |
| 906 | + birthday:th.data.datet | |
| 911 | 907 | } |
| 912 | 908 | //往上提交美导的ID |
| 913 | 909 | if(th.data.fir_guide_id!=th.data.user.staffId){ | ... | ... |
pages/user/userinfo/userinfo.wxml
| ... | ... | @@ -150,7 +150,7 @@ |
| 150 | 150 | </picker> |
| 151 | 151 | </block> |
| 152 | 152 | <block wx:else> |
| 153 | - <view>{{datet==""? user.birthday==""?"":filters.replace_time2(user.birthday):datet}}</view> | |
| 153 | + <view>{{datet==""? user.birthday==""?"":filters.format_time(user.birthday):datet}}</view> | |
| 154 | 154 | </block> |
| 155 | 155 | </view> |
| 156 | 156 | ... | ... |