From ad8abc44cf633517c30ab8447b9b035019beeadb Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 09 十二月 2022 17:57:14 +0800
Subject: [PATCH] 2022-12-09
---
src/api/index.js | 71 +----------------------------------
1 files changed, 2 insertions(+), 69 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 52ef280..05c8cc9 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -120,16 +120,15 @@
}
/**
-<<<<<<< HEAD
* @description 浣跨敤dostar鎺ュ彛锛岃烦杩囬獙璇�
* @param {Object} param 鏌ヨ鍙婃彁浜ゅ弬鏁�
*/
loginAndRedirect (param) {
let url = ''
if (process.env.NODE_ENV === 'production') {
- url = document.location.origin + '/Home/LoginAndRedirect'
+ url = document.location.origin + '/zh-CN/Home/LoginAndRedirect'
} else {
- url = '/Home/LoginAndRedirect'
+ url = window.GLOB.location + '/zh-CN/Home/LoginAndRedirect'
}
return axios({
@@ -140,72 +139,6 @@
}
/* @description 鐩存帴璇锋眰
-=======
- * @description 寰俊涓氬姟璇锋眰
- */
- wxAccessToken () {
- let _url = window.GLOB.baseurl + 'wxpay/getaccesstoken'
- if (process.env.NODE_ENV !== 'production') {
- _url = document.location.origin + '/wxpay/getaccesstoken'
- }
-
- return new Promise(resolve => {
- if (window.GLOB.accessToken.accessTime && (parseInt(new Date().getTime() / 1000) - window.GLOB.accessToken.accessTime < 30)) {
- resolve(window.GLOB.accessToken)
- } else {
- window.GLOB.accessToken = {}
- axios({
- url: _url,
- method: 'get'
- }).then(res => {
- if (res.oa_access_token || res.mini_access_token) {
- window.GLOB.accessToken.accessTime = parseInt(new Date().getTime() / 1000)
- window.GLOB.accessToken.oa_access_token = res.oa_access_token
- window.GLOB.accessToken.mini_access_token = res.mini_access_token
- }
- resolve(res)
- })
- }
- })
- }
-
- /**
- * @description 寰俊涓氬姟璇锋眰
- */
- wxNginxRequest (url, method, param) {
- let _url = window.GLOB.location + '/' + url
- if (process.env.NODE_ENV === 'production') {
- _url = document.location.origin + '/' + url
- }
- if (/^http:\/\/(qingqiumarket.cn|cloud.mk9h.cn|sso.mk9h.cn)/.test(_url)) {
- _url = window.GLOB.location + ':8080/' + url
- if (process.env.NODE_ENV === 'production') {
- _url = document.location.origin + ':8080/' + url
- }
- } else if (/^https:\/\/(qingqiumarket.cn|cloud.mk9h.cn|sso.mk9h.cn)/.test(_url)) {
- _url = window.GLOB.location + ':8443/' + url
- if (process.env.NODE_ENV === 'production') {
- _url = document.location.origin + ':8443/' + url
- }
- }
-
- if (param) {
- return axios({
- url: _url,
- method,
- data: param
- })
- }
-
- return axios({
- url: _url,
- method
- })
- }
-
- /**
- * @description 鐩存帴璇锋眰
->>>>>>> positec
* @param {Object} param 鏌ヨ鍙婃彁浜ゅ弬鏁�
*/
directRequest (url, method = 'post', param, cross) {
--
Gitblit v1.8.0