From cb4142ab6f88ed7827b78af4a59b6f66329fe03f Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 19 Jan 2024 17:07:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/home.vue        |  71 +++++++++++++++++++++++++------------
 pages/login/login.vue      |  15 ++++----
 static/image/menu/RF05.png | Bin 2249 -> 1341 bytes
 3 files changed, 58 insertions(+), 28 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index a51ffb6..f815c5b 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -22,12 +22,13 @@
 			</view>
 		</view>
 		<view class="sec_menu_wraper" :class="show ? 'show' : 'hidden'">
-			<view class="cancel">
+			<!-- <view class="cancel">
 				<view class="iconfont cancel_icon" @tap="show = false"></view>
-			</view>
+			</view> -->
+			<view class="line"></view>
 			<view class="sec_menu_w">
-				<view class="sec_menu-item" v-for="(e, i) in secM" :key="i" @click="toPage2(e)">
-					<view class="menu-name_inner">{{e.name}}</view>
+				<view class="sec_menu-item" :style="{'background-image': 'url(' + require('../../static/image/menu/' + e.icon + '.png') + ')'}" v-for="(e, i) in secM" :key="i" @click="toPage2(e)">
+					<view class="menu-name_inner" :class="'bgc_' + (i + 1)">{{e.name}}</view>
 				</view>
 			</view>
 		</view>
