From 3266aa2fbcca63b89d5d68fc272d74e4fb5ae2be Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 16 Jan 2024 18:20:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                 |   2 +-
 common/style/layout.css |  16 ++---
 common/style/reset.css  |   2 +-
 components/NavBar.vue   |   4 +-
 pages.json              |  10 +--
 pages/home/home.vue     | 144 ++++++++++++++++------------------------
 pages/login/login.vue   |  13 ++--
 7 files changed, 85 insertions(+), 106 deletions(-)

diff --git a/App.vue b/App.vue
index 3d97b1b..f6ef8a2 100644
--- a/App.vue
+++ b/App.vue
@@ -3,7 +3,7 @@
 		onLaunch: function() {
 			// #ifdef APP-PLUS
 			plus.screen.lockOrientation('portrait-primary');
-			plus.navigator.setFullscreen(true);
+			// plus.navigator.setFullscreen(true);
 			// #endif
 		},
 		onHide: function() {
diff --git a/common/style/layout.css b/common/style/layout.css
index cac4beb..742b564 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -107,7 +107,7 @@ uni-button:after {
 .zd_content {
 	width: 100%;
 	height: auto;
-	padding: 92rpx 15rpx 82rpx 14rpx;
+	padding: calc(var(--status-bar-height) + 92rpx) 24rpx 122rpx 24rpx;
 }
 .zd_wrapper {
 	width: 100%;
@@ -273,22 +273,22 @@ uni-button:after {
 	width: 100%;
 	z-index: 200;
 	background-color: #fff;
-	padding-top: 10rpx;
+	padding-top: 20rpx;
 	box-shadow: 0 0 20rpx 0 rgba(160,160,160,0.7);
 }
 .submit-button {
-	font-size: 30rpx;
-	line-height: 62rpx;
+	font-size: 32rpx;
+	line-height: 82rpx;
 	color: #ff6a00;
 	text-align: center;
 	letter-spacing: 1rpx;
-	padding: 0 22rpx;
+	padding: 0 42rpx;
 	background-color: #fff;
 	border: 1px solid #ff6a00;
-	margin: 0 40rpx 10rpx 0;
-	border-radius: 30rpx;
+	margin: 0 40rpx 20rpx 0;
+	border-radius: 12rpx;
 }
-.btn-disabled, .submit-button:disabled {
+.btn-disabled, .submit-button[disabled] {
 	background-color: #c9c9c9;
 	border: 1px solid #c9c9c9;
 	color: #fff;
diff --git a/common/style/reset.css b/common/style/reset.css
index 8355389..73b3b54 100644
--- a/common/style/reset.css
+++ b/common/style/reset.css
@@ -6,7 +6,7 @@
 	text-decoration: none;
 	border: none;
 	outline: none;
-	font-family: uniicons, Arial, "Microsoft Yahei", "Helvetica Neue", Helvetica, sans-serif;
+	font-family: uniicons, Helvetica Neue,Helvetica,PingFang SC,Hiragino Sans GB,Microsoft YaHei,SimSun,sans-serif;
 	box-sizing: border-box;
 	-webkit-box-sizing: border-box;
 	-webkit-tap-highlight-color:transparent;
diff --git a/components/NavBar.vue b/components/NavBar.vue
index a03af93..820fca8 100644
--- a/components/NavBar.vue
+++ b/components/NavBar.vue
@@ -53,10 +53,10 @@
 .header
 	_fj()
 	position fixed
-	_wh(100%, 72rpx)
+	_wh(100%, calc(var(--status-bar-height) + 72rpx))
 	background-color $red
 	z-index 200
-	padding 0 20rpx
+	padding var(--status-bar-height) 20rpx 0 20rpx
 .page_name
 	_font(32rpx, 32rpx, #fff,700,center)
 </style>
diff --git a/pages.json b/pages.json
index dd3e26b..874c38b 100644
--- a/pages.json
+++ b/pages.json
@@ -52,11 +52,11 @@
 		}
     ],
 	"globalStyle": {
-		// "pageOrientation": "landscape",
-		"navigationBarTextStyle": "white",
-		"navigationBarTitleText": "uni-app",
-		"navigationBarBackgroundColor": "#d7592f",
-		"backgroundColor": "#ffffff"
+		"navigationBarTextStyle": "black",//导航栏标题颜色及状态栏前景颜色，仅支持 black/white
+		"navigationBarTitleText": "海亮三线LMS系统",//导航栏标题文字内容
+		"navigationBarBackgroundColor": "#ff6a00",//导航栏背景颜色（同状态栏背景色）
+		"backgroundColor": "#ffffff",//下拉显示出来的窗口的背景色
+		"onReachBottomDistance": 50//页面上拉触底事件触发时距页面底部距离，单位只支持px
 	},
 	"uniIdRouter": {}
 }
diff --git a/pages/home/home.vue b/pages/home/home.vue
index de63c44..cf8ca34 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -1,35 +1,31 @@
 <template>
-	<view class="zd_content">
-		<view class="header">首页</view>
-		<view class="userInfo-wrap">
-			<view class="userInfo">
-				<text class="p1">{{userName}}</text>
-				<text class="p2">欢迎进入海亮三线LMS系统！</text>
-			</view>
-			<view class="exit" @tap="Quit">
-				<view class="icon-exit"></view>
-				<view class="exit-text">退出</view>
-			</view>
-		</view>
-		<view class="zd_wrapper">
-			<view class="menu-wrap">
-				<view class="menu-item" v-for="(e, i) in menuList" :key="i" @tap="toPage1(e)">
-					<image class="menu-img" :src="require('../../static/image/menu/' + e.icon + '.png')" alt="">
-					<view class="menu-name">{{e.name}}</view>
+	<view class="home_wraper">
+		<view class="zd_content">
+			<view class="header">首页</view>
+			<view class="userInfo-wrap">
+				<view class="userInfo">
+					<text v-if="userName !== ''" class="p1">{{userName}}</text>
+					<text class="p2">欢迎进入海亮三线LMS系统！</text>
+				</view>
+				<view class="exit" @tap="Quit">
+					<view class="icon-exit"></view>
+					<view class="exit-text">退出</view>
 				</view>
 			</view>
-		</view>
-		<view v-if="show === true" class="sec_menu_wraper">
-			<view class="sec_menu_w">
-				<view class="menu-item" v-for="(e, i) in secM" :key="i" @click="toPage2(e)">
-					<view class="sec_menu-col_inner">
-						<view class="menu-name menu-name_inner">{{e.name}}</view>
+			<view class="zd_home_wrapper">
+				<view class="menus_wrap" v-for="(e, i) in menuList" :key="e.id">
+					<view class="fir_menu_wrap">
+						<view class="fir_menu_tip"></view>
+						<view class="fir_menu_title">{{e.name}}</view>
+					</view>
+					<view class="sec_menu_wrap">
+						<view class="sec_menu-item" v-for="(el, i) in e.sonTree" :key="e.menu_id" @tap="toPage(el)">
+							<image class="menu-img" :src="require('../../static/image/menu/' + el.icon + '.png')" alt="">
+							<view class="menu-name">{{el.name}}</view>
+						</view>
 					</view>
 				</view>
 			</view>
-			<view class="cancel">
-				<view class="iconfont cancel_icon" @tap="show = false"></view>
-			</view>
 		</view>
 	</view>
 </template>
@@ -40,12 +36,12 @@
 			return {
 				userName: '',
 				menuList: [
-			{menu_id: '1', icon: 'RF06', name: '仓储管理', sonTree: [
-				{menu_id: '1', name: '半成品入库', path: '/pages/modules/SemifinishedInStore'},
-				{menu_id: '2', name: '半成品出库', path: '/pages/modules/SemifinishedOutStore'},
-				{menu_id: '3', name: '空箱出库', path: '/pages/modules/EmptyOutStore'}
-				]}
-		],
+					{id: '1', name: '仓储管理', sonTree: [
+						{menu_id: '1', icon: 'RF01', name: '半成品入库', path: '/pages/modules/SemifinishedInStore'},
+						{menu_id: '2', icon: 'RF02', name: '半成品出库', path: '/pages/modules/SemifinishedOutStore'},
+						{menu_id: '3', icon: 'RF03', name: '空箱出库', path: '/pages/modules/EmptyOutStore'}
+					]}
+				],
 				show: false,
 				secM: []
 			};
@@ -62,17 +58,7 @@
 				this.menuList = [...res.sonTree]
 				
 			},
-			toPage1 (e) {
-				// let url = e.path
-				// uni.redirectTo({
-				// 	url: url
-				// })
-				if (e.sonTree.length > 0) {
-					this.show = true
-					this.secM = e.sonTree
-				}
-			},
-			toPage2 (e) {
+			toPage (e) {
 				let url = e.path
 				uni.redirectTo({
 					url: url
@@ -90,10 +76,21 @@
 
 <style lang="stylus">
 @import '../../common/style/mixin.styl';
+.home_wraper
+	_wh(100%, 100%)
 .zd_content
-	padding-top 0
+	padding 0 24rpx
+	height 100%
+	padding-top calc(var(--status-bar-height) + 86rpx)
+	background linear-gradient(to bottom, #f8e6db 0%, #f6f6f6 30%, #f6f6f6 100%)
 .header
-	height 86rpx
+	position fixed
+	left 0
+	top 0
+	padding-top var(--status-bar-height)
+	z-index 100
+	_wh(100%, calc(var(--status-bar-height) + 86rpx))
+	background-color  #f8e6db
 	_font(36rpx,86rpx,#333,,center)
 .userInfo-wrap
 	_fj()
@@ -102,7 +99,7 @@
 	background-color $red
 	_bis('../../static/image/info_bg.png',auto,100%,right,bottom)
 	border-radius 12rpx
-	margin-bottom 20rpx
+	margin-bottom 24rpx
 .userInfo
 	_fj(,flex-start,column)
 .p1
@@ -122,10 +119,24 @@
 .exit-text
 	_font(24rpx,47rpx,#fff,,right)
 	padding-left 10rpx
-.menu-wrap
+.zd_home_wrapper
+	_wh(100%, calc(100% - 208rpx))
+	background-color #fff
+	border-radius: 12rpx;
+	padding: 14rpx;
+	margin-bottom: 24rpx;
+	overflow-y auto
+.menus_wrap
+	width 100%
+	margin-bottom 24rpx
+.fir_menu_wrap
+	_wh(100%, 98rpx)
+.fir_menu_title
+	_font(32rpx, 98rpx, #333, bold,)
+.sec_menu_wrap
 	_fj(flex-start,flex-start,,wrap)
 	align-content: flex-start
-.menu-item
+.sec_menu-item
 	_fj()
 	flex-direction column
 	_wh(30%, auto)
@@ -143,41 +154,4 @@
 		margin 0 auto 0.2rpx
 .menu-name
 	_font(28rpx, 38rpx, #444,,center)
-.sec_menu_wraper
-	position fixed
-	top 0
-	left 0
-	_wh(100%, 100%)
-	background-color rgba(0, 0, 0, .9)
-	z-index 2017
-	flex-direction column
-.sec_menu_w
-	_fj()
-	_wh(100%, calc(100% - 100rpx))
-	padding 0 24rpx
-	flex-wrap wrap
-	align-content center
-	&::after
-		content ''
-		display block
-		_wh(30%,0)
-.sec_menu-col
-	background-color transparent
-	border none
-	height auto
-.sec_menu-col_inner
-	_fj(center)
-	_wh(160rpx, 160rpx)
-	border-radius 50%
-	background-color $yellow
-	margin 0 auto
-.menu-name_inner
-	color #fff
-	padding 0 20rpx
-.cancel
-	_wh(100%, 100rpx)
-	  padding 0 24rpx
-	  overflow hidden
-	  background-color rgba(255, 255, 255, .3)
-	  box-shadow 0 1rpx 4rpx 0 rgba(160,160,160,0.9)
 </style>
diff --git a/pages/login/login.vue b/pages/login/login.vue
index faec0c0..0e42135 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -50,7 +50,7 @@
 			//#ifdef APP-PLUS
 				// 获取本地应用资源版本号
 				plus.runtime.getProperty(plus.runtime.appid, (info) => {
-					console.log(JSON.stringify(info));
+					// console.log(JSON.stringify(info));
 					this.version = info.version;
 					this.versionCode = info.versionCode ;
 				}) 
@@ -143,11 +143,11 @@
 <style lang="stylus" scoped>
 @import '../../common/style/mixin.styl';
 .p1
-  _font(60rpx,75rpx,#444)
+  _font(40rpx,75rpx,#444, 600)
   padding-top: 90rpx
 .p2
-  _font(50rpx,1,#444)
-  padding: 40rpx 0 25rpx
+  _font(50rpx,1,#444, 600)
+  padding: 10rpx 0 55rpx 0
 .input-box
   _fj()
   margin-top 68rpx
@@ -182,6 +182,11 @@
 .zd_content
 	position: relative
 	height: 100%
+	width: 100%
+	padding-left 40rpx
+	padding-right 40rpx
+	background linear-gradient(to bottom, #f8e6db 0%, #f6f6f6 30%, #f6f6f6 100%)
+	overflow hidden
 .version-name
 	width 100%
 	position: absolute