Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/api/system/user.js
#	src/layout/components/Navbar.vue

src/api/system/user.js

@@ -135,6 +135,7 @@ export function deptTreeSelect() {
   })
 }
 
+// 根据用户名查询实际名称
 export function showName(userName) {
   return request({
     url: '/system/user/showName',
@@ -144,3 +145,4 @@ export function showName(userName) {
     }
   })
 }
+

src/layout/components/Navbar.vue

@@ -8,18 +8,18 @@
     <div class="right-menu" style="margin-top: 20px">
       <el-dropdown class="avatar-container right-menu-item " trigger="click">
         <div class="avatar-wrapper">
-<!--          <img :src="avatar" class="user-avatar">-->
+          <!--          <img :src="avatar" class="user-avatar">-->
           <span class="username">{{ username }}
           <i class="el-icon-caret-bottom"/></span>
         </div>
         <el-dropdown-menu>
-<!--          <router-link to="/user/profile">
-            <el-dropdown-item>个人中心</el-dropdown-item>
-          </router-link>
-          <el-dropdown-item @click.native="setting = true">
-            <span>布局设置</span>
-          </el-dropdown-item>-->
-<!--          sunyu 新加了修改密码的弹窗,完成修改密码功能-->
+          <!--          <router-link to="/user/profile">
+                      <el-dropdown-item>个人中心</el-dropdown-item>
+                    </router-link>
+                    <el-dropdown-item @click.native="setting = true">
+                      <span>布局设置</span>
+                    </el-dropdown-item>-->
+          <!--          sunyu 新加了修改密码的弹窗,完成修改密码功能-->
           <el-dropdown-item @click.native="resetPwdVisible = true">
             <span>修改密码</span>
           </el-dropdown-item>
@@ -34,10 +34,10 @@
               <el-form-item label="确认密码" prop="confirmPassword">
                 <el-input v-model="user.confirmPassword" placeholder="请确认新密码" type="password" show-password/>
               </el-form-item>
-<!--              <el-form-item>-->
-<!--                <el-button type="primary" size="mini" @click="submit">保存</el-button>-->
-<!--                <el-button type="danger" size="mini" @click="close">关闭</el-button>-->
-<!--              </el-form-item>-->
+              <!--              <el-form-item>-->
+              <!--                <el-button type="primary" size="mini" @click="submit">保存</el-button>-->
+              <!--                <el-button type="danger" size="mini" @click="close">关闭</el-button>-->
+              <!--              </el-form-item>-->
             </el-form>
             <span slot="footer" class="dialog-footer">
               <el-button @click.native="resetPwdVisible = false">取 消</el-button>
@@ -115,7 +115,7 @@ export default {
   },
   mounted() {
     showName(Cookies.get('username')).then(response => {
-      if(response.code == 200){
+      if(response.code === 200){
         this.username = response.msg
       } else {
         this.username = '';
@@ -274,3 +274,4 @@ export default {
   }
 }
 </style>
+