Merge branch 'dev-followUp-20190312' of...

Merge branch 'dev-followUp-20190312' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-followUp-20190312

src/views/login.vue

@@ -57,11 +57,11 @@
               <p class="err-text" v-show="resetCodeErr"><img src="../assets/image/err-icon.svg" alt="">{{resetCodeErrText}}</p>
             </el-form-item>
             <el-form-item label="">
-              <el-input v-model="resetPassword.password" placeholder="新密码" type="password" v-if="!showPSW" :class="{errColor: resetPWDErr}">
+              <el-input v-model.lazy="resetPassword.password" placeholder="新密码" type="password" v-if="!showPSW" :class="{errColor: resetPWDErr}">
                 <i slot="prefix" class="el-input__icon my-icon password-icon"></i>
                 <i @click="showPWSBtn"  slot="suffix" class="el-input__icon my-icon open-eyes-icon"></i>
               </el-input>
-              <el-input v-model="resetPassword.password" placeholder="新密码" v-else :class="{errColor: resetPWDErr}">
+              <el-input v-model.lazy="resetPassword.password" placeholder="新密码" v-else :class="{errColor: resetPWDErr}">
                 <i slot="prefix" class="el-input__icon my-icon password-icon"></i>
                 <i @click="hidePWSBtn" slot="suffix" class="el-input__icon my-icon close-eyes-icon"></i>
               </el-input>
@@ -331,7 +331,7 @@
         this.saasGET('/mobiles/checkCaptcha',para).then(data => {
           let req = {
             mobile: this.resetPassword.mobile,
-            password: md5(this.resetPassword.authCode).toUpperCase()
+            password: md5(this.resetPassword.password).toUpperCase()
           }
           this.saasPUT('/login/password',req).then(data => {
             this.$message({