Merge branch 'master' of http://121.4.203.192:9000/mingxue/front

.env.development

@@ -2,11 +2,9 @@
 ENV = 'development'
 
 # 名学金榜学习系统/生产环境
-# VUE_APP_BASE_API = 'https://front.mingxuejinbang.com/prod-api'
+#VUE_APP_BASE_API = 'https://front.mingxuejinbang.com/prod-api'
 #VUE_APP_BASE_API = 'http://192.168.0.106:1024/prod-api'
-#VUE_APP_BASE_API = 'http://192.168.0.107:1024/prod-api'
-VUE_APP_BASE_API = 'https://fronttest.mingxuejinbang.com/prod-api'
+VUE_APP_BASE_API = '/prod-api'
 
-#VUE_APP_BASE_API = '/prod-api'
 VUE_APP_MOBILE = "https://h5.mingxuejinbang.com"
 

src/components/Top/index.vue

@@ -23,7 +23,7 @@
       </el-col>
       <el-col v-if="userInfo" :span="12" class="layui-col-md6 layui-col-xs8" style="text-align:right;">
         您好！
-        <span style="color:#FFA400;">{{userInfo.nickName}}{{userInfo.userName}} [{{userInfo.provinceName}}{{userInfo.schoolName}}]，</span>
+        <span style="color:#FFA400;">{{userInfo.nickName}}{{userInfo.userName}} [{{userInfo.provinceName}} {{userInfo.schoolName}}]，</span>
         欢迎登录名学金榜
         <el-dropdown v-if="roleList.length > 1" @command="handleRoleExchange">
           <span class="el-dropdown-link pointer">[{{currentRole.roleName}}]</span>