Merge remote-tracking branch 'origin/master'

src/views/user/LoginAccount.vue

@@ -12,19 +12,19 @@
           </a-input>
         </a-form-model-item>
 
-        <a-row :gutter="0">
-          <a-col :span="16">
-            <a-form-model-item required prop="inputCode">
-              <a-input v-model="model.inputCode" size="large" type="text" placeholder="请输入验证码">
-                <a-icon slot="prefix" type="smile" :style="{ color: 'rgba(0,0,0,.25)' }"/>
-              </a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="8" style="text-align: right">
-            <img v-if="requestCodeSuccess" style="margin-top: 2px;" :src="randCodeImage" @click="handleChangeCheckCode"/>
-            <img v-else style="margin-top: 2px;" src="../../assets/checkcode.png" @click="handleChangeCheckCode"/>
-          </a-col>
-        </a-row>
+<!--        <a-row :gutter="0">-->
+<!--          <a-col :span="16">-->
+<!--            <a-form-model-item required prop="inputCode">-->
+<!--              <a-input v-model="model.inputCode" size="large" type="text" placeholder="请输入验证码">-->
+<!--                <a-icon slot="prefix" type="smile" :style="{ color: 'rgba(0,0,0,.25)' }"/>-->
+<!--              </a-input>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="8" style="text-align: right">-->
+<!--            <img v-if="requestCodeSuccess" style="margin-top: 2px;" :src="randCodeImage" @click="handleChangeCheckCode"/>-->
+<!--            <img v-else style="margin-top: 2px;" src="../../assets/checkcode.png" @click="handleChangeCheckCode"/>-->
+<!--          </a-col>-->
+<!--        </a-row>-->
       </a-form-model>
     </div>
 </template>
@@ -45,7 +45,7 @@
         model:{
           username: 'admin',
           password: '123456',
-          inputCode: ''
+          // inputCode: ''
         },
         validatorRules:{
           username: [
@@ -55,9 +55,9 @@
           password: [{
             required: true, message: '请输入密码!', validator: 'click'
           }],
-          inputCode: [{
-            required: true, message: '请输入验证码!'
-          }]
+          // inputCode: [{
+          //   required: true, message: '请输入验证码!'
+          // }]
         }
 
       }
@@ -123,12 +123,13 @@
       },
       //账号密码登录
       handleLogin(rememberMe){
-        this.validateFields([ 'username', 'password', 'inputCode' ], (err)=>{
+        // this.validateFields([ 'username', 'password', 'inputCode' ], (err)=>{
+        this.validateFields([ 'username', 'password' ], (err)=>{
           if(!err){
             let loginParams = {
               username: this.model.username,
               password: this.model.password,
-              captcha: this.model.inputCode,
+              // captcha: this.model.inputCode,
               checkKey: this.currdatetime,
               remember_me: rememberMe,
             }