登录、导航页、设备点检页

pages/home/home.vue

@@ -3,8 +3,8 @@
 		<view class="header">首页</view>
 		<view class="userInfo-wrap">
 			<view class="userInfo">
-				<text class="p1">{{$store.getters.userName}}</text>
-				<text class="p2">欢迎进入铜箔手持系统！</text>
+				<text class="p1">{{userName}}</text>
+				<text class="p2">欢迎进入瑞泰马钢手持系统！</text>
 			</view>
 			<view class="exit" @tap="Quit">
 				<view class="icon-exit"></view>
@@ -14,7 +14,7 @@
 		<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.path + '.png')" alt="">
+					<image class="menu-img" :src="require('../../static/image/menu/' + e.icon + '.png')" alt="">
 					<view class="menu-name">{{e.name}}</view>
 				</view>
 			</view>
@@ -39,6 +39,7 @@
 	export default {
 		data() {
 			return {
+				userName: this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).username : '',
 				menuList: [],
 				show: false,
 				secM: []
@@ -54,10 +55,14 @@
 				
 			},
 			toPage1 (e) {
-				if (e.sonTree.length > 0) {
-					this.show = true
-					this.secM = e.sonTree
-				}
+				let url = e.path
+				uni.redirectTo({
+					url: url
+				})
+				// if (e.sonTree.length > 0) {
+				// 	this.show = true
+				// 	this.secM = e.sonTree
+				// }
 			},
 			toPage2 (e) {
 				let url = e.path