Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev

src/views/components/pay/index.vue

@@ -77,6 +77,11 @@ export default {
 			return '';
 		},
 		height() {
+			if (/\/dp\//.test(this.$route.path) ||
+				/\/plan\//.test(this.$route.path)) {
+				return this.$store.state.app.height;
+			}
+
 			return this.$store.state.app.height - 61;
 		}
 	},

src/views/dashboard/echarts/permission.vue

@@ -27,7 +27,7 @@ export default {
 	data() {
 		return {
 			option: {
-				backgroundColor: '#f0f0f0',
+				backgroundColor: '#fefefe',
 				title: {
 					text: '',
 					subtext: '',

src/views/dashboard/index.vue

@@ -91,6 +91,5 @@ export default {
 .perssmin-card {
 	display: flex;
 	justify-content: center;
-	// margin-top: 20px;
 }
 </style>

src/views/exam/index.vue

@@ -27,7 +27,7 @@ export default {
 	data() {
 		return {
 			listShow: true,
-			widthLeft: 450
+			widthLeft: Number(localStore.get('LeftWidth')) || 450
 		};
 	},
 	computed: {
@@ -43,9 +43,6 @@ export default {
 			this.listShow = val;
 		}
 	},
-	mounted() {
-		this.widthLeft = Number(localStore.get('LeftWidth'));
-	},
 	methods: {
 		refresh() {
 			this.$refs && this.$refs.examlList && this.$refs.examlList.refresh();

src/views/exam/list/examList.vue

@@ -2,7 +2,6 @@
   <el-card v-loading="loading" class="map-list-main">
     <div slot="header" class="clearfix">
       <span>试题列表</span>
-      <!-- <div v-if="role" class="back-home" @click="backHome">返回首页</div> -->
     </div>
     <filter-city
       ref="filerCity"
@@ -12,7 +11,7 @@
       @filterSelectChange="refresh"
     />
     <el-input v-model="filterText" placeholder="输入关键字进行过滤" clearable />
-    <el-scrollbar wrap-class="scrollbar-wrapper" :style="{ height: (height-125) +'px' }">
+    <el-scrollbar wrap-class="scrollbar-wrapper" :style="{ height: (height-175) +'px' }">
       <el-tree
         ref="tree"
         :data="treeData"
@@ -97,9 +96,6 @@ export default {
 		}
 	},
 	methods: {
-		// backHome() {
-		// 	this.$router.push({ path: `/` });
-		// },
 		filterNode(value, data) {
 			if (!value) return true;
 			return data.name.indexOf(value) !== -1;

src/views/orderauthor/author/draft/ruleForm.vue

@@ -30,7 +30,7 @@
             :data="ruleList"
             border
             style="width: 100%"
-            :height="height-300"
+            :height="height-450"
           >
             <el-table-column prop="createTime" label="创建时间" />
             <el-table-column prop="creatorUserName" label="创建者" />
@@ -102,7 +102,7 @@ export default {
 	},
 	computed: {
 		height() {
-			return this.$store.state.app.height - 62;
+			return this.$store.state.app.height - 65;
 		}
 	},
 	mounted() {