소스 검색

登录页-二维码登录隐藏

Xiao_123 7 달 전
부모
커밋
239e4c485b
3개의 변경된 파일16개의 추가작업 그리고 20개의 파일을 삭제
  1. 4 2
      src/components/headSearch/index.vue
  2. 5 12
      src/views/login/components/editPassword.vue
  3. 7 6
      src/views/login/index.vue

+ 4 - 2
src/components/headSearch/index.vue

@@ -35,7 +35,8 @@
         style="height: 100%; line-height: 100%;"
         @keyup.enter="handleSearch"
       ></v-text-field>
-      <div class="searchBtn" @click="handleSearch">搜索</div>
+      <!-- <div class="searchBtn" @click="handleSearch">搜索</div> -->
+      <v-btn class="searchBtn" @click="handleSearch">搜索</v-btn>
     </div>
   </div>
 </template>
@@ -117,7 +118,8 @@ const handleClickJob = (val) => {
   }
   .searchBtn {
     width: 100px;
-    height: 50px; line-height: 48px;
+    height: 50px;
+    line-height: 48px;
     text-align: center;
     font-size: 18px;
     color: #fff;

+ 5 - 12
src/views/login/components/editPassword.vue

@@ -23,7 +23,7 @@
         prepend-inner-icon="mdi-lock-outline" 
         :append-inner-icon="show ? 'mdi-eye-outline' : 'mdi-eye-off-outline'"
         :type="show ? 'text' : 'password'"
-        :rules="secondaryConfirmation"
+        :rules="[v=> !!v || '请再次输入密码', confirmPassword]"
         @click:append-inner="show = !show"
       ></v-text-field>
     </v-form>
@@ -67,23 +67,16 @@ const loading = ref(false)
 const passwordType = ref(false)
 const phoneRef = ref()
 
-const secondaryConfirmation = ref([
-  value => {
-    if (value) return true
-    return '请再次输入密码'
-  },
-  value => {
-    if (value === query.password) return true
-    return '两次输入密码不一致'
-  }
-])
-
 // 密码效验
 const regex = /^(?=.*[0-9])(?=.*[a-z])(?=.*[A-Z]).{8,16}$/
 const validPassword = computed(() => {
   return regex.test(query.password) || '请输入8-16位数由数字、大小写字母组成的密码'
 })
 
+const confirmPassword = computed(() => {
+  return query.checkPassword === query.password || '两次输入密码不一致'
+})
+
 
 const handleClose = () => {
   query = {

+ 7 - 6
src/views/login/index.vue

@@ -1,15 +1,15 @@
 <template>
   <div class="login-box">
     <div class="login-content">
-      <div class="text-end pr-5 pt-5">
+      <!-- <div class="text-end pr-5 pt-5">
         <span class="color-error cursor-pointer text-decoration-underline" @click="router.push('/register/selected')">还没有登录账户?去注册</span>
-      </div>
-      <div class="login-content-box mb-10">
+      </div> -->
+      <div class="login-content-box my-10">
         <div class="login-tab">
           <v-tabs v-model="tab" align-tabs="center" color="primary" class="mb-10">
             <v-tab :value="1">验证码</v-tab>
             <v-tab :value="2">账号</v-tab>
-            <v-tab :value="3">二维码</v-tab>
+            <!-- <v-tab :value="3">二维码</v-tab> -->
           </v-tabs>
           <v-window v-model="tab">
               <!-- 验证码登录 -->
@@ -20,16 +20,17 @@
             <v-window-item :value="2">
               <passwordFrom ref="passRef" @handleEnter="handleLogin"></passwordFrom>
             </v-window-item>
-            <v-window-item :value="3">
+            <!-- <v-window-item :value="3">
               <div class="d-flex align-center flex-column">
                 <span class="text-decoration-underline">微信扫描二维码进行登录</span>
                 <v-img src="https://minio.citupro.com/dev/menduner/login-qrCode.png" width="150" height="150"></v-img>
               </div>
-            </v-window-item>
+            </v-window-item> -->
           </v-window>
         </div>
         <div class="font-size-14 tips">
           <span class="float-left color-666 cursor-pointer" v-if="tab === 2" @click="router.push('/forgotPassword')">忘记密码</span>
+          <span class="float-right color-error cursor-pointer text-decoration-underline" @click="router.push('/register/selected')">还没有登录账户?去注册</span>
         </div>
         <v-btn :loading="loginLoading" color="primary" class="white--text mt-5" min-width="350" @click="handleLogin">
           {{ $t('login.login') }}