Merge branch 'master' of http://119.23.72.7/shiyu/icsales

dist/js/person/login.js

@@ -302,6 +302,7 @@
             
             IcController.getData(apis.authlogin, 'POST', data.field, function (res) {
               
+              
               if (res.err_code === 0) {
                 
                 //注入token
@@ -311,6 +312,8 @@
                 
               } else {
                 
+                $(".error-text").hide();
+                
                 layer.msg(res.err_msg);
                 
                 opt.isClick = false;

dist/js/person/register.js

@@ -270,7 +270,7 @@
               if (res.err_code === 0) {
                 
                 //注入token
-                Util.setCookie('token', res.access_token, 1, cookieHostname);
+                Util.setCookie('token', res.data.access_token, 1, cookieHostname);
                 
                 window.location.href = home_url + '/homes';