From 4fdff772838dab41c8b2b08c37135fd6227bfcbb Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 19 九月 2022 01:09:52 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/api/index.js | 84 +++++++++++++++++++++++++++++++----------
1 files changed, 63 insertions(+), 21 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 3db610c..17a85f5 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -201,7 +201,7 @@
/**
* @description 娓稿鐧诲綍
*/
- getTouristMsg (appid, openid, memberid, scanId) {
+ getTouristMsg (binding_type, appid, openid, memberid, scanId) {
let _SessionUid = localStorage.getItem('SessionUid')
if (!_SessionUid) { // 鎵嬪姩娓呴櫎SessionUid鏃讹紝瀹炴椂鐢熸垚
@@ -216,24 +216,39 @@
TypeCharOne: 'pc',
kei_id: window.btoa(window.encodeURIComponent(window.GLOB.host))
}
-
- param.LText = md5(window.btoa(_SessionUid + param.timestamp))
- param.secretkey = md5(param.LText + 'mingke' + param.timestamp)
-
- param.appkey = window.GLOB.appkey || ''
-
- if (appid) {
- param.binding_type = 'mk'
- param.thd_party_member_id = memberid
- param.thd_party_openid = openid
- param.thd_party_appid = appid
- param.id = scanId
- }
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')
+
+ if (!param.rduri) {
+ param.rduri = window.GLOB.baseurl + 'webapi/dologon/s_visitor_login'
+ }
+
+ param.linkurl = appid.replace(/\/webapi(.*)/, '/index.html')
+ }
+
+ param.LText = md5(window.btoa(_SessionUid + param.timestamp + (param.linkurl || '')))
+
+ // param.secretkey = md5(param.LText + 'mingke' + param.timestamp) // v_type 涓虹┖鏃�
+ let solt = md5((window.GLOB.appkey + window.btoa(window.GLOB.appkey + 'mingke') + 'mingke').toLowerCase()).slice(-6).toUpperCase()
+
+ param.v_type = param.v_type || 'Y'
+ param.secretkey = md5(param.LText + solt + param.timestamp)
+
+ param.appkey = window.GLOB.appkey || ''
return axios({
url: url,
@@ -770,7 +785,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, '')
@@ -779,18 +795,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