diff --git a/app.json b/app.json index ff51ba3..a3688e2 100644 --- a/app.json +++ b/app.json @@ -22,6 +22,8 @@ "pages/edit/edit", "pages/actdetail/actdetail", "pages/radetail/index", + "pages/radetail/success/index", + "pages/radetail/joinActivity/edit", "pages/bannerdetail/index", "pages/getuserinfo/index", "pages/phoneinput/phoneinput", diff --git a/config/config.js b/config/config.js index c537836..819faa1 100755 --- a/config/config.js +++ b/config/config.js @@ -299,7 +299,9 @@ var config = { */ printHtmlById:"/wxCampaign/printHtmlById", acfindById:"/wxActivity/findById", - acPrintHtmlById:"/wxActivity/printHtmlById" + acPrintHtmlById:"/wxActivity/printHtmlById", + //参与活动 + activityJoin:"/wxActivityJoin/join" }, weapp: { AppId: weappId diff --git a/pages/radetail/index.js b/pages/radetail/index.js index 7114015..0ea383b 100644 --- a/pages/radetail/index.js +++ b/pages/radetail/index.js @@ -7,43 +7,55 @@ const imgurl = require("../../utils/imgurl"); Page({ data: { data: {}, + status:1, couponId: null, orderId: "", day: "", hour: "", + activityId:"", wmhome: imgurl.wmhome.url, minute: "", nodes: '' }, onLoad(options) { let that = this; - console.log(options) if (options.id){ + that.setData({ + activityId: options.id + }) Http.get({ url: config.api.acfindById, data: { id: options.id } }).then(res => { - that.setData({ - data: res.data.activity - }); - if (res.data.activity.type == 2 ){ - wx.request({ - url: 'https://ciformall.youlane.cn/C/api' + config.api.acPrintHtmlById, - data: { - id: options.id, - date: new Date(), - token: app.globalData.token, - }, - header: { - 'content-type': 'application/html' - }, - success: function (res) { - var temp = WxParse.wxParse('article', 'html', res.data, that, 5); - } + if (res && res.data && res.data.activity){ + that.setData({ + data: res.data.activity }) + if (res.data.activity.type == 2) { + wx.request({ + url: 'https://ciformall.youlane.cn/C/api' + config.api.acPrintHtmlById, + data: { + id: options.id, + date: new Date(), + token: app.globalData.token, + }, + header: { + 'content-type': 'application/html' + }, + success: function (res) { + var temp = WxParse.wxParse('article', 'html', res.data, that, 5); + } + }) + } + } + if (res && res.data && res.data.status) { + that.setData({ + status: res.data.status + }); } + }).catch(err => { wx.showToast({ title: err.errMsg, @@ -54,6 +66,13 @@ Page({ }) } }, + //跳转到报名详情页 + goSignUp(e){ + let activityId = e.currentTarget.dataset.activityid; + wx.navigateTo({ + url: `/pages/radetail/joinActivity/edit?activityId=${activityId}`, + }) + }, goback: function () { wx.switchTab({ url: '/pages/main/index', diff --git a/pages/radetail/index.wxml b/pages/radetail/index.wxml index 5d91b2a..5a6feef 100644 --- a/pages/radetail/index.wxml +++ b/pages/radetail/index.wxml @@ -15,6 +15,11 @@ 活动说明 {{data.detail}} + 活动人数:30人 + 活动开始时间:2019.06.11 08:11:30 + 活动结束时间:2019.06.11 08:11:30 + 报名开始时间:2019.06.11 08:11:30 + 报名结束时间:2019.06.11 08:11:30 @@ -23,4 +28,8 @@