Merge branch 'develop' into FOTON

src/components/personalCenter/index.vue

@@ -1,5 +1,8 @@
 <template>
   <div class="header">
+    <div>
+      <img style="height: 50px;width: 100%" :src="require('@/assets/images/shangqi/home/top-logo.png')">
+    </div>
       <!-- header头部 右侧内容 当前登录人和退出-->
 <!--      <div class="header-right" style="display: inline-block; float: right; margin-right: 20px; color: #fff">-->
 <!--        <div>-->

src/components/roleTree/index.vue

@@ -166,6 +166,7 @@
             handleTreeDrawerCancel () {
                 this.filterText = ''
                 this.isVisible2 = false
+                this.open1 = true
             },
             saveUserInfo () {
                 if (this.checkBox) {
@@ -195,6 +196,7 @@
                         this.$emit('checkedRole', this.roleList)
                     }
                 }
+                this.open1 = true
             },
             drawerCheck (data) {
                 if (this.checkBox) {