Merge branch 'develop' into FOTON

src/components/roleTree/index.vue

@@ -135,7 +135,10 @@
                 this.isVisible2 = false
             },
             saveUserInfo () {
-                if (this.nodeList.length > 0) {
+                if (this.nodeList[0].length === 0) {
+                    this.isVisible2 = false
+                    this.$emit('checkedRole', this.roleList)
+                } else if (this.nodeList.length > 0) {
                     let ids = ''
                     this.nodeList.forEach(item => {
                         if (ids.length > 0) {

src/pages/home/components/EnterCard.vue

@@ -2,8 +2,8 @@
   <div @click="toPage">
     <div>
       <div v-if="label" class="icon-style">
-        <span v-for="item in icons" v-if="item.label === label" :class="item.icon">
-          <span style="padding-left: 10px">
+        <span v-for="item in icons" v-if="item.label === label" :class="item.icon" style="font-size: 20px;">
+          <span style="padding-left: 10px; font-size: 16px">
             {{ label }}
           </span>
         </span>