From af89cc791fc928578740a62917e9ee32a8a23d6b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 17 五月 2022 23:24:23 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/api/index.js | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 9 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index a542dfc..49a2c94 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -66,16 +66,22 @@
return Promise.resolve(response.data)
}
}, (error) => {
- if (error && error.response) {
- notification.error({
- className: 'notification-custom-error',
- bottom: 0,
- message: '鐘舵�佺爜-' + error.response.status + '锛岃鑱旂郴绠＄悊鍛�',
- placement: 'bottomRight',
- duration: 15
- })
+ let response = error.response
+
+ if (response) {
+ if (!response.data || !response.data.errors) { // 杩囨护鏃疯鎶ラ敊淇℃伅
+ notification.error({
+ className: 'notification-custom-error',
+ bottom: 0,
+ message: '鐘舵�佺爜-' + response.status + '锛岃鑱旂郴绠＄悊鍛�',
+ placement: 'bottomRight',
+ duration: 15
+ })
+ }
+ return Promise.reject(response)
+ } else {
+ return Promise.reject()
}
- return Promise.reject(error.response)
})
class Api {
@@ -265,6 +271,11 @@
// Type: 'X' 鏃�
// param.Password = Utils.formatOptions(password)
+ // positecgroup
+ if (window.GLOB.appkey === '202011021844144334E823A3011414082AD77') {
+ param.svccode = 'oms'
+ }
+
param.appkey = window.GLOB.appkey || ''
let url = '/webapi/dologon'
@@ -290,6 +301,36 @@
}
/**
+ * @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 (_resolve, _reject) {
--
Gitblit v1.8.0