From 997036b27927bcc1e9207a40b7a69c106a10f30c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 31 七月 2024 15:49:52 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
wechat_staff/pages/login/index.js | 59 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 49 insertions(+), 10 deletions(-)
diff --git a/wechat_staff/pages/login/index.js b/wechat_staff/pages/login/index.js
index 084b641..98dbf50 100644
--- a/wechat_staff/pages/login/index.js
+++ b/wechat_staff/pages/login/index.js
@@ -3,7 +3,8 @@
getDictData,
getWxMiniPhone,
loginByPhone,
- bindingOpenid
+ bindingOpenid,
+ wxLoginCustomer
} from '../../api/index'
Page({
@@ -16,6 +17,7 @@
status: '0', // 鏍囪瘑
countDown: 0,
phone: '',
+ openid:'',
code: '',
showModal: false,
activeHtml: '',
@@ -62,7 +64,8 @@
loginPhone() {
const {
code,
- phone
+ phone,
+ openid
} = this.data
if (!this.data.agreementFalg) {
return wx.showToast({
@@ -85,17 +88,18 @@
loginByPhone({
code,
+ openid,
phone
}).then(res => {
if (res.data && res.data.token) {
- wx.login({
- timeout: 5000,
- success: (loginRes) => {
- if (loginRes.code) {
- this.bindingOpenid(loginRes.code, res.data.token)
- }
- }
- })
+ // wx.login({
+ // timeout: 5000,
+ // success: (loginRes) => {
+ // if (loginRes.code) {
+ // this.bindingOpenid(loginRes.code, res.data.token)
+ // }
+ // }
+ // })
if(res.data.phone){
res.data.users.phone = res.data.phone || res.data.users.phone
}
@@ -132,8 +136,43 @@
primary: app.primary,
bottomLift: app.bottomLift
})
+ this.autoLogin()
this.initData()
},
+ autoLogin(){
+ var that =this
+ wx.login({
+ timeout: 5000,
+ success(res) {
+ if (res.code) {
+ //鍙戣捣缃戠粶璇锋眰
+ wxLoginCustomer({
+ code: res.code
+ }).then(res => {
+ console.log(res)
+ wx.setStorageSync('sessionKey', res.data.sessionKey)
+ that.setData({openid:res.data.openid})
+ if (res && res.data !=null && res.data.token!=null) {
+ console.log(res)
+ wx.setStorageSync('member', res.data.users || '')
+ wx.setStorageSync('token', res.data.token || '')
+ wx.switchTab({
+ url: '/pages/index/index',
+ })
+ }
+ })
+ } else {
+ wx.navigateTo({
+ url: '/pages/login/index',
+ })
+ console.log('鐧诲綍澶辫触锛�' + res)
+ }
+ },
+ fail(err) {
+ console.log(err)
+ }
+ })
+ },
getPhoneNumber(e) {
const data = {
...e.detail
--
Gitblit v1.9.3