Merge branch 'master' of git.dev.advichcloud.com:wangfan/adweb3-web

src/views/adweb/site/AdwebSiteList.vue

@@ -349,6 +349,7 @@
       },
     ];
 
+    // 站点不是删除状态
     if (record.status != 0) {
       dropDown.push({
         label: '站点删除',
@@ -368,7 +369,7 @@
       dropDown.push({
         label: '资源删除',
         popConfirm: {
-          title: '是否确认删除',
+          title: '该站点将从系统中删除，站点资源将会保留10天，是否确认删除',
           confirm: handleDelete.bind(null, record),
           placement: 'topLeft',
         },

src/views/adweb/website/enterpriseInfo/advantage/CompanyAdvantage.vue

@@ -0,0 +1,24 @@
+<template>
+  <div>
+    <iframe-com :loading="loading" ref="iframeCom" :src="src" />
+  </div>
+</template>
+
+<script>
+  import iframeCom from '/@/views/adweb/wpInTo/iframeCom.vue';
+  import { useIframe } from '/src/hooks/component/useIframe';
+
+  export default {
+    components: { iframeCom },
+    mixins: [useIframe],
+    data() {
+      return {
+        url: 'edit.php?post_type=adweb_advantage',
+        loginUrl: 'edit.php?post_type=adweb_advantage',
+        iframePage: 'companyAdvantage',
+      };
+    },
+  };
+</script>
+
+<style scoped></style>

src/views/adweb/website/enterpriseInfo/bannerAdv/bannerAdv.vue

@@ -1,26 +1,24 @@
 <template>
   <div>
-      <iframe-com :loading="loading"  ref="iframeCom" :src="src" />
+    <iframe-com :loading="loading" ref="iframeCom" :src="src" />
   </div>
 </template>
 
 <script>
-import iframeCom from '/@/views/adweb/wpInTo/iframeCom.vue'
-import { useIframe } from '/src/hooks/component/useIframe'
+  import iframeCom from '/@/views/adweb/wpInTo/iframeCom.vue';
+  import { useIframe } from '/src/hooks/component/useIframe';
 
-export default {
-  components:{ iframeCom },
-  mixins: [useIframe],
-  data(){
-    return{
-      url:'edit.php?post_type=home_banner',
-      loginUrl:'edit.php?post_type=home_banner',
-      iframePage:'banner'
-    }
-  },
-}
+  export default {
+    components: { iframeCom },
+    mixins: [useIframe],
+    data() {
+      return {
+        url: 'edit.php?post_type=home_banner',
+        loginUrl: 'edit.php?post_type=home_banner',
+        iframePage: 'banner',
+      };
+    },
+  };
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>