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

package-lock.json

@@ -1119,9 +1119,9 @@
       }
     },
     "@ezijing/vue-form": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@ezijing/vue-form/-/vue-form-2.1.3.tgz",
-      "integrity": "sha512-No21m6zSkCuj5+1MQVYnnNDnw3LlYF23j18sGCPvmRO6guV/Ws8BS0MkgvBCJRsFCVszBBp+QfkbnjUaO3NyCQ==",
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/@ezijing/vue-form/-/vue-form-2.1.9.tgz",
+      "integrity": "sha512-ArYeLbLM+OGWJ/tGvFR1Jb0lebOAKWMM90TcyCqzwrikJklSp4pbLQ8V9VmPpX6MZWL/q8H4amTXnUKnGllDzg==",
       "requires": {
         "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
         "@vue/babel-preset-jsx": "^1.1.2",

package.json

@@ -72,7 +72,7 @@
     "webpack-merge": "^4.2.2"
   },
   "dependencies": {
-    "@ezijing/vue-form": "^2.1.3",
+    "@ezijing/vue-form": "^2.1.9",
     "@ezijing/vue-passport": "^1.0.0",
     "axios": "^0.21.0",
     "bootstrap": "^4.5.3",

src/components/layout/header.vue

@@ -4,7 +4,7 @@
       <div class="inner">
         <div class="login">
           <template v-if="isLogin">
-            <div>{{ user.nickname }}</div>
+            <div>{{ user.nickname || user.realname }}</div>
             <span>|</span>
             <div @click="handleLogout">退出</div>
           </template>

src/pages/my/interview/form/zp.js

@@ -53,7 +53,7 @@ export default function(_this) {
             limit: 1
           },
           append:
-            '申请者需要上传本人半年以内的一寸彩色近照。<br> 只需上传一个文件，且照片完整、干净。<br> 上传文件仅限“jpg,jpeg,gif,png”格式的图片文件，且文件小于10MB。'
+            '申请者需要上传本人半年以内的两寸彩色近照。<br> 只需上传一个文件，且照片完整、干净。<br> 上传文件仅限“jpg,jpeg,gif,png”格式的图片文件，且文件小于10MB。'
         }
       ]
     }