From b1fd1f43e98dd78bdd2dd5345910f271ec34b4b0 Mon Sep 17 00:00:00 2001
From: ival <610568032@qq.com>
Date: Wed, 14 Aug 2019 16:46:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=BF=94=E5=9B=9E=E4=B8=BB?=
 =?UTF-8?q?=E9=A1=B5=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Qcode.vue            | 12 ++++++++++--
 src/views/demonstration/list/demonList.vue |  8 ++++----
 src/views/exam/list/examList.vue           |  8 ++++----
 src/views/teach/category/tree.vue          |  8 ++++----
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/layout/components/Qcode.vue b/src/layout/components/Qcode.vue
index fa97e68ea..82b95383e 100644
--- a/src/layout/components/Qcode.vue
+++ b/src/layout/components/Qcode.vue
@@ -32,8 +32,16 @@ export default {
 			this.centerDialogVisible = false;
 		},
 		async comit() {
-			await getPermissionJoint(`${this.input}`);
-			this.centerDialogVisible = false;
+			if (this.input) {
+				try {
+					await getPermissionJoint(`${this.input}`);
+					this.centerDialogVisible = false;
+				} catch (error) {
+					this.$messageBox('扫码错误:' + error.message);
+				}
+			} else {
+				this.$messageBox('请输入房间号');
+			}
 		}
 	}
 };
diff --git a/src/views/demonstration/list/demonList.vue b/src/views/demonstration/list/demonList.vue
index 38f07b7e9..603134d68 100644
--- a/src/views/demonstration/list/demonList.vue
+++ b/src/views/demonstration/list/demonList.vue
@@ -2,7 +2,7 @@
   <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 v-if="role" class="back-home" @click="backHome">返回首页</div> -->
     </div>
     <filter-city ref="filerCity" filter-empty :query-function="queryFunction" @filterSelectChange="refresh" @changeFilter="clearMapSelect" />
     <el-input v-model="filterText" placeholder="输入关键字进行过滤" clearable />
@@ -80,9 +80,9 @@ export default {
 		this.clearMapSelect();
 	},
 	methods: {
-		backHome() {
-			this.$router.push({ path: `/` });
-		},
+		// backHome() {
+		// 	this.$router.push({ path: `/` });
+		// },
 		filterNode(value, data) {
 			if (!value) return true;
 			return data.name.indexOf(value) !== -1;
diff --git a/src/views/exam/list/examList.vue b/src/views/exam/list/examList.vue
index 688dcb9ca..2c3c7b0ec 100644
--- a/src/views/exam/list/examList.vue
+++ b/src/views/exam/list/examList.vue
@@ -2,7 +2,7 @@
   <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 v-if="role" class="back-home" @click="backHome">返回首页</div> -->
     </div>
     <filter-city
       ref="filerCity"
@@ -97,9 +97,9 @@ export default {
 		}
 	},
 	methods: {
-		backHome() {
-			this.$router.push({ path: `/` });
-		},
+		// backHome() {
+		// 	this.$router.push({ path: `/` });
+		// },
 		filterNode(value, data) {
 			if (!value) return true;
 			return data.name.indexOf(value) !== -1;
diff --git a/src/views/teach/category/tree.vue b/src/views/teach/category/tree.vue
index 7fd8e1022..208f82070 100644
--- a/src/views/teach/category/tree.vue
+++ b/src/views/teach/category/tree.vue
@@ -2,7 +2,7 @@
   <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 v-if="role" class="back-home" @click="backHome">返回首页</div> -->
     </div>
     <filter-city
       ref="filerCity"
@@ -108,9 +108,9 @@ export default {
 		}
 	},
 	methods: {
-		backHome() {
-			this.$router.push({ path: `/` });
-		},
+		// backHome() {
+		// 	this.$router.push({ path: `/` });
+		// },
 		filterNode(value, data) {
 			if (!value) return true;
 			return data.name.indexOf(value) !== -1;