add .

src/boot/utils.js

@@ -2,7 +2,7 @@ import Vue from 'vue'
 import axios from 'axios'
 import md5 from 'js-md5'
 // import {eventBus} from './eventBus'
-import VueCoreVideoPlayer from 'vue-core-video-players'
+// import VueCoreVideoPlayer from 'vue-core-video-players'
 import 'viewerjs/dist/viewer.css'
 import user from './user'
 import message from './message'
@@ -10,7 +10,7 @@ import product from './product'
 import VueViewer from 'v-viewer'
 // import VueCoreVideoPlayer from 'vue-core-video-player'
 Vue.prototype.$EventBus = new Vue()
-Vue.use(VueCoreVideoPlayer)
+// Vue.use(VueCoreVideoPlayer)
 Vue.use(VueViewer)
 Vue.prototype.$md5 = md5;
 Vue.prototype.$message = message

src/css/app.scss

@@ -105,6 +105,9 @@
 .f22 {
     font-size: 22px;
 }
+.f25 {
+    font-size: 25px;
+}
 .f26 {
     font-size: 26px;
 }

src/pages/resetPassword.vue

@@ -93,27 +93,54 @@
     <div class="login-box" :class="$q.platform.is.desktop ? 'login-box-pc': ''">
           <div class="f34 bold">重置密码</div>
         <div class="login_row">
-          <div class="form-group">
-            <div class="login_labelName">輸入郵箱</div>
-            <q-input outlined v-model="loginMsg.Mailbox" />
-            <div class="primary q-mt-sm" v-show="tips">邮箱格式有误,请核实</div>
-          </div>
-          <div>
-            <q-btn
-              v-if="!isSend" class="q-mb-lg"
-              unelevated
-              color="grey-3"
-              style="width: 100%; color: #8B8B8B !important; height: 50px; margin-top: 20px"
-              filled
-              label="发送验证码"
-              @click="sendVerify"
-            />
-            <div v-else class="mt q-mb-sm">
-              <q-input outlined v-model="loginMsg.MailCode" type="text" />
-              <div class="q-mt-sm" :class="cutDown ? 'text-grey-6' : ''">
-                {{ cutDown ? cutDown + "秒后可重新发送" : "重新發送驗證碼" }}
-              </div>
-            </div>
+          <q-input
+            filled
+            v-model="loginMsg.Mailbox"
+            class="q-mt-xl"
+            label="輸入郵箱"
+            style="ime-mode: disabled"
+            aria-autocomplete="off"
+            :rules="[
+              (val) =>
+                /^[a-zA-Z0-9]+([-_.][A-Za-zd]+)*@([a-zA-Z0-9]+[-.])+[A-Za-zd]{2,5}$/.test(
+                  val
+                ) || '請輸入正確的郵箱地址',
+            ]"
+          >
+            <template
+              v-slot:after
+            >
+              <q-btn
+                unelevated
+                color="text-white bg-secondary"
+                :disable="
+                  !/^[a-zA-Z0-9]+([-_.][A-Za-zd]+)*@([a-zA-Z0-9]+[-.])+[A-Za-zd]{2,5}$/.test(
+                    loginMsg.Mailbox
+                  ) || cutDown > 0
+                "
+                style="height: 46px; margin-top: -10px"
+                filled
+                :loading="inSending"
+                :label="
+                  !isSend
+                    ? '发送验证码'
+                    : cutDown > 0
+                    ? cutDown + '秒'
+                    : '重新發送'
+                "
+                @click="sendVerify"
+              />
+            </template>
+          </q-input>
+          <div
+            class="q-mt-md"
+          >
+            <verify-code
+              :digit="6"
+              hint="請輸入正確的驗證碼"
+              ref="verify"
+              v-model="loginMsg.MailCode"
+            ></verify-code>
           </div>
           <div class="form-group">
             <div class="login_labelName flex justify-between items-center">
@@ -161,10 +188,11 @@
 
 <script>
 import QrcodeVue from "qrcode.vue";
+import verifyCode from "src/components/auth/verifyCode.vue";
 export default {
   name: "Login",
   components: {
-    QrcodeVue,
+    QrcodeVue,verifyCode
   },
   data() {
     return {
@@ -183,6 +211,7 @@ export default {
       logo: "",
       flag: 2,
       mylabel: "重置密码",
+      inSending: false,
     };
   },
   created() {},