From 3b84681c4b16a6979ea152490be7ede40ceba3fc Mon Sep 17 00:00:00 2001
From: Zheng Jie <201507802@qq.com>
Date: Sat, 6 May 2023 11:10:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=BF=E5=91=8A=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Crud/crud.js       |  2 +-
 src/layout/components/AppMain.vue | 28 ++++++++++++++++++++++++++++
 src/router/index.js               | 10 ----------
 src/views/login.vue               |  3 ---
 4 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/src/components/Crud/crud.js b/src/components/Crud/crud.js
index b5bd398..8a02165 100644
--- a/src/components/Crud/crud.js
+++ b/src/components/Crud/crud.js
@@ -34,7 +34,7 @@ function CRUD(options) {
     // 排序规则，默认 id 降序， 支持多字段排序 ['id,desc', 'createTime,asc']
     sort: ['id,desc'],
     // 等待时间
-    time: 50,
+    time: 1,
     // CRUD Method
     crudMethod: {
       add: (form) => {},
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index ac6db2a..d0f88c8 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -5,6 +5,7 @@
         <router-view :key="key" />
       </keep-alive>
     </transition>
+    <Ad v-show="showAd" />
     <div v-if="$store.state.settings.showFooter" id="el-main-footer">
       <span v-html="$store.state.settings.footerTxt" />
       <span v-if="$store.state.settings.caseNumber"> ⋅ </span>
@@ -14,8 +15,19 @@
 </template>
 
 <script>
+import Ad from '@/components/Ad'
 export default {
   name: 'AppMain',
+  components: { Ad },
+  data() {
+    return {
+      showAd: true,
+      list: ['/dashboard', '/monitor/online', '/monitor/logs',
+        '/monitor/errorLog', '/monitor/server', '/sys-tools/generator',
+        '/sys-tools/storage', '/components/echarts', '/components/icon',
+        '/components/markdown', '/components/yaml', '']
+    }
+  },
   computed: {
     cachedViews() {
       return this.$store.state.tagsView.cachedViews
@@ -23,7 +35,23 @@ export default {
     key() {
       return this.$route.path
     }
+  },
+  watch: {
+    '$route.path'(newPath) {
+      // 判断是否包含在list中
+      this.checkAd(newPath)
+    }
+  },
+  created() {
+    this.checkAd(this.$route.path)
+  },
+  methods: {
+    checkAd(path) {
+      // 判断是否包含在list中
+      this.showAd = !this.list.includes(path)
+    }
   }
+
 }
 </script>
 
diff --git a/src/router/index.js b/src/router/index.js
index 874ec0f..a5a351e 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -12,16 +12,6 @@ NProgress.configure({ showSpinner: false })// NProgress Configuration
 const whiteList = ['/login']// no redirect whitelist
 
 router.beforeEach((to, from, next) => {
-  setTimeout(() => {
-    var _hmt = _hmt || [];
-    (function() {
-      // 百度统计
-      const hm = document.createElement('script')
-      hm.src = 'https://hm.baidu.com/hm.js?300a24a5326d0e7a0ff1b14c4e8d9056'
-      const s = document.getElementsByTagName('script')[0]
-      s.parentNode.insertBefore(hm, s)
-    })()
-  }, 0)
   if (to.meta.title) {
     document.title = Config.title + ' - ' + to.meta.title
   }
diff --git a/src/views/login.vue b/src/views/login.vue
index d046e08..65485cc 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -1,6 +1,5 @@
 <template>
   <div class="login" :style="'background-image:url('+ Background +');'">
-    <Ad />
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" label-position="left" label-width="0px" class="login-form">
       <h3 class="title">
         ELADMIN 后台管理系统
@@ -43,7 +42,6 @@
 </template>
 
 <script>
-import Ad from '@/components/Ad'
 import { encrypt } from '@/utils/rsaEncrypt'
 import Config from '@/settings'
 import { getCodeImg } from '@/api/login'
@@ -52,7 +50,6 @@ import qs from 'qs'
 import Background from '@/assets/images/background.webp'
 export default {
   name: 'Login',
-  components: { Ad },
   data() {
     return {
       Background: Background,