Merge branch 'x' of gitlab.ezijing.com:ezijing/new-project into x

.config.dev.js

 module.exports = {
   domain: 'dev.ezijing.com',
-  url: 'https://project-api.ezijing.com/api',
+  url: 'https://project-api.ezijing.com',
   isEnableToIphoneDebugger: false,
   apiBaseURL: '/api',
   webpack: {

src/components/layout/header.vue

@@ -36,7 +36,10 @@
         </ul>
         <div class="login">
           <template v-if="isLogin">
-            <span @click="handleLogout">退出</span>
+            <div class="login-name">
+              <span class="name">{{ user.realname || user.username }}</span>
+              <span @click="handleLogout">退出</span>
+            </div>
           </template>
           <template v-else>
             <span @click="handleLogin">用户登录</span>
@@ -148,6 +151,7 @@ export default {
       isLogin: false,
       user: null,
       options: {
+        baseUrl: webConf.url,
         register: {
           data:{
             username: `ezijing-${new Date().getTime()}`
@@ -275,6 +279,17 @@ export default {
       margin-left: auto;
       color: #fff;
       cursor: pointer;
+      .login-name{
+        display: flex;
+        .name{
+          width: 100px;
+          overflow: hidden;
+          text-overflow:ellipsis;
+          white-space: nowrap;
+          text-align: right;
+          margin-right: 10px;
+        }
+      }
     }
     .logo-box{
       cursor: pointer;