From fd467c346e70bc05c3b22d70abcd8fdf6b58824a Mon Sep 17 00:00:00 2001 From: xiayt Date: Tue, 26 Oct 2021 16:21:15 +0800 Subject: [PATCH] feat: 适老化，支付 --- src/App.vue | 3 ++- src/router/index.js | 19 ++++++++++++++++++- src/views/Home/Home.vue | 2 +- src/views/Home/MyClassList.vue | 3 +-- src/views/Home/StudentDetail.vue | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/Home/component/AddChildPopupGroup.vue | 4 ---- src/views/Service/AbroadDetail.vue | 31 ++++++++++++++++++++++--------- src/views/Service/AbroadEvaluate.vue | 27 +++++++++++++++++++++++++++ src/views/Service/CardBoxXST.vue | 28 ++++++++++++++++++++++++++++ src/views/Service/CardCourseList.vue | 17 ----------------- src/views/Service/CheckOrder.vue | 223 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------- src/views/Service/DatePackage.vue | 79 ++++++++++++++++++++++++++++++++----------------------------------------------- src/views/Service/SelectContact.vue | 23 +++++++++++++++++++++++ src/views/Service/ServiceBaseKQ.vue | 20 ++------------------ src/views/Service/ServiceOrderXST.vue | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------- src/views/Service/component/ServiceList.vue | 3 +-- src/views/Service/component/ServiceListFour.vue | 46 +++++++++++++++++++++++++++++++--------------- src/views/Service/component/ServiceListSecond.vue | 3 +-- src/views/Service/component/ServiceListThird.vue | 3 +-- src/views/Service/payneed.vue | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/Service/protocol.vue | 162 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 21 files changed, 691 insertions(+), 228 deletions(-) create mode 100644 src/views/Service/payneed.vue create mode 100644 src/views/Service/protocol.vue diff --git a/src/App.vue b/src/App.vue index cd160da..4cf1185 100644 --- a/src/App.vue +++ b/src/App.vue @@ -8,6 +8,7 @@ @@ -490,4 +456,61 @@ export default { .van-checkbox { display: inline-flex; } + + \ No newline at end of file diff --git a/src/views/Service/DatePackage.vue b/src/views/Service/DatePackage.vue index 6a01c40..4dac060 100644 --- a/src/views/Service/DatePackage.vue +++ b/src/views/Service/DatePackage.vue @@ -203,8 +203,6 @@ export default { }, checkOrder () { - let isLogin = this.checkLogin() - if (!isLogin) return; if (this.count > this.numSecond) { this.$toast('库存不足'); @@ -222,20 +220,6 @@ export default { this.$router.push({ name: 'ServiceCheckOrder', query: query }) } }, - // 判断是否已登录 - checkLogin () { - if (process.env.NODE_ENV != "production") return true; - - const userInfo = JSON.parse(sessionStorage.getItem('userInfo')) - const publicName = sessionStorage.getItem('publicName') - if (!userInfo?.phone) { - sessionStorage.setItem('prePage', 'ServiceDatePackage'); - sessionStorage.setItem('prePageQuery', JSON.stringify({ date: this.date })); - this.$router.push({ name: 'LoginPublic', query: { publicName: publicName } }) - return false; - } - return true; - }, } } @@ -417,40 +401,41 @@ export default { \ No newline at end of file diff --git a/src/views/Service/SelectContact.vue b/src/views/Service/SelectContact.vue index f975b2c..95d21a8 100644 --- a/src/views/Service/SelectContact.vue +++ b/src/views/Service/SelectContact.vue @@ -212,4 +212,27 @@ export default { border-radius: 45px; } } + + \ No newline at end of file diff --git a/src/views/Service/ServiceBaseKQ.vue b/src/views/Service/ServiceBaseKQ.vue index 18f2c89..99f9a3f 100644 --- a/src/views/Service/ServiceBaseKQ.vue +++ b/src/views/Service/ServiceBaseKQ.vue @@ -92,7 +92,7 @@ export default { handler () { // 设置tabbar状态 this.tabName = this.$route.query.showTab || 'KQ' - document.title = this.$route.query.showTab == 'ZZY' ? '周周营' : '柯桥研学' + document.title = this.$route.query.showTab == 'ZZY' ? '周周营' : '红色网上游——柯桥研学' } } }, @@ -368,24 +368,8 @@ export default { }, // 我的优惠券 handleMyCard () { - let isLogin = this.checkLogin() - if (!isLogin) return; - const publicName = sessionStorage.getItem('publicName') // this.$toast('暂未开放，敬请期待！'); - this.$router.push({ name: 'CardBoxXST', query: { active: 1, publicName: publicName } }) - }, - // 判断是否已登录 - checkLogin () { - if (process.env.NODE_ENV != "production") return true; - const userInfo = JSON.parse(sessionStorage.getItem('userInfo')) - if (!userInfo?.phone) { - const publicName = sessionStorage.getItem('publicName') - sessionStorage.setItem('prePage', 'Service' + publicName); - sessionStorage.setItem('prePageQuery', JSON.stringify({ showTab: this.$route.query.showTab })); - this.$router.push({ name: 'LoginPublic', query: { publicName: publicName } }) - return false; - } - return true; + this.$router.push({ name: 'CardBoxXST', query: { active: 1} }) }, formatWeek (week) { return week == 1 ? '周一' : week == 2 ? '周二' : week == 3 ? '周三' : week == 4 ? '周四' : week == 5 ? '周五' : week == 6 ? '周六' : week == 0 ? '周日' : ''; diff --git a/src/views/Service/ServiceOrderXST.vue b/src/views/Service/ServiceOrderXST.vue index b60e2fb..fb6a7fe 100644 --- a/src/views/Service/ServiceOrderXST.vue +++ b/src/views/Service/ServiceOrderXST.vue @@ -51,9 +51,9 @@ 加入拼团群
- 退款说明 + 退款说明 - 核销码 + 核销码
@@ -144,12 +144,14 @@

退款说明

-

1、凡拼团活动报名人数未达最低成团数，本团活动则不开营，系统将在72小时内，全额退还，且不产生违约风险赔偿。

-

2、如果您因行程发生变动需要取消预订，建议您尽可能提前与平台商户取得联系，并按商品订购须知或该商户旅游合同条款进行退款。

-

如若未声明与明确的，按《浙江省境内旅游合同》条款退款。

- +

我知道了

@@ -434,7 +436,7 @@ export default { }, //跳转 toEdit (item) { - this.$router.push({ path: 'abroad_detail', query: { courseId: item.courseId, publicName: sessionStorage.getItem('publicName') } }) + this.$router.push({ path: 'abroad_detail', query: { courseId: item.courseId } }) }, //二维码转图片 canvanqrCode () { @@ -865,3 +867,91 @@ export default { width: 100vw; } + \ No newline at end of file diff --git a/src/views/Service/component/ServiceList.vue b/src/views/Service/component/ServiceList.vue index 189df88..2ff72dc 100644 --- a/src/views/Service/component/ServiceList.vue +++ b/src/views/Service/component/ServiceList.vue @@ -92,8 +92,7 @@ export default { }, methods: { handleUniDetail (item) { - const publicName = sessionStorage.getItem('publicName'); - this.$router.push({ name: 'ServiceAbroadDetail', query: { courseId: item.id,publicName:publicName } }) + this.$router.push({ name: 'ServiceAbroadDetail', query: { courseId: item.id} }) }, } } diff --git a/src/views/Service/component/ServiceListFour.vue b/src/views/Service/component/ServiceListFour.vue index 3e1f1b9..ba820cf 100644 --- a/src/views/Service/component/ServiceListFour.vue +++ b/src/views/Service/component/ServiceListFour.vue @@ -64,8 +64,7 @@ export default { }, methods: { handleUniDetail (item) { - const publicName = sessionStorage.getItem('publicName'); - this.$router.push({ name: 'ServiceAbroadDetail', query: { courseId: item.id,publicName:publicName } }) + this.$router.push({ name: 'ServiceAbroadDetail', query: { courseId: item.id} }) }, } } @@ -271,29 +270,46 @@ export default { .elder { .abroad { .uni_item { - .content{ - .title{ + .content { + height: auto; + .title { font-size: 40px; } - .active_time{ + .active_time { font-size: 32px; } - .tag_box{ - .tag{ - font-size: 32px; - } + .tag_box { + .tag { + font-size: 32px; + } + } + .address { + font-size: 40px; } .price { - .icon { - font-size: 34px; + font-size: 40px; + .icon { + font-size: 40px; + } + .tint { + font-size: 40px; + } + .limit { + font-size: 34px; + } } - .tint { - font-size: 28px; + .flex_box { + display: block; } - .limit { - font-size: 28px; + .pintuan { + width: auto; + height: auto; + font-size: 34px; + line-height: 44px; } } + .img_box .bottom .count { + font-size: 34px; } } } diff --git a/src/views/Service/component/ServiceListSecond.vue b/src/views/Service/component/ServiceListSecond.vue index 9c47b88..41e8bba 100644 --- a/src/views/Service/component/ServiceListSecond.vue +++ b/src/views/Service/component/ServiceListSecond.vue @@ -56,8 +56,7 @@ export default { }, methods: { handleUniDetail (item) { - const publicName = sessionStorage.getItem('publicName'); - this.$router.push({ name: 'ServiceAbroadDetail', query: { courseId: item.id, publicName: publicName } }) + this.$router.push({ name: 'ServiceAbroadDetail', query: { courseId: item.id } }) }, } } diff --git a/src/views/Service/component/ServiceListThird.vue b/src/views/Service/component/ServiceListThird.vue index 74b589e..2271ade 100644 --- a/src/views/Service/component/ServiceListThird.vue +++ b/src/views/Service/component/ServiceListThird.vue @@ -70,8 +70,7 @@ export default { }, methods: { handleUniDetail (item) { - const publicName = sessionStorage.getItem('publicName'); - this.$router.push({ name: 'ServiceAbroadDetail', query: { courseId: item.id, publicName: publicName } }) + this.$router.push({ name: 'ServiceAbroadDetail', query: { courseId: item.id } }) }, orderScroll () { // console.log(this.$refs.viewBox.scrollTop) diff --git a/src/views/Service/payneed.vue b/src/views/Service/payneed.vue new file mode 100644 index 0000000..b581358 --- /dev/null +++ b/src/views/Service/payneed.vue @@ -0,0 +1,66 @@ + + + + + + \ No newline at end of file diff --git a/src/views/Service/protocol.vue b/src/views/Service/protocol.vue new file mode 100644 index 0000000..ca5dbad --- /dev/null +++ b/src/views/Service/protocol.vue @@ -0,0 +1,162 @@ + + + + + + + \ No newline at end of file -- libgit2 0.21.0