diff --git a/public/index.html b/public/index.html index 4570ba5..1a77f9e 100644 --- a/public/index.html +++ b/public/index.html @@ -84,7 +84,7 @@
- loading + loading
正在加载资源
diff --git a/src/components/third-register/main.vue b/src/components/third-register/main.vue new file mode 100644 index 0000000..05dac3f --- /dev/null +++ b/src/components/third-register/main.vue @@ -0,0 +1,116 @@ + + + diff --git a/src/lang/zh.js b/src/lang/zh.js index 2b93ed4..3903879 100644 --- a/src/lang/zh.js +++ b/src/lang/zh.js @@ -78,7 +78,7 @@ export default { phone: '请输入手机号', code: '请输入验证码', submit: '登录', - userLogin: '账户密码登陆', + userLogin: '账号密码登陆', phoneLogin: '手机号登录', thirdLogin: '第三方系统登录', msgText: '发送验证码', diff --git a/src/main.js b/src/main.js index 5254906..d6b7dad 100644 --- a/src/main.js +++ b/src/main.js @@ -18,6 +18,7 @@ import i18n from './lang' // Internationalization import './styles/common.scss'; import basicBlock from './components/basic-block/main' import basicContainer from './components/basic-container/main' +import thirdRegister from './components/third-register/main' import website from '@/config/website'; Vue.use(router); @@ -31,6 +32,7 @@ Vue.use(window.AVUE, { //注册全局容器 Vue.component('basicContainer', basicContainer); Vue.component('basicBlock', basicBlock); +Vue.component('thirdRegister', thirdRegister); // 加载相关url地址 Object.keys(urls).forEach(key => { Vue.prototype[key] = urls[key]; diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue index 4d94418..9f369f9 100644 --- a/src/page/login/userlogin.vue +++ b/src/page/login/userlogin.vue @@ -81,7 +81,7 @@ username: "admin", //密码 password: "admin", - //账户类型 + //账号类型 type: "account", //验证码的值 code: "", diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue index 5c31804..82c6481 100644 --- a/src/views/wel/index.vue +++ b/src/views/wel/index.vue @@ -2,34 +2,7 @@
- - - - - - - - - - - - - - - - - - - - 确 定 - - + @@ -449,25 +422,11 @@