From d26ecdf69db28f9e3ac71834658e0fade6fcf5ca Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 27 十月 2023 09:50:58 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/api/index.js | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 101 insertions(+), 7 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index ea5fd03..291e306 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -46,6 +46,18 @@
okText: '鐭ラ亾浜�',
onOk: () => {
window.GLOB.$error = false
+
+ localStorage.removeItem('UserID')
+ localStorage.removeItem('LoginUID')
+ localStorage.removeItem('User_Name')
+ localStorage.removeItem('Full_Name')
+ localStorage.removeItem('avatar')
+ localStorage.removeItem('dataM')
+ localStorage.removeItem('localDataM')
+ localStorage.removeItem('debug')
+ localStorage.removeItem('role_id')
+ localStorage.removeItem('mk_user_type')
+
sessionStorage.clear()
if (!!(window.history && window.history.pushState)) {
window.history.replaceState(null, null, window.location.href.split('#')[0] + '#/login')
@@ -94,6 +106,25 @@
}
/**
+ * @description 浣跨敤dostar鎺ュ彛锛岃烦杩囬獙璇�
+ * @param {Object} param 鏌ヨ鍙婃彁浜ゅ弬鏁�
+ */
+ loginAndRedirect (param) {
+ let url = ''
+ if (process.env.NODE_ENV === 'production') {
+ url = document.location.origin + '/zh-CN/Home/LoginAndRedirect'
+ } else {
+ url = window.GLOB.location + '/zh-CN/Home/LoginAndRedirect'
+ }
+
+ return axios({
+ url: url,
+ method: 'post',
+ data: qs.stringify(param)
+ })
+ }
+
+ /* @description 鐩存帴璇锋眰
* @description 寰俊涓氬姟璇锋眰
*/
wxAccessToken (domain = '') {
@@ -303,6 +334,11 @@
// Type: 'X' 鏃�
// param.Password = Utils.formatOptions(password)
+ // positecgroup
+ if (window.GLOB.appkey === '202011021844144334E823A3011414082AD77') {
+ param.svccode = 'oms'
+ }
+
let url = '/webapi/dologon'
if (isCloud) {
@@ -354,7 +390,37 @@
}
/**
- * @description 鑾峰彇绯荤粺鐗堟湰淇℃伅
+ * @description 鐧诲綍浜屾楠岃瘉 // positecgroup
+ */
+ verifycode (verify) {
+ let param = {
+ certificate: 'certificate',
+ captcha: verify.code,
+ token: verify.token,
+ ati: verify.ati,
+ vid: verify.vid,
+ uid: verify.uid,
+ shopId: verify.shopId,
+ loginId: verify.loginId,
+ phone: verify.phone,
+ sellerNick: verify.sellerNick,
+ isRisk: verify.isRisk,
+ requestId: verify.requestId,
+ riskNum: verify.riskNum,
+ username: verify.username
+ }
+
+ let url = '/webapi/dologon'
+
+ return axios({
+ url,
+ method: 'post',
+ data: param
+ })
+ }
+
+ /**
+ * @description 鑾峰彇绯荤粺鐗堟湰淇℃伅锛屽惎鐢ㄦ垨鏇存柊websql
*/
getAppVersion (reload) {
if (!window.GLOB.IndexDB) {
@@ -669,7 +735,7 @@
param.appkey = window.GLOB.appkey || ''
let url = '/webapi/dostars'
- if (param.rduri && !window.GLOB.transfer) {
+ if (param.rduri && !window.GLOB.transfer) { // positecgroup
url = param.rduri
delete param.rduri
}
@@ -704,7 +770,7 @@
}
}
- visitOuterSystem (param, _resolve) {
+ visitOuterSystem (param, _resolve, _reject) {
let token = param.$token
delete param.$token
@@ -760,6 +826,8 @@
data: JSON.stringify(param)
}).then(res => {
_resolve(res)
+ }, () => {
+ _reject()
})
} else {
let _param = {
@@ -807,9 +875,22 @@
data: JSON.stringify(param)
}).then(res => {
_resolve(res)
+ }, () => {
+ _reject()
})
} else {
_resolve(result)
+ }
+ }, (e) => {
+ if (!e || !e.status) {
+ let msg = '缃戠粶杩炴帴涓嶆甯搞��'
+
+ if (/^http:/.test(token.interface) && /https:/.test(window.location.protocol)) {
+ msg = '缃戠粶杩炴帴涓嶆甯革紝鎺ュ彛鍦板潃鍙兘涓嶆敮鎸乭ttps銆�'
+ }
+ _resolve({status: false, ErrCode: 'E', message: msg})
+ } else {
+ _reject()
}
})
}
@@ -829,7 +910,7 @@
if (param.$token === '') {
return Promise.resolve({status: false, ErrCode: 'token_error', message: '鎺ュ彛鍦板潃灏氭湭璁剧疆锛�'})
} else if (param.$token) {
- return new Promise(resolve => this.visitOuterSystem(param, resolve))
+ return new Promise((resolve, reject) => this.visitOuterSystem(param, resolve, reject))
}
if (['sPC_TableData_InUpDe', 'sPC_TableData_InUpDe_debug'].includes(param.func)) {
@@ -888,6 +969,17 @@
})
} else {
resolve(res)
+ }
+ }, (e) => {
+ if (!e || !e.status) {
+ let msg = '缃戠粶杩炴帴涓嶆甯搞��'
+
+ if (/^http:/.test(rduri) && /https:/.test(window.location.protocol)) {
+ msg = '缃戠粶杩炴帴涓嶆甯革紝鎺ュ彛鍦板潃鍙兘涓嶆敮鎸乭ttps銆�'
+ }
+ resolve({status: false, ErrCode: 'E', message: msg})
+ } else {
+ reject()
}
})
})
@@ -1032,9 +1124,9 @@
sql = sql.replace(/@db@/ig, window.GLOB.externalDatabase)
}
- sql = sql.replace(/\n\s{6,20}/ig, ' ')
+ console.info(`/* sql 楠岃瘉 */\n${sql.replace(/\n\s{6,20}/ig, '\n')}`)
- console.info(`/* sql 楠岃瘉 */\n${sql}`)
+ sql = sql.replace(/\n/ig, ' ')
param.LText = Utils.formatOptions(sql)
param.secretkey = Utils.encrypt('', param.timestamp)
@@ -1062,7 +1154,7 @@
method: 'post',
data: JSON.stringify(_param)
})
- }, 10000)
+ }, 20000)
return new Promise(resolve => {
axios({
@@ -1073,6 +1165,8 @@
clearTimeout(timer)
if (/Shared Memory Provider|浼氳瘽澶勪簬缁堟鐘舵�亅褰撳墠鍛戒护鍙戠敓浜嗕弗閲嶉敊璇�/.test(res.message)) {
res.message = '楠岃瘉澶辫触锛岃妫�鏌QL涓槸鍚﹀瓨鍦ㄦ寰幆銆�'
+ } else if (res.message.indexOf('EXECUTE 鍚庣殑浜嬪姟璁℃暟鎸囩ず BEGIN 鍜� COMMIT 璇彞鐨勬暟鐩笉鍖归厤銆備笂涓�璁℃暟 = 1锛屽綋鍓嶈鏁� = 0') > -1) {
+ res.ErrCode = '-2'
}
resolve(res)
}, () => {
--
Gitblit v1.8.0