WIN-20230912WHV\Administrator 1 ano atrás
pai
commit
1af8db2c3a

+ 8 - 1
components/en-from/en-input/index.vue

@@ -1,6 +1,13 @@
 <template>
   <view class="en-box">
-    <input type="number" class="en-input sys-size-32 " placeholder="请输入手机号" maxlength="11" placeholder-class="sys-size-28 " v-model="loginData.phone"></input>
+    <input  class="en-input sys-size-32 text-color-12 sys-weight-600 "
+            placeholder-class="sys-size-28 text-color-999 sys-weight-400"
+            :maxlength="maxlength"
+            :type="type"
+            :placeholder="placeholder ? placeholder : ''"
+            :disabled="!!disabled"
+            v-model="inputValue"
+    ></input>
   </view>
 </template>
 

+ 6 - 4
pages/login/index.vue

@@ -13,20 +13,20 @@
         <view class="from-box one-background-color " :class="{'one-from':type===1,'two-from':type===2}">
           <view class="from-animation animate__animated animate__fadeIn"  v-if="type===1" >
             <view class="input-item  sys-from-background-color sys-radius-30 " :class="{'apply-shake':phoneShake}">
-              <input type="number" class="login-input" placeholder="请输入手机号" maxlength="11" v-model="loginData.phone"></input>
+              <en-input type="number" class="login-input" placeholder="请输入手机号"  v-model="loginData.phone" maxlength="11"></en-input>
             </view>
             <view class="input-item  input-send sys-from-background-color sys-radius-30" :class="{'apply-shake':codedShake}">
-              <input type="number" class="login-input" placeholder="请输入验证码" v-model="loginData.code"></input>
+              <en-input type="number" class="login-input" placeholder="请输入验证码"  v-model="loginData.code" maxlength="6"></en-input>
               <view class="login-send text-color-dominant sys-size-28 sys-weight-400" @click="getVerifiedCode" v-if="timeNum<=0">发送验证码</view>
               <view class="login-send text-color-dominant sys-size-28 sys-weight-400" v-else>{{ timeNum }} s</view>
             </view>
           </view>
           <view class="from-animation animate__animated animate__fadeIn" v-else>
             <view class="input-item  sys-from-background-color sys-radius-30 " :class="{'apply-shake':phoneShake}">
-              <input type="number" class="login-input" placeholder="请输入手机号"  v-model="loginData.phone" maxlength="11"></input>
+              <en-input type="number" class="login-input" placeholder="请输入手机号"  v-model="loginData.phone" maxlength="11"></en-input>
             </view>
             <view class="input-item input-send  sys-from-background-color sys-radius-30" :class="{'apply-shake':passwordShake}">
-              <input type="password" class="login-input" placeholder="请输入密码" v-model="loginData.password"></input>
+              <en-input type="password" class="login-input" placeholder="请输入密码"  v-model="loginData.password"></en-input>
               <view class="login-send text-color-dominant sys-size-28 sys-weight-400" >忘记密码?</view>
             </view>
           </view>
@@ -65,9 +65,11 @@
   import {commonSend} from "@/api/common";
   import tools from "@/service/tools";
   import {login} from "@/api/login";
+  import EnInput from "@/components/en-from/en-input/index.vue";
 
   export default {
     components: {
+      EnInput
 
     },
     data() {

+ 2 - 0
service/router.js

@@ -18,6 +18,7 @@ const router = createRouter({
 const whiteList = ['/pages/login/index']
 
 router.beforeEach((to, from, next) => {
+    // tools.showLoading()
     let userToken=''
     if (to.query.token ) {
         userToken = to.query.token;
@@ -37,6 +38,7 @@ router.beforeEach((to, from, next) => {
 // 全局路由后置守卫
 router.afterEach((to, from) => {
     // console.log('后置守卫to------', to)
+    // tools.hideLoading()
 })
 
 export {

+ 2 - 2
static/css/default-color.scss

@@ -36,7 +36,7 @@
   color: #7C7C7C;;
 }
 
-.page-box .text-color-13{
-  color: #131313;;
+.page-box .text-color-12{
+  color: #121212;;
 }