Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/WebSet/WebSiteEdit.vue

@@ -458,6 +458,7 @@
         this.currentEditItemData = JSON.parse(JSON.stringify(item.plugData));
         if(!this.currentEditItemData.BottomList) this.$set(this.currentEditItemData,'BottomList',[])
         if(!this.currentEditItemData.MBgColor) this.$set(this.currentEditItemData,'MBgColor','')
+        if(!this.currentEditItemData.MLogo) this.$set(this.currentEditItemData,'MLogo','')
       },
       //获取数据
       setSubPlugData() {

src/components/WebSet/home/indexNav.vue

@@ -395,10 +395,10 @@
           //一级菜单
           this.plugData.MenuList.push(JSON.parse(JSON.stringify(this.MenuList)))
         } else if (type == 2) {
-          //二级菜单 
+          //二级菜单
           this.plugData.MenuList[index].SubMenuList.push(JSON.parse(JSON.stringify(this.SubMenuList)))
         } else if (type == 3) {
-          //底部导航 
+          //底部导航
           this.plugData.BottomList.push(JSON.parse(JSON.stringify(this.BottomList)))
         }
       },
@@ -411,11 +411,11 @@
           if (type == 1) {
             that.plugData.MenuList.splice(index, 1)
           }
-          //二级菜单 
+          //二级菜单
           else if (type == 2) {
             that.plugData.MenuList[index].SubMenuList.splice(i, 1)
           }
-          //底部导航 
+          //底部导航
           else if (type == 3) {
             that.plugData.BottomList.splice(i, 1)
           }