From 32973f90869ff466401759c23681fc06fa65c71a Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 10 六月 2025 23:06:50 +0800 Subject: [PATCH] Merge branch 'master' into positec --- src/api/index.js | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 50 insertions(+), 3 deletions(-) diff --git a/src/api/index.js b/src/api/index.js index 45b9cbf..215737f 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -144,6 +144,17 @@ } /** + * @description 鑰佺郴缁熺櫥褰� + */ + loginAndRedirect (param) { + return axios({ + url: document.location.origin + '/zh-CN/Home/LoginAndRedirect', + method: 'post', + data: qs.stringify(param) + }) + } + + /** * @description 寰俊涓氬姟璇锋眰 鍘熸帴鍙� 'wxpay/getaccesstoken' */ // wxAccessToken (appId, domain = '') { @@ -328,6 +339,11 @@ // Type: 'X' 鏃� // param.Password = Utils.formatOptions(password) + // positecgroup + if (window.GLOB.appkey === '202011021844144334E823A3011414082AD77') { + param.svccode = 'oms' + } + let url = '/webapi/dologon' if (isCloud) { @@ -375,6 +391,36 @@ resolve({data: null, valid: false}) } }) + }) + } + + /** + * @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 }) } @@ -757,7 +803,7 @@ } let url = '/webapi/dostars' - if (param.rduri && !window.GLOB.transfer) { + if (param.rduri && !window.GLOB.transfer) { // positecgroup url = param.rduri delete param.rduri } @@ -1079,8 +1125,9 @@ res.ErrCode = '-2' MKEmitter.emit('reloadTabs') } else if (res.message === 'permission deny') { - res.message = window.GLOB.dict['permission_deny'] || '鏃犲綋鍓嶈彍鍗曟垨鎸夐挳鐨勮闂潈闄愶紝璇疯仈绯荤鐞嗗憳锛�' - res.ErrMesg = window.GLOB.dict['permission_deny'] || '鏃犲綋鍓嶈彍鍗曟垨鎸夐挳鐨勮闂潈闄愶紝璇疯仈绯荤鐞嗗憳锛�' + let isBtn = url.indexOf('s_TableData_InUpDe') > -1 + res.message = window.GLOB.dict['permission_deny'] || `鏃犲綋鍓�${isBtn ? '鎸夐挳' : '鑿滃崟'}鐨勮闂潈闄愶紝璇疯仈绯荤鐞嗗憳锛乣 + res.ErrMesg = res.message } } resolve(res) -- Gitblit v1.8.0