@@ -40,7 +41,7 @@
 	export default {
 		data() {
 			return {
-				userName: '',
+				userName: 'admin',
 				menuList: [],
 				show: false,
 				secM: []
@@ -108,29 +109,30 @@
 .userInfo
 	_fj(,flex-start,column)
 .p1
-	_font(34rpx,1,#fff)
+	_font(32rpx,1,#fff)
 	padding-bottom 18rpx
 .p2
-	_font(26rpx,1,#fff)
+	_font(28rpx,1,#fff)
 .exit
 	_fj()
-	height 47rpx
-	padding 0 15rpx
+	height 48rpx
+	padding 0 20rpx
 	border 1px solid #FF967C
 	border-radius 20rpx
 .icon-exit
 	_wh(22rpx, 22rpx)
 	_bis('../../static/image/exit.png',22rpx)
 .exit-text
-	_font(24rpx,47rpx,#fff,,right)
+	_font(28rpx,48rpx,#fff,,right)
 	padding-left 10rpx
 .zd_home_wrapper
 	_wh(100%, calc(100% - 208rpx))
 	background-color #fff
 	border-radius: 12rpx;
-	padding: 14rpx;
+	padding: 24rpx 14rpx;
 	margin-bottom: 24rpx;
 	overflow-y auto
+	box-shadow 0 4rpx 10rpx 2rpx rgba(0,0,0,.1)
 .menu-wrap
 	_wh(100%, auto)
 	_fj(flex-start,flex-start,,wrap)
@@ -140,26 +142,30 @@
 	flex-direction column
 	_wh(30%, auto)
 	margin-bottom 40rpx
-	_font(26rpx, 60rpx,#e74f1a,,center)
+	_font(26rpx, 28rpx,#e74f1a,,center)
 	&:nth-child(3n+2)
 		margin-left 5%
 		margin-right 5%
 ::v-deep .menu-img 
 	_wh(100%, auto)
+	margin-bottom 16rpx
 	img
 		position relative
 		opacity 1
 		_wh(55%, auto)
+		background-color: #f3f5f8
+		box-shadow 8rpx 6rpx 10rpx 0px rgba(0,0,0,0.1)
+		padding 16rpx
+		border-radius 50%
 		margin 0 auto 0.2rpx
 .menu-name
-	_font(28rpx, 38rpx, #444,,center)
+	_font(28rpx, 30rpx, #444,,center)
 .sec_menu_wraper
 	position fixed
 	bottom 0
 	left 0
 	width 100%
-	height 70%
-	background-color rgba(246, 246, 246, 1)
+	background-color #f4f5f5
 	box-shadow 0 -8px 16px 0 rgba(28,31,33,.1)
 	border-top-left-radius 20rpx
 	border-top-right-radius 20rpx
@@ -178,20 +184,27 @@
 	_fj(flex-start)
 	flex-wrap wrap
 .sec_menu-item
-	_wh(32%, 150rpx)
+	_wh(30%, 120rpx)
 	margin-bottom 20rpx
-	background-color #fff
-	border 2px solid #dfe2e6
-	border-radius 20rpx
+	border-radius 10rpx
+	background-size 40% auto
+	background-position right 90%
+	background-repeat no-repeat
 	&:nth-child(3n+2)
-		margin-left 2%
-		margin-right 2%
+		margin-left 5%
+		margin-right 5%
 .menu-name_inner
 	_wh(100%, 100%)
 	_fj(center)
-	_font(28rpx, 34rpx, #444,,center)
+	_font(28rpx, 30rpx, #fff,,center)
+	border-radius 10rpx
 	padding 10rpx
 	overflow hidden
+.line
+	_wh(90rpx, 10rpx)
+	background-color #e0e0e1
+	border-radius 4rpx
+	margin 20rpx auto 40rpx
 .cancel
 	_wh(calc(100% - 76rpx), 100rpx)
 	margin 0 auto
@@ -202,4 +215,18 @@
 	transform: translateY(0)
 .hidden
 	transform: translateY(100%)
+.bgc_1
+	background linear-gradient(to right, rgba(73,102,255,0.8) 0%, rgba(117,142,255,0.8) 100%)
+.bgc_2
+	background linear-gradient(to right, rgba(254, 168, 20,0.8) 0%, rgba(255, 177, 1,0.8) 100%)
+.bgc_3
+	background linear-gradient(to right, rgba(0, 228, 153,0.8) 0%, rgba(0, 241, 197,0.8) 100%)
+.bgc_4
+	background linear-gradient(to right, rgba(162, 86, 171,0.8) 0%, rgba(183,120,190,0.8) 100%)
+.bgc_5
+	background linear-gradient(to right, rgba(146, 94, 52,0.8) 0%, rgba(162, 116, 79,0.8) 100%)
+.bgc_6
+	background linear-gradient(to right, rgba(83, 191, 194,0.8) 0%, rgba(119, 198, 201,0.8) 100%)
+.bgc_7
+	background linear-gradient(to right, rgba(244, 97, 61,0.8) 0%, rgba(245, 130, 102,0.8) 100%)
 </style>
diff --git a/pages/login/login.vue b/pages/login/login.vue
index be6733a..7c8b4f7 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -84,9 +84,9 @@
 				})
 			},
 			async toLogin() {
-				// uni.redirectTo({
-				// 	url: '/pages/home/home'
-				// })
+				uni.redirectTo({
+					url: '/pages/home/home'
+				})
 				this.disabled = true
 				if (this.user === '') {
 					uni.showToast({
@@ -143,11 +143,11 @@
 <style lang="stylus" scoped>
 @import '../../common/style/mixin.styl';
 .p1
-  _font(60rpx,75rpx,#444)
+  _font(40rpx,75rpx,#444,666)
   padding-top: 90rpx
 .p2
-  _font(50rpx,1,#444)
-  padding: 40rpx 0 25rpx
+  _font(52rpx,1,#444,600)
+  padding: 10rpx 0 55rpx 0
 .input-box
   _fj()
   margin-top 68rpx
@@ -182,6 +182,9 @@
 .zd_content
 	position: relative
 	height: 100%
+	padding-left 40rpx
+	padding-right 40rpx
+	background linear-gradient(to bottom, #f8e6db 0%, #f6f6f6 30%, #f6f6f6 100%)
 	overflow: hidden
 .version-name
 	width 100%
diff --git a/static/image/menu/RF05.png b/static/image/menu/RF05.png
index 775f2e8d9c4f1b89be40339c285fb11af636a688..8f5a2c2f43d5265368910fdcaab144e87c7e23f8 100644
GIT binary patch
delta 1323
zcmV+`1=RY<5xokKBYy=1Nkl<Zc%1FrYlxIp9LMp`cuTWHyDPrRFtoCudjv+%J<IGW
z8Fqm(q39w8MQ<XBG7TxaQbbpylx|iOfmTEz6c!N~<%_74u99fxuJ+=rwLbgo&hE^d
zd7hm;Ul?Ye|2fb9`Ok08ocmc4i9{liNF)-8L?V$$Boc{4Vt+tWiQ#nTqKx<d-YfrK
zcTTHxNt>u*iHfNzl@Yt=>&RQ#%}={Z<r@`us#vkR|4RPzvhj3!ugut1>qqaFK@Im<
zKclf4XJSMz?-`8ASdOzJ#Z?z&6#8-;RLA|dHY$)tGNkALa+utWeJ5VPTi730;;5W_
zlj4L`A7v`hgMV-$F6$=!Qp^&>UV`KBYEHhfn5XyEPE#m@&<n5)?f4k`<m7n~FK2Aq
zF}LGA%R+2H8=e-a(eDdI3%w_9$FM5--t5NyGuHNS-(bwfA$<?6vBa#SC*UfK@3{UJ
zi?Ov+o@xT`qNf7Uo6<Tm$96Ynbj0u-9+6)aHH26~AAf^Yx_-cl@B#bE3_O=(-w#u2
z@OKjK=yW{+r{hLEScAW+#Hu<L$S*~;{)8{U)fwARp%f0S!QTPh*zd!b8vIoyR*9Y(
z!RM2hj(3DX%`A=Y$_>ZKc%#97qY1r7B)`)-UNPA>hSQ>Z9h>o2<Y%-Cy^}&IdSuv!
z3vsR5>VMj5v||}IM)2JyiWVB)>v**^MOPgIhGq+0hF=iz8tZOpw$LZ&{b(>2Lxc&c
zra!cqOu!m^AT(5jS+;5=Y;R%Sq9;aINgsl}gelf>Rq{5RB7VwK)HZDH*QCa<NhG10
zL=w753?!jn!H%LHK2U^y02kvDVcD$d3<RN9V}E|f-^+0tHZ?nlRu}pwVO71YlkG!c
zg{3|Bj!3k!(A$OTVna^abkzqy4W*TZzD3x+kY$?M)-CIzRfT>Q59Qb=;duq@^Jqn(
zzrdUv`xv|~%$qcwRulS9Va0q)#y%J?DR3iAD+#?*SQ-C5CvBn7tt*UH68bKz%(2hL
z&3{dfr3<Yh^xJ~aS&qkJO^zj(B8C1EGx1BEe%1?{*R%5&<Al9*O<%UkqbQ+&7X}T>
zgi`l)jeh<X8oxg>_Thra^_(1NC`AapLzvvz)o863HlV*-gRkr4Z`*ww$JP{GB#IFF
z3A~@NZNfQtv=4rk;+Y)#JX}#*Xz?gQ=zm!_H^<(F>v5Cn^TwYDL+mVP;NH5Ti$oDZ
zkHl+&pm{98dBVQDJT~GY{FAXy6zcp^_N0mmYLGA)zf}G#+Dc*j><<}xyD;tfW5zy8
z7+zP~a!?pWfBSQVy~ug<4{L>!S8F=i<_jkYIx|=}sdZ?C_!>qTwrHItOvX>swSNR}
zz$sWHZ0}v1bN>RNAuTm!5E_oer$Qt7Stf0Z&`9Pn6SqZ-t6>yfb#!K|P_obOW&Wdu
z;}-pbG6_vMceq0J^V|mtBfnCej_rxE2~CLUe&NJbUXNs$@MVn8Nh>X76nYnPgl^ub
zjQwF@6}w+iW}yiqy^nBk$Mp@krhm9_YNsr{j-EI|nB7~4!wQb2X8MEBgnIe#qJyZ1
zvR54~LlU|xZPl~%omfI=Cw=-8>tZ;KCG=B~{Kn>UyH8>@j95b7BkUOJPizuaW_HGK
z9!u!0I92#(CQ<6V2D3^y1Nl{~2gK~&{U(%<Il|e#va%V!79B()kw_#Gi6lfKkw_#G
hi9{liNF)-C;9o8bv4VhRymkNp002ovPDHLkV1kC5ii!XL

literal 2249
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
AVgLXD