diff --git a/api/index/index.js b/api/index/index.js index 7ba9259..519b041 100644 --- a/api/index/index.js +++ b/api/index/index.js @@ -25,7 +25,14 @@ export const courseselectCourse = (data) => { data }) } - +// 兑换 +export const userPrizeExchangeexchange = (data) => { + return http.request({ + url: '/userPrizeExchange/exchange', + data, + method:'post' + }) +} // 搜索 export const selectCourseTitles = (data) => { return http.request({ diff --git a/pages.json b/pages.json index c0c8e7a..f0e3d7f 100644 --- a/pages.json +++ b/pages.json @@ -202,6 +202,13 @@ { "navigationBarTitleText" : "我的奖励" } + }, + { + "path" : "pages/index/prizeDraw/duihuan", + "style" : + { + "navigationBarTitleText" : "兑换" + } } ], "globalStyle": { diff --git a/pages/index/prizeDraw/LotteryRecords.vue b/pages/index/prizeDraw/LotteryRecords.vue index fbfe23a..0b85852 100644 --- a/pages/index/prizeDraw/LotteryRecords.vue +++ b/pages/index/prizeDraw/LotteryRecords.vue @@ -6,17 +6,18 @@ v-for="(item, index) in datas.tab" :key="index">{{ item.label }} - 中奖时间 {{item.drawDay}} + {{datas.tabIndex==1?'中奖时间':'兑换时间'}} {{item.createTime}} - 大额红包 - ×1 + {{item.name}} + {{item.prizeName}} + ×{{item.number}} - - + + 立即兑换 @@ -86,10 +87,10 @@ } } else { if (datas.page == 1) { - datas.list = res.page.list; + datas.list = res.list; } else { if (res.records.length) { - datas.list.push(...datas.list, res.records) + datas.list.push(...datas.list, res.list) } } // datas.total = res.page.totalCount; @@ -106,8 +107,8 @@ // 立即兑换 function toDuiHuan(item) { uni.navigateTo({ - url: `/me/gift/duihuan?source=${this.query.source}&id=${item.id}` - }); + url: `/pages/index/prizeDraw/duihuan?id=${item.id}` + }) } diff --git a/pages/index/prizeDraw/duihuan.vue b/pages/index/prizeDraw/duihuan.vue new file mode 100644 index 0000000..90aba10 --- /dev/null +++ b/pages/index/prizeDraw/duihuan.vue @@ -0,0 +1,110 @@ + + + + + \ No newline at end of file diff --git a/pages/index/prizeDraw/kevy-luckydraw.vue b/pages/index/prizeDraw/kevy-luckydraw.vue index 9f8f7cb..058f817 100644 --- a/pages/index/prizeDraw/kevy-luckydraw.vue +++ b/pages/index/prizeDraw/kevy-luckydraw.vue @@ -3,7 +3,7 @@ - + @@ -24,7 +24,7 @@ 活动规则 1.抽奖细则:每日前{{ freeNumDay }}次付款均可获得抽奖机会 - 2.奖励说明:红包奖励将自动发放到红包余额,已绑定支付宝账号将会自动发起提现。其余奖品则需联系客服领取。 + 2.奖励说明:红包奖励将自动发放到红包余额,已绑定银行卡账号将会自动发起提现。其余奖品则需联系客服领取。 @@ -38,7 +38,7 @@ 再努力努力肯定就会中哦~ --> - + @@ -84,9 +84,13 @@ freeNumDay: 0, list: [], selectData: "", + source:1 } }, - onLoad() { + onLoad(opt) { + if (opt.source) { + this.source = opt.source + } this.getRedPack(); this.getCount(); this.getPrizeList(); @@ -105,7 +109,7 @@ async onClick() { if (this.luckDrawTimes) { const res = await discSpinningdraw({ - source: 1 + source: this.source }); let indexs = -1 this.list.forEach((ele, index) => { @@ -121,7 +125,7 @@ // 抽奖次数 async getCount() { const res = await drawCount({ - source: 1 + source: this.source }); this.luckDrawTimes = res.count || 0; this.freeNumDay = res.sum || 0; @@ -134,7 +138,7 @@ // 获取奖品列表 async getPrizeList() { const res = await selectDiscSpinning({ - source: 1 + source: this.source }); res.records.forEach(res => { res.img = res.url @@ -216,7 +220,7 @@ background-repeat: no-repeat; margin: 0rpx auto; position: relative; - background-image:url('./luck/BJ.png') + background-image: url('./luck/BJ.png') } .t-zp {