|
@@ -161,7 +161,10 @@ const isStringEmpty = (str) => { |
|
@@ -161,7 +161,10 @@ const isStringEmpty = (str) => { |
161
|
export const getUserInfo = (e) => {
|
161
|
export const getUserInfo = (e) => {
|
162
|
if (e.detail.errMsg === 'getUserInfo:ok') {
|
162
|
if (e.detail.errMsg === 'getUserInfo:ok') {
|
163
|
loginAction((error, loginData) => {
|
163
|
loginAction((error, loginData) => {
|
164
|
- if (error) return;
|
164
|
+ if (error) {
|
|
|
165
|
+ event.emit('user-get-phonenumber-error', e.detail);
|
|
|
166
|
+ return;
|
|
|
167
|
+ }
|
165
|
decodeUnionId(loginData.srd_session, e).then(data => {
|
168
|
decodeUnionId(loginData.srd_session, e).then(data => {
|
166
|
wechatUserIsBind(data.union_id, data.userInfo).then(message => {
|
169
|
wechatUserIsBind(data.union_id, data.userInfo).then(message => {
|
167
|
|
170
|
|
|
@@ -196,8 +199,10 @@ export const getUserInfo = (e) => { |
|
@@ -196,8 +199,10 @@ export const getUserInfo = (e) => { |
196
|
});
|
199
|
});
|
197
|
} else {
|
200
|
} else {
|
198
|
loginAction((error, loginAction) => {
|
201
|
loginAction((error, loginAction) => {
|
199
|
- if (error) return;
|
|
|
200
|
- event.emit('user-get-phonenumber-error', e.detail);
|
202
|
+ if (error) {
|
|
|
203
|
+ event.emit('user-get-phonenumber-error', e.detail);
|
|
|
204
|
+ return;
|
|
|
205
|
+ }
|
201
|
});
|
206
|
});
|
202
|
}
|
207
|
}
|
203
|
}
|
208
|
}
|