diff --git a/src/App.vue b/src/App.vue index 47c318d..287c762 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,8 +1,8 @@ @@ -48,14 +48,19 @@ export default { myhead, }, + watch: { + /* $route(to, from) { + this.routeFLag = to.path !== '/login' + } */ + }, data() { return { rQCodeShow:false, + routeFLag: true } }, methods: { enter() { - console.log(1); this.rQCodeShow = true const drawer = this.$refs.drawer; drawer.style.right = 0; @@ -68,7 +73,7 @@ export default { goTop(){ window.scroll(0, 0) //滚动条返回顶部 } - }, + } }; diff --git a/src/api/request.js b/src/api/request.js index 032ac4d..6ab1954 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -3,8 +3,8 @@ import { Message } from "element-ui" const service = axios.create({ - baseURL: '/C/', - //baseURL: 'https://www.yjyculture.com/C/', + // baseURL: '/C/', + baseURL: 'https://www.yjyculture.com/C/', timeout: 60000 // 请求超时时间 }) diff --git a/src/assets/img/login.png b/src/assets/img/login.png new file mode 100644 index 0000000..0a5c586 Binary files /dev/null and b/src/assets/img/login.png differ diff --git a/src/components/headTail/head.vue b/src/components/headTail/head.vue index c0adf9c..fe65fd9 100644 --- a/src/components/headTail/head.vue +++ b/src/components/headTail/head.vue @@ -1,18 +1,16 @@ + + diff --git a/src/page/publish/publish.vue b/src/page/publish/publish.vue new file mode 100644 index 0000000..e66f995 --- /dev/null +++ b/src/page/publish/publish.vue @@ -0,0 +1,247 @@ + + + diff --git a/src/page/register/register.vue b/src/page/register/register.vue new file mode 100644 index 0000000..97d9759 --- /dev/null +++ b/src/page/register/register.vue @@ -0,0 +1,173 @@ + + + diff --git a/src/router/index.js b/src/router/index.js index ffe63d7..eecb34d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -12,6 +12,30 @@ const routes = [ }, component: r => require.ensure([], () => r(require('@/page/home/home.vue')), 'pointzujinListEdit') }, + //登录 + { + path: '/login', + meta:{ + title:"登录" + }, + component: r => require.ensure([], () => r(require('@/page/login/login.vue')), 'login') + }, + //注册 + { + path: '/register', + meta:{ + title:"注册" + }, + component: r => require.ensure([], () => r(require('@/page/register/register.vue')), 'register') + }, + //注册 + { + path: '/publish', + meta:{ + title:"注册" + }, + component: r => require.ensure([], () => r(require('@/page/publish/publish.vue')), 'publish') + }, //公司简介 { path: '/companySynopsis',