Showing
2 changed files
with
9 additions
and
5 deletions
| ... | ... | @@ -17,7 +17,7 @@ |
| 17 | 17 | </view> |
| 18 | 18 | <view class="form-row u-flex"> |
| 19 | 19 | <view class="v-input"><input type="text" v-model="loginForm.password" maxlength="32" placeholder="请输入登录密码" :password="!showPassword" /></view> |
| 20 | - <view class="v-password" @click="showPasswordMode"><u-icon size="25" :name="showPassword ? 'eye-fill' : 'eye-off'"></u-icon></view> | |
| 20 | + <view class="v-password" @click="showPasswordMode"><u-icon color="#9a9a9a" size="25" :name="showPassword ? 'eye-fill' : 'eye-off'"></u-icon></view> | |
| 21 | 21 | <u-icon></u-icon> |
| 22 | 22 | </view> |
| 23 | 23 | <button class="submit" size="default" @click="onSubmitFunc"><text class="text">登录</text></button> |
| ... | ... | @@ -81,11 +81,13 @@ export default { |
| 81 | 81 | methods: { |
| 82 | 82 | ...mapMutations(['setUserInfo']), |
| 83 | 83 | //微信授权登录 |
| 84 | + //#ifdef MP | |
| 84 | 85 | onAuthorization(e) { |
| 85 | 86 | wx.getUserProfile({ |
| 86 | 87 | desc: '获取用户信息', |
| 87 | 88 | success: res => { |
| 88 | 89 | if (res) { |
| 90 | + //微信官方自带解密（node） | |
| 89 | 91 | let pc = new WXBizDataCrypt(appId, this.session_key); |
| 90 | 92 | let data = pc.decryptData(res.encryptedData, res.iv); |
| 91 | 93 | let obj = { |
| ... | ... | @@ -98,6 +100,9 @@ export default { |
| 98 | 100 | .get(`/yt/third/login/${this.openid}`) |
| 99 | 101 | .then(res => { |
| 100 | 102 | if (res.token == '' || res.token == null) { |
| 103 | + // return uni.showToast({ | |
| 104 | + // title: '需要绑定' | |
| 105 | + // }); | |
| 101 | 106 | } else { |
| 102 | 107 | // 储存登录信息 |
| 103 | 108 | let resObj = { |
| ... | ... | @@ -116,9 +121,6 @@ export default { |
| 116 | 121 | icon: 'none' |
| 117 | 122 | }); |
| 118 | 123 | this.saveUserInfo(); |
| 119 | - // return uni.showToast({ | |
| 120 | - // title: '不需要绑定' | |
| 121 | - // }); | |
| 122 | 124 | } |
| 123 | 125 | }) |
| 124 | 126 | .catch(e => { |
| ... | ... | @@ -127,7 +129,7 @@ export default { |
| 127 | 129 | // #ifdef APP-PLUS||MP |
| 128 | 130 | setTimeout(() => { |
| 129 | 131 | uni.reLaunch({ |
| 130 | - url: '/pages/personal/personal?obj=' + JSON.stringify(obj) | |
| 132 | + url: '/pages/personal/personal?obj=' + encodeURIComponent(JSON.stringify(obj)) | |
| 131 | 133 | }); |
| 132 | 134 | }, 500); |
| 133 | 135 | // #endif |
| ... | ... | @@ -135,6 +137,7 @@ export default { |
| 135 | 137 | } |
| 136 | 138 | }); |
| 137 | 139 | }, |
| 140 | + //#endif | |
| 138 | 141 | saveUserInfo() { |
| 139 | 142 | //储存个人信息 |
| 140 | 143 | uni.$u.http.get('/yt/user/me/info').then(res => { | ... | ... |