From 0245e64a9dff794903e546c3bdf9fef7efeefdf1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 十二月 2022 16:09:04 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/api/index.js |   62 +++++++++++++++++++++++++++----
 1 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index 5179db8..12f10a6 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -32,7 +32,7 @@
 axios.defaults.withCredentials = false
 
 axios.interceptors.request.use((config) => {
-  if (config.url.includes('LoginAndRedirect') || config.url.includes('getjsonresult') || config.url.includes('wxNativePay')) {
+  if (/LoginAndRedirect|getjsonresult|wxNativePay|postek/ig.test(config.url)) {
     config.data = qs.stringify(config.data)
   } else if (/\/doupload|\/dopreload|\/upload/.test(config.url)) {
     config.headers = { 'Content-Type': 'multipart/form-data' }
@@ -340,6 +340,11 @@
     // Type: 'X' 鏃�
     // param.Password = Utils.formatOptions(password)
 
+    // positecgroup
+    if (window.GLOB.appkey === '202011021844144334E823A3011414082AD77') {
+      param.svccode = 'oms'
+    }
+
     let url = '/webapi/dologon'
 
     if (isCloud) {
@@ -353,6 +358,36 @@
       }
       param.rduri = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon')
     }
+
+    return axios({
+      url,
+      method: 'post',
+      data: param
+    })
+  }
+
+  /**
+   * @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,
@@ -792,17 +827,20 @@
     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
     }
 
-    let _param = JSON.parse(JSON.stringify(param)) // 缂撳瓨鏍￠獙锛屽幓闄ゆ椂闂村拰鍔犲瘑瀛楃
-    delete _param.timestamp
-    delete _param.secretkey
-    delete _param.open_key
-    _param = JSON.stringify(_param)
-    _param  = md5(_param)
+    let _param = ''
+    if (cache) {
+      _param = JSON.parse(JSON.stringify(param)) // 缂撳瓨鏍￠獙锛屽幓闄ゆ椂闂村拰鍔犲瘑瀛楃
+      delete _param.timestamp
+      delete _param.secretkey
+      delete _param.open_key
+      _param = JSON.stringify(_param)
+      _param  = md5(_param)
+    }
 
     if (cache && window.GLOB.CacheMap.has(_param)) {
       return Promise.resolve(window.GLOB.CacheMap.get(_param))
@@ -1181,6 +1219,14 @@
     })
   }
 
+  postekPrint (data) {
+    return axios({
+      url: 'http://127.0.0.1:888/postek/print',
+      method: 'post',
+      data: data
+    })
+  }
+
   // /**
   //  * @description 鏂囦欢涓婁紶
   //  */

--
Gitblit v1.8.0