gpc-ui 0.1.19 → 0.1.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gpc-ui",
-  "version": "0.1.19",
+  "version": "0.1.21",
   "description": "二小UI",
   "private": false,
   "main": "lib/gpc-ui.umd.min.js",

package/src/components/gpc-login/index.vue

@@ -4,7 +4,7 @@
       <div style="color: #018a46;  font-size: 40px; font-style: unset; text-align: right;">
         {{systemTitle}}
       </div>
-      <div style="color: #018a46;  font-size: 32px; font-style: unset; text-align: right;">·{{subtitle}}</div>
+      <div style="color: #018a46;  font-size: 32px; font-style: unset; text-align: right;">{{subtitle}}</div>
     </div>
     <div class="wrap-box">
       <div class="box-content">
@@ -37,7 +37,7 @@
                 </drag-verify>
                 <div class="buttons clearfix">
                   <el-button class="btn-login fr button" :loading="loading" @click="getAccountLogin">登录</el-button>
-                  <el-button type="text" style="color: #028037;" size="small" @click="getRegister">重置密码</el-button>
+<!--                  <el-button type="text" style="color: #028037;" size="small" @click="getRegister">重置密码</el-button>-->
                 </div>
               </div>
             </TabPane>
@@ -54,7 +54,7 @@
                 </div>
                 <div class="input-box">
                   <div class="drag-verify-box">
-                    <input type="text" placeholder="验证码" v-model="verifyFrom.smsCode">
+                    <input type="text" placeholder="验证码" v-model="verifyFrom.code">
                     <el-button style="border-color: #028037; color: #028037;" plain size="small" @click="getLoginVerifyCode" :disabled="isDisabledLogin">{{buttonLoginText}}</el-button>
                   </div>
                 </div>
@@ -79,7 +79,7 @@
             </div>
             <div class="input-box">
               <div class="drag-verify-box">
-                <input type="text" placeholder="验证码" v-model="resetFrom.smsCode">
+                <input type="text" placeholder="验证码" v-model="resetFrom.code">
                 <el-button style="border-color: #028037; color: #028037;" plain size="small" @click="getRestVerifyCode" :disabled="isDisabledRest">{{buttonRestText}}</el-button>
               </div>
             </div>
@@ -177,7 +177,7 @@ export default {
       verifyFrom:{
         phoneNum: "",
         authCode: "",
-        smsCode: "",
+        code: "",
       },
       // 滑块验证 - 验证码登录
       isPassingLogin: false,
@@ -187,7 +187,7 @@ export default {
       resetFrom:{
         phoneNum: "",
         authCode: "",
-        smsCode: "",
+        code: "",
       },
       // 滑块验证 - 验证码登录
       isPassingRest: false,
@@ -209,7 +209,7 @@ export default {
       console.log('getCodeRequest', type, authCode)
       if(type === 'account'){
         this.accountFrom.authCode = authCode
-      } else if(type === 'smsCode'){
+      } else if(type === 'code'){
         this.verifyFrom.authCode = authCode
       } else if(type === 'rest'){
         this.resetFrom.authCode = authCode
@@ -260,7 +260,7 @@ export default {
         // 校验公共逻辑
         if (!this.validateVerifyForm()) return false;
         // 校验短信验证码
-        if (!this.verifyFrom.smsCode) {
+        if (!this.verifyFrom.code) {
           this.$notify.error({ message: '请输入短信验证码' });
           return false;
         }
@@ -293,7 +293,7 @@ export default {
       if(this.isPassingLogin){
         this.$emit('applySMSCodeRequest', this.verifyFrom);
         this.isDisabledLogin = true
-        this.countdownLogin = 3
+        this.countdownLogin = 60
         const interval = setInterval(()=>{
           this.countdownLogin--
           if(this.countdownLogin === 0){
@@ -306,7 +306,7 @@ export default {
     },
     // 验证码登录- 发送获取authCode
     passCallLoginBack() {
-      this.$emit('getCodeRequest', 'smsCode');
+      this.$emit('getCodeRequest', 'code');
     },
     resetLogin() {
       this.isPassingLogin = false;
@@ -339,7 +339,7 @@ export default {
         if (!this.validateResetForm()) return false;
 
         // 校验短信验证码
-        if (!this.resetFrom.smsCode) {
+        if (!this.resetFrom.code) {
           this.$notify.error({ message: '请输入短信验证码' });
           return false;
         }
@@ -373,7 +373,7 @@ export default {
       if(this.isPassingRest){
         this.$emit('applySMSCodeRequest', this.resetFrom);
         this.isDisabledRest = true
-        this.countdownRest = 3
+        this.countdownRest = 60
         const interval = setInterval(()=>{
           this.countdownRest--
           if(this.countdownRest === 0){
@@ -387,6 +387,13 @@ export default {
     passCallRestBack() {
       this.$emit('getCodeRequest', 'rest');
     },
+    resetPwNotice(){
+      this.accountFrom.username = this.resetFrom.phoneNum
+      this.resetFrom.phoneNum = ''
+      this.resetFrom.code = ''
+      this.resetFrom.smsCode = ''
+      this.getLogin()
+    },
     resetPw() {
       this.isPassingRest = false;
       this.$refs.dragVerifyRest.reset()