From 8730e273d5dbf1de6438c12882e69549cf44faf3 Mon Sep 17 00:00:00 2001 From: cp <513960435@qq.com> Date: 星期一, 13 二月 2023 17:29:09 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnwcs' into zjfnwcs --- src/main/java/com/zy/core/MainProcess.java | 4 ++-- src/main/webapp/views/login.html | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java index 52de28e..9829b0d 100644 --- a/src/main/java/com/zy/core/MainProcess.java +++ b/src/main/java/com/zy/core/MainProcess.java @@ -69,8 +69,8 @@ //鍚姩銆佸畬鎴愩�佹殏鍋滄祴璇曠郴缁熸祴璇� mainService.packTest(); - //鐏锛岀粰鍫嗗灈鏈哄彂閫佺伀璀﹁鎶� - mainService.fierCrn(); +// //鐏锛岀粰鍫嗗灈鏈哄彂閫佺伀璀﹁鎶� +// mainService.fierCrn(); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/webapp/views/login.html b/src/main/webapp/views/login.html index 57329ed..0a783e3 100644 --- a/src/main/webapp/views/login.html +++ b/src/main/webapp/views/login.html @@ -212,7 +212,12 @@ if (res.code === 200){ localStorage.setItem("token", res.data.token); localStorage.setItem("username", res.data.username); - window.location.href = "index.html"; + if (mobile==="dsj1"){ + window.location.href = "index.html"; + }else { + window.location.href = "index2.html"; + } + } else { layer.msg(res.msg, {offset: '150px'}); } -- Gitblit v1.9.1