登录修改

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/AuthRedirectController.java

@@ -8,6 +8,7 @@ import com.management.platform.mapper.CompanyMapper;
 import com.management.platform.mapper.SysConfigMapper;
 import com.management.platform.mapper.UserMapper;
 import com.management.platform.mapper.WxCorpInfoMapper;
+import com.management.platform.service.UserService;
 import com.management.platform.util.HttpRespMsg;
 import com.management.platform.util.MessageUtils;
 import com.management.platform.util.UserAgentUtils;
@@ -54,6 +55,8 @@ public class AuthRedirectController {
     UserMapper userMapper;
     @Resource
     WxCorpInfoMapper wxCorpInfoMapper;
+    @Resource
+    UserService userService;
 
     @RequestMapping("/corpWXAuth")
     public ModelAndView auth(String code, String state) {
@@ -96,6 +99,8 @@ public class AuthRedirectController {
                     reqParam.put("errorMsg", MessageUtils.message("user.accountNoExist"));
                 } else if (curUser.getIsActive() == 1) {
                     reqParam.put("userId", curUser.getId());
+//                    HttpRespMsg httpRespMsg = userService.loginByUserId(curUser.getId(), request);
+//                    reqParam.put("userInfo", httpRespMsg.data);
                 } else {
                     //提示账号已停用
                     //reqParam.put("errorMsg", "您的账号已停用，无法登录");
@@ -106,9 +111,9 @@ public class AuthRedirectController {
         reqParam.put("hasTriedAutoLogin", 1);
         String redirecUrl = null;
         if (isMobile) {
-            redirecUrl = "http://mobworktime.ttkuaiban.com";
+            redirecUrl = "http://mobworktime.ttkuaiban.com/#/login";
         } else {
-            redirecUrl = "http://worktime.ttkuaiban.com";
+            redirecUrl = "http://worktime.ttkuaiban.com#/#/login";
         }
         ModelAndView modelAndView = new ModelAndView(
                 new RedirectView(redirecUrl), reqParam);

fhKeeper/formulahousekeeper/timesheet_h5/src/views/index/index.vue

@@ -123,14 +123,6 @@
             if (localStorage.userInfo != null) {
                 this.getAccountInfo();
             }
-            
-            this.getMessage();
-            this.bindIfNessary();
-            if (localStorage.userInfo != null) {
-                this.getAccountInfo();
-            }
-            
-            
         },
         components: {
             Footer

fhKeeper/formulahousekeeper/timesheet_h5/src/views/login/index.vue

@@ -176,6 +176,7 @@
                         } else {
                             //获取openId
                             if (res.data != null) {
+                                this.$store.commit("updateLogin", true);
                                 localStorage.userInfo = JSON.stringify(res.data);
                                 this.user = res.data;
                                 window.location.href = '/#/index';