极验证修改

@@ -59,12 +59,10 @@ export default {
 
             captchaObj.onFail(function() {
                 _this._result = [];
-                _this.$emit('change', _this._result);
             });
 
             captchaObj.onRefresh(function() {
                 _this._result = [];
-                _this.$emit('change', _this._result);
                 _this.refreshCb && _this.refreshCb();
             });
 

@@ -19,11 +19,11 @@
                     <Form-item>
                         <gee-captcha v-if="isCaptcha" :failNum="failNum" @change="captchaChange"></gee-captcha>
                     </Form-item>
-                    <Form-item class="login-btn">
+                    <!-- <Form-item class="login-btn">
                         <Button type="primary" :loading="loading" @click="handleSubmit('formInline')">
                             登录
                         </Button>
-                    </Form-item>
+                    </Form-item> -->
                 </Form>
             </Card>
         </div>
@@ -79,6 +79,7 @@ export default {
         },
         captchaChange(vals) {
             this.captcha = vals;
+            this.handleSubmit('formInline');
         },
         login(username, password, captcha) {
             this.loading = true;
@@ -87,7 +88,10 @@ export default {
                     this.$Message.error(ret.pwdComplexRateDesc);
                     this.$router.push('/password.html');
                 } else {
-                    this.$Message.warning(ret.overdueInfo);
+                    if (ret.overdueInfo) {
+                        this.$Message.warning(ret.overdueInfo);
+                    }
+
                     this.loading = false;
                     this.$router.push('/');
                 }

@@ -118,18 +118,12 @@ let domainApis = {
 };
 
 // 域名列表
-// const domains = {
-//     erp: 'http://192.168.103.82:9098',
-//     platform: 'http://192.168.102.48:8088/platform',
-//     shop: 'http://192.168.102.211:30016'
-// };
 const domains = {
-    erp: 'http://192.168.20.180',
+    erp: 'http://192.168.103.82:9098',
     platform: 'http://192.168.102.48:8088/platform',
     shop: 'http://192.168.102.211:30016'
 };
 
-
 if (global.env.Test) {
     domains.erp = 'http://192.168.103.82:9098';
     domains.platform = 'http://192.168.102.48:8088/platform';

@@ -25,14 +25,14 @@ class UserController extends Context {
 
                 if (user.passwd_time > 0) {
                     overdueInfo = `您的密码即将在${user.passwd_time}天后过期`;
-                } else {
+                } else if (user.passwd_time) {
                     overdueInfo = user.passwd_time === 0 ? '您的密码已于今天过期' : `您的密码已过期${user.passwd_time}天`;
                 }
 
                 this.userService.getShops(user.pid).then(result => {
                     if (result.code === 200) {
                         let currentShop = _.first(result.data);
-                        let needUpdate = !user.pwdComplexRate;
+                        let needUpdate = user.pwdComplexRate === false;
 
                         this.userService.switchShop({
                             shopId: currentShop.shopsId,