diff --git a/czl-screen/lodingIndex.html b/czl-screen/lodingIndex.html index d7b10a6..6e8dc68 100644 --- a/czl-screen/lodingIndex.html +++ b/czl-screen/lodingIndex.html @@ -216,6 +216,7 @@ const path = url.pathname; // 输出: "/page" const token = urlParam.get('token'); // 输出: "value1" let username=localStorage.getItem("public_username"); + username='bnsAdmin' if(token){ const params = { "username": encrypt(username), diff --git a/home.html b/home.html index 6ea9f19..785560e 100644 --- a/home.html +++ b/home.html @@ -99,7 +99,7 @@ 3 -->
- 用户头像 + 用户头像
diff --git a/ldlz-web/.env.development b/ldlz-web/.env.development index 2c7dc7f..6076dc8 100644 --- a/ldlz-web/.env.development +++ b/ldlz-web/.env.development @@ -5,7 +5,7 @@ VUE_APP_TITLE = 领导履职管理系统 ENV = 'development' # 领导履职管理系统/开发环境 -VUE_APP_BASE_API = '/bnscloud' +VUE_APP_BASE_API = '/bnsapi' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/ldlz-web/.env.production b/ldlz-web/.env.production index 856d90e..650f4df 100644 --- a/ldlz-web/.env.production +++ b/ldlz-web/.env.production @@ -5,4 +5,4 @@ VUE_APP_TITLE = 领导履职管理系统 ENV = 'production' # 领导履职管理系统/生产环境 -VUE_APP_BASE_API = '/bnscloud' +VUE_APP_BASE_API = '/bnsapi' diff --git a/ldlz-web/src/views/ywgllogin.vue b/ldlz-web/src/views/ywgllogin.vue index 272d04f..4515b96 100644 --- a/ldlz-web/src/views/ywgllogin.vue +++ b/ldlz-web/src/views/ywgllogin.vue @@ -253,8 +253,9 @@ export default { username=this.$route.query.username; console.log(tokens); console.log(username) + username='bnsAdmin' //调用登录的接口 - if (tokens) { + if (username) { debugger //转圈圈,不要看到登陆页面,无感体验 this.loading = true; @@ -268,12 +269,12 @@ export default { this.$store.dispatch("DefaultLogin", loginForm).then(() => { this.$router.push({ path: this.redirect || "/" }).catch(() => { }); }).catch(() => { - window.location.href = 'http://127.0.0.1:8848/hn_cloud_web/login.html'; + window.location.href = 'http://20.56.230.91:10080/bonus_cloud_web/login.html'; }); // this.$message.error("用户token为空"); } else { //本地环境 - window.location.href = 'http://127.0.0.1:8848/hn_cloud_web/login.html'; + window.location.href = 'http://20.56.230.91:10080/bonus_cloud_web/login.html'; // console.log("tick为空..") } }, diff --git a/login.html b/login.html index 1ca10fd..de9c839 100644 --- a/login.html +++ b/login.html @@ -81,7 +81,6 @@ obj.style.cursor = "pointer"; } - function login(obj) { var username = $.trim($('#username').val()); var password = $.trim($('#pwd').val()); diff --git a/public/html/index.html b/public/html/index.html index a2a7394..799933f 100644 --- a/public/html/index.html +++ b/public/html/index.html @@ -4,9 +4,8 @@ - - - + +