[feat][登录]添加密码铭文效果、添加自动带入效果，修改部分问题

src/views/xjc-integratedmachine/components/head_component.vue

@@ -5,7 +5,7 @@
 <!-- 等UI图更新继续画     <div>-->
 <!--        <div>{{headInfo.title}}</div>-->
 <!--        <div>头像</div>-->
-<!--        <el-button @click="exit">退出</el-button>-->
+        <el-button @click="exit">退出</el-button>
 <!--        <el-button>使用说明</el-button>-->
 <!--      </div>-->
     </div>
@@ -40,7 +40,7 @@
 
 </script>
 
-<style scoped>
+<style scoped lang='scss'>
 
     .contenter{
       position: absolute;

src/views/xjc-integratedmachine/login/student_forgetpass.vue

@@ -13,7 +13,7 @@
                 <el-form-item prop="userName">
               <el-input
                   style="background-color: #F5F9FA;"
-                  v-model="form.userName"
+                  v-model.trim="form.userName"
                   @input="getSecret()"
                   placeholder="请输入身份证号"
                   class="form-box-input1"
@@ -26,8 +26,9 @@
                 <el-form-item prop="password">
                   <el-input
                   style="background-color: #F5F9FA;"
-                  v-model="form.password"
+                  v-model.trim="form.password"
                   placeholder="请输入新密码"
+                  show-password
                   class="form-box-input1"
               >
                 <template #prefix>
@@ -38,8 +39,9 @@
                 <el-form-item prop="reppassword">
                <el-input
                   style="background-color: #F5F9FA;"
-                  v-model="form.reppassword"
+                  v-model.trim="form.reppassword"
                   placeholder="请确认新密码"
+                  show-password
                   class="form-box-input1"
               >
                 <template #prefix>
@@ -53,7 +55,7 @@
                 <el-form-item prop="secretAnswer">
                    <el-input
                   style="background-color: #F5F9FA;"
-                  v-model="form.secretAnswer"
+                  v-model.trim="form.secretAnswer"
                   placeholder="请输入答案"
                   class="form-box-input1"
               >
@@ -76,6 +78,8 @@
     import {login} from "@/api/login.js";
     import {setToken} from "@/utils/auth.js";
     import HeadComponent from "@/views/xjc-integratedmachine/components/head_component.vue";
+    import {handleThemeStyle} from "@/utils/theme.js";
+    import useSettingsStore from "@/store/modules/settings.js";
 
     const loading = ref(false)
     const router = useRouter()
@@ -138,6 +142,10 @@
         }
       })
     }
+    onMounted(() => {
+      form.value.userName = params.username
+      getSecret()
+    })
 </script>
 
 <style scoped lang="scss">

src/views/xjc-integratedmachine/login/student_login.vue

@@ -12,7 +12,7 @@
                 <el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form">
                   <el-form-item prop="username">
                     <el-input
-                        v-model="loginForm.username"
+                        v-model.trim="loginForm.username"
                         type="text"
                         size="large"
                         auto-complete="off"
@@ -26,7 +26,7 @@
                   </el-form-item>
                   <el-form-item prop="password">
                     <el-input
-                        v-model="loginForm.password"
+                        v-model.trim="loginForm.password"
                         type="password"
                         size="large"
                         auto-complete="off"
@@ -60,7 +60,6 @@
                   </el-form-item>
                 </el-form>
               </div>
-
             </div>
           </div>
         </div>
@@ -114,9 +113,8 @@
                       router.push({
                           path: params.modulePath
                       })
-                      if(resp.data.access_token === 600){
-                        loading.value = false;
-                      }
+                }).catch((err)=>{
+                  loading.value = false;
                 })
             }
         })
@@ -126,7 +124,8 @@
         router.push({
             path : '/xjc-integratedmachine/login/student_forgetpass',
             query:{
-                modulePath : params.modulePath
+                modulePath : params.modulePath,
+                username : loginForm.value.username || "",
             }
         })
     }

src/views/xjc-integratedmachine/login/visitor_login.vue

@@ -13,7 +13,7 @@
                 <el-form-item prop="userName">
               <el-input
                   style="background-color: #F5F9FA;"
-                  v-model="loginForm.userName"
+                  v-model.trim="loginForm.userName"
                   placeholder="请输入手机号"
                   class="form-box-input1"
               >
@@ -22,9 +22,7 @@
                 </template>
               </el-input>
             </el-form-item>
-              <p class="form-box-text" v-show="needRegister">
-                未检测到该手机号 请先注册
-               </p>
+
                 <div style="display: flex;justify-content: center">
                   <el-button class="form-box-btn1" @click="phoneLogin">登录</el-button>
                 </div>
@@ -36,7 +34,7 @@
                 <el-form-item prop="userName">
               <el-input
                   style="background-color: #F5F9FA;"
-                  v-model="loginForm.userName"
+                  v-model.trim="loginForm.userName"
                   placeholder="请输入手机号"
                   class="form-box-input1"
               >
@@ -55,13 +53,16 @@
                 </el-form-item>
                  <el-form-item prop="checkCode">
                    <el-input
-                       v-model="loginForm.checkCode"
+                       v-model.trim="loginForm.checkCode"
                        style="background-color: #F5F9FA;"
                        placeholder="请输入验证码"
                        class="form-box-input1"
                    >
                    </el-input>
                 </el-form-item>
+                <p class="form-box-text">
+                  未检测到该手机号 请先注册
+                </p>
                 {{loginForm.checkCodeText}}
                 <div style="display: flex;justify-content: center">
                   <el-button class="form-box-btn1" @click="validCheckCode">下一步</el-button>
@@ -78,7 +79,7 @@
               <el-input
                   style="background-color: #F5F9FA;"
                   type="password"
-                  v-model="loginForm.password"
+                  v-model.trim="loginForm.password"
                   placeholder="请输入密码"
                   class="form-box-input1"
                   show-password
@@ -91,7 +92,7 @@
                 <el-form-item prop="reppassword">
               <el-input
                   type="password"
-                  v-model="loginForm.reppassword"
+                  v-model.trim="loginForm.reppassword"
                   style="background-color: #F5F9FA;"
                   placeholder="请再次输入密码"
                   class="form-box-input1"
@@ -241,14 +242,11 @@ function phoneLogin() {
       getUserInfo(loginForm.value.userName).then(resp => {
         if (resp.sysUser == null) {
           //没有此人，需要注册
-          needRegister
           step.value = 2
         } else {
           step.value = 4
         }
       })
-      //清空数据
-      clearFrom()
     }
   })
 }