From c296a3276824d7de035507ee1dc8291d3a75766b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?=
 <9634538+git_rabbit@user.noreply.gitee.com>
Date: Thu, 28 Mar 2024 13:33:13 +0800
Subject: [PATCH] =?UTF-8?q?PDA=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=8C=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                           |   4 +-
 pages/inWarehouse/inWarehouse.vue       |   3 +-
 pages/index/index.vue                   | 297 ++++++++++++++----------
 pages/login/login.vue                   |  11 +-
 pages/outWarehouse/outWarehouse.vue     |   2 +-
 pages/relocation/relocation.vue         |   2 +-
 pages/returnWarehose/returnWarehose.vue |   2 +-
 pages/stocktake/stocktake.vue           |   2 +-
 utils/request.js                        |   4 +-
 9 files changed, 192 insertions(+), 135 deletions(-)

diff --git a/manifest.json b/manifest.json
index 153331b..8f84138 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
     "name" : "干巷仓库APP",
-    "appid" : "__UNI__A82C0EC",
+    "appid" : "__UNI__A67E78B",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -100,7 +100,7 @@
             "disableHostCheck" : true,
             "proxy" : {
                 "/api" : {
-                    "target" : "http://192.168.0.31:8888",
+                    "target" : "http://192.168.2.101:8888",
                     "pathRewrite" : {
                         "^/api" : ""
                     }
diff --git a/pages/inWarehouse/inWarehouse.vue b/pages/inWarehouse/inWarehouse.vue
index dedc67b..f47f7b8 100644
--- a/pages/inWarehouse/inWarehouse.vue
+++ b/pages/inWarehouse/inWarehouse.vue
@@ -333,6 +333,7 @@ export default {
 	display: flex;
 	align-items: center;
 	justify-content: center;
+	color: #151515;
 }
 .scroll-view-box {
 	width: 94%;
@@ -340,7 +341,7 @@ export default {
 	margin-top: 30px;
 	height: 400px;
 	padding: 10px;
-	background-color: rgba(20, 9, 69, 0.2);
+	background-color: rgba(179, 179, 179, 0.7);
 	border-radius: 5px;
 }
 .scroll-view-last {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 603aa9f..5d5f844 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -9,7 +9,7 @@
 			<uni-grid :column="3" @change="gridCheck" :showBorder="false" :highlight="false">
 				<uni-grid-item v-for="(item, index) in gridItemList" :index="index + 1">
 					<view class="item">
-						<uni-icons :type="item.icon" :size="55" color="#0081ff" />
+						<uni-icons :type="item.icon" :size="40" color="#00aaff" />
 						<text class="text">{{ item.name }}</text>
 					</view>
 				</uni-grid-item>
@@ -23,131 +23,182 @@
 </template>
 
 <script>
-export default {
-	data() {
-		return {
-			gridItemList: [
-				{ name: '入库', icon: 'download-filled' },
-				{ name: '出库', icon: 'upload-filled' },
-				{ name: '盘点', icon: 'wallet-filled' },
-				{ name: '移库', icon: 'cart-filled' },
-				{ name: '退库', icon: 'undo-filled' },
-				{ name: '拼箱', icon: 'folder-add-filled' },
-				{ name: '拆箱', icon: 'folder-add-filled' },
-				{ name: '货物查看', icon: 'eye-filled' },
-				{ name: '入库记录', icon: 'list' },
-				{ name: '出库记录', icon: 'list' },
-				{ name: '注销', icon: 'redo-filled' }
-			]
-		};
-	},
-	onLoad: function () {},
-	mounted() {
-		// setInterval(function () {
-		// 	uni.hideKeyboard(); //隐藏软键盘
-		// 	// plus.key.hideSoftKeybord();
-		// }, 60);
-	},
-
-	methods: {
-		gridCheck(item) {
-			const index = item.detail?.index;
-			switch (index) {
-				case 1:
-					uni.navigateTo({
-						url: '/pages/inWarehouse/inWarehouse'
-					});
-					break;
-				case 2:
-					uni.navigateTo({
-						url: '/pages/outWarehouse/outWarehouse'
-					});
-					break;
-				case 3:
-					uni.navigateTo({
-						url: '/pages/stocktake/stocktake'
-					});
-					break;
-				case 4:
-					uni.navigateTo({
-						url: '/pages/relocation/relocation'
-					});
-					break;
-				case 5:
-					uni.navigateTo({
-						url: '/pages/returnWarehose/returnWarehose'
-					});
-					break;
-				case 6:
-					//TODO 拼箱
-					// uni.navigateTo({
-					// 	url: '/pages/returnWarehose/returnWarehose'
-					// });
-					break;
-				case 7:
-					// 货物查看
-					// uni.navigateTo({
-					// 	url: '/pages/returnWarehose/returnWarehose'
-					// });
-					break;
-				case 8:
-					// 货物查看
-					// uni.navigateTo({
-					// 	url: '/pages/returnWarehose/returnWarehose'
-					// });
-					break;
-				case 9:
-					// 货物查看
-					// uni.navigateTo({
-					// 	url: '/pages/returnWarehose/returnWarehose'
-					// });
-					break;
-				case 11:
-					// 注销
-					uni.navigateTo({
-						url: '/pages/login/login'
-					});
-					break;
-				default:
-					break;
-			}
+	export default {
+		data() {
+			return {
+				gridItemList: [{
+						name: '入库',
+						icon: 'download-filled'
+					},
+					{
+						name: '出库',
+						icon: 'upload-filled'
+					},
+					{
+						name: '盘点',
+						icon: 'wallet-filled'
+					},
+					{
+						name: '移库',
+						icon: 'cart-filled'
+					},
+					{
+						name: '退库',
+						icon: 'undo-filled'
+					},
+					{
+						name: '拼箱',
+						icon: 'folder-add-filled'
+					},
+					{
+						name: '拆箱',
+						icon: 'folder-add-filled'
+					},
+					{
+						name: '货物查看',
+						icon: 'eye-filled'
+					},
+					{
+						name: '入库记录',
+						icon: 'list'
+					},
+					{
+						name: '出库记录',
+						icon: 'list'
+					},
+					{
+						name: '注销',
+						icon: 'redo-filled'
+					}
+				]
+			};
 		},
-		handleWareHouseChange(data) {
-			uni.showToast({
-				title: '扫描成功',
-				icon: 'success'
-			});
-			// console.log('handleWareHouseChange', data);
+		onLoad: function() {},
+		mounted() {
+			// setInterval(function () {
+			// 	uni.hideKeyboard(); //隐藏软键盘
+			// 	// plus.key.hideSoftKeybord();
+			// }, 60);
+		},
+
+		methods: {
+			gridCheck(item) {
+				const index = item.detail?.index;
+				switch (index) {
+					case 1:
+						uni.navigateTo({
+							url: '/pages/inWarehouse/inWarehouse'
+						});
+						break;
+					case 2:
+						uni.navigateTo({
+							url: '/pages/outWarehouse/outWarehouse'
+						});
+						break;
+					case 3:
+						uni.navigateTo({
+							url: '/pages/stocktake/stocktake'
+						});
+						break;
+					case 4:
+						uni.navigateTo({
+							url: '/pages/relocation/relocation'
+						});
+						break;
+					case 5:
+						uni.navigateTo({
+							url: '/pages/returnWarehose/returnWarehose'
+						});
+						break;
+					case 6:
+						//TODO 拼箱
+						// uni.navigateTo({
+						// 	url: '/pages/returnWarehose/returnWarehose'
+						// });
+						break;
+					case 7:
+						// 货物查看
+						// uni.navigateTo({
+						// 	url: '/pages/returnWarehose/returnWarehose'
+						// });
+						break;
+					case 8:
+						// 货物查看
+						// uni.navigateTo({
+						// 	url: '/pages/returnWarehose/returnWarehose'
+						// });
+						break;
+					case 9:
+						// 货物查看
+						// uni.navigateTo({
+						// 	url: '/pages/returnWarehose/returnWarehose'
+						// });
+						break;
+					case 11:
+						// 注销
+						uni.showModal({
+							title: '注销',
+							content: '是否注销当前账户?',
+							showCancel: true,
+							cancelText: '取消',
+							confirmText: '注销',
+							success: (res) => {
+								if (res.confirm) {
+									uni.reLaunch({
+										url: '/pages/login/login'
+									})
+								}
+							}
+						});
+
+						break;
+					default:
+						break;
+				}
+			},
+			handleWareHouseChange(data) {
+				uni.showToast({
+					title: '扫描成功',
+					icon: 'success'
+				});
+				// console.log('handleWareHouseChange', data);
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style scoped>
-.background {
-	/* background-color: #4671d5; */
-}
-.title-box {
-	width: 100%;
-	height: 150px;
-}
-.grid-box {
-	width: 100%;
-	height: 100%;
-}
-.grid-box .item {
-	width: 100%;
-	height: 100%;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-}
+	.background {
+		margin-top: 20px;
+		height: 692px;
+		/* background-color: #4671d5; */
+	}
 
-.item {
-	background-color: rgba(128, 128, 128, 0.5);
-}
-.text {
-	font-size: 24px;
-}
-</style>
+	.title-box {
+		width: 100%;
+		height: 150px;
+	}
+
+	.grid-box {
+		width: 100%;
+		height: 100%;
+	}
+
+	.grid-box .item {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.item {
+		background-color: rgba(128, 128, 128, 0.5);
+	}
+
+	.text {
+		font-size: 24px;
+		color: white;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/login/login.vue b/pages/login/login.vue
index c3ec367..b634c58 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -31,7 +31,7 @@
 				<text @click="handleUserRegister" class="text-blue">立即注册</text>
 			</view>
 			<view class="xieyi text-center">
-				<text class="text-grey1">登录即代表同意</text>
+				<text class="text-white">登录即代表同意</text>
 				<text @click="handleUserAgrement" class="text-blue">《用户协议》</text>
 				<text @click="handlePrivacy" class="text-blue">《隐私协议》</text>
 			</view>
@@ -168,7 +168,12 @@ export default {
 page {
 	background-color: #ffffff;
 }
-
+.text-white{
+	color: white;
+}
+.text-blue{
+	color:#5500ff;
+}
 .normal-login-container {
 	background-image:linear-gradient(rgba(255, 255, 255, 0.9), rgba(255, 255, 255, 0.1)), url('@/static/images/background/login2.png');
 	width: 100%;
@@ -178,7 +183,7 @@ page {
 
 	background-position: center;
 	
-	height: 662px;
+	height: 712px;
 	.logo-content {
 		width: 100%;
 		font-size: 21px;
diff --git a/pages/outWarehouse/outWarehouse.vue b/pages/outWarehouse/outWarehouse.vue
index 3676e59..bf92d75 100644
--- a/pages/outWarehouse/outWarehouse.vue
+++ b/pages/outWarehouse/outWarehouse.vue
@@ -326,7 +326,7 @@ export default {
 	margin-top: 50px;
 	height: 360px;
 	padding: 10px;
-	background-color: rgba(20, 9, 69, 0.2);
+	background-color: rgba(179, 179, 179, 0.7);
 	border-radius: 5px;
 }
 .scroll-view-last {
diff --git a/pages/relocation/relocation.vue b/pages/relocation/relocation.vue
index 8231a2d..efca215 100644
--- a/pages/relocation/relocation.vue
+++ b/pages/relocation/relocation.vue
@@ -286,7 +286,7 @@ export default {
 	margin-top: 30px;
 	height: 400px;
 	padding: 10px;
-	background-color: rgba(20, 9, 69, 0.2);
+	background-color: rgba(179, 179, 179, 0.7);
 	border-radius: 5px;
 }
 .scroll-view-last {
diff --git a/pages/returnWarehose/returnWarehose.vue b/pages/returnWarehose/returnWarehose.vue
index c0e2efa..33c0fd0 100644
--- a/pages/returnWarehose/returnWarehose.vue
+++ b/pages/returnWarehose/returnWarehose.vue
@@ -245,7 +245,7 @@ export default {
 	margin-top: 20px;
 	height: 360px;
 	padding: 10px;
-	background-color: rgba(20, 9, 69, 0.2);
+	background-color: rgba(179, 179, 179, 0.7);
 	border-radius: 5px;
 }
 .scroll-view-last {
diff --git a/pages/stocktake/stocktake.vue b/pages/stocktake/stocktake.vue
index ae28923..3296b8d 100644
--- a/pages/stocktake/stocktake.vue
+++ b/pages/stocktake/stocktake.vue
@@ -256,7 +256,7 @@ export default {
 	margin-top: 50px;
 	height: 360px;
 	padding: 10px;
-	background-color: rgba(20, 9, 69, 0.2);
+	background-color: rgba(179, 179, 179, 0.7);
 	border-radius: 5px;
 }
 .scroll-view-last {
diff --git a/utils/request.js b/utils/request.js
index 8be47e6..444bed1 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -18,9 +18,9 @@ import {
 let timeout = 10000
 const request = config => {
 	// 浏览器测试用
-	 const storageBaseUrl = 'http://' + getBaseUrl() + '/api';
+	 // const storageBaseUrl = 'http://' + getBaseUrl() + '/api';
 	// 真机测试以及部署用
-	//const storageBaseUrl = 'http://' + getBaseUrl();
+	const storageBaseUrl = 'http://' + getBaseUrl();
 	// 是否需要设置 token
 	const isToken = (config.headers || {}).isToken === false
 	config.header = config.header || {}