From fbdc9fd53ce80d89b70184db67258f7b3b3a2ebb Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 27 Oct 2023 14:51:58 +0800
Subject: [PATCH] 登录、切换角色
---
http/api.js | 36 ++++--------------------------------
1 files changed, 4 insertions(+), 32 deletions(-)
diff --git a/http/api.js b/http/api.js
index 3204a5b..de859da 100644
--- a/http/api.js
+++ b/http/api.js
@@ -19,8 +19,9 @@
config.header['Authorization'] = 'Basic ' + Base64.encode(clientId + ':' + clientSecret);
}
if (config.custom.Authorization == true) {
- console.log(config.custom,"==========")
- config.header['Authorization']="Bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX25hbWUiOiJBRE1JTiIsIlVzZXJJZCI6IjEiLCJzY29wZSI6WyJhbGwiXSwiVXNlclJlYWxOYW1lIjoi6LaF57qn566h55CG5ZGYIiwiVXNlclh6cWhkbSI6IjQyMDUiLCJleHAiOjI1MTk3NzIwMTAsImp0aSI6ImExNTcxYzk1LTBkNjMtNDkyYi1iOWEyLTE2ZTIzNTQ5ZTY1ZiIsImNsaWVudF9pZCI6InVzZXItc2VydmljZSJ9.ebNVZrw9LbhKaj2w6RR8b2wccQiDkhvBeq79SxxCK-yWiOlIFqBkotTN4TNJg8umcpyYvLILwvqXWRJhffEtgi25sX2y6MqLIWM4kMZ9d8ptdnSmTpBPhltSiQOM0KFa1kl5nSDCBwYOLn-pESJglam76cjpgZNoC88x3iNHacdiXDItY0rtY85HrQ26uyJu9UovKtmYmZRHsIbGMpDta5Q1p4vfaCIr-YUayDrCweZJiQDEEcOSpWJ7O7RMk3pRkX_4UmPHFzrOI2lMp1jQIhxnSTE7EVAz_4z8h8r46muSkpF54Ic4XSawHKqdSLHx8T05LB0MpvOzWMPS6c1uHA"
+ console.log(config.custom, "==========")
+ config.header['Authorization'] =
+ "Bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX25hbWUiOiJBRE1JTiIsIlVzZXJJZCI6IjEiLCJzY29wZSI6WyJhbGwiXSwiVXNlclJlYWxOYW1lIjoi6LaF57qn566h55CG5ZGYIiwiVXNlclh6cWhkbSI6IjQyMDUiLCJleHAiOjI1MTk3NzIwMTAsImp0aSI6ImExNTcxYzk1LTBkNjMtNDkyYi1iOWEyLTE2ZTIzNTQ5ZTY1ZiIsImNsaWVudF9pZCI6InVzZXItc2VydmljZSJ9.ebNVZrw9LbhKaj2w6RR8b2wccQiDkhvBeq79SxxCK-yWiOlIFqBkotTN4TNJg8umcpyYvLILwvqXWRJhffEtgi25sX2y6MqLIWM4kMZ9d8ptdnSmTpBPhltSiQOM0KFa1kl5nSDCBwYOLn-pESJglam76cjpgZNoC88x3iNHacdiXDItY0rtY85HrQ26uyJu9UovKtmYmZRHsIbGMpDta5Q1p4vfaCIr-YUayDrCweZJiQDEEcOSpWJ7O7RMk3pRkX_4UmPHFzrOI2lMp1jQIhxnSTE7EVAz_4z8h8r46muSkpF54Ic4XSawHKqdSLHx8T05LB0MpvOzWMPS6c1uHA"
config.header["Content-Type"] = "application/json";
}
if (accessToken) {
@@ -72,35 +73,6 @@
return response.data
}
- //对该区域做处理
- if (response.data.resultList && response.data.resultList.length > 0) {
- response.data.resultList = response.data.resultList.map(item => {
- if (item.city_nm && item.city_nm == '恩施土家族苗族自治州') {
- item.city_nm = '恩施州'
- }
-
- if (item.ad_nm && item.ad_nm == '恩施土家族苗族自治州') {
- item.ad_nm = '恩施州'
- }
-
- if (item.ad_name && item.ad_name == '恩施土家族苗族自治州') {
- item.ad_name = '恩施州'
- }
- return item
- })
- }
-
- //对该区域做处理
- if (response.data.data && (response.data.data instanceof Array) && response.data.data.length > 0) {
- response.data.data = response.data.data.map(item => {
- if (item.c_name && item.c_name == '恩施土家族苗族自治州') {
- item.c_name = '恩施州'
- }
- return item
- })
- }
-
-
// 服务端返回的状态码不等于200，则reject()
if (response.data.code) {
if (response.data.code !== 200) {
@@ -143,7 +115,7 @@
success: res => {
if (res.confirm) {
uni.redirectTo({
- url: `/pages/login/index?redirect=/${currentPage.route}`
+ url: `/pages/login/login-account?redirect=/${currentPage.route}`
})
} else if (res.cancel) {
console.log('用户点击取消');
--
Gitblit v1.9.3