From 551bbfa31cb8611b3328becf15c2b03fcc25a7db Mon Sep 17 00:00:00 2001 From: xy <271556543@qq.com> Date: Thu, 19 Jan 2023 10:53:34 +0800 Subject: [PATCH] 2023-1-19 --- pages.json | 12 + pages/active/active.vue | 199 +++-- pages/active/detail.vue | 1631 +++++++++++++++++++++++++++++++++++++++ pages/active/my.vue | 291 +++++++ pages/my/my.vue | 35 + static/750x500.jpg | Bin 0 -> 40160 bytes 6 files changed, 2084 insertions(+), 84 deletions(-) create mode 100644 pages/active/detail.vue create mode 100644 pages/active/my.vue create mode 100644 static/750x500.jpg diff --git a/pages.json b/pages.json index d00c33c..045f2fa 100644 --- a/pages.json +++ b/pages.json @@ -19,6 +19,18 @@ "navigationBarTextStyle": "white" } + }, + { + "path": "pages/active/detail", + "style": { + "navigationBarTitleText": "活动详情" + } + }, + { + "path": "pages/active/my", + "style": { + "navigationBarTitleText": "我的活动" + } }, { "path": "pages/member/member", diff --git a/pages/active/active.vue b/pages/active/active.vue index e09f19e..6e60c52 100644 --- a/pages/active/active.vue +++ b/pages/active/active.vue @@ -16,54 +16,28 @@ - - - - 参加活动 - - - - 享受服务 - - - - 特价优惠 - - - - 优质商户 - - - - 为您优选 - - - - 母婴商城 - - - - 月子中心 - - - - 关于我们 - + + + + + {{item.name}} + + 为您精选 - + - + {{item.end_at}} {{item.name}} {{item.address}} - {{item.activity_price[0].selling_price > 0 ? `¥${item.activity_price[0].selling_price}` : '免费'}} - {{item.people_number}}人参与 + {{ Number(item.money) > 0 ? `¥${item.money}` : '免费' }} + {{item.member_sum}}人参与 @@ -79,8 +53,8 @@ 为您推荐 - - 推荐 + + 推荐 {{item.name}} @@ -89,10 +63,10 @@ {{item.end_at}} {{item.address}} - ¥{{item.service_price[0].selling_price}} + ¥{{item.money}} 免费 - - 分享金{{item.service_price[0].shared_price}}元 + + 分享金{{ Number(item.money) }}元 @@ -109,7 +83,13 @@ indicatorDots: true, autoplay: true, interval: 4000, - activityList: [], + activityList: [], + activitySelect:{ + page:1, + page_size:5, + myself:0 + }, + indexNav: [], serviceList: [], ads: [], page: 1, @@ -120,58 +100,109 @@ }, onShow() { this.getAdS() - this.getActivityList() - this.getServiceList() + this.getActivityList() + this.getNav() + // this.getServiceList() }, onReachBottom() { - this.getServiceList() + this.getActivityList() }, - methods: { - goCarecenter(){ - uni.navigateTo({ - url:"../../packages/packageCarecenter/pages/careCenter/careCenter" - }) + methods: { + toAction: function(item) { + console.log(item) + if (item.link) { + uni.redirectTo({ + url: item.link + }) + } else { + uni.showToast({ + icon: "none", + title: "建设中" + }) + } + }, + async getNav(code) { + await weixin.request({ + newUrl: true, + api: '/api/member/applet-menu-first/index', + data: { + page: 1, + page_size: 8, + sort_name: "sort_number", + sort_type: "asc" + }, + utilSuccess: (res) => { + this.indexNav = res.data; + } + }) }, getActivityList() { - uni.request({ - url: this.baseUrl + '/api/wechat/activity-index', - method: 'POST', - data: {page_size: 2}, - success: r => { - if (r.data.code == 0) { - this.activityList = r.data.data.list - } - } + weixin.request({ + api:"/api/member/active-list", + data:this.activitySelect, + utilSuccess:res => { + if(res.data.length > 0){ + this.activitySelect.page ++ + }else{ + uni.showToast({ + icon:'none', + title:"没有更多了" + }) + } + if(this.activitySelect.page === 1){ + this.activityList = res.data + }else{ + this.activityList.push(...res.data) + } + console.log(res); + + }, + utilFail:err => { + console.log(err); + } }) }, getServiceList() { - uni.request({ - url: this.baseUrl + '/api/wechat/service-index', - method: 'POST', - data: {page: this.page}, - success: r => { - if (r.data.code == 0) { - this.serviceList = this.serviceList.concat(r.data.data.list) - this.page++ - } - } - }) + // weixin.request({ + // api:"/api/member/active-list", + // data:{ + + // }, + // utilSuccess:res => { + // console.log(res); + // }, + // utilFail:err => { + // console.log(err); + // } + // }) }, - getAdS() { - uni.request({ - url: this.baseUrl + '/api/wechat/adertisement-index', - method: 'POST', - data: {}, - success: r => { - if (r.data.code == 0) { - this.ads = r.data.data - } - } - }) + getAdS() { + this.ads = [] + weixin.request({ + newUrl: true, + api: '/api/member/other/advertisement', + data: { + origin_system: 1 + }, + utilSuccess: (res) => { + res.map(item => { + if (item.type === 0) { + this.ads.push({ + id: item.id, + pic: item.pic, + action: item.action + }) + } + }) + }, + utilFail: (err) => { + console.log(err, 'err'); + } + }) }, - gotoDetail(id, type) { + gotoDetail(id) { uni.navigateTo({ - url: `/pages/detail/detail?id=${id}&type=${type}` + url: `/pages/active/detail?id=${id}` }) } } diff --git a/pages/active/detail.vue b/pages/active/detail.vue new file mode 100644 index 0000000..8a2a56b --- /dev/null +++ b/pages/active/detail.vue @@ -0,0 +1,1631 @@ + + + diff --git a/pages/active/my.vue b/pages/active/my.vue new file mode 100644 index 0000000..a623729 --- /dev/null +++ b/pages/active/my.vue @@ -0,0 +1,291 @@ + + + + + diff --git a/pages/my/my.vue b/pages/my/my.vue index 74a1d6f..ed2127d 100644 --- a/pages/my/my.vue +++ b/pages/my/my.vue @@ -45,6 +45,36 @@ + + + 我的活动 + + + + + + + 待支付 + + + + 进行中 + + + + 已完成 + + + + 全部活动 + + + + +