Merge branch 'master' of https://gitee.com/beiwu/cmanager

src/views/manage/advertisement/advertisementBody.vue

@@ -2,7 +2,6 @@
   <div>
     <div class="title">{{menuDetail.menuName}}</div>
     <avue-crud
-      v-if="menuDetail && menuDetail.menuName"
       :option="option"
       :table-loading="loading"
       :data="data"
@@ -205,6 +204,9 @@ export default {
       drawerTitle: ''
     }
   },
+  mounted() {
+    this.bannerInit()
+  },
   methods: {
     isURL,
     openUrl (row) {
@@ -337,7 +339,7 @@ export default {
       this.loading = true;
       var menuId = this.recommend.menuDetail.menuId
       getCarouselList(
-        5,
+        1,
         menuId,
       ).then((res) => {
         this.data = res.data.data;
@@ -347,7 +349,8 @@ export default {
     bannerInit (){
       this.data = []
       this.loading = true;
-      var type = this.envType()
+      // var type = this.envType()
+      var type = 1;
       getCarouselList(
           type,
       ).then((res) => {

src/views/manage/advertisement/index.vue

@@ -65,11 +65,7 @@
           {
             name: '轮播图',
             select: true
-          },
-          // {
-          //   name: '侧边栏',
-          //   select: true
-          // },
+          }
           
         ],
         menuList: [
@@ -85,6 +81,9 @@
         menuDetail: {}
       }
     },
+    mounted() {
+      this.$refs.advertisementBody.bannerInit()
+    },
     methods: {
       titleActive (item) {
         if(item.select)return
@@ -98,6 +97,7 @@
         this.menuDetail = JSON.parse(JSON.stringify(item))
         if (this.titleList[0].select) {
           this.$refs.advertisementBody.onLoad()
+          // this.$refs.advertisementBody.bannerInit()
         } else if (this.titleList[1].select) {
           this.$refs.advertisementBody.bannerInit()
         }

vue.config.js

@@ -24,9 +24,9 @@ module.exports = {
     proxy: {
       "/api": {
         // target: 'http://localhost:8000', // 本地服务接口地址
-        // target: "http://39.98.184.58:8000",  // 阿里云后台地址
+        target: "http://39.98.184.58:8000",  // 阿里云后台地址
         // target: "http://192.168.3.108:8000",  // 本地
-        target: 'http://192.168.3.111:8000',
+        // target: 'http://192.168.3.111:8000',
         ws: true,
         changeOrigin: true,
         pathRewrite: {