From a299f72a7e49afb0116565fecb758c0eea7bc2a6 Mon Sep 17 00:00:00 2001
From: vee <apple@MacBook-Pro.local>
Date: Thu, 25 Aug 2022 16:05:22 +0800
Subject: [PATCH] =?UTF-8?q?api=E9=85=8D=E7=BD=AE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json        | 30 ++++++++++++++++++++++++++++++
 pages/home/index.vue |  6 ++++++
 utils/axios.js       | 40 ++++++++++++++++++++++------------------
 utils/constant.js    |  6 +++++-
 4 files changed, 63 insertions(+), 19 deletions(-)

diff --git a/manifest.json b/manifest.json
index f3cc131..a999c4c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -46,6 +46,36 @@
             "sdkConfigs" : {}
         }
     },
+	"h5" : {
+	    "publicPath" : "/",
+	    "devServer" : {
+	        // "port" : 8083,
+	        "disableHostCheck" : true,
+	        "https" : true,
+	        "proxy" : {
+	            "/api" : {
+	                "ws" : false,
+	                "target" : "https://sapi.payairs.com",
+	                "changeOrigin" : true,
+	                "secure" : false,
+	                "pathRewrite" : {
+	                    "^/api" : ""
+	                }
+	            },
+				"/market" : {
+				    "ws" : false,
+				    "target" : "https://market.acefinex.com",
+				    "changeOrigin" : true,
+				    "secure" : false,
+				    "pathRewrite" : {
+				        "^/market" : ""
+				    }
+				}
+	        },
+	        "port" : ""
+	    }
+	  
+	},
     /* 快应用特有相关 */
     "quickapp" : {},
     /* 小程序特有相关 */
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 09b3459..d874e9a 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -89,6 +89,7 @@ Blame
 <script>
 import languagePopups from '@/components/language-popups/language-popups.vue'
 import languageData from '@/utils/language/config'
+import api from '@/utils/api'
 // 引入echarts
 // import * as echarts from 'echarts';
 // let videoPlayerObj = {};
@@ -162,6 +163,7 @@ export default {
 		if (uni.getStorageSync('langTrue')) {
 			this.langTrue = uni.getStorageSync('langTrue')
 		}
+		this.getbanner();
 
 	},
 	onHide() {
@@ -173,6 +175,10 @@ export default {
 		}
 	},
 	methods: {
+		getbanner(){
+			const indexBanner=api.indexBanner({'mark':'APP_INDEX'});
+			console.log(indexBanner)
+		},
 		// 弹出语言选择框
 		laug() {
 			this.laugValue = true;
diff --git a/utils/axios.js b/utils/axios.js
index fda9908..bcd0d08 100644
--- a/utils/axios.js
+++ b/utils/axios.js
@@ -5,28 +5,24 @@ import md5 from 'js-md5';
 import constant from './constant.js';
 
 let baseURL = '';
-let key = '';
 // #ifdef H5
-baseURL = constant.H5
-key = constant.H5_KEY
+baseURL = constant.H5_BASE_URL
 // #endif
 // #ifdef APP-PLUS
-baseURL = constant.APP
-key = constant.APP_KEY
+baseURL = constant.BASE_URL
 // #endif
 const service = axios.create({
 	withCredentials: true,
 	crossDomain: true,
-	baseURL: constant.BASE_URL,
+	baseURL: baseURL,
 	timeout: 160000
 })
-console.log(constant.BASE_URL)
 
 // request拦截器,在请求之前做一些处理
 service.interceptors.request.use(
 	config => {
-		const language = uni.getStorageSync("language") || 'en_US';
-		console.log('语言', uni.getStorageSync('language'))
+		const language = uni.getStorageSync("language")|| 'en_US';
+		console.log('语言', language)
 		if (constant.SHOW_DIALOG) {
 			uni.showLoading({
 				title: 'loading',
@@ -34,8 +30,15 @@ service.interceptors.request.use(
 			})
 		}
 		if (config.url.indexOf('market') > -1) {
-			config.baseURL = Vue.prototype.MARKET_URL;
-		}
+			// #ifdef H5
+			baseURL = constant.H5_MARKET_URL;
+			// #endif
+			// #ifdef APP-PLUS
+			config.baseURL = Vue.prototype.MARKET_URL;
+			// #endif
+			
+		}
+		
 		const ticket = uni.getStorageSync('ticket')
 		if (ticket != '') {
 			config.data['ticket'] = ticket
@@ -64,7 +67,7 @@ service.interceptors.request.use(
 
 		if (config.method == 'post') {
 			console.log(config.data)
-			dataStr = config.data.split('&');
+			dataStr = qs.stringify(config.data).split('&');
 
 
 
@@ -81,9 +84,8 @@ service.interceptors.request.use(
 		let sign = '';
 		
 		var t = Date.now() - 2901;
-		// config.headers["timestamp"] = t;
-		// config.data["timestamp"] = t
 		
+		config.data['lang'] = language;
 		for (var k in config.data)
 			keys.push(k);
 		keys.sort(function(a, b) {
@@ -91,7 +93,7 @@ service.interceptors.request.use(
 		})
 
 		
-		//console.log("keys===========",keys);
+		
 
 
 		keys.forEach(function(e) {
@@ -103,9 +105,11 @@ service.interceptors.request.use(
 		});
 
 
-		key = "key=" + constant.KEY;
+		key = "key=" + constant.KEY;
+		
+		
+		console.log(sign + key)
 		sign = md5(sign + key);
-		config.data['timestamp'] = null
 		if (config.method == 'post') {
 			config.data['sign'] = sign
 
@@ -121,7 +125,7 @@ service.interceptors.request.use(
 		return config;
 	},
 	error => {
-		// console.log(error); // for debug
+		 console.error(error); // for debug
 		uni.hideLoading();
 		return Promise.reject(error);
 	}
diff --git a/utils/constant.js b/utils/constant.js
index 4f40d86..19a0754 100644
--- a/utils/constant.js
+++ b/utils/constant.js
@@ -1,5 +1,7 @@
 const IS_TEST = true;
+const H5_BASE_URL = '/api';
 const BASE_URL = IS_TEST?'https://sapi.payairs.com':'';
+const H5_MARKET_URL = '/market';
 const MARKET_URL = IS_TEST?'https://market.acefinex.com':'';
 const KEY = IS_TEST?'jsabdjhfbsjndfksnjndja,sndmbstart':'';
 const WSSURL = IS_TEST?'wss://market.acefinex.com/wss/':'';  
@@ -10,5 +12,7 @@ export default {
     MARKET_URL,
     KEY,
     WSSURL,
-	SHOW_DIALOG
+	SHOW_DIALOG,
+	H5_BASE_URL,
+	H5_MARKET_URL
 }
\ No newline at end of file