From 1d1ef9c117f162f5ee48237b67d69fbd015b10d1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 23 七月 2023 10:32:40 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/api/index.js | 46 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 1d2ed22..50bd0f5 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -42,6 +42,7 @@
Modal.destroyAll()
Modal.error({
title: response.data.message,
+ okText: '鐭ラ亾浜�',
onOk: () => {
window.GLOB.$error = false
sessionStorage.clear()
@@ -302,6 +303,11 @@
// Type: 'X' 鏃�
// param.Password = Utils.formatOptions(password)
+ // positecgroup
+ if (window.GLOB.appkey === '202011021844144334E823A3011414082AD77') {
+ param.svccode = 'oms'
+ }
+
let url = '/webapi/dologon'
if (isCloud) {
@@ -358,7 +364,41 @@
}
/**
+<<<<<<< HEAD
+ * @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
+=======
* @description 鑾峰彇绯荤粺鐗堟湰淇℃伅
+>>>>>>> master
*/
getAppVersion (reload) {
if (!window.GLOB.IndexDB) {
@@ -416,7 +456,7 @@
if (list.length > 0) {
let clear = false
let _appkey = window.GLOB.appkey.substr(-10)
- let reg = new RegExp(_appkey + '$', 'ig')
+ let reg = new RegExp(_appkey + '$', 'i')
list.forEach(mid => {
if (reg.test(mid)) {
@@ -543,7 +583,7 @@
param.lang = param.lang || sessionStorage.getItem('lang') || ''
param.SessionUid = localStorage.getItem('SessionUid') || ''
param.LoginUID = sessionStorage.getItem('LoginUID') || ''
- param.appkey = window.GLOB.appkey || ''
+ param.appkey = param.appkey || window.GLOB.appkey || ''
let url = '/webapi/dostars'
if (sessionStorage.getItem('isEditState') === 'true') { // 缂栬緫鐘舵�侊紝鍗曠偣鐧诲綍鏈嶅姟鍣ㄤ负浜戠
@@ -672,7 +712,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
}
--
Gitblit v1.8.0