From 27e01670ba3a715599b5059c3d11d2803b354b38 Mon Sep 17 00:00:00 2001
From: Zheng Jie <201507802@qq.com>
Date: Mon, 1 Aug 2022 18:23:14 +0800
Subject: [PATCH] update

---
 src/components/Ad/components.js   |  5 -----
 src/components/Ad/index.vue       | 16 +++-------------
 src/layout/components/AppMain.vue |  9 +++------
 src/main.js                       |  4 ----
 src/views/system/dept/index.vue   |  4 +---
 src/views/system/dict/index.vue   |  4 +---
 src/views/system/job/index.vue    |  4 +---
 src/views/system/menu/index.vue   |  4 +---
 src/views/system/role/index.vue   |  4 +---
 src/views/system/timing/index.vue |  4 +---
 src/views/system/user/center.vue  |  4 +---
 src/views/system/user/index.vue   |  4 +---
 12 files changed, 14 insertions(+), 52 deletions(-)
 delete mode 100644 src/components/Ad/components.js

diff --git a/src/components/Ad/components.js b/src/components/Ad/components.js
deleted file mode 100644
index d352c16..0000000
--- a/src/components/Ad/components.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import wwads from '@/components/Ad'
-
-export default (Vue) => {
-  Vue.component('wwads', wwads)
-}
diff --git a/src/components/Ad/index.vue b/src/components/Ad/index.vue
index 9ddb5a5..4a7cf11 100644
--- a/src/components/Ad/index.vue
+++ b/src/components/Ad/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    v-show="show"
+    v-if="show"
     class="wwads-cn wwads-vertical"
     data-id="148"
     style="z-index:10000;position:fixed;bottom:33px;right:5px;max-width:200px;padding:10px;border-radius:5px;"
@@ -11,22 +11,12 @@
 export default {
   data() {
     return {
-      show: false
+      show: true
     }
   },
   created() {
-    const _this = this
     if (window._AdBlockInit === undefined) {
-      _this.show = false
-    } else {
-      const oScript = document.createElement('script')
-      oScript.type = 'text/javascript'
-      oScript.src = '//cdn.wwads.cn/js/makemoney.js'
-      document.body.appendChild(oScript)
-      window._AdBlockInit()
-      setTimeout(function() {
-        _this.show = true
-      }, 650)
+      this.show = false
     }
   }
 }
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index b3b12c1..7a54a74 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -10,12 +10,15 @@
       <span v-if="$store.state.settings.caseNumber"> ⋅ </span>
       <a href="https://beian.miit.gov.cn/#/Integrated/index" target="_blank">{{ $store.state.settings.caseNumber }}</a>
     </div>
+    <wwads />
   </section>
 </template>
 
 <script>
+import wwads from '@/components/Ad'
 export default {
   name: 'AppMain',
+  components: { wwads },
   computed: {
     cachedViews() {
       return this.$store.state.tagsView.cachedViews
@@ -23,12 +26,6 @@ export default {
     key() {
       return this.$route.path
     }
-  },
-  watch: {
-    '$route.path': {
-      handler: function() {
-      }
-    }
   }
 }
 </script>
diff --git a/src/main.js b/src/main.js
index 9ce875f..a6f5eec 100644
--- a/src/main.js
+++ b/src/main.js
@@ -17,9 +17,6 @@ import './assets/styles/element-variables.scss'
 // global css
 import './assets/styles/index.scss'
 
-// AD
-import components from '@/components/Ad/components.js'
-
 import App from './App'
 import store from './store'
 import router from './router/routers'
@@ -33,7 +30,6 @@ Vue.use(dict)
 Vue.use(Element, {
   size: Cookies.get('size') || 'small' // set element-ui default size
 })
-Vue.use(components)
 
 Vue.config.productionTip = false
 
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 064e214..650a35a 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -1,7 +1,5 @@
 <template>
-  <div class="app-container">
-    <!--广告-->
-    <wwads />
+  <div class="app-container">===
     <!--工具栏-->
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 8be3f95..2c904f1 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -1,7 +1,5 @@
 <template>
-  <div class="app-container">
-    <!--广告-->
-    <wwads />
+  <div class="app-container">===
     <!--表单组件-->
     <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible="crud.status.cu > 0" :title="crud.status.title" width="500px">
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
diff --git a/src/views/system/job/index.vue b/src/views/system/job/index.vue
index 365abec..2428214 100644
--- a/src/views/system/job/index.vue
+++ b/src/views/system/job/index.vue
@@ -1,7 +1,5 @@
 <template>
-  <div class="app-container">
-    <!--广告-->
-    <wwads />
+  <div class="app-container">===
     <!--工具栏-->
     <div class="head-container">
       <eHeader :dict="dict" :permission="permission" />
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 60b3fa8..41a79f3 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -1,7 +1,5 @@
 <template>
-  <div class="app-container">
-    <!--广告-->
-    <wwads />
+  <div class="app-container">===
     <!--工具栏-->
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index b242156..5dee46c 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -1,7 +1,5 @@
 <template>
-  <div class="app-container">
-    <!--广告-->
-    <wwads />
+  <div class="app-container">===
     <!--工具栏-->
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
diff --git a/src/views/system/timing/index.vue b/src/views/system/timing/index.vue
index 6bcdd1a..f1e6dab 100644
--- a/src/views/system/timing/index.vue
+++ b/src/views/system/timing/index.vue
@@ -1,7 +1,5 @@
 <template>
-  <div class="app-container">
-    <!--广告-->
-    <wwads />
+  <div class="app-container">===
     <!--工具栏-->
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
diff --git a/src/views/system/user/center.vue b/src/views/system/user/center.vue
index c0f2953..21812fe 100644
--- a/src/views/system/user/center.vue
+++ b/src/views/system/user/center.vue
@@ -1,7 +1,5 @@
 <template>
-  <div class="app-container">
-    <!--广告-->
-    <wwads />
+  <div class="app-container">===
     <el-row :gutter="20">
       <el-col :xs="24" :sm="24" :md="8" :lg="6" :xl="5" style="margin-bottom: 10px">
         <el-card class="box-card">
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 291a458..452ae0d 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -1,7 +1,5 @@
 <template>
-  <div class="app-container">
-    <!--广告-->
-    <wwads />
+  <div class="app-container">===
     <el-row :gutter="20">
       <!--侧边部门数据-->
       <el-col :xs="9" :sm="6" :md="5" :lg="4" :xl="4">