dedsudiyu před 11 měsíci
rodič
revize
1daee902da

+ 67 - 58
component/homeConfigurationSlot.vue

@@ -39,15 +39,13 @@
 		</view>
 		<!-- 大型按钮模块 -->
 		<view class="big-icon-button-box" v-if="homeConfig.type == 'bigBox'">
-			<permissionsSlot class="imgBox" v-for="(item,index) in homeConfig.layout" :key="index"
-				:hasPermi="item.limits">
+			<permissionsSlot class="imgBox" v-for="(item,index) in homeConfig.layout" :key="index" :hasPermi="item.limits">
 				<img :src="item.img" @click="buttonClick(item)">
 			</permissionsSlot>
 		</view>
 		<!-- 三格按钮 -->
 		<view class="three-big-icon-button-box" v-if="homeConfig.type == 'threeBox'">
-			<permissionsSlot class="imgBox" v-for="(item,index) in homeConfig.layout" :key="index"
-				:hasPermi="item.limits">
+			<permissionsSlot class="imgBox" v-for="(item,index) in homeConfig.layout" :key="index" :hasPermi="item.limits">
 				<img v-if="index<3" :src="item.img" @click="buttonClick(item)">
 			</permissionsSlot>
 		</view>
@@ -72,7 +70,7 @@
 		outSubjectPhoto,
 		gradingControl
 	} from '@/api/basicsModules/index.js'
-	import {} from '@/api/safetyExamine/index.js'
+	// import {} from '@/api/safetyExamine/index.js'
 	export default {
 		name: "homeConfigurationSlot",
 		props: {
@@ -102,73 +100,72 @@
 			},
 			//按钮点击事件
 			buttonClick(item) {
-				if (item.buttonType === 'page') {//随手拍
-					if (item.route === 'snapshotManage') {//安全检查
+				if (item.buttonType === 'page') { //随手拍
+					if (item.route === 'snapshotManage') { //安全检查
 						uni.navigateTo({
 							url: item.routeUrl,
 						});
 					}
-					if (item.route === 'safetyExamine') {//安全检查
+					if (item.route === 'safetyExamine') { //安全检查
 						uni.navigateTo({
 							url: item.routeUrl,
 						});
 						//this.getGentleIdentifier(item.routeUrl)
 					}
-					if (item.route === 'leaveInspection') {//离开检查
-					console.log(11)
+					if (item.route === 'leaveInspection') { //离开检查
 						uni.navigateTo({
 							url: item.routeUrl,
 						});
 						//this.outSubjectPhoto(item.routeUrl);
 					}
-					if (item.route === 'accessQualification') {//准入审核
+					if (item.route === 'accessQualification') { //准入审核
 						uni.navigateTo({
 							url: item.routeUrl,
 						});
 						//this.outSubjectPhoto(item.routeUrl);
 					}
-					if (item.route === 'gasBottle') {//气瓶管理
+					if (item.route === 'gasBottle') { //气瓶管理
 						uni.navigateTo({
 							url: item.routeUrl,
 						});
 					}
-					if (item.route === 'warningRecording') {//安全报警
+					if (item.route === 'warningRecording') { //安全报警
 						uni.navigateTo({
 							url: item.routeUrl,
 						});
 					}
-					if (item.route === 'emergencyEvacuation') {//应急处置
+					if (item.route === 'emergencyEvacuation') { //应急处置
 						uni.navigateTo({
 							url: item.routeUrl,
 						});
 					}
-					if (item.route === 'gradingControl') {//分級管控
+					if (item.route === 'gradingControl') { //分級管控
 						uni.navigateTo({
 							url: item.routeUrl,
 						});
 					}
 					//学生端------------------------
-					if (item.route === 'integralExchange') {//积分兑换
+					if (item.route === 'integralExchange') { //积分兑换
 						uni.navigateTo({
 							url: item.routeUrl,
 						});
 						//this.saoCode(item.routeUrl)
 					}
-					if (item.route === 'accessApplication') {//准入申请
+					if (item.route === 'accessApplication') { //准入申请
 						uni.navigateTo({
 							url: item.routeUrl,
 						});
 					}
-					if (item.route === 'studentGasBottle') {//气瓶管理
+					if (item.route === 'studentGasBottle') { //气瓶管理
 						uni.navigateTo({
 							url: item.routeUrl,
 						});
 					}
-					
-					
-					
-					
-				}else if (item.buttonType === 'button') {
+
+
+
+
+				} else if (item.buttonType === 'button') {
 					if (item.route === 'photoInspection') {
 						this.outSubjectPhoto();
 					}
@@ -182,40 +179,52 @@
 				}
 			},
 			//获取用户身份标识"adminGentle": false,   管理员身份 "rectifyGentle": false, 院级管理员collegeGentle   整改身份"applyGentle": false    检查者身份
-			async getGentleIdentifier(routeUrl){
+			async getGentleIdentifier(routeUrl) {
 				let self = this;
-				const {data} = await getGentleIdentifier();
-				if(data.code==200){
+				const {
+					data
+				} = await getGentleIdentifier();
+				if (data.code == 200) {
 					let pageType = null
-				   // 如果是管理员 检查者和整改者
-				   let list=[];
-			  if(data.data.adminGentle || data.data.collegeGentle){//校级管理员
-				list.push({name:'管理员',pageType:1})
-			  }
-			  if(data.data.applyGentle ||data.data.myApplyGentle){
-				list.push({name:'检查者',pageType:2})
-			  }
-			  if(data.data.rectifyGentle){
-				list.push({name:'整改者',pageType:3})
-			  }
-			  if(!data.data.adminGentle && !data.data.applyGentle && !data.data.myApplyGentle  && !data.data.rectifyGentle && !data.data.collegeGentle){
-		
-			  }
-			  uni.setStorageSync('gentleIdentifier',list)
-			  uni.setStorageSync('gentleIdentifierData',data.data)
-			  if(list.length>0){
-				  uni.navigateTo({
-					url: routeUrl,
-				  });
-			  }else{
-				  uni.showToast({
-					title: '没有相关权限',
-					icon:"none",
-					mask:true,
-					duration: 2000
-				  });
-			  }
-			}
+					// 如果是管理员 检查者和整改者
+					let list = [];
+					if (data.data.adminGentle || data.data.collegeGentle) { //校级管理员
+						list.push({
+							name: '管理员',
+							pageType: 1
+						})
+					}
+					if (data.data.applyGentle || data.data.myApplyGentle) {
+						list.push({
+							name: '检查者',
+							pageType: 2
+						})
+					}
+					if (data.data.rectifyGentle) {
+						list.push({
+							name: '整改者',
+							pageType: 3
+						})
+					}
+					if (!data.data.adminGentle && !data.data.applyGentle && !data.data.myApplyGentle && !data.data
+						.rectifyGentle && !data.data.collegeGentle) {
+
+					}
+					uni.setStorageSync('gentleIdentifier', list)
+					uni.setStorageSync('gentleIdentifierData', data.data)
+					if (list.length > 0) {
+						uni.navigateTo({
+							url: routeUrl,
+						});
+					} else {
+						uni.showToast({
+							title: '没有相关权限',
+							icon: "none",
+							mask: true,
+							duration: 2000
+						});
+					}
+				}
 			},
 			//获取拍照检查配置
 			async outSubjectPhoto(routeUrl) {
@@ -236,7 +245,7 @@
 							sourceRiskUrl: "",
 						};
 						uni.navigateTo({
-							url: routeUrl+'?newData=' + encodeURIComponent(JSON.stringify(obj)),
+							url: routeUrl + '?newData=' + encodeURIComponent(JSON.stringify(obj)),
 						});
 					} else if (data.data == false) {
 						//不需要检查
@@ -260,7 +269,7 @@
 							sourceRiskUrl: data.data.sourceRiskUrl,
 						};
 						uni.navigateTo({
-							url: routeUrl+'?newData=' + encodeURIComponent(JSON.stringify(obj)),
+							url: routeUrl + '?newData=' + encodeURIComponent(JSON.stringify(obj)),
 						});
 					}
 				}
@@ -280,7 +289,7 @@
 					onlyFromCamera: true,
 					success: function(res) {
 						uni.navigateTo({
-							url: routeUrl+'?q=' + encodeURIComponent(JSON
+							url: routeUrl + '?q=' + encodeURIComponent(JSON
 								.stringify(res.result))
 						});
 					}

+ 45 - 38
component/permissionsSlot.vue

@@ -1,50 +1,57 @@
+<!-- 
+
+			<permissionsSlot class="button-for-box" :hasPermi="'demo:demo:demo'"> 
+			</permissionsSlot>
+
+ -->
+
 <template>
 	<view class="permissionsSlot" v-if='permissionType'>
-		<slot ></slot>
+		<slot></slot>
 	</view>
 </template>
 
 <script>
-export default {
-  name: "permissionsSlot",
-	props: {
-		hasPermi:'',
-	},
-  data() {
-    return {
-		permissionType:false,
-		objStore:uni.getStorageSync('permissions'),
-    }
-  },
-  created() {
-	  
-  },
-  mounted(){
-	  this.permissionVerification();
-  },
-  methods:{
-	  permissionVerification(){
-		let self = this;
-		console.log('self.objStore',self.objStore)
-		console.log('self.hasPermi',self.hasPermi)
-		if(this.objStore[0] == "*:*:*" || self.hasPermi === ""){
-			this.$set(self,'permissionType',true);
-			return
-		}
-		for(let i=0;i<self.objStore.length;i++){
-			if(self.objStore[i] === self.hasPermi){
-				this.$set(self,'permissionType',true);
-				return
+	export default {
+		name: "permissionsSlot",
+		props: {
+			hasPermi: '',
+		},
+		data() {
+			return {
+				permissionType: false,
+				objStore: uni.getStorageSync('permissions'),
 			}
-		}
-	  },
-  },
-}
+		},
+		created() {
+
+		},
+		mounted() {
+			this.permissionVerification();
+		},
+		methods: {
+			permissionVerification() {
+				let self = this;
+				// console.log('self.objStore',self.objStore)
+				// console.log('self.hasPermi',self.hasPermi)
+				if (this.objStore[0] == "*:*:*" || self.hasPermi === "") {
+					this.$set(self, 'permissionType', true);
+					return
+				}
+				for (let i = 0; i < self.objStore.length; i++) {
+					if (self.objStore[i] === self.hasPermi) {
+						this.$set(self, 'permissionType', true);
+						return
+					}
+				}
+			},
+		},
+	}
 </script>
 
 <style lang="stylus" scoped>
-	.permissionsSlot{
-		margin:0;
-		padding:0;
+	.permissionsSlot {
+		margin: 0;
+		padding: 0;
 	}
 </style>

+ 23 - 19
components/mineConfigurationSlot.vue

@@ -25,24 +25,26 @@
 	},
  -->
 <template>
-	 <view class="mineConfigurationSlot">
+	<view class="mineConfigurationSlot">
 		<view class="button-max-big-box">
-			<permissionsSlot class="button-for-box" v-for="(item,index) in mineConfig.layout" :key="item.id" :hasPermi="item.limits">
+			<permissionsSlot class="button-for-box" v-for="(item,index) in mineConfig.layout" :key="item.id"
+				:hasPermi="item.limits">
 				<view class="button-max-box" @click="buttonClick(item)">
 					<img class="left-img" :src="item.img">
 					<view>{{item.name}}</view>
-					<view class="view-three-one" v-if="item.route === 'mineWarningRecording' && securityAlertNum>0">{{securityAlertNum}}</view>
+					<view class="view-three-one" v-if="item.route === 'mineWarningRecording' && securityAlertNum>0">
+						{{securityAlertNum}}</view>
 					<view class="view-three-two" v-if="item.route === 'laboratory' && adminSubCount>0">{{adminSubCount}}</view>
 					<view class="view-three-two" v-if="item.route === 'PlanExecuteRecord' && wranDoCount>0">{{wranDoCount}}</view>
 					<view class="view-three-type" v-if="item.route === 'faceImage'"
-					:class="ifFaceFeature==''?'colorA':'marginType'">
+						:class="ifFaceFeature==''?'colorA':'marginType'">
 						{{ifFaceFeature==''?'去认证':'已认证'}}
 					</view>
 					<img class="right-img" src="@/images/basicsModules/icon_04.png">
 				</view>
 			</permissionsSlot>
 		</view>
-	</view> 
+	</view>
 </template>
 
 <script>
@@ -56,8 +58,8 @@
 			// 人脸
 			ifFaceFeature: "",
 			//签名
-			isUpload:"",
-			Quantity:0,//指纹录取数量
+			isUpload: "",
+			Quantity: 0, //指纹录取数量
 			//用户签名
 			signatureUrl: "",
 			//预案执行记录
@@ -68,35 +70,34 @@
 			securityAlertNum: 10,
 		},
 		data() {
-			return {
-			}
+			return {}
 		},
 		created() {
-			this.$set(this,'ifFaceFeature',data.data.faceImg)
+			// this.$set(this, 'ifFaceFeature', data.data.faceImg)
 		},
 		mounted() {
-			console.log('mineConfig',this.mineConfig)
+			
 		},
 		methods: {
 			//按钮点击事件
 			buttonClick(item) {
 				if (item.buttonType === 'page') {
-					if (item.route === 'mineWarningRecording') {//预警记录
+					if (item.route === 'mineWarningRecording') { //预警记录
 						uni.navigateTo({
 							url: item.routeUrl,
 						});
 					}
-					if (item.route === 'laboratory') {//我的实验室
+					if (item.route === 'laboratory') { //我的实验室
 						uni.navigateTo({
 							url: item.routeUrl,
 						});
 					}
-					if (item.route === 'PlanExecuteRecord') {//预案执行记录
+					if (item.route === 'PlanExecuteRecord') { //预案执行记录
 						uni.navigateTo({
 							url: item.routeUrl,
 						});
 					}
-					if (item.route === 'faceImage') {//身份验证
+					if (item.route === 'faceImage') { //身份验证
 						uni.navigateTo({
 							url: item.routeUrl,
 						});
@@ -123,15 +124,18 @@
 		background: #fff;
 		padding: 0 20rpx;
 		margin-top: 30rpx;
-		.button-for-box:last-of-type{
-			.button-max-box{
-				border:none !important;
+
+		.button-for-box:last-of-type {
+			.button-max-box {
+				border: none !important;
 			}
 		}
+
 		.button-max-box {
 			height: 100rpx;
 			display flex;
 			border-bottom: 1px solid #e0e0e0;
+
 			.left-img {
 				height: 30rpx;
 				width: 30rpx;
@@ -194,4 +198,4 @@
 			}
 		}
 	}
-</style>
+</style>

+ 2 - 2
components/tabBar.vue

@@ -4,7 +4,7 @@
 		<view class="tab-bar-box">
 			<view class="null-box"></view>
 			<view class="tba-bar-min-box" @click="tabBarGoPage(1)">
-				<img src="@/images/basicsModules/btn_sy_xz.png" v-if="currentRoute == 'pages/home'">
+				<img src="@/images/basicsModules/btn_sy_xz.png" v-if="currentRoute == 'pages/home/home'">
 				<img src="@/images/basicsModules/btn_sy_zc.png" v-else>
 				<view :class="currentRoute == 'pages/home'?'primary':''">首页</view>
 			</view>
@@ -17,7 +17,7 @@
 			</view>
 			<view class="null-box"></view>
 			<view class="tba-bar-min-box" @click="tabBarGoPage(3)">
-				<img src="@/images/basicsModules/btn_wd_xz.png" v-if="currentRoute == 'pages/mine'">
+				<img src="@/images/basicsModules/btn_wd_xz.png" v-if="currentRoute == 'pages/mine/mine'">
 				<img src="@/images/basicsModules/btn_wd_zc.png" v-else>
 				<view :class="currentRoute == 'pages/mine'?'primary':''">我的</view>
 			</view>

+ 1 - 1
main.js

@@ -2,7 +2,7 @@ import Vue from 'vue'
 import App from './App'
 
 // 权限组件
-import { permissionsSlot } from '@/component/permissionsSlot'
+import permissionsSlot from '@/component/permissionsSlot'
 
 Vue.config.productionTip = false
 

+ 71 - 51
pages/home/home.vue

@@ -1,58 +1,78 @@
 <template>
-  <view id="home">
-   <manage-home v-if="userType==1" ref="manage"></manage-home>
-   <user-home v-if="userType==2"></user-home>
-    <supplier-home v-if="userType==3"></supplier-home>
-    <tab-bar v-if="userType!=3"></tab-bar>
-  </view>
+	<view id="home">
+		<manage-home v-if="userType==1" ref="manage"></manage-home>
+		<user-home v-if="userType==2"></user-home>
+		<supplier-home v-if="userType==3"></supplier-home>
+		<tab-bar v-if="userType!=3"></tab-bar>
+	</view>
 </template>
 <script>
-import { manageHome } from '@/pages/home/manageWorkbench'
-import { userHome } from '@/pages/home/studentWorkbench.vue'
-import { supplierHome } from '@/pages/home/supplierWorkbench.vue'
-import { tabBar } from '@/components/tabBar.vue'
-export default {
-  name: "home",
-  components: {
-    manageHome,
-    userHome,
-    supplierHome,
-    tabBar
-  },
-  data() {
-    return {
-      userType:0,
-    }
-  },
-  onLoad() {
+	// #ifdef MP-WEIXIN
+	import {
+		manageHome
+	} from '@/pages/home/manageWorkbench'
+	import {
+		userHome
+	} from '@/pages/home/studentWorkbench.vue'
+	import {
+		supplierHome
+	} from '@/pages/home/supplierWorkbench.vue'
+	import {
+		tabBar
+	} from '@/components/tabBar.vue'
+	// #endif
+	export default {
+		name: "home",
+		// #ifdef MP-WEIXIN
+		components: {
+			manageHome,
+			userHome,
+			supplierHome,
+			tabBar
+		},
+		// #endif
+		// #ifdef H5
+		components: {
+			"manageHome": () => import('@/pages/home/manageWorkbench.vue'),
+			"userHome": () => import('@/pages/home/studentWorkbench.vue'),
+			"supplierHome": () => import('@/pages/home/supplierWorkbench.vue'),
+			"tabBar": () => import('@/components/tabBar.vue'),
+		},
+		// #endif
+		data() {
+			return {
+				userType: 0,
+			}
+		},
+		onLoad() {
+			console.log('permissionsVerify',this.permissionsVerify)
+		},
+		onShow() {
+			if (uni.getStorageSync('token') && uni.getStorageSync('userId') && uni.getStorageSync('userType')) {
+				this.userType = uni.getStorageSync('userType')
+			} else {
+				uni.removeStorageSync('token');
+				uni.removeStorageSync('userId');
+				uni.removeStorageSync('userType');
+				uni.redirectTo({
+					url: '/pages/login/login',
+				});
+			}
+		},
+		methods: {
 
-  },
-  onShow(){
-    if(uni.getStorageSync('token')&&uni.getStorageSync('userId')&&uni.getStorageSync('userType')){
-		this.userType = uni.getStorageSync('userType')
-    }else{
-      uni.removeStorageSync('token');
-      uni.removeStorageSync('userId');
-      uni.removeStorageSync('userType');
-      uni.redirectTo({
-        url: '/pages/login/login',
-      });
-    }
-  },
-  methods: {
-
-  },
-  onHide(){
-    this.userType = 0;
-  },
-  onUnload(){
-    this.userType = 0;
-  }
-}
+		},
+		onHide() {
+			this.userType = 0;
+		},
+		onUnload() {
+			this.userType = 0;
+		}
+	}
 </script>
 
 <style lang="stylus" scoped>
-#home{
-  height:100%;
-}
-</style>
+	#home {
+		height: 100%;
+	}
+</style>

+ 16 - 4
pages/home/manageWorkbench.vue

@@ -65,19 +65,31 @@
   import {getSafeWarnList, laboratoryAppletSubList,
     systemAppletLayoutSelect,laboratoryAppletGetSubDetailInfo
   } from '@/api/basicsModules/index.js'
-  import {tabBar} from '@/components/tabBar.vue'
-  import {topWarn} from '@/component/topWarn.vue'
-  import {navBar} from '@/component/navbar.vue'
-  import {homeConfigurationSlot} from '@/component/homeConfigurationSlot'
   import {getHomeConfig} from '@/utils/homeConfig'
+	// #ifdef MP-WEIXIN
+	import {tabBar} from '@/components/tabBar.vue'
+	import {topWarn} from '@/component/topWarn.vue'
+	import {navBar} from '@/component/navbar.vue'
+	import {homeConfigurationSlot} from '@/component/homeConfigurationSlot'
+	// #endif
   export default {
     name: 'manageWorkbench',
+		// #ifdef MP-WEIXIN
     components: {
       tabBar,
       topWarn,
       navBar,
       homeConfigurationSlot,
     },
+		// #endif
+		// #ifdef H5
+		components: {
+			"tabBar": () => import('@/components/tabBar.vue'),
+			"topWarn": () => import('@/component/topWarn.vue'),
+			"navBar": () => import('@/component/navbar.vue'),
+			"homeConfigurationSlot": () => import('@/component/homeConfigurationSlot.vue'),
+		},
+		// #endif
     data() {
       return {
         homeConfigData: [],

+ 117 - 89
pages/information/information.vue

@@ -3,7 +3,7 @@
 	<view id="information">
 		<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
 			<view class="for-info-box" v-for="(item,index) in dataList" :key="index" @click="goInfoPage(item)">
-				<img  src="@/images/basicsModules/icon_xx_tz.png">
+				<img src="@/images/basicsModules/icon_xx_tz.png">
 				<view class="right-box">
 					<view class="top-box">
 						<view>{{item.userName}}</view>
@@ -20,136 +20,164 @@
 </template>
 
 <script>
-    import {systemNoticeGetNoticeList } from '@/api/basicsModules/index.js'
-    import { tabBar } from '@/components/tabBar.vue'
+	import {
+		systemNoticeGetNoticeList
+	} from '@/api/basicsModules/index.js'
+	// #ifdef MP-WEIXIN
+	import {
+		tabBar
+	} from '@/components/tabBar.vue'
+	// #endif
 	export default {
-        components: {
-            tabBar
-        },
+		// #ifdef MP-WEIXIN
+		components: {
+			tabBar
+		},
+		// #endif
+		// #ifdef H5
+		components: {
+			"tabBar": () => import('@/components/tabBar.vue'),
+		},
+		// #endif
 		data() {
 			return {
 				queryParams: {
-				  page: 1,
-				  pageSize: 20,
+					page: 1,
+					pageSize: 20,
 				},
-				total:0,
-				dataList:[],
+				total: 0,
+				dataList: [],
 			}
 		},
 		onLoad() {
 
 		},
-		onShow(){
+		onShow() {
 
 		},
 		mounted() {
 			this.getList();
 		},
 		methods: {
-            //滚动事件
-			scrollGet(){
-				let self=this;
-				if(self.total/self.queryParams.pageSize<=self.queryParams.page){
+			//滚动事件
+			scrollGet() {
+				let self = this;
+				if (self.total / self.queryParams.pageSize <= self.queryParams.page) {
 					console.log('没有更多数据!')
-				}else{
-						setTimeout(function(){
-							self.queryParams.page += 1;
-							self.getList();
-						},1000)
+				} else {
+					setTimeout(function() {
+						self.queryParams.page += 1;
+						self.getList();
+					}, 1000)
 
 				}
 
 			},
-            //获取列表数据
-            async getList(){
-                let self = this;
-                const {data} = await systemNoticeGetNoticeList(this.queryParams);
-                if(data.code==200){
-					this.dataList=[...this.dataList,...data.data.records]
-					this.total=data.data.total;
+			//获取列表数据
+			async getList() {
+				let self = this;
+				const {
+					data
+				} = await systemNoticeGetNoticeList(this.queryParams);
+				if (data.code == 200) {
+					this.dataList = [...this.dataList, ...data.data.records]
+					this.total = data.data.total;
 				}
-            },
-            formatDate(date) {
-                let newDate = new Date(date);
-                let YY = newDate.getFullYear() + '-';
-                let MM = (newDate.getMonth() + 1 < 10 ? '0' + (newDate.getMonth() + 1) : newDate.getMonth() + 1) + '-';
-                let DD = (newDate.getDate() < 10 ? '0' + (newDate.getDate()) : newDate.getDate());
-                return YY + MM + DD;
-            },
+			},
+			formatDate(date) {
+				let newDate = new Date(date);
+				let YY = newDate.getFullYear() + '-';
+				let MM = (newDate.getMonth() + 1 < 10 ? '0' + (newDate.getMonth() + 1) : newDate.getMonth() + 1) + '-';
+				let DD = (newDate.getDate() < 10 ? '0' + (newDate.getDate()) : newDate.getDate());
+				return YY + MM + DD;
+			},
 		}
 	}
 </script>
 
 <style lang="stylus" scoped>
-	#information{
-		height:100%;
-		display flex
-		background #fff
-		.info-max-box{
-			flex:1;
-			overflow: scroll
-			padding-bottom:100rpx;
-			background #fff
-			margin:0 20rpx;
-			.for-info-box:nth-child(1){
-				border:none;
+	#information {
+		height: 100%;
+
+		display flex;
+		background #fff;
+
+		.info-max-box {
+			flex: 1;
+			overflow: scroll;
+			padding-bottom: 100rpx;
+			background #fff;
+			margin: 0 20rpx;
+
+			.for-info-box:nth-child(1) {
+				border: none;
 			}
-			.for-info-box{
-				height:150rpx;
-				border-top:1rpx solid #F5F5F5;
-				display flex
-				img{
-					border-radius:50%;
-					margin:25rpx 28rpx 25rpx 20rpx;
-					width:100rpx;
-					height:100rpx;
+
+			.for-info-box {
+				height: 150rpx;
+				border-top: 1rpx solid #F5F5F5;
+
+				display flex;
+
+				img {
+					border-radius: 50%;
+					margin: 25rpx 28rpx 25rpx 20rpx;
+					width: 100rpx;
+					height: 100rpx;
 				}
-				.right-box{
-					flex:1;
-					.top-box{
-						display flex
-						line-height:67rpx;
-						margin-top:7rpx;
-						view:nth-child(1){
-							font-size:30rpx;
-							color:#333333;
-							margin-right:28rpx;
+
+				.right-box {
+					flex: 1;
+
+					.top-box {
+						display flex;
+						line-height: 67rpx;
+						margin-top: 7rpx;
+
+						view:nth-child(1) {
+							font-size: 30rpx;
+							color: #333333;
+							margin-right: 28rpx;
 						}
-						view:nth-child(2){
 
-							font-size:24rpx;
-							color:#CCCCCC;
-							flex:1;
-							white-space:nowrap;
-							overflow:hidden;
-							text-overflow:ellipsis;
+						view:nth-child(2) {
+
+							font-size: 24rpx;
+							color: #CCCCCC;
+							flex: 1;
+							white-space: nowrap;
+							overflow: hidden;
+							text-overflow: ellipsis;
 
 
 						}
-						view:nth-child(3){
-							font-size:20rpx;
-							color:#CCCCCC;
+
+						view:nth-child(3) {
+							font-size: 20rpx;
+							color: #CCCCCC;
 							text-align right;
 						}
 					}
-					.bottom{
-						width:530rpx;
-						line-height:62rpx;
-						font-size:25rpx;
+
+					.bottom {
+						width: 530rpx;
+						line-height: 62rpx;
+						font-size: 25rpx;
 						color: #666666;
-						display block
-						overflow:hidden;
-						text-overflow:ellipsis;
-						white-space:nowrap;
+						display block;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
 					}
 				}
 			}
-			.get-null-box{
-				height:100rpx;
-				line-height:100rpx;
-				color:#999;
+
+			.get-null-box {
+				height: 100rpx;
+				line-height: 100rpx;
+				color: #999;
 				text-align center
 			}
 		}
 	}
-</style>
+</style>

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 717 - 712
pages/mine/mine.vue


+ 0 - 1
utils/homeConfig.js

@@ -164,7 +164,6 @@ export function getHomeConfig(data) {
 			layout:[],
 		};
 		for(let l=0 ; l<list[i].layout.length; l++){
-		console.log('list',list[i].layout[l])
 			for(let o=0 ; o<routeDataList.length; o++){
 				if(list[i].layout[l].path === routeDataList[o].route){
 					bigObj.layout.push({

+ 7 - 8
utils/mineConfig.js

@@ -27,13 +27,13 @@ let routeDataList = [
 		buttonType:"page",
 	},
 	{
-		id:'4',
-		name: "身份验证",
-		limits:"",
-		route: "faceImage",
-		routeUrl: "/pages_basics/faceImage",
-		img: require('@/images/basicsModules/icon_001.png'),
-		buttonType:"page",
+		id:'4',																								//id
+		name: "身份验证",																			//名称
+		limits:"",														//权限字段
+		route: "faceImage",																		//路由名称
+		routeUrl: "/pages_basics/faceImage",									//组件地址
+		img: require('@/images/basicsModules/icon_001.png'),	//图片
+		buttonType:"page",																		//类型
 	}
 ];
 
@@ -46,7 +46,6 @@ export function getMineConfig(data) {
 			layout:[],
 		};
 		for(let l=0 ; l<list[i].layout.length; l++){
-		console.log('list',list[i].layout[l])
 			for(let o=0 ; o<routeDataList.length; o++){
 				if(list[i].layout[l].path === routeDataList[o].route){
 					bigObj.layout.push({