Merge branch 'develop_lsy' into develop

# Conflicts:
#	src/router/index.js

src/router/index.js

@@ -142,8 +142,8 @@ const router = new VueRouter({
 })
 router.beforeEach((to, from, next) => {
   const whiteList = '/login'
-  if (to.path !== whiteList && to.path !== '/creat' && to.path !== '/noadmin') {
-    if (userStore().user.role?.indexOf("2") !== -1 || userStore().user.role?.indexOf("1") !== -1) {
+  if (to.path !== whiteList && to.path !== '/Create' && to.path !== '/noadmin') {
+    if (userStore().user.role.indexOf("2") !== -1 || userStore().user.role.indexOf("1") !== -1) {
       next()
     } else {
       next('/noadmin')

src/views/Create.vue

@@ -169,10 +169,10 @@ export default {
       let timerId = setInterval(() => {
         this.CountDown--
         this.isDisabled = true
-        this.buttonName = 'Retry in ' + this.CountDown + ' seconds'
+        this.buttonName = this.CountDown + 's'
         if (this.CountDown <= 0) {
           clearInterval(timerId)
-          this.buttonName = 'resend'
+          this.buttonName = 'send'
           this.CountDown = 60
           this.isDisabled = false
         }
@@ -182,9 +182,7 @@ export default {
         get(
           '/pdf-tech/auth/getVerifyCode?action=0&type=0&receiver=' +
             this.ruleForm.email
-        ).then((res) => {
-          console.log(res)
-        })
+        ).then((res) => {})
       }
     },
     changeEmail() {
@@ -241,6 +239,7 @@ export default {
               </el-input>
               <button
                 type="button"
+                :class="isDisabled ? 'bgColor' : ''"
                 :disabled = isDisabled
                 @click="sendEmail()"
                 class="
@@ -252,8 +251,7 @@ export default {
                   right-0px
                   border-1px border-[#1460F3]
                   text-[#1460F3]
-                  w-auto
-                  px-5px
+                  w-64px
                   h-24px
                   rounded-4px
                 "
@@ -442,6 +440,10 @@ export default {
 </template>
 
 <style lang="scss" scoped>
+.bgColor{
+  background-color: rgba(20, 96, 243, 0.2);
+  border: none;
+}
 .bg {
   background: #e7eaee url('@/assets/images/background.png') center center
     no-repeat;

src/views/Login.vue

@@ -252,6 +252,10 @@ export default {
 .loginBox {
   box-shadow: 0px 0px 12px rgba(35, 97, 169, 0.05);
 }
+.el-checkbox ::v-deep .el-checkbox__label {
+  font-size: 12px;
+  line-height: 16px;
+}
 .el-input::v-deep input {
   border: 0px !important;
   padding-right: 30px;

src/views/forgotpassword.vue

@@ -62,7 +62,6 @@ export default {
                 duration: 5000,
                 message: 'Please create account first'
               })
-              this.$router.push("/login")
             }
           })
         }