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

src/components/platformModule/menuManagement.vue

@@ -362,8 +362,9 @@
           this.addMsg.MenuUrl = updateList.MenuUrl
           this.addMsg.MenuStatus = updateList.MenuStatus.toString()
           let style = JSON.parse(updateList.MenuStyle)
+          // this.addMsg.MenuStyleIcon = style.icon
+          console.log(style,'----')
           this.addMsg.MenuStyleIcon = style.icon
-          this.addMsg.MenuStyleIcon = style.menutype
           this.addMsg.MenuStyleColor = style.color
           
           this.currentUpdateIndex = index
@@ -390,7 +391,8 @@
           'MenuStyle': '',
           'MenuStatus': '0',
           MenuStyleIcon: '',
-          MenuStyleColor: ''
+          MenuStyleColor: '',
+          Sort: null
         }
       },
       resetPageIndex() {