Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/views/layout/components/Navbar.vue

@@ -7,6 +7,7 @@
       <div>
         <el-dropdown trigger="click" style="color:#fff;">
         <span class="el-dropdown-link">{{ this.$store.getters.xt_user.org.org_name }}
+          <!--<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>-->
         </span>
         </el-dropdown>
       </div>
@@ -116,9 +117,9 @@
       }
     },
     create() {
-      // var xtuser = this.$store.getters.xt_user
-      // this.orgname = xtuser.org.org_name
-      // console.log(this.orgname)
+      var xtuser = this.$store.getters.xt_user
+      this.orgname = xtuser.org.org_name
+      console.log(this.orgname)
 
     }
   }

src/views/layout/components/Sidebar/index.vue

@@ -5,7 +5,7 @@
     </div>
     <el-menu
       mode="vertical"
-      unique-opened="ture"
+      :unique-opened="uniqueOpened"
       :show-timeout="200"
       :default-active="$route.path"
       :collapse="isCollapse"
@@ -32,6 +32,11 @@ export default {
       return !this.sidebar.opened;
     }
   },
+  data(){
+    return{
+      uniqueOpened:true,
+    }
+  },
   methods:{
     toggleSideBar() {
       this.$store.dispatch("toggleSideBar");

src/xt_pages/home/modify_user_info_dialog.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <el-dialog title="修改个人信息" modal-append-to-body="false" append-to-body="true" width="50%" :visible.sync="visible" :before-close="_close">
+        <el-dialog title="修改个人信息" :modal-append-to-body="false" :append-to-body="true" width="50%" :visible.sync="visible" :before-close="_close">
             <el-form ref="form" :model="form"  :rules="rules" label-width="80px" 
                     v-loading="uploading">
                 <el-form-item label="账号:">
@@ -34,7 +34,7 @@
             </div>
         </el-dialog>
 
-        <el-dialog title="修改密码" modal-append-to-body="false" append-to-body="true" :visible.sync="pwd_dialog_visible">
+        <el-dialog title="修改密码" :modal-append-to-body="false" :append-to-body="true" :visible.sync="pwd_dialog_visible">
             <el-form ref="pwd_form" :model="pwd_form" label-width="80px">
                 <el-form-item label="账号:">
                     <span>{{ this.$store.getters.xt_user.user.mobile }}</span>