diff --git a/src/App.vue b/src/App.vue index 34cf55c..f476a2b 100644 --- a/src/App.vue +++ b/src/App.vue @@ -484,7 +484,7 @@ textarea { line-height: .42rem; padding-top: .02rem; background-color: #d1d5ff; - background-image: url(../assets/../assets/images/home/index/arrow-more.png); + background-image: url(./assets/images/home/index/arrow-more.png); background-repeat: no-repeat; background-position: 1.18rem center; background-size: .11rem .2rem; @@ -693,7 +693,7 @@ textarea { display: block; width: .16rem; height: .28rem; - background-image: url(../assets/images/home/expert/arrow-notice.png); + background-image: url(./assets/images/home/expert/arrow-notice.png); background-size: .16rem .28rem; } .expert-receive-01{ @@ -732,7 +732,7 @@ textarea { .addr-select{ width: 2.5rem; height: .8rem; - background-image: url(../assets/images/home/expert/arrow-down.png); + background-image: url(./assets/images/home/expert/arrow-down.png); background-repeat: no-repeat; background-size: .22rem .12rem; background-position: center right; @@ -1242,7 +1242,7 @@ textarea::-webkit-input-placeholder{ } .ask-top{ padding: .6rem 0 .55rem; - background-image: url(../assets/images/home/expert/expert-bg.png); + background-image: url(./assets/images/home/expert/expert-bg.png); background-size: cover; border-radius: .1rem; overflow: hidden; @@ -2260,7 +2260,7 @@ textarea::-webkit-input-placeholder{ padding: 0 .1rem; border: .02rem solid #dedede; border-radius: .04rem; - background-image: url(../assets/images/home/expert/arrow-down.png); + background-image: url(./assets/images/home/expert/arrow-down.png); background-repeat: no-repeat; background-size: .22rem .12rem; background-position: 3.1rem center; diff --git a/assets/css/common/Fzcs-Gbk.ttf b/src/assets/css/common/Fzcs-Gbk.ttf similarity index 100% rename from assets/css/common/Fzcs-Gbk.ttf rename to src/assets/css/common/Fzcs-Gbk.ttf diff --git a/assets/css/common/PingFangSC-Semibold.otf b/src/assets/css/common/PingFangSC-Semibold.otf similarity index 100% rename from assets/css/common/PingFangSC-Semibold.otf rename to src/assets/css/common/PingFangSC-Semibold.otf diff --git a/assets/css/common/public.css b/src/assets/css/common/public.css similarity index 100% rename from assets/css/common/public.css rename to src/assets/css/common/public.css diff --git a/assets/css/common/style.css b/src/assets/css/common/style.css similarity index 100% rename from assets/css/common/style.css rename to src/assets/css/common/style.css diff --git a/assets/css/common/swiper.css b/src/assets/css/common/swiper.css similarity index 100% rename from assets/css/common/swiper.css rename to src/assets/css/common/swiper.css diff --git a/assets/images/common/bin.png b/src/assets/images/common/bin.png similarity index 100% rename from assets/images/common/bin.png rename to src/assets/images/common/bin.png diff --git a/assets/images/common/cellphone.png b/src/assets/images/common/cellphone.png similarity index 100% rename from assets/images/common/cellphone.png rename to src/assets/images/common/cellphone.png diff --git a/assets/images/common/class.png b/src/assets/images/common/class.png similarity index 100% rename from assets/images/common/class.png rename to src/assets/images/common/class.png diff --git a/assets/images/common/lazyImg.jpg b/src/assets/images/common/lazyImg.jpg similarity index 100% rename from assets/images/common/lazyImg.jpg rename to src/assets/images/common/lazyImg.jpg diff --git a/assets/images/common/load.gif b/src/assets/images/common/load.gif similarity index 100% rename from assets/images/common/load.gif rename to src/assets/images/common/load.gif diff --git a/assets/images/common/loading_more.gif b/src/assets/images/common/loading_more.gif similarity index 100% rename from assets/images/common/loading_more.gif rename to src/assets/images/common/loading_more.gif diff --git a/assets/images/common/logo.png b/src/assets/images/common/logo.png similarity index 100% rename from assets/images/common/logo.png rename to src/assets/images/common/logo.png diff --git a/assets/images/common/right_arrow.png b/src/assets/images/common/right_arrow.png similarity index 100% rename from assets/images/common/right_arrow.png rename to src/assets/images/common/right_arrow.png diff --git a/assets/images/common/search.png b/src/assets/images/common/search.png similarity index 100% rename from assets/images/common/search.png rename to src/assets/images/common/search.png diff --git a/assets/images/common/search_icon.png b/src/assets/images/common/search_icon.png similarity index 100% rename from assets/images/common/search_icon.png rename to src/assets/images/common/search_icon.png diff --git a/assets/images/common/search_x.png b/src/assets/images/common/search_x.png similarity index 100% rename from assets/images/common/search_x.png rename to src/assets/images/common/search_x.png diff --git a/assets/images/common/x.png b/src/assets/images/common/x.png similarity index 100% rename from assets/images/common/x.png rename to src/assets/images/common/x.png diff --git a/assets/images/home/arrow-right.png b/src/assets/images/home/arrow-right.png similarity index 100% rename from assets/images/home/arrow-right.png rename to src/assets/images/home/arrow-right.png diff --git a/assets/images/home/cart/checkmark.png b/src/assets/images/home/cart/checkmark.png similarity index 100% rename from assets/images/home/cart/checkmark.png rename to src/assets/images/home/cart/checkmark.png diff --git a/assets/images/home/cart/del.png b/src/assets/images/home/cart/del.png similarity index 100% rename from assets/images/home/cart/del.png rename to src/assets/images/home/cart/del.png diff --git a/assets/images/home/cart/edit.png b/src/assets/images/home/cart/edit.png similarity index 100% rename from assets/images/home/cart/edit.png rename to src/assets/images/home/cart/edit.png diff --git a/assets/images/home/cart/gou.png b/src/assets/images/home/cart/gou.png similarity index 100% rename from assets/images/home/cart/gou.png rename to src/assets/images/home/cart/gou.png diff --git a/assets/images/home/cart/map.png b/src/assets/images/home/cart/map.png similarity index 100% rename from assets/images/home/cart/map.png rename to src/assets/images/home/cart/map.png diff --git a/assets/images/home/evaluation/evaluation-01.png b/src/assets/images/home/evaluation/evaluation-01.png similarity index 100% rename from assets/images/home/evaluation/evaluation-01.png rename to src/assets/images/home/evaluation/evaluation-01.png diff --git a/assets/images/home/evaluation/evaluation-02.png b/src/assets/images/home/evaluation/evaluation-02.png similarity index 100% rename from assets/images/home/evaluation/evaluation-02.png rename to src/assets/images/home/evaluation/evaluation-02.png diff --git a/assets/images/home/evaluation/evaluation-03.png b/src/assets/images/home/evaluation/evaluation-03.png similarity index 100% rename from assets/images/home/evaluation/evaluation-03.png rename to src/assets/images/home/evaluation/evaluation-03.png diff --git a/assets/images/home/evaluation/evaluation-04.png b/src/assets/images/home/evaluation/evaluation-04.png similarity index 100% rename from assets/images/home/evaluation/evaluation-04.png rename to src/assets/images/home/evaluation/evaluation-04.png diff --git a/assets/images/home/evaluation/evaluation-05.png b/src/assets/images/home/evaluation/evaluation-05.png similarity index 100% rename from assets/images/home/evaluation/evaluation-05.png rename to src/assets/images/home/evaluation/evaluation-05.png diff --git a/assets/images/home/evaluation/evaluation-06.png b/src/assets/images/home/evaluation/evaluation-06.png similarity index 100% rename from assets/images/home/evaluation/evaluation-06.png rename to src/assets/images/home/evaluation/evaluation-06.png diff --git a/assets/images/home/expert/abstract-left.png b/src/assets/images/home/expert/abstract-left.png similarity index 100% rename from assets/images/home/expert/abstract-left.png rename to src/assets/images/home/expert/abstract-left.png diff --git a/assets/images/home/expert/abstract-right.png b/src/assets/images/home/expert/abstract-right.png similarity index 100% rename from assets/images/home/expert/abstract-right.png rename to src/assets/images/home/expert/abstract-right.png diff --git a/assets/images/home/expert/arrow-down.png b/src/assets/images/home/expert/arrow-down.png similarity index 100% rename from assets/images/home/expert/arrow-down.png rename to src/assets/images/home/expert/arrow-down.png diff --git a/assets/images/home/expert/arrow-notice.png b/src/assets/images/home/expert/arrow-notice.png similarity index 100% rename from assets/images/home/expert/arrow-notice.png rename to src/assets/images/home/expert/arrow-notice.png diff --git a/assets/images/home/expert/arrow-right.png b/src/assets/images/home/expert/arrow-right.png similarity index 100% rename from assets/images/home/expert/arrow-right.png rename to src/assets/images/home/expert/arrow-right.png diff --git a/assets/images/home/expert/back.png b/src/assets/images/home/expert/back.png similarity index 100% rename from assets/images/home/expert/back.png rename to src/assets/images/home/expert/back.png diff --git a/assets/images/home/expert/banner.jpg b/src/assets/images/home/expert/banner.jpg similarity index 100% rename from assets/images/home/expert/banner.jpg rename to src/assets/images/home/expert/banner.jpg diff --git a/assets/images/home/expert/detail.jpg b/src/assets/images/home/expert/detail.jpg similarity index 100% rename from assets/images/home/expert/detail.jpg rename to src/assets/images/home/expert/detail.jpg diff --git a/assets/images/home/expert/ewm.jpg b/src/assets/images/home/expert/ewm.jpg similarity index 100% rename from assets/images/home/expert/ewm.jpg rename to src/assets/images/home/expert/ewm.jpg diff --git a/assets/images/home/expert/expert-bg.png b/src/assets/images/home/expert/expert-bg.png similarity index 100% rename from assets/images/home/expert/expert-bg.png rename to src/assets/images/home/expert/expert-bg.png diff --git a/assets/images/home/expert/expert-list.jpg b/src/assets/images/home/expert/expert-list.jpg similarity index 100% rename from assets/images/home/expert/expert-list.jpg rename to src/assets/images/home/expert/expert-list.jpg diff --git a/assets/images/home/expert/head-bg.jpg b/src/assets/images/home/expert/head-bg.jpg similarity index 100% rename from assets/images/home/expert/head-bg.jpg rename to src/assets/images/home/expert/head-bg.jpg diff --git a/assets/images/home/expert/notice-01.png b/src/assets/images/home/expert/notice-01.png similarity index 100% rename from assets/images/home/expert/notice-01.png rename to src/assets/images/home/expert/notice-01.png diff --git a/assets/images/home/expert/notice-02.png b/src/assets/images/home/expert/notice-02.png similarity index 100% rename from assets/images/home/expert/notice-02.png rename to src/assets/images/home/expert/notice-02.png diff --git a/assets/images/home/expert/yes.png b/src/assets/images/home/expert/yes.png similarity index 100% rename from assets/images/home/expert/yes.png rename to src/assets/images/home/expert/yes.png diff --git a/assets/images/home/goods/back.png b/src/assets/images/home/goods/back.png similarity index 100% rename from assets/images/home/goods/back.png rename to src/assets/images/home/goods/back.png diff --git a/assets/images/home/goods/cart.png b/src/assets/images/home/goods/cart.png similarity index 100% rename from assets/images/home/goods/cart.png rename to src/assets/images/home/goods/cart.png diff --git a/assets/images/home/goods/down.png b/src/assets/images/home/goods/down.png similarity index 100% rename from assets/images/home/goods/down.png rename to src/assets/images/home/goods/down.png diff --git a/assets/images/home/goods/down2.png b/src/assets/images/home/goods/down2.png similarity index 100% rename from assets/images/home/goods/down2.png rename to src/assets/images/home/goods/down2.png diff --git a/assets/images/home/goods/face1.png b/src/assets/images/home/goods/face1.png similarity index 100% rename from assets/images/home/goods/face1.png rename to src/assets/images/home/goods/face1.png diff --git a/assets/images/home/goods/goods.png b/src/assets/images/home/goods/goods.png similarity index 100% rename from assets/images/home/goods/goods.png rename to src/assets/images/home/goods/goods.png diff --git a/assets/images/home/goods/goods1.jpg b/src/assets/images/home/goods/goods1.jpg similarity index 100% rename from assets/images/home/goods/goods1.jpg rename to src/assets/images/home/goods/goods1.jpg diff --git a/assets/images/home/goods/goodsdesc1.jpg b/src/assets/images/home/goods/goodsdesc1.jpg similarity index 100% rename from assets/images/home/goods/goodsdesc1.jpg rename to src/assets/images/home/goods/goodsdesc1.jpg diff --git a/assets/images/home/goods/goodsdesc2.jpg b/src/assets/images/home/goods/goodsdesc2.jpg similarity index 100% rename from assets/images/home/goods/goodsdesc2.jpg rename to src/assets/images/home/goods/goodsdesc2.jpg diff --git a/assets/images/home/goods/up.png b/src/assets/images/home/goods/up.png similarity index 100% rename from assets/images/home/goods/up.png rename to src/assets/images/home/goods/up.png diff --git a/assets/images/home/goods/x.png b/src/assets/images/home/goods/x.png similarity index 100% rename from assets/images/home/goods/x.png rename to src/assets/images/home/goods/x.png diff --git a/assets/images/home/index/arrow-more.png b/src/assets/images/home/index/arrow-more.png similarity index 100% rename from assets/images/home/index/arrow-more.png rename to src/assets/images/home/index/arrow-more.png diff --git a/assets/images/home/index/banner.jpg b/src/assets/images/home/index/banner.jpg similarity index 100% rename from assets/images/home/index/banner.jpg rename to src/assets/images/home/index/banner.jpg diff --git a/assets/images/home/index/evaluation-01.png b/src/assets/images/home/index/evaluation-01.png similarity index 100% rename from assets/images/home/index/evaluation-01.png rename to src/assets/images/home/index/evaluation-01.png diff --git a/assets/images/home/index/evaluation-02.png b/src/assets/images/home/index/evaluation-02.png similarity index 100% rename from assets/images/home/index/evaluation-02.png rename to src/assets/images/home/index/evaluation-02.png diff --git a/assets/images/home/index/expert.png b/src/assets/images/home/index/expert.png similarity index 100% rename from assets/images/home/index/expert.png rename to src/assets/images/home/index/expert.png diff --git a/assets/images/home/index/live-01.png b/src/assets/images/home/index/live-01.png similarity index 100% rename from assets/images/home/index/live-01.png rename to src/assets/images/home/index/live-01.png diff --git a/assets/images/home/index/live-02.png b/src/assets/images/home/index/live-02.png similarity index 100% rename from assets/images/home/index/live-02.png rename to src/assets/images/home/index/live-02.png diff --git a/assets/images/home/index/plan-01.png b/src/assets/images/home/index/plan-01.png similarity index 100% rename from assets/images/home/index/plan-01.png rename to src/assets/images/home/index/plan-01.png diff --git a/assets/images/home/index/plan-02.png b/src/assets/images/home/index/plan-02.png similarity index 100% rename from assets/images/home/index/plan-02.png rename to src/assets/images/home/index/plan-02.png diff --git a/assets/images/home/index/plan-03.png b/src/assets/images/home/index/plan-03.png similarity index 100% rename from assets/images/home/index/plan-03.png rename to src/assets/images/home/index/plan-03.png diff --git a/assets/images/home/index/receive.jpg b/src/assets/images/home/index/receive.jpg similarity index 100% rename from assets/images/home/index/receive.jpg rename to src/assets/images/home/index/receive.jpg diff --git a/assets/images/home/index/start.jpg b/src/assets/images/home/index/start.jpg similarity index 100% rename from assets/images/home/index/start.jpg rename to src/assets/images/home/index/start.jpg diff --git a/assets/images/home/index/top.jpg b/src/assets/images/home/index/top.jpg similarity index 100% rename from assets/images/home/index/top.jpg rename to src/assets/images/home/index/top.jpg diff --git a/assets/images/home/main/evaluation.png b/src/assets/images/home/main/evaluation.png similarity index 100% rename from assets/images/home/main/evaluation.png rename to src/assets/images/home/main/evaluation.png diff --git a/assets/images/home/main/expert.png b/src/assets/images/home/main/expert.png similarity index 100% rename from assets/images/home/main/expert.png rename to src/assets/images/home/main/expert.png diff --git a/assets/images/home/main/index.png b/src/assets/images/home/main/index.png similarity index 100% rename from assets/images/home/main/index.png rename to src/assets/images/home/main/index.png diff --git a/assets/images/home/main/my.png b/src/assets/images/home/main/my.png similarity index 100% rename from assets/images/home/main/my.png rename to src/assets/images/home/main/my.png diff --git a/assets/images/home/start/start.jpg b/src/assets/images/home/start/start.jpg similarity index 100% rename from assets/images/home/start/start.jpg rename to src/assets/images/home/start/start.jpg diff --git a/assets/images/login/green-yes.png b/src/assets/images/login/green-yes.png similarity index 100% rename from assets/images/login/green-yes.png rename to src/assets/images/login/green-yes.png diff --git a/assets/images/login/logo.png b/src/assets/images/login/logo.png similarity index 100% rename from assets/images/login/logo.png rename to src/assets/images/login/logo.png diff --git a/assets/images/login/nail.png b/src/assets/images/login/nail.png similarity index 100% rename from assets/images/login/nail.png rename to src/assets/images/login/nail.png diff --git a/assets/images/login/phone.png b/src/assets/images/login/phone.png similarity index 100% rename from assets/images/login/phone.png rename to src/assets/images/login/phone.png diff --git a/assets/images/login/yes.png b/src/assets/images/login/yes.png similarity index 100% rename from assets/images/login/yes.png rename to src/assets/images/login/yes.png diff --git a/assets/images/user/banner.jpg b/src/assets/images/user/banner.jpg similarity index 100% rename from assets/images/user/banner.jpg rename to src/assets/images/user/banner.jpg diff --git a/assets/images/user/card.png b/src/assets/images/user/card.png similarity index 100% rename from assets/images/user/card.png rename to src/assets/images/user/card.png diff --git a/assets/images/user/close.png b/src/assets/images/user/close.png similarity index 100% rename from assets/images/user/close.png rename to src/assets/images/user/close.png diff --git a/assets/images/user/icon-feedback.png b/src/assets/images/user/icon-feedback.png similarity index 100% rename from assets/images/user/icon-feedback.png rename to src/assets/images/user/icon-feedback.png diff --git a/assets/images/user/icon-phone.png b/src/assets/images/user/icon-phone.png similarity index 100% rename from assets/images/user/icon-phone.png rename to src/assets/images/user/icon-phone.png diff --git a/assets/images/user/icon-report.png b/src/assets/images/user/icon-report.png similarity index 100% rename from assets/images/user/icon-report.png rename to src/assets/images/user/icon-report.png diff --git a/assets/images/user/icon-student.png b/src/assets/images/user/icon-student.png similarity index 100% rename from assets/images/user/icon-student.png rename to src/assets/images/user/icon-student.png diff --git a/assets/images/user/mobile/tip.png b/src/assets/images/user/mobile/tip.png similarity index 100% rename from assets/images/user/mobile/tip.png rename to src/assets/images/user/mobile/tip.png diff --git a/assets/images/user/photo.png b/src/assets/images/user/photo.png similarity index 100% rename from assets/images/user/photo.png rename to src/assets/images/user/photo.png diff --git a/assets/images/user/seekcard.png b/src/assets/images/user/seekcard.png similarity index 100% rename from assets/images/user/seekcard.png rename to src/assets/images/user/seekcard.png diff --git a/src/assets/logo.png b/src/assets/logo.png deleted file mode 100644 index f3d2503..0000000 Binary files a/src/assets/logo.png and /dev/null differ diff --git a/src/main.js b/src/main.js index a4b49cc..11eb452 100644 --- a/src/main.js +++ b/src/main.js @@ -3,7 +3,32 @@ import axios from 'axios' import VueAxios from 'vue-axios' import App from './App.vue' import router from './router' -Vue.config.productionTip = false +// Vue.config.productionTip = false +Vue.prototype.HOME = '/api' + + +axios.interceptors.request.use(config => { + console.log(config.url) + // config.headers.Authorization = "Basic c2FiZXI6c2FiZXJfc2VjcmV0" + // if (config.url!="/hysc/auth/token") { + // if (!localStorage.token) { + // router.replace('/'); + // return config + // } + // } + // config.headers.common['Blade-Auth'] =localStorage.token + + // if (config.url!="/hysc/auth/token") { + // if (!localStorage.token) { + + // router.replace('/'); + // return config + // } + // } + + + return config +}) Vue.use(VueAxios, axios) new Vue({ router, diff --git a/src/router/index.js b/src/router/index.js index 7473a1e..d7019d4 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,6 +1,7 @@ import Vue from 'vue' import VueRouter from 'vue-router' import login from '../views/login.vue' +import verification from '../views/login/verification.vue' Vue.use(VueRouter) @@ -10,7 +11,11 @@ const routes = [ name: 'login', component: login }, - + { + path: '/verification', + name: 'verification', + component: verification + }, ] const router = new VueRouter({ diff --git a/src/views/login.vue b/src/views/login.vue index 618fbfc..4bfa5a1 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -8,7 +8,7 @@
有谱志愿
@@ -21,7 +21,7 @@ @click="isAgreement = !isAgreement" >

@@ -30,11 +30,9 @@

@@ -42,20 +40,18 @@
- -
- +

有谱志愿

申请

获取您的钉钉昵称

钉钉昵称 -

张三

+

张三

同意 @@ -98,7 +94,7 @@ @click="openPhoneTips = !openPhoneTips" >
-

{{ tipsMsg }}

+
确认
@@ -107,33 +103,26 @@ + + diff --git a/vue.config.js b/vue.config.js new file mode 100644 index 0000000..d235746 --- /dev/null +++ b/vue.config.js @@ -0,0 +1,22 @@ +module.exports = { + devServer: { + proxy: { + + '/api': { + target: 'https://ypzy.emingren.com', // 你请求的第三方接口 + + changeOrigin: true, // 在本地会创建一个虚拟服务端,然后发送请求的数据,并同时接收请求的数据,这样服务端和服务端进行数据的交互就不会有跨域问题 + + pathRewrite: { // 路径重写, + + '^/api': '' // 替换target中的请求地址,也就是说以后你在请求http://api.douban.com/v2/XXXXX这个地址的时候直接写成/api即可。 + + } + + } + + } + + } + +} \ No newline at end of file