From 925afb68b8117db5bcb23fff2ea77c0ddab52bc4 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Fri, 27 Nov 2020 16:07:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E5=BC=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/js/common.js          | 18 +++++++++++++++---
 src/views/regime/Liveing.vue |  6 +++---
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/public/js/common.js b/public/js/common.js
index 2105534..6a4eb88 100644
--- a/public/js/common.js
+++ b/public/js/common.js
@@ -155,9 +155,21 @@ function setBtnClickFuc() {
   );
   //logout
   $('#logout-btn').on('click', () => {
-    leave();
-    $('#room-root').hide();
-    $('#login-root').show();
+    // window.location.hash='edit'
+    // console.log(window.location.hash)
+    var x;
+    var r=confirm("您确认关闭吗？");
+    if (r==true){
+       leave();
+        $('#room-root').hide();
+        $('#login-root').show();
+    }
+    else{
+      x="你按下了\"取消\"按钮!";
+    }
+    // leave();
+    // $('#room-root').hide();
+    // $('#login-root').show();
   });
   //switch main video
   $('#main-video').on('click', () => {
diff --git a/src/views/regime/Liveing.vue b/src/views/regime/Liveing.vue
index ecb21e8..69724be 100644
--- a/src/views/regime/Liveing.vue
+++ b/src/views/regime/Liveing.vue
@@ -1,5 +1,5 @@
 <template>
-    <iframe style="width:100%;height: 100%" :src="url" frameborder="0"></iframe>
+    <iframe id="iframe" style="width:100%;height: 100%" :src="url" frameborder="0"></iframe>
 </template>
 <style lang="scss" scoped>
 
@@ -7,7 +7,7 @@
 <script lang="ts">
 import { getliveinfo } from '@/api';
 import store from '@/store';
-import { defineComponent, ref } from 'vue';
+import { defineComponent, onMounted, ref, watch } from 'vue';
 import { useRoute } from 'vue-router';
 
 
@@ -21,7 +21,7 @@ export default defineComponent({
             })
 
         }
-
+     
         return {
             url
         }