Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
| | |
|---|
| | | getWxMiniPhone({ |
|---|
| | | encryptedData: data.encryptedData, |
|---|
| | | iv: data.iv, |
|---|
| | | openid:this.data.openid, |
|---|
| | | sessionKey: wx.getStorageSync('sessionKey'), |
|---|
| | | }).then(res => { |
|---|
| | | if (res.data && res.data.token) { |
|---|
| | | wx.login({ |
|---|
| | | timeout: 5000, |
|---|
| | | success: (loginRes) => { |
|---|
| | | if (loginRes.code) { |
|---|
| | | this.bindingOpenid(loginRes.code, res.data.token) |
|---|
| | | } |
|---|
| | | } |
|---|
| | | }) |
|---|
| | | if (res.data && res.data.token) { |
|---|
| | | if(res.data.phone){ |
|---|
| | | res.data.users.phone = res.data.phone || res.data.users.phone |
|---|
| | | } |
|---|
