From 4c43b91787a794e086e55ff6a7e5211032cce417 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Thu, 12 May 2022 13:53:21 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9EH5=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E4=BB=A3=E7=90=86=E5=95=86=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       | 16 ++++++++--------
 manifest.json                                 |  6 +++---
 pages/goods/refuel-details/refuel-details.vue |  2 +-
 pages/tabBar/home/home.vue                    | 17 +++++++++++++++++
 4 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/App.vue b/App.vue
index c85253e..751aaba 100644
--- a/App.vue
+++ b/App.vue
@@ -5,15 +5,15 @@
 			// brestUrl: 'http://192.168.3.4:9302/brest',
 			// imgUrl: 'https://192.168.3.4:9301/filesystem/',
 			//正式
-			// url: 'https://hsg.dctpay.com/crest',
-			// imgUrl: 'https://hsg.dctpay.com/filesystem/',
-			// brestUrl : 'https://hsg.dctpay.com/brest',
-			// imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/',
+			url: 'https://hsg.dctpay.com/crest',
+			imgUrl: 'https://hsg.dctpay.com/filesystem/',
+			brestUrl : 'https://hsg.dctpay.com/brest',
+			imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/',
 			//测试
-			url: 'https://hsgcs.dctpay.com/crest',
-			brestUrl : 'https://hsgcs.dctpay.com/brest',
-			imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
-			imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/',
+			// url: 'https://hsgcs.dctpay.com/crest',
+			// brestUrl : 'https://hsgcs.dctpay.com/brest',
+			// imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
+			// imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/',
 			userInfo: "",
 			brestUserInfo : '',
 			openId: '',
diff --git a/manifest.json b/manifest.json
index 665b896..3683510 100644
--- a/manifest.json
+++ b/manifest.json
@@ -80,14 +80,14 @@
                 }
             }
         },
-        "title" : "嗨加油",
+        "title" : "嗨森逛",
         "router" : {
             "mode" : "hash",
-            "base" : "/H5"
+            "base" : "/hsgH5"
         },
         "devServer" : {
             "port" : "",
-            "https" : true
+            "https" : false
         },
         "domain" : "https://hsgcs.dctpay.com",
         "template" : ""
diff --git a/pages/goods/refuel-details/refuel-details.vue b/pages/goods/refuel-details/refuel-details.vue
index f7c823b..be36e9d 100644
--- a/pages/goods/refuel-details/refuel-details.vue
+++ b/pages/goods/refuel-details/refuel-details.vue
@@ -356,7 +356,7 @@
 				}
 
 				//原来计算方式
-				this.litre = parseFloat(this.inputMoney / this.priceOfficial).toFixed(2);
+				this.litre = parseFloat(this.inputMoney / this.priceGun).toFixed(2);
 				// var arr1 = parseFloat(this.inputMoney / this.priceOfficial * this.priceVip).toFixed(4);
 				// this.totalPrice = this.numFilter(arr1);
 				this.oilPriceCompute();
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index 8680892..49b0707 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -178,6 +178,16 @@
 					this.getMembershipLevel();
 				}
 			}
+			// #ifdef H5
+			uni.getStorage({
+				key: 'accountId',
+				success(e) {
+					if (e.data) {
+						app.globalData.accountId = e.data;
+					}
+				}
+			})
+			// #endif
 		},
 		onLoad(options) {
 			let that = this;
@@ -189,12 +199,19 @@
 			} else {
 				// 获取openid
 				this.jumpcdx();
+				uni.setStorage({
+					key: "accountId",
+					data: arr2[1]
+				})
 			}
+
 			if (app.globalData.h5code) {
 				this.getH5AccessToken();
 			}
 			// #endif
+			// #ifdef MP
 			app.globalData.accountId = options.accountId;
+			// #endif 
 			// 1.wx获取登录用户code
 			// #ifdef MP
 			uni.login({