From 5d911a5e02c6c3a17dd31d29149dad12cedf638a Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 25 Mar 2024 13:31:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                |  3 ++-
 common/style/layout.styl | 14 +++++++++-----
 common/style/mixin.styl  |  5 ++---
 components/NavBar.vue    |  2 +-
 pages/home/home.vue      | 20 ++++++++++++++------
 pages/login/login.vue    |  4 ++--
 utils/mork2.js           |  4 ++--
 7 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 8d8dad0..aa0815b 100644
--- a/README.md
+++ b/README.md
@@ -2,4 +2,5 @@
 + 原生APP云打包使用自有证书
 + 证书别名：testalias
 + 当前应用版本名称1.0.4
-+ 当前应用版本号104
\ No newline at end of file
++ 当前应用版本号104
++ 线上菜单接口地址：(https://apifox.com/apidoc/shared-cb4996b0-0426-44a6-82a5-0cefe2540fb9/api-152616802)
\ No newline at end of file
diff --git a/common/style/layout.styl b/common/style/layout.styl
index ad74884..5e03b08 100644
--- a/common/style/layout.styl
+++ b/common/style/layout.styl
@@ -296,25 +296,29 @@ uni-button:after {
 	font-size: 28rpx;
 	line-height: 73rpx;
 	border-radius: 10rpx;
+	border-width: 2rpx;
+	border-style: solid;
 }
 .btn-default {
 	color: #ff6800;
 	background: #fff;
-	border: 1px solid #ff9856;
+	border-color: #ff791a;
 }
 .btn-success {
 	color: #fff;
-	border: 1px solid #ff9856;
-	background: linear-gradient(-45deg, #ff6800, #ff9856);
+	border-color: #ff791a;
+	// background: linear-gradient(-45deg, #ff6800, #ff9856);
+	// background: linear-gradient(90deg,#ff791a,#ffa400)
+	background: #ff791a;
 }
 .btn-info {
 	color: #fff;
-	border: 1px solid #c9c9c9;
+	border-color: #c9c9c9;
 	background-color: #c9c9c9;
 }
 uni-button[disabled]:not([type]) {
 	color: #fff;
-	border: 1px solid #c9c9c9;
+	border-color: #c9c9c9;
 	background-color: #c9c9c9;
 }
 
diff --git a/common/style/mixin.styl b/common/style/mixin.styl
index 48d8bf0..a040289 100644
--- a/common/style/mixin.styl
+++ b/common/style/mixin.styl
@@ -1,8 +1,7 @@
 $red = #D7592F
 $red1 = #ff6800
-$red2 = #ff8227
-$red3 = #ff9856
-$red4 = #ff6800
+$red2 = #ff9856
+$red3 = #ff6a00
 $green = #6CBE8B
 $yellow = #E9B451
 $blue = #6798ef
diff --git a/components/NavBar.vue b/components/NavBar.vue
index 11e541e..4172057 100644
--- a/components/NavBar.vue
+++ b/components/NavBar.vue
@@ -55,7 +55,7 @@
 	position fixed
 	_wh(100%, calc(var(--status-bar-height) + 88rpx))
 	background-color $red
-	background linear-gradient(to bottom, $red1, $red2)
+	background linear-gradient(90deg, $red1, $red2)
 	z-index 200
 	padding var(--status-bar-height) 20rpx 0 20rpx
 .page_name
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 594997d..c74982e 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -43,8 +43,8 @@
 </template>
 
 <script>
-	// import {authority} from '@/utils/getData2.js'
-	import {authority} from '@/utils/mork2.js'
+	import {authority} from '@/utils/getData2.js'
+	// import {authority} from '@/utils/mork2.js'
 	export default {
 		data() {
 			return {
@@ -67,9 +67,17 @@
 		methods: {
 			async _authority () {
 				let res = await authority()
-				this.menuList1 = [...res.result.sonTree1]
-				this.menuList2 = [...res.result.sonTree2]
-				this.menuList = [...this.menuList1]
+				if (res.code === '1') {
+					this.menuList1 = [...res.result.rf_menu0]
+					this.menuList2 = [...res.result.rf_menu1]
+					this.menuList = [...this.menuList1]
+				} else {
+					uni.showToast({
+						title: res.desc,
+						icon: 'none'
+					})
+				}
+				
 			},
 			changeTab (type) {
 				if (type === 1) {
@@ -120,7 +128,7 @@
 .userInfo_wrap
 	_wh(100%,173rpx)
 	padding 0 30rpx
-	background linear-gradient(to bottom, $red1, $red3)
+	background linear-gradient(to bottom, $red1, $red2)
 	border-radius 12rpx
 	margin-bottom 68rpx
 .userInfo_content
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 66528eb..52431d1 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -171,7 +171,7 @@
 	_font(28rpx, 28rpx,#333)
 	padding-left: 10rpx
 .setup-text
-	_font(28rpx, 28rpx,$red4,,right)
+	_font(28rpx, 28rpx,$red3,,right)
 	padding-left 25rpx
 .bg
 	background-color: #fff;
@@ -180,7 +180,7 @@
   width 100%
   border-radius 46rpx
   _font(36rpx,92rpx,#fff,,center)
-  background linear-gradient(45deg, $red1, $red3)
+  background linear-gradient(45deg, $red1, $red2)
 .zd_content
 	position: relative
 	height: 100%
diff --git a/utils/mork2.js b/utils/mork2.js
index 6c5e51c..3fa26b5 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -2,7 +2,7 @@ export const authority = () => {
 	let res = {
 		code: '1',
 		result: {
-		sonTree1: [
+		rf_menu0: [
 			{menu_id: '1', path: 'RF01', title: '生产管理', sonTree: [
 				{menu_id: '1', title: '生箔生产进度', path: '/pages/ProductManage/SboProdProgress'},
 				{menu_id: '2', title: '生箔工序', path: '/pages/ProductManage/SboProcess'},
@@ -52,7 +52,7 @@ export const authority = () => {
 				{menu_id: '2', title: 'RGV状态查询', path: '/pages/DispatchManage/RGVStatus'}
 				]}
 		],
-		sonTree2: [
+		rf_menu1: [
 			{menu_id: '1', path: 'RF08', title: '载具入库', sonTree: [
 				{menu_id: '1', title: '空载具入库', path: '/pages/SecondPhase/EmptyVehicleInStore'}
 			]},