-
Status changed to merged
-
mentioned in commit 01e5114801a5f1ccf6358db6cd052131a6fc2cc6
Showing
2 changed files
pages/user/userinfo/userinfo.js
| @@ -644,7 +644,8 @@ Page({ | @@ -644,7 +644,8 @@ Page({ | ||
| 644 | identity_card: a.idcard, | 644 | identity_card: a.idcard, |
| 645 | address: a.address, | 645 | address: a.address, |
| 646 | isGender: a.sex, | 646 | isGender: a.sex, |
| 647 | - isstcsp: a.vipnopwd | 647 | + isstcsp: a.vipnopwd, |
| 648 | + iscalendar:a.islunar | ||
| 648 | }); | 649 | }); |
| 649 | } | 650 | } |
| 650 | }) | 651 | }) |
| @@ -809,13 +810,16 @@ Page({ | @@ -809,13 +810,16 @@ Page({ | ||
| 809 | vipname: user_name, //昵称 | 810 | vipname: user_name, //昵称 |
| 810 | idcard: identity_card, //身份证 | 811 | idcard: identity_card, //身份证 |
| 811 | address: address, //地址 | 812 | address: address, //地址 |
| 812 | - pickup_id: sto_sele_id //自提门店 所属门店 | 813 | + pickup_id: sto_sele_id ,//自提门店 所属门店 |
| 814 | + islunar:th.data.iscalendar, | ||
| 815 | + birthday:th.data.datet | ||
| 813 | } | 816 | } |
| 814 | getApp().request.put("/api/weshop/users/updateUserInfo", { | 817 | getApp().request.put("/api/weshop/users/updateUserInfo", { |
| 815 | data: datas, | 818 | data: datas, |
| 816 | success: function(res) { | 819 | success: function(res) { |
| 817 | if (res.data.code == 0) { | 820 | if (res.data.code == 0) { |
| 818 | getApp().my_warnning("修改成功", 1, th); | 821 | getApp().my_warnning("修改成功", 1, th); |
| 822 | + getApp().goto("/pages/user/index/index"); | ||
| 819 | } else { | 823 | } else { |
| 820 | getApp().my_warnning("系统繁忙,请稍后再试", 0, th); | 824 | getApp().my_warnning("系统繁忙,请稍后再试", 0, th); |
| 821 | } | 825 | } |
pages/user/userinfo/userinfo.wxml
| @@ -117,7 +117,7 @@ | @@ -117,7 +117,7 @@ | ||
| 117 | <view class="flex flex-vertical-between fs28 Birth"> | 117 | <view class="flex flex-vertical-between fs28 Birth"> |
| 118 | <view class="flex" bindtap="iscalendar"> | 118 | <view class="flex" bindtap="iscalendar"> |
| 119 | 119 | ||
| 120 | - <block wx:if="user.birthday==null&&user.birthday==''"> | 120 | + <!-- <block wx:if="user.birthday==null&&user.birthday==''"> --> |
| 121 | 121 | ||
| 122 | <block wx:if="{{iscalendar}}"> | 122 | <block wx:if="{{iscalendar}}"> |
| 123 | <view class="flex-center"> | 123 | <view class="flex-center"> |
| @@ -128,7 +128,7 @@ | @@ -128,7 +128,7 @@ | ||
| 128 | <icon size="20" type="success" color="rgb(0, 0, 0, 0.4)"></icon> | 128 | <icon size="20" type="success" color="rgb(0, 0, 0, 0.4)"></icon> |
| 129 | </block> | 129 | </block> |
| 130 | 130 | ||
| 131 | - </block> | 131 | + <!-- </block> --> |
| 132 | 132 | ||
| 133 | 133 | ||
| 134 | <view class="flex-center"> | 134 | <view class="flex-center"> |