Merge branch 'yoona' into 'master'

Yoona

See merge request pigbigbig/beyond-clouds-front!48

components/pc/select/selectCard.vue

 <template>
 <template>
   <div>
   <div>
-    <div class="select-container" v-if="selectType === '1'" style="min-height: 100px;width: 354px;">
+    <div class="select-container" v-if="selectType === '1'" @mouseleave="isShow2=false" style="min-height: 100px;width: 354px;">
       <div class="select-container__input-box">
       <div class="select-container__input-box">
         <div>
         <div>
           <input
           <input
@@ -186,6 +186,7 @@ export default {
               };
               };
               this.result.push(obj);
               this.result.push(obj);
               this.$popupbox.close();
               this.$popupbox.close();
+              this.$emit('handleTag', this.result);
               this.$message({
               this.$message({
                 type: 'success',
                 type: 'success',
                 message: '标签创建成功'
                 message: '标签创建成功'

nuxt.config.js

-
 module.exports = {
 module.exports = {
   server:{
   server:{
     port:3010,
     port:3010,

pages/users/login.vue

@@ -22,6 +22,7 @@
             v-model="account"
             v-model="account"
             @handleCheck="checkAccount"
             @handleCheck="checkAccount"
             @cancelCheck="accountErrMsg = ''"
             @cancelCheck="accountErrMsg = ''"
+            @keyup.enter.native="handleLogin"
           ></login-input>
           ></login-input>
           <login-input
           <login-input
             :error-message="passwordErrMsg"
             :error-message="passwordErrMsg"
@@ -32,6 +33,7 @@
             v-if="isPassword"
             v-if="isPassword"
             @handleCheck="checkPassword"
             @handleCheck="checkPassword"
             @cancelCheck="passwordErrMsg = ''"
             @cancelCheck="passwordErrMsg = ''"
+            @keyup.enter.native="handleLogin"
           ></login-input>
           ></login-input>
           <login-input
           <login-input
             :error-message="verifyErrMsg"
             :error-message="verifyErrMsg"
@@ -42,6 +44,7 @@
             v-if="!isPassword"
             v-if="!isPassword"
             @sendSms="checkVerification"
             @sendSms="checkVerification"
             @cancelCheck="verifyErrMsg = ''"
             @cancelCheck="verifyErrMsg = ''"
+            @keyup.enter.native="handleLogin"
           ></login-input>
           ></login-input>
         </template>
         </template>
         <template #mainFooter>
         <template #mainFooter>

pages/users/register.vue

@@ -15,6 +15,7 @@
               v-model="account"
               v-model="account"
               @handleCheck="checkAccount"
               @handleCheck="checkAccount"
               @cancelCheck="accountErrMsg = ''"
               @cancelCheck="accountErrMsg = ''"
+              @keyup.enter.native="handleRegisterEnter"
             ></login-input>
             ></login-input>
             <login-input
             <login-input
               :error-message="passwordErrMsg"
               :error-message="passwordErrMsg"
@@ -24,6 +25,7 @@
               v-model="password"
               v-model="password"
               @handleCheck="checkPassword"
               @handleCheck="checkPassword"
               @cancelCheck="passwordErrMsg = ''"
               @cancelCheck="passwordErrMsg = ''"
+              @keyup.enter.native="handleRegisterEnter"
             ></login-input>
             ></login-input>
             <login-input
             <login-input
               :error-message="verifyErrMsg"
               :error-message="verifyErrMsg"
@@ -34,10 +36,11 @@
               v-if="!isEmail"
               v-if="!isEmail"
               @sendSms="checkVerification"
               @sendSms="checkVerification"
               @cancelCheck="verifyErrMsg = ''"
               @cancelCheck="verifyErrMsg = ''"
+              @keyup.enter.native="handleRegisterEnter"
             ></login-input>
             ></login-input>
           </template>
           </template>
           <template #mainFooter>
           <template #mainFooter>
-            <login-button @handle="handleRegister" button="注册"></login-button>
+            <login-button @handle="handleRegister" button="注册" ref="registerButton"></login-button>
           </template>
           </template>
         </login-wrap>
         </login-wrap>
       </div>
       </div>
@@ -160,6 +163,9 @@ export default {
         })
         })
       }
       }
     },
     },
+    handleRegisterEnter() {
+      this.$refs.registerButton.handel();
+    },
     async handleRegister(isAgree) {
     async handleRegister(isAgree) {
       this.checkAccount();
       this.checkAccount();
       this.checkPassword();
       this.checkPassword();
@@ -184,6 +190,7 @@ export default {
         }
         }
         // 邮箱注册
         // 邮箱注册
       }
       }
+      console.log(isAgree);
       console.log(registerResponse);
       console.log(registerResponse);
 
 
       // 注册成功
       // 注册成功

pages/users/reset.vue

@@ -12,6 +12,7 @@
             v-model="account"
             v-model="account"
             @handleCheck="checkAccount"
             @handleCheck="checkAccount"
             @cancelCheck="accountErrMsg = ''"
             @cancelCheck="accountErrMsg = ''"
+            @keyup.enter.native="handleReset"
           ></login-input>
           ></login-input>
           <login-input
           <login-input
             :error-message="passwordErrMsg"
             :error-message="passwordErrMsg"
@@ -21,6 +22,7 @@
             v-model="password"
             v-model="password"
             @handleCheck="checkPassword"
             @handleCheck="checkPassword"
             @cancelCheck="passwordErrMsg = ''"
             @cancelCheck="passwordErrMsg = ''"
+            @keyup.enter.native="handleReset"
           ></login-input>
           ></login-input>
           <login-input
           <login-input
             :error-message="verifyErrMsg"
             :error-message="verifyErrMsg"
@@ -30,6 +32,7 @@
             v-model="verifyCode"
             v-model="verifyCode"
             @sendSms="checkVerification"
             @sendSms="checkVerification"
             @cancelCheck="verifyErrMsg = ''"
             @cancelCheck="verifyErrMsg = ''"
+            @keyup.enter.native="handleReset"
           ></login-input>
           ></login-input>
         </template>
         </template>
         <template #mainFooter>
         <template #mainFooter>