From 1ad98e72e116155c30b14beb2da59e80ca971a6b Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期一, 20 三月 2023 16:32:53 +0800
Subject: [PATCH] login修改
---
miniprogram/app.ts | 4 ++--
miniprogram/pages/user/pubulicty/index.ts | 27 +++++++++++++--------------
miniprogram/pages/user/loginInfo/index.ts | 20 ++++++++++++++++++--
miniprogram/pages/index/index.ts | 3 +++
4 files changed, 36 insertions(+), 18 deletions(-)
diff --git a/miniprogram/app.ts b/miniprogram/app.ts
index c296eb7..a9c5d3c 100644
--- a/miniprogram/app.ts
+++ b/miniprogram/app.ts
@@ -4,8 +4,8 @@
// url:'https://qyqjzdd.cdqingyang.gov.cn/qyjz',
url:'http://192.168.3.220:8080',
// url:'http://221.237.182.28:8443/api',
- // imageUrl:'https://qyqjzdd.cdqingyang.gov.cn/minio'
- imageUrl:'http://192.168.3.220:8080/minio'
+ imageUrl:'https://qyqjzdd.cdqingyang.gov.cn/minio'
+ // imageUrl:'http://192.168.3.220:8080/minio'
},
onLaunch() {
// 灞曠ず鏈湴瀛樺偍鑳藉姏
diff --git a/miniprogram/pages/index/index.ts b/miniprogram/pages/index/index.ts
index 1722e4d..2d054e3 100644
--- a/miniprogram/pages/index/index.ts
+++ b/miniprogram/pages/index/index.ts
@@ -71,6 +71,9 @@
wx.login({
success: (res) => {
console.log("code", res.code)
+ wx.setStorageSync('uesrCode', res.code)
+ wx.setStorageSync('userPhoneNumberCode',e.detail.code)
+
wx.request({
url:app.globalData.url+"/wx/checkIdentity",
data: {
diff --git a/miniprogram/pages/user/loginInfo/index.ts b/miniprogram/pages/user/loginInfo/index.ts
index edf9ae9..4719350 100644
--- a/miniprogram/pages/user/loginInfo/index.ts
+++ b/miniprogram/pages/user/loginInfo/index.ts
@@ -55,7 +55,23 @@
})
return
}
-
+ wx.request({
+ url: loginInfo.globalData.url+"/wx/login",
+ data: {
+ "code": wx.getStorageSync('uesrCode'),
+ "phoneNumberCode": wx.getStorageSync('userPhoneNumberCode')
+ },
+ method: "GET",
+ success: (res) => {
+ console.log(res);
+ wx.setStorageSync('token', res.data.data.token)
+ wx.setStorageSync('role', res.data.data.role)
+ wx.setStorageSync('id', res.data.data.id)
+ wx.setStorageSync('card',res.data.data.time)
+ console.log(res.data.data.id)
+ }
+
+ })
wx.request({
url:loginInfo.globalData.url+"/wx/user/add",
method:"POST",
@@ -83,7 +99,7 @@
filePath: res.tempFiles[0].tempFilePath,
name: "file",
header: {
- 'token': wx.getStorageSync('token'),
+ // 'token': wx.getStorageSync('token'),
'content-type': 'application/json'
},
success:(res)=>{
diff --git a/miniprogram/pages/user/pubulicty/index.ts b/miniprogram/pages/user/pubulicty/index.ts
index 36c2870..b9ef926 100644
--- a/miniprogram/pages/user/pubulicty/index.ts
+++ b/miniprogram/pages/user/pubulicty/index.ts
@@ -50,26 +50,25 @@
},
// 浜嬩欢澶勭悊鍑芥暟
onLoad() {
- this.getMobile()
- let info=wx.getStorageSync('card')
- console.log(info);
+ // this.getMobile()
+ // let info=wx.getStorageSync('card')
+ // console.log(info);
- if (info) {
- this.setData({
- cardFig :false
- })
- }else{
- this.setData({
- cardFig :true
- })
- }
+ // if (info) {
+ // this.setData({
+ // cardFig :false
+ // })
+ // }else{
+ // this.setData({
+ // cardFig :true
+ // })
+ // }
wx.request(
{
url: userCause.globalData.url + "/wx/publicity",
method: "GET",
- header: { 'token': wx.getStorageSync('token') },
+ // header: { 'token': wx.getStorageSync('token') },
success: (res) => {
-
res.data.data.map(i => {
if (i.photoStr != null) {
i.photoStr = i.photoStr.split(",").map(i => userCause.globalData.imageUrl + "/img/" + i),
--
Gitblit v1.8.0