diff --git a/pages/index/index.vue b/pages/index/index.vue index 833cc45..9e8ccfe 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -51,11 +51,11 @@ - - + + - {{calendarItem.name}} - 活动时间:{{ calendarItem.begin_date }}—{{ calendarItem.end_date }} + {{calendarItem.title}} + 活动时间:{{ calendarItem.start_time }}—{{ calendarItem.end_time }} @@ -90,7 +90,7 @@ - + {{item.title || item.name}} @@ -447,13 +447,12 @@ // 周边特惠活动 getCalendarList() { this.Post({ - apiType: 'jdsz', - page_no: 1, - page_num: 1 - }, '/api/pbservice/Actcalendar/getActList').then(res => { - if(res) { - this.calendarItem = res.data.rows[0] - } + date: '', + offset: 0, + limit: 100, + type_id: 6 + },'/api/activity/getActivityCalendar').then(res => { + this.calendarItem = res.data[0] }) }, // 更改热门推荐类型 @@ -797,7 +796,7 @@ position: relative; .hot-img { - height: 267rpx; + width: 340rpx; } .play-img { diff --git a/static/js/CommonFunction.js b/static/js/CommonFunction.js index eee80d9..329f8d2 100644 --- a/static/js/CommonFunction.js +++ b/static/js/CommonFunction.js @@ -387,4 +387,13 @@ Vue.prototype.exploit = () => { title: '开发中', icon: 'none' }) +} + +// 周边特惠活动跳转详情 +Vue.prototype.gotoWebUrl = item => { + if(item.url) { + uni.navigateTo({ + url: '/subPackages/webPage/webPage?url=' + encodeURIComponent(item.url) + }); + } } \ No newline at end of file diff --git a/subPackages/order/detail.vue b/subPackages/order/detail.vue index ac4f819..9c4760a 100644 --- a/subPackages/order/detail.vue +++ b/subPackages/order/detail.vue @@ -206,6 +206,15 @@ + + 使用日期: + + {{info.order_child[0].use_date}} + + {{info.order_child[0].start_time}}-{{info.order_child[0].end_time}} + 入园 + + 商品总额:¥{{info.money / 100}} diff --git a/subPackages/peripheralActivity/peripheralActivity.vue b/subPackages/peripheralActivity/peripheralActivity.vue index 647c503..76948bf 100644 --- a/subPackages/peripheralActivity/peripheralActivity.vue +++ b/subPackages/peripheralActivity/peripheralActivity.vue @@ -3,11 +3,11 @@ - - + + - {{item.name}} - 活动时间:{{ item.begin_date }}—{{ item.end_date }} + {{item.title}} + 活动时间:{{ item.start_time }}—{{ item.end_time }} @@ -41,15 +41,14 @@ }, getList() { this.Post({ - apiType: 'jdsz', - page_no: this.pageNo, - page_num: this.limit - }, '/api/pbservice/Actcalendar/getActList').then(res => { - if(res) { - if(res.data.rows.length < this.limit) this.isLoading = true - this.list = this.list.concat(res.data.rows) - this.pageNo ++ - } + date: '', + offset: this.list.length, + limit: this.limit, + type_id: 6 + },'/api/activity/getActivityCalendar').then(res => { + this.calendarItem = res.data[0] + if(res.data.length < this.limit) this.isLoading = true + this.list = this.list.concat(res.data) }) } }