From e2c0db7864c6385f81958fddde10729dc35f8ec4 Mon Sep 17 00:00:00 2001 From: taiyuan Date: Thu, 20 May 2021 10:37:49 +0800 Subject: [PATCH] 我的礼包 和 礼包详情 修改 --- packageA/pages/myGift/myGift.js | 3 ++- packageA/pages/myGift/myGift.wxml | 8 ++++---- packageA/pages/myGift/myGift.wxss | 6 +++--- packageA/pages/myGiftDetails/myGiftDetails.js | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------- packageA/pages/myGiftDetails/myGiftDetails.wxml | 27 +++++++++------------------ packageA/pages/myGiftDetails/myGiftDetails.wxss | 4 ++-- 6 files changed, 85 insertions(+), 42 deletions(-) diff --git a/packageA/pages/myGift/myGift.js b/packageA/pages/myGift/myGift.js index c807cfe..fb8c06e 100644 --- a/packageA/pages/myGift/myGift.js +++ b/packageA/pages/myGift/myGift.js @@ -22,6 +22,7 @@ Page({ let url = ''; let data = { store_id: app.globalData.setting.stoid, + user_id: app.globalData.user_id, }; this.setData({ @@ -35,7 +36,6 @@ Page({ url = '/api/weshop/libao/libaoForm/page'; } else if(index == 1) { url = '/api/weshop/libao/libaoFormvip/page'; - data.user_id = app.globalData.user_id; }; this.getData(true, url, data); @@ -74,6 +74,7 @@ Page({ this.getData(true, '/api/weshop/libao/libaoForm/page', { store_id: app.globalData.setting.stoid, + user_id: app.globalData.user_id, }); }; }; diff --git a/packageA/pages/myGift/myGift.wxml b/packageA/pages/myGift/myGift.wxml index 84d2d87..f0e37c7 100644 --- a/packageA/pages/myGift/myGift.wxml +++ b/packageA/pages/myGift/myGift.wxml @@ -6,7 +6,7 @@ - + @@ -26,14 +26,14 @@ - 立即兑换 - 立即购买 + 立即兑换 + 立即购买 - + diff --git a/packageA/pages/myGift/myGift.wxss b/packageA/pages/myGift/myGift.wxss index 845e145..a263faf 100644 --- a/packageA/pages/myGift/myGift.wxss +++ b/packageA/pages/myGift/myGift.wxss @@ -99,7 +99,7 @@ page { .img-container2 { width: 200rpx; - /* height: 200rpx; */ + height: 200rpx; background-color: #dedede; margin-right: 20rpx; flex-shrink: 0; @@ -140,12 +140,12 @@ page { text-align: center; } -.btn.exchange { +.btn.red { background-color: #FF6768; color: white; } -.btn.buy { +.btn.pink { background-color: #FACAD6; color: #FF6768; } diff --git a/packageA/pages/myGiftDetails/myGiftDetails.js b/packageA/pages/myGiftDetails/myGiftDetails.js index d10457c..3cf4a1d 100644 --- a/packageA/pages/myGiftDetails/myGiftDetails.js +++ b/packageA/pages/myGiftDetails/myGiftDetails.js @@ -16,7 +16,11 @@ Page({ */ onLoad: function (options) { self = this; - this.data.id = options.id; + this.setData({ + id: options.id, + index: options.index, + }) + // console.log('options', options); app.isLogin().then(function(data) {//进入页面前已经授权登录成功 self.setData({ @@ -44,20 +48,67 @@ Page({ isLogin: true, }); - // 请求数据 - app.request.promiseGet('/api/weshop/libao/libaoFormvip/page', { - data: { - store_id: app.globalData.setting.stoid, - user_id: app.globalData.user_id, - id: this.data.id, - }, - isShowLoading: true, - }).then(function(res) { - console.log('res-->', res.data.data.pageData); - self.setData({ - details: res.data.data.pageData[0], + let url = ''; + // let data = { + // store_id: app.globalData.setting.stoid, + // user_id: app.globalData.user_id, + // }; + + if(this.data.index == 0) { + // data.lbid = this.data.id; + // 请求数据 + app.request.promiseGet('/api/weshop/libao/libaoForm/page', { + data: { + store_id: app.globalData.setting.stoid, + id: this.data.id, + }, + isShowLoading: true, + }).then(function(res) { + self.setData({ + details: res.data.data.pageData[0], + }); }); - }); + + app.request.promiseGet('/api/weshop/libao/libaoList/page', { + data: { + store_id: app.globalData.setting.stoid, + lbid: this.data.id, + }, + isShowLoading: true, + }).then(function(res) { + self.setData({ + list: res.data.data.pageData, + }); + }); + } else if(this.data.index == 1) { + app.request.promiseGet('/api/weshop/libao/libaoFormvip/page', { + data: { + store_id: app.globalData.setting.stoid, + user_id: app.globalData.user_id, + id: this.data.id, + }, + isShowLoading: true, + }).then(function(res) { + console.log('res3-->', res); + self.setData({ + details: res.data.data.pageData[0], + }); + }); + + app.request.promiseGet('/api/weshop/libao/libaoListvip/page', { + data: { + store_id: app.globalData.setting.stoid, + lbvipid: this.data.id, + }, + isShowLoading: true, + }).then(function(res) { + console.log('res4-->', res); + self.setData({ + list: res.data.data.pageData, + }); + }); + }; + }; }; diff --git a/packageA/pages/myGiftDetails/myGiftDetails.wxml b/packageA/pages/myGiftDetails/myGiftDetails.wxml index f0403a3..e4b192b 100644 --- a/packageA/pages/myGiftDetails/myGiftDetails.wxml +++ b/packageA/pages/myGiftDetails/myGiftDetails.wxml @@ -15,7 +15,7 @@ 已售{{details.salenum}}件 - 活动截止日期 {{filter.format_time(details.expdate)}} + 活动截止日期 {{details.expdate ? filter.format_time(details.expdate):filter.format_time(details.endtime)}} @@ -25,28 +25,19 @@ 单品名称 数量 - - DN53000039蒂诺间金 - x1 - - - 蒂诺间金 - x1 - - - 金 - x1000 - - - 蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂 - x199 + + {{item.goods_name}} + x{{item.goods_num}} - 立即兑换 - 马上购买 + + 立即兑换 + 立即购买 + + 立即使用 diff --git a/packageA/pages/myGiftDetails/myGiftDetails.wxss b/packageA/pages/myGiftDetails/myGiftDetails.wxss index 096e475..23bdcaf 100644 --- a/packageA/pages/myGiftDetails/myGiftDetails.wxss +++ b/packageA/pages/myGiftDetails/myGiftDetails.wxss @@ -68,12 +68,12 @@ page { text-align: center; } -.btn.exchange { +.btn.red { background-color: #FF6768; color: white; } -.btn.buy { +.btn.pink { background-color: #FACAD6; color: #FF6768; } \ No newline at end of file -- libgit2 0.21.4