Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner into dev

src/components/FormUI/TextInput/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div :style="{ width: item.width ? item.width + 'px' : '100%' }">
     <v-text-field
-      v-model="value"
+      v-model.trim="value"
       variant="outlined"
       :density="item.dense || 'compact'"
       :type="inputType"

src/components/VerificationCode/index.vue

@@ -4,7 +4,7 @@
       <!-- 邀请新同事快捷登录时需要填写邮箱 -->
       <v-text-field
         v-if="props.showEmailInput"
-        v-model="loginData.email"
+        v-model.trim="loginData.email"
         placeholder="请输入企业邮箱"
         color="primary"
         variant="outlined"
@@ -32,7 +32,7 @@
         </template>
       </v-text-field>
       <v-text-field 
-        v-model="loginData.code" 
+        v-model.trim="loginData.code" 
         :placeholder="$t('login.enterCode')" 
         color="primary" 
         variant="outlined" 

src/views/login/components/editPassword.vue

@@ -3,7 +3,7 @@
     <PhonePage ref="phoneRef" style="width: 370px;" :phone="phone" :scene="scene" openVerify :phoneDisabled="phone ? true : false" @verifySuccess="handleSubmit"></PhonePage>
     <v-form ref="passwordRef" style="width: 370px;">
       <v-text-field
-        v-model="query.password"
+        v-model.trim="query.password"
         placeholder="请输入新密码" 
         variant="outlined" 
         density="compact"
@@ -15,7 +15,7 @@
         @click:append-inner="passwordType = !passwordType"
       ></v-text-field>
       <v-text-field
-        v-model="query.checkPassword"
+        v-model.trim="query.checkPassword"
         placeholder="请再次输入新密码" 
         variant="outlined" 
         density="compact"

src/views/login/components/editPasswordEnt.vue

@@ -2,7 +2,7 @@
   <div class="mt-3">
     <v-form ref="emailRef" style="width: 100%;">
       <v-text-field
-        v-model="query.email"
+        v-model.trim="query.email"
         label="企业邮箱"
         placeholder="请输入企业邮箱" 
         variant="outlined" 
@@ -12,7 +12,7 @@
         :rules="[v=> !!v || '请输入企业邮箱', v=> checkEmail(v) || '邮箱格式不正确']"
       ></v-text-field>
       <v-text-field
-        v-model="query.code"
+        v-model.trim="query.code"
         label="验证码"
         placeholder="请输入邮箱收到的验证码" 
         variant="outlined" 
@@ -28,7 +28,7 @@
     </v-form>
     <v-form ref="passwordRef" style="width: 100%;">
       <v-text-field
-        v-model="query.password"
+        v-model.trim="query.password"
         placeholder="请输入新密码" 
         variant="outlined" 
         density="compact"
@@ -40,7 +40,7 @@
         @click:append-inner="passwordType = !passwordType"
       ></v-text-field>
       <v-text-field
-        v-model="query.checkPassword"
+        v-model.trim="query.checkPassword"
         placeholder="请再次输入新密码" 
         variant="outlined" 
         density="compact"

src/views/login/components/passwordPage.vue

@@ -1,7 +1,7 @@
 <template>
   <v-form ref="passwordForm" @submit.prevent>
     <v-text-field
-      v-model="loginData.phone"
+      v-model.trim="loginData.phone"
       :counter="isCounter ? 100 : 11"
       :disabled="props.phoneDisabled"
       :placeholder="placeholder ? placeholder : '请输入手机号码'"
@@ -30,7 +30,7 @@
       </template> -->
     </v-text-field>
     <v-text-field
-      v-model="loginData.password"
+      v-model.trim="loginData.password"
       :placeholder="$t('login.enterPassword')" 
       variant="outlined" 
       density="compact"

src/views/recruit/personal/home/components/advertisement/dynamic/intercontinental.vue

@@ -7,7 +7,13 @@
       </v-carousel>
       <v-img class="logo-png" src="https://minio.citupro.com/dev/menduner/preferredGroup/IHG-logo.png" width="152" height="72"></v-img>
     </div> -->
-    <v-img src="https://minio.menduner.com/dev/menduner/IHG.gif" width="1184" height="500"></v-img>
+    <v-img src="https://minio.menduner.com/dev/menduner/IHG.gif" lazy-src="https://minio.menduner.com/dev/menduner/IHG.gif" width="1184" height="500">
+      <template v-slot:placeholder>
+        <v-row align="center" class="fill-height ma-0" justify="center">
+          <v-progress-circular color="grey-lighten-5" indeterminate></v-progress-circular>
+        </v-row>
+      </template>
+    </v-img>
     <!-- 集团简介 -->
     <div class="brief-introduction">
       <h2>集团简介</h2>