From 5a6193c34f1a19f90dd038b5a2c8da092a6a9618 Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Mon, 20 Mar 2023 09:32:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       |  3 ++-
 .../pages/stationDetail/stationDetail.vue     | 23 ++++++++++++++++++-
 pages/tabbar/home/home.vue                    |  1 -
 utils/request.js                              | 14 +++++------
 4 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/App.vue b/App.vue
index d06c90b..6ad0d6d 100644
--- a/App.vue
+++ b/App.vue
@@ -29,7 +29,8 @@
 					let custom = wx.getMenuButtonBoundingClientRect();
 					Vue.prototype.Custom = custom;
 					Vue.prototype.CustomBar = custom.bottom + custom.top - e.statusBarHeight;
-					// #endif		        // #ifdef MP-ALIPAY
+					// #endif		        
+					// #ifdef MP-ALIPAY
 					Vue.prototype.StatusBar = e.statusBarHeight;
 					Vue.prototype.CustomBar = e.statusBarHeight + e.titleBarHeight;
 					// #endif
diff --git a/BagStation/pages/stationDetail/stationDetail.vue b/BagStation/pages/stationDetail/stationDetail.vue
index 6572681..3d6f1ca 100644
--- a/BagStation/pages/stationDetail/stationDetail.vue
+++ b/BagStation/pages/stationDetail/stationDetail.vue
@@ -88,7 +88,7 @@
 					<text class=" text-black ">加 {{itm.oilsCode}} {{itm.volume}}L 节省 <text class="text-red">
 							￥{{itm.discountAmount}}</text></text>
 				</view>
-				<view class="cu-item no-border" v-if="!siteInfo.oilSiteOrderInfoVos.length">
+				<view class="cu-item no-border" v-if="siteInfo.oilSiteOrderInfoVos && !siteInfo.oilSiteOrderInfoVos.length">
 					暂无
 				</view>
 
@@ -187,7 +187,17 @@
 			console.log('这里是卸载页面')
 				this.innerAudioContext.stop()
 		},
+		
+
 		onLoad(option) { 
+			console.log(22222)
+			if(option.q) {
+				let originLink  = decodeURIComponent(option.q)
+				let target = this.obtainUrlPathParameterTarget(originLink)
+				console.log('target',target)
+				return 
+			}
+
 			if(!option.item){
 				let siteInfos = uni.getStorageSync('siteInfo') 
 				var oilItem = JSON.parse(decodeURIComponent(siteInfos)) 
@@ -209,6 +219,17 @@
 			this.ContextAudio(this.audioUrl)
 		},
 		methods: {
+			obtainUrlPathParameterTarget(url) {
+				let target = {}
+				if(url.includes('?')) {
+					let paramsText = url.split("?")[1]
+					let paramsArr = paramsText.split("&")
+					paramsArr.forEach(item => {
+						target[item.split('=')[0]] = item.split('=')[1]
+					})
+				}
+				return target
+			},
 			// 生成音频文件
 			ContextAudio(url){
 				this.innerAudioContext = uni.createInnerAudioContext();
diff --git a/pages/tabbar/home/home.vue b/pages/tabbar/home/home.vue
index 12bc10c..37ea9d5 100644
--- a/pages/tabbar/home/home.vue
+++ b/pages/tabbar/home/home.vue
@@ -576,7 +576,6 @@
 			},
 			toDetail(item) {
 				let itemS = encodeURIComponent(JSON.stringify(item))
-				console.log(itemS)
 				if (uni.getStorageSync('user')) {
 					uni.navigateTo({
 						url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`,
diff --git a/utils/request.js b/utils/request.js
index 91d109e..0df125e 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -2,9 +2,9 @@ import axios from 'axios'
 import utils from '@/utils/encode'
 
 // const env = process.env.NODE_ENV
-const env = 'production'/*  */
-// const env = 'test'
-const testUrl = 'http://192.168.0.45:38080'
+// const env = 'production'/*  */
+const env = 'test'
+const testUrl = 'http://192.168.110.230:38080'
 // const productUrl = 'http://121.196.213.68/adminapi' //预生产
 
 // const productUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new 
@@ -54,8 +54,8 @@ service.interceptors.request.use(
 			config.data = data
 			// }
 		} else {
-			console.log('\n\n-----------------------')
-			console.log('参数', config.url, '参数加密前', config.data)
+			// console.log('\n\n-----------------------')
+			// console.log('参数', config.url, '参数加密前', config.data)
 			url = config.url
 		}
 
@@ -84,8 +84,8 @@ service.interceptors.response.use(
 				// console.log('返回', response.config.url, '返回结果',res)
 			}
 		} else {
-			console.log('返回', response.config.url, '返回结果未加密', res)
-			console.log('-------------------------------------------\n\n')
+			// console.log('返回', response.config.url, '返回结果未加密', res)
+			// console.log('-------------------------------------------\n\n')
 		}
 
 		uni.hideLoading()