diff --git a/src/locales/lang/en.js b/src/locales/lang/en.js
index 8731e33..bdb84bc 100644
--- a/src/locales/lang/en.js
+++ b/src/locales/lang/en.js
@@ -9,7 +9,7 @@ export default {
forgetPassword: 'Forget password',
signIn: 'Sign in',
signInOther: 'Sign in with',
- userPlaceholder: 'user / phone / email',
+ userPlaceholder: 'phone / email',
userError: 'Please input a user name',
PWPlaceholder: 'Please input a password',
PWError: 'Please input a password',
diff --git a/src/locales/lang/zh-cn.js b/src/locales/lang/zh-cn.js
index 87c0150..cce6766 100644
--- a/src/locales/lang/zh-cn.js
+++ b/src/locales/lang/zh-cn.js
@@ -9,7 +9,7 @@ export default {
forgetPassword: '忘记密码',
signIn: '登录',
signInOther: '其他登录方式',
- userPlaceholder: '用户名 / 手机 / 邮箱',
+ userPlaceholder: '手机 / 邮箱',
userError: '请输入用户名',
PWPlaceholder: '请输入密码',
PWError: '请输入密码',
diff --git a/src/router/systemRouter.js b/src/router/systemRouter.js
index 7f29a3a..e92475b 100644
--- a/src/router/systemRouter.js
+++ b/src/router/systemRouter.js
@@ -50,6 +50,20 @@ const routes = [
meta: {
title: "重置密码"
}
+ },
+ {
+ path: "/serve",
+ component: () => import(/* webpackChunkName: "serveView" */ '@/views/serveView'),
+ meta: {
+ title: "信息服务"
+ }
+ },
+ {
+ path: "/maintenance",
+ component: () => import(/* webpackChunkName: "serveView" */ '@/views/maintenance'),
+ meta: {
+ title: "维保服务"
+ }
}
]
diff --git a/src/style/pages.scss b/src/style/pages.scss
index c098dac..cc8f7d7 100644
--- a/src/style/pages.scss
+++ b/src/style/pages.scss
@@ -27,7 +27,7 @@
.pageHeader{box-shadow: 0 1px 10px rgba(0,0,0,0.14);margin-bottom: 10px;}
.common-header-left {display: flex;align-items: center;}
.common-header-logo {display: flex;align-items: center;}
-.common-header-logo img {margin-right: 10px;vertical-align: bottom;}
+.common-header-logo img {margin-right: 10px;vertical-align: bottom;width: 180px;}
.common-header-logo label {font-size: 20px;}
.common-header-title {font-size: 16px;border-left: 1px solid var(--el-border-color-light);margin-left: 15px;padding-left: 15px;}
.common-header-right {display: flex;align-items: center;}
diff --git a/src/views/login/activate.vue b/src/views/login/activate.vue
index 0039484..7b65691 100644
--- a/src/views/login/activate.vue
+++ b/src/views/login/activate.vue
@@ -52,6 +52,14 @@ export default {
}
this.$store.commit("SET_LOGIN_NAME", user.data.user.name);
+ if(user.data.user.company_id === 0){
+ this.$router.replace({
+ path: '/maintenance'
+ })
+ this.islogin = false
+ return
+ }
+
//获取菜单
let menu = null;
menu = await this.$API.system.menu.myMenus.get()
diff --git a/src/views/login/components/passwordForm.vue b/src/views/login/components/passwordForm.vue
index 930b071..9abefd8 100644
--- a/src/views/login/components/passwordForm.vue
+++ b/src/views/login/components/passwordForm.vue
@@ -74,6 +74,13 @@
this.islogin = false
return false
}
+ if(user.data.user.company_id === 0){
+ this.$router.replace({
+ path: '/maintenance'
+ })
+ this.islogin = false
+ return
+ }
//获取菜单
const menu = await this.$API.system.menu.myMenus.get();
if (menu.code == 200) {
diff --git a/src/views/login/components/phoneForm.vue b/src/views/login/components/phoneForm.vue
index 45a8450..5553840 100644
--- a/src/views/login/components/phoneForm.vue
+++ b/src/views/login/components/phoneForm.vue
@@ -81,6 +81,15 @@
this.islogin = false
return false
}
+
+ if(user.data.user.company_id === 0){
+ this.$router.replace({
+ path: '/maintenance'
+ })
+ this.islogin = false
+ return
+ }
+
//获取菜单
const menu = await this.$API.system.menu.myMenus.get();
if (menu.code == 200) {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index e3c83c3..1206447 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -185,6 +185,14 @@
}
this.$store.commit("SET_LOGIN_NAME", user.data.user.name);
+ if(user.data.user.company_id === 0){
+ this.$router.replace({
+ path: '/maintenance'
+ })
+ this.islogin = false
+ return
+ }
+
//获取菜单
let menu = null;
menu = await this.$API.system.menu.myMenus.get()
@@ -301,7 +309,7 @@
}
}
.logo{
- height: 30px;
+ width: 200px;
}
}
diff --git a/src/views/login/userRegister.vue b/src/views/login/userRegister.vue
index fc74360..00c080d 100644
--- a/src/views/login/userRegister.vue
+++ b/src/views/login/userRegister.vue
@@ -30,6 +30,9 @@
+
+
+
@@ -76,6 +79,7 @@
form: {
email: "",
mobile:"",
+ password:"",
verify_code:"",
company_name:"",
customer: "",
diff --git a/src/views/maintenance/index.vue b/src/views/maintenance/index.vue
new file mode 100644
index 0000000..7c0237c
--- /dev/null
+++ b/src/views/maintenance/index.vue
@@ -0,0 +1,194 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+
+
+
+
+
+
+
436
+
+
+
+
+
diff --git a/src/views/serveView/components/term.vue b/src/views/serveView/components/term.vue
new file mode 100644
index 0000000..906ed6f
--- /dev/null
+++ b/src/views/serveView/components/term.vue
@@ -0,0 +1,15 @@
+
+
+ 部件信息
+
+
+
+
+
+
diff --git a/src/views/serveView/components/widget.vue b/src/views/serveView/components/widget.vue
new file mode 100644
index 0000000..ee62d0f
--- /dev/null
+++ b/src/views/serveView/components/widget.vue
@@ -0,0 +1,13 @@
+
+ et
+
+
+
+
+
diff --git a/src/views/serveView/index.vue b/src/views/serveView/index.vue
new file mode 100644
index 0000000..fb5842c
--- /dev/null
+++ b/src/views/serveView/index.vue
@@ -0,0 +1,115 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+
+
+
+
+
+
+
+
+
+
+