From 0f6153ab337c4ecca5579a79b03f3ba5f831e0c4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 18 九月 2022 02:03:48 +0800
Subject: [PATCH] 2022-09-18
---
src/api/index.js | 57 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 46 insertions(+), 11 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index f4b19fa..02782e6 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -227,17 +227,25 @@
param.appkey = window.GLOB.appkey || ''
+ let url = '/webapi/dologon/s_visitor_login'
+ if (window.GLOB.mainSystemApi) {
+ param.rduri = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon/s_visitor_login')
+ }
+
if (binding_type === 'mk') {
param.binding_type = 'mk'
param.thd_party_member_id = memberid
param.thd_party_openid = openid
param.thd_party_appid = appid
param.id = scanId
- }
+ } else if (binding_type === 'login_check') { // appid 姝ゆ椂涓虹洰鏍�
+ param.v_type = 'login_check'
+ param.LoginUID = sessionStorage.getItem('LoginUID') || ''
+ url = appid.replace(/\/webapi(.*)/, '/webapi/dologon/s_visitor_login')
- let url = '/webapi/dologon/s_visitor_login'
- if (window.GLOB.mainSystemApi) {
- param.rduri = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon/s_visitor_login')
+ if (!param.rduri) {
+ param.rduri = window.GLOB.baseurl + 'webapi/dologon/s_visitor_login'
+ }
}
return axios({
@@ -775,7 +783,8 @@
param.LoginUID = param.LoginUID || sessionStorage.getItem('LoginUID') || ''
param.appkey = window.GLOB.appkey || ''
- let url = '/webapi/dostars'
+ let login = false
+ let rduri = null
if (param.rduri && /\s|\n/.test(param.rduri)) {
param.rduri = param.rduri.replace(/\s|\n/g, '')
@@ -784,18 +793,44 @@
}
}
- if (param.rduri && !window.GLOB.transfer && /\/dostars/.test(param.rduri) && param.func !== 'webapi_ChangeUser') { // 鍒囨崲鐢ㄦ埛闇�瑕侀�氳繃鏈湴
+ if (param.$login && !window.GLOB.transfer) {
+ login = true
+ rduri = param.rduri || ''
+ }
+ delete param.$login
+
+ let url = '/webapi/dostars'
+
+ if (param.rduri && !window.GLOB.transfer && /\/dostars/.test(param.rduri) && param.func !== 'webapi_ChangeUser') {
url = param.rduri
delete param.rduri
}
param = this.encryptParam(param)
- return axios({
- url: `${url}${param.func ? '/' + param.func : ''}`,
- method: 'post',
- data: param
- })
+ if (login) {
+ return new Promise((resolve, reject) => {
+ this.getTouristMsg('login_check', rduri).then(res => {
+ if (res.status) {
+ axios({
+ url: `${url}${param.func ? '/' + param.func : ''}`,
+ method: 'post',
+ data: param
+ }).then(result => {
+ resolve(result)
+ })
+ } else {
+ resolve(res)
+ }
+ })
+ })
+ } else {
+ return axios({
+ url: `${url}${param.func ? '/' + param.func : ''}`,
+ method: 'post',
+ data: param
+ })
+ }
}
/**
--
Gitblit v1.8.0