7 лет назад · f8ebb5feff
--- a/src/main/House/src/router/index.js
+++ b/src/main/House/src/router/index.js
@@ -197,12 +197,12 @@ router.beforeEach((to, from, next) => {
 
				                 if (res.status === 200) {
			
 
				                     if (res.data.success) {
			
 
				                         if (!res.data.data) {
			
 
				-                            next('/login')
			
 
				-                                // if (isWeiXin) {
			
 
				-                                //     window.open('http://xjw.izouma.com/wx/auth?redirectUri=' + to.name);
			
 
				-                                // } else {
			
 
				-                                //     next('/login')
			
 
				-                                // }
			
 
				+                            // next('/login')
			
 
				+                            if (isWeiXin) {
			
 
				+                                window.open('http://xjw.izouma.com/wx/auth?redirectUri=' + to.name);
			
 
				+                            } else {
			
 
				+                                next('/login')
			
 
				+                            }
			
 
				 
			
 
				                             return;
			
 
				                         }
			
@@ -211,13 +211,13 @@ router.beforeEach((to, from, next) => {
 
				                         return;
			
 
				                     }
			
 
				                 }
			
 
				-                next('/login');
			
 
				-                // if (isWeiXin) {
			
 
				-                //     window.open('http://xjw.izouma.com/wx/auth?redirectUri=' + to.name);
			
 
				+                // next('/login');
			
 
				+                if (isWeiXin) {
			
 
				+                    window.open('http://xjw.izouma.com/wx/auth?redirectUri=' + to.name);
			
 
				 
			
 
				-                // } else {
			
 
				-                //     next('/login')
			
 
				-                // }
			
 
				+                } else {
			
 
				+                    next('/login')
			
 
				+                }
			
 
				             }).catch(() => {
			
 
				                 // next('/login');
			
 
				             })
			
--- a/src/main/java/com/izouma/awesomeadmin/web/WeiXinController.java
+++ b/src/main/java/com/izouma/awesomeadmin/web/WeiXinController.java
@@ -74,7 +74,7 @@ public class WeiXinController extends BaseController {
 
				     public ModelAndView redirectLogin(HttpServletRequest request, HttpServletResponse response,
			
 
				                                       @RequestParam(required = true, value = "code") String code, @RequestParam(required = false, value = "redirectUri") String redirectUri) {
			
 
				 
			
 
				-        ModelAndView mav = new ModelAndView("redirect:"+ PropertiesFileLoader.getProperties("base_domain") +"/#/" + redirectUri);
			
 
				+        ModelAndView mav = new ModelAndView("redirect:"+ PropertiesFileLoader.getProperties("base_domain") +"/index#/" + redirectUri);
			
 
				         final String APP_ID = PropertiesFileLoader.getProperties("weixinappid");
			
 
				         final String APP_SECRET = PropertiesFileLoader.getProperties("weixinsecret");
			
 
				         try {
			
@@ -141,7 +141,7 @@ public class WeiXinController extends BaseController {
 
				     public ModelAndView LoginService(HttpServletRequest request, HttpServletResponse response,
			
 
				                                      @RequestParam(required = true, value = "code") String code) {
			
 
				 
			
 
				-        ModelAndView mav = new ModelAndView("redirect:../#/");
			
 
				+        ModelAndView mav = new ModelAndView("redirect:../index#/");
			
 
				         final String APP_ID = PropertiesFileLoader.getProperties("weixinappid");
			
 
				         final String APP_SECRET = PropertiesFileLoader.getProperties("weixinsecret");
			
 
				         try {
			
--- a/src/main/webapp/WEB-INF/html/house.html
+++ b/src/main/webapp/WEB-INF/html/house.html
@@ -44,4 +44,4 @@
 
				         width: 30%!important;
			
 
				     }
			
 
				     
			
 
				-    .mint-datetime-cancel {}</style><body><div id=app></div><script type=text/javascript src=./staticWeb/house/js/manifest.d9fa46eee5bc51eff85c.js></script><script type=text/javascript src=./staticWeb/house/js/vendor.bc99c291f19f8a9227bf.js></script><script type=text/javascript src=./staticWeb/house/js/app.d02e476f754c4a4cb1da.js></script></body></html>
			
 
				+    .mint-datetime-cancel {}</style><body><div id=app></div><script type=text/javascript src=./staticWeb/house/js/manifest.d9fa46eee5bc51eff85c.js></script><script type=text/javascript src=./staticWeb/house/js/vendor.bc99c291f19f8a9227bf.js></script><script type=text/javascript src=./staticWeb/house/js/app.40d8c3e3db6154d50c5b.js></script></body></html>
			
--- a/src/main/webapp/staticWeb/house/js/app.40d8c3e3db6154d50c5b.js
+++ b/src/main/webapp/staticWeb/house/js/app.40d8c3e3db6154d50c5b.js
--- a/src/main/webapp/staticWeb/house/js/app.40d8c3e3db6154d50c5b.js.map
+++ b/src/main/webapp/staticWeb/house/js/app.40d8c3e3db6154d50c5b.js.map
--- a/src/main/webapp/staticWeb/house/js/app.d02e476f754c4a4cb1da.js.map
+++ b/src/main/webapp/staticWeb/house/js/app.d02e476f754c4a4cb1da.js.map
--- a/src/main/webapp/staticWeb/house/js/manifest.d9fa46eee5bc51eff85c.js.map
+++ b/src/main/webapp/staticWeb/house/js/manifest.d9fa46eee5bc51eff85c.js.map