From ef04e43323c0d0f629b619c36e255a330c9370ba Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Sun, 26 Apr 2020 22:44:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8D=8F=E8=AE=AE=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E5=9C=A8=E5=AF=BC=E5=85=A5=E6=95=B0=E6=8D=AE=E6=97=B6?=
 =?UTF-8?q?=E4=B8=8D=E5=80=92=E8=AE=A1=E6=97=B6=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/components/material/Modal.vue    |  3 +++
 .../components/material/PactModal.vue         | 21 ++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/renderer/components/material/Modal.vue b/src/renderer/components/material/Modal.vue
index ec74da20..2dc7dd60 100644
--- a/src/renderer/components/material/Modal.vue
+++ b/src/renderer/components/material/Modal.vue
@@ -91,6 +91,9 @@ export default {
   mounted() {
     if (this.setting.randomAnimate) this.createWatch()
   },
+  beforeDestroy() {
+    this.removeWatch()
+  },
   methods: {
     createWatch() {
       this.removeWatch()
diff --git a/src/renderer/components/material/PactModal.vue b/src/renderer/components/material/PactModal.vue
index 58d66298..3b9cc423 100644
--- a/src/renderer/components/material/PactModal.vue
+++ b/src/renderer/components/material/PactModal.vue
@@ -60,15 +60,9 @@ import { mapGetters, mapMutations } from 'vuex'
 import { rendererSend } from '../../../common/ipc'
 import { openUrl } from '../../utils'
 export default {
-  props: {
-    show: {
-      type: Boolean,
-      default: false,
-    },
-  },
   data() {
     return {
-      time: 20,
+      time: 2,
       globalObj: {
         isShowPact: false,
       },
@@ -83,12 +77,19 @@ export default {
       return this.btnEnable ? '' : `(${this.time})`
     },
   },
-  mounted() {
-    if (!this.setting.isAgreePact) {
+  watch: {
+    'setting.isAgreePact'(n) {
+      if (n) return
+      this.time = 10
       this.startTimeout()
-    }
+    },
+  },
+  mounted() {
     this.$nextTick(() => {
       this.globalObj = window.globalObj
+      if (!this.setting.isAgreePact) {
+        this.startTimeout()
+      }
     })
   },
   methods: {