diff --git a/.gitignore b/.gitignore
index dd8a10d2..b33e75b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,4 +59,6 @@ build/
!**/src/test/**/build/
### VS Code ###
-.vscode/
\ No newline at end of file
+.vscode/
+/supervise-uniapp/.hbuilderx/
+/supervise-uniapp/unpackage/
diff --git a/supervise-uniapp/common/config.js b/supervise-uniapp/common/config.js
index 73f33b50..de17e42c 100644
--- a/supervise-uniapp/common/config.js
+++ b/supervise-uniapp/common/config.js
@@ -6,7 +6,7 @@
* loginTimeoutPage = "/pages/login/index", // 登录超时或失效的情况下,跳转到的登录页面
*/
module.exports = {
- baseUrl: 'http://127.0.0.1:9501/ltest',
+ baseUrl: 'http://jianguan.yyundong.com/api',
tokenName : "Authorization", // 请求头中token的名字,与服务器端对应
loginTimeoutCode : "5001", // 登录超时或失效的情况下,服务器端返回的错误码
loginTimeoutPage : "/pages/login/index", // 登录超时或失效的情况下,跳转到的登录页面
diff --git a/supervise-uniapp/common/request.api.js b/supervise-uniapp/common/request.api.js
index 7a82c77e..de5a17e5 100644
--- a/supervise-uniapp/common/request.api.js
+++ b/supervise-uniapp/common/request.api.js
@@ -1,6 +1,6 @@
import request from '@/utils/requester.js'
export default {
- login: (params = {}) => request.post("/login", params),
+ login: (params = {}) => request.post("/portal/v1/sysuser/login", params),
sayhello: (params = {}) => request.get("/sayb", params)
}
diff --git a/supervise-uniapp/pages/login/index.vue b/supervise-uniapp/pages/login/index.vue
index f65cdbdd..e8257ae7 100644
--- a/supervise-uniapp/pages/login/index.vue
+++ b/supervise-uniapp/pages/login/index.vue
@@ -8,11 +8,11 @@
-
-
+
+
-
-
+
+
@@ -26,11 +26,11 @@
-
-
+
+
-
-
+
+
@@ -48,8 +48,8 @@ export default {
vavatar: '/static/uview/common/logo.png',
// 表单数据
formData: {
- name: '',
- passwd: ''
+ userName: '',
+ password: ''
},
rules: {
// 对name字段进行必填验证