From d09f0612d18b9591accef472db5100be34f6a094 Mon Sep 17 00:00:00 2001
From: yunkexin <760754045@qq.com>
Date: Wed, 31 Jul 2024 17:36:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=B7=AF=E7=94=B1=E6=9C=AC?=
 =?UTF-8?q?=E5=9C=B0=E5=AD=98=E5=82=A8=EF=BC=8C=E8=B0=83=E6=95=B4=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json               |  8 ++++----
 pages/apply/complete.vue |  6 +++---
 pages/index/index.vue    | 26 +++++++-------------------
 utils/request.js         | 14 +++++---------
 4 files changed, 19 insertions(+), 35 deletions(-)

diff --git a/pages.json b/pages.json
index 70db082..c64863c 100644
--- a/pages.json
+++ b/pages.json
@@ -27,15 +27,15 @@
 		{
 			"path": "pages/apply/index",
 			"style": {
-				"navigationBarTitleText": "个人信息",
-				"navigationBarBackgroundColor": "#fff"
+				"navigationBarTitleText": "个人信息"
+				// "navigationBarBackgroundColor": "#fff"
 			}
 		},
 		{
 			"path": "pages/apply/complete",
 			"style": {
 				"navigationBarTitleText": "",
-				"navigationBarBackgroundColor": "#fff",
+				// "navigationBarBackgroundColor": "#fff",
 				"app-plus": {
 					"titleNView": {
 						// "titleSize": "18px",
@@ -56,7 +56,7 @@
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
-		"navigationBarBackgroundColor": "#fff", //f6faff
+		"navigationBarBackgroundColor": "#f6faff", //f6faff
 		"backgroundColor": "#F8F8F8"
 	},
 	"uniIdRouter": {}
diff --git a/pages/apply/complete.vue b/pages/apply/complete.vue
index 079b801..d562dc0 100644
--- a/pages/apply/complete.vue
+++ b/pages/apply/complete.vue
@@ -60,13 +60,13 @@
 
 <style>
 	.content {
-		background-color: #fff;
+		background-color: #f6faff;
 		width: 100%;
 		/* #ifndef APP-PLUS */
-		height: calc(100vh - 44px - 50px); // 非APP平台下生效
+		height: calc(100vh - 44px ); // 非APP平台下生效
 		/* #endif */
 		/* #ifdef APP-PLUS */
-		height: calc(100vh); // APP平台下生效
+		height: 100vh; // APP平台下生效
 		/* #endif */
 	}
 
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 3d76b65..a7841c3 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -46,30 +46,18 @@
 
 
 				],
-				company: 'XLK'
+				company: ''
 			}
 		},
 		onShow() {
-
+			const pages = getCurrentPages()
+			const currentPage = pages[pages.length - 1]
+			const Options = currentPage.options
+			uni.setStorageSync('Company', Options.Company?Options.Company:'XLK')
 		},
 		onLoad() {
-			let pages = getCurrentPages()
-			let currentPage = pages[pages.length - 1]
-			let options = currentPage.options
-			console.log(options, 'options')
-			if (options.Company == 'DCJD') {
-				this.company = 'DCJD'
-			} else if (options.Company == 'GXBB') {
-				this.company = 'GXBB'
-			} else if (options.Company == 'LYYL') {
-				this.company = 'LYYL'
-			} else if (options.Company == 'LYXT') {
-				this.company = 'LYXT'
-			} else {
-				this.company = 'XLK'
-			}
 			this.getCaidan()
-			
+
 		},
 		onNavigationBarButtonTap(e) {
 			let url = 'http://47.122.43.22:9100/'
@@ -83,7 +71,7 @@
 					if (index == name) {
 						if (item.name == '新增用户') {
 							uni.navigateTo({
-								url: `/pages/apply/index?Company=${this.company}`
+								url: `/pages/apply/index?Company=${uni.getStorageSync('Company')}`
 							})
 						}
 					}
diff --git a/utils/request.js b/utils/request.js
index 4ab340c..177eb1c 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -5,23 +5,19 @@ import handle401 from './handle401'
 
 export default {
 	send(params) {
-		let pages = getCurrentPages()
-		let currentPage = pages[pages.length - 1]
-		let options = currentPage.options
+		let Company = uni.getStorageSync('Company') 
 		let tenantId = ''
-		console.log(options, 'options')
-		if (options.Company == 'DCJD') {
+		if (Company == 'DCJD') {
 			tenantId = 'A0000025'
-		} else if (options.Company == 'GXBB') {
+		} else if (Company == 'GXBB') {
 			tenantId = 'A0000028'
-		} else if (options.Company == 'LYYL') {
+		} else if (Company == 'LYYL') {
 			tenantId = 'A0000024'
-		} else if (options.Company == 'LYXT') {
+		} else if (Company == 'LYXT') {
 			tenantId = '0002'
 		} else {
 			tenantId = '0001'
 		}
-		console.log(tenantId, 'tenantId')
 		let url = params.url;
 		let method = params.method || "get";
 		let data = params.data || {};