diff --git a/packageA/pages/myGift/myGift.wxml b/packageA/pages/myGift/myGift.wxml
index 52eca65..ccc9103 100644
--- a/packageA/pages/myGift/myGift.wxml
+++ b/packageA/pages/myGift/myGift.wxml
@@ -17,18 +17,18 @@
- {{item.lbprice}}/{{item.lbintegral}}积分
+ {{filter.toFix(item.lbprice,2)}}/{{item.lbintegral}}积分
- {{item.lbprice}}
+ {{filter.toFix(item.lbprice,2) }}
{{item.lbintegral}}积分
- 零售价{{item.oldprice}}
+ 零售价{{filter.toFix(item.oldprice,2)}}
已售{{item.salenum}}件
diff --git a/packageA/pages/myGiftDetails/myGiftDetails.js b/packageA/pages/myGiftDetails/myGiftDetails.js
index f0f4798..7fd7754 100644
--- a/packageA/pages/myGiftDetails/myGiftDetails.js
+++ b/packageA/pages/myGiftDetails/myGiftDetails.js
@@ -57,7 +57,7 @@ Page({
// store_id: app.globalData.setting.stoid,
// user_id: app.globalData.user_id,
// };
-
+ //购买的时候是0，购买后是1
if(this.data.index == 0) {
// data.lbid = this.data.id;
// 请求数据
@@ -68,60 +68,100 @@ Page({
},
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,
- });
+
+ if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
+ var da= res.data.data.pageData[0]
+ self.setData({ details:da, });
+
+ //礼包有俩种类型
+ if(da.lbtype==1){
+ app.request.promiseGet('/api/weshop/libao/libaoList/page', {
+ data: {
+ store_id: app.globalData.setting.stoid,
+ lbid: self.data.id,pageSize:500
+ },
+ isShowLoading: true,
+ }).then(function(res) {
+ self.setData({
+ list: res.data.data.pageData,
+ });
+ });
+ }else{
+ app.request.promiseGet('/api/weshop/libao/libaoList/listLQ', {
+ data: {
+ store_id: app.globalData.setting.stoid,
+ lbid: self.data.id,
+ },
+ isShowLoading: true,
+ }).then(function(res) {
+ if(res.data.code==0){
+ self.setData({
+ list: res.data.data,
+ });
+ }
+ });
+ }
+
+ }
});
+
} 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,
+ id: this.data.id
},
isShowLoading: true,
}).then(function(res) {
// console.log('res3-->', res);
if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
+
+ var da= res.data.data.pageData[0]
self.setData({
- details: res.data.data.pageData[0],
+ details:da,
});
- }
- });
-
- 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);
- if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0) {
- var list_arr=res.data.data.pageData;
- for(var i in list_arr){
- list_arr[i].alsonum= list_arr[i]['goods_num'] - list_arr[i]['usenum'];//剩余次数
+
+ if(da.lbtype==1){
+ app.request.promiseGet('/api/weshop/libao/libaoListvip/page', {
+ data: {
+ store_id: app.globalData.setting.stoid,
+ lbvipid: self.data.id,pageSize:500
+ },
+ isShowLoading: true,
+ }).then(function(res) {
+ // console.log('res4-->', res);
+ if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0) {
+ var list_arr=res.data.data.pageData;
+ for(var i in list_arr){
+ list_arr[i].alsonum= list_arr[i]['goods_num'] - list_arr[i]['usenum'];//剩余次数
+ }
+ self.setData({
+ list: res.data.data.pageData,
+ });
+ }
+ });
+ }else{
+ app.request.promiseGet('/api/weshop/libao/libaoListvip/listLQ', {
+ data: {
+ store_id: app.globalData.setting.stoid,
+ lbvipid: self.data.id,
+ user_id:app.globalData.user_id
+ },
+ isShowLoading: true,
+ }).then(function(res) {
+ // console.log('res4-->', res);
+ if(res.data.code==0 && res.data.data) {
+ self.setData({
+ list: res.data.data,
+ });
+ }
+ });
}
- self.setData({
- list: res.data.data.pageData,
- });
+
}
});
};
-
-
};
};
},
@@ -260,14 +300,38 @@ Page({
icon: 'none',
duration: 2000
})
-
-
-
+
}
}
})
- }
+ },
+
+ //一键领取券
+ show_get_quan:function (e) {
+ var th=this;
+ var json = {
+ store_id:os.stoid,
+ user_id:getApp().globalData.user_id,
+ id:this.data.id
+ };
+ var url = "/api/weshop/libao/libaoFormvip/saveLibaoQuan";
+ getApp().request.post(url,{
+ data:json,
+ success:function(res) {
+ if (res.data.code == 0) {
+ th.setData({'details.isget':1});
+ } else {
+ wx.showToast({
+ title: res.data.msg,
+ icon: 'none',
+ duration: 2000
+ })
+ }
+ },
+ })
+
+ }
})
\ No newline at end of file
diff --git a/packageA/pages/myGiftDetails/myGiftDetails.wxml b/packageA/pages/myGiftDetails/myGiftDetails.wxml
index 74e8787..bd8ba1d 100644
--- a/packageA/pages/myGiftDetails/myGiftDetails.wxml
+++ b/packageA/pages/myGiftDetails/myGiftDetails.wxml
@@ -2,6 +2,8 @@
+
+ 兑换结束时间：{{filter.format_time(details.expdate,1)}}
@@ -11,11 +13,11 @@
- {{details.lbprice}}/{{details.lbintegral}}积分
+ {{filter.toFix(details.lbprice,2)}}/{{details.lbintegral}}积分
- {{details.lbprice}}
+ {{filter.toFix(details.lbprice,2)}}
{{details.lbintegral}}积分
@@ -23,15 +25,18 @@
- 零售价{{details.oldprice}}
+ 零售价{{filter.toFix(details.oldprice,2)}}
已售{{details.salenum}}件
活动截止日期 {{details.expdate ? filter.format_time(details.expdate):filter.format_time(details.endtime)}}
+
+
+
-
+
可到线下门店兑换以下单品
@@ -53,7 +58,6 @@
-
单品名称
@@ -65,15 +69,48 @@
-
+
+
+
+
+
+
+ 满1000.00使用
+ ￥1000
+
+ 活动结束日期： 2022-06-02 00:00:00
+
+
+
+
+
+
-
+
立即兑换
立即购买
- 立即使用
+
+
+
+ 已领取{{list[0].freebh}}
+
+ 立即使用
+
+
+
+
+ 立即兑换
+ 立即购买
+
+
+ 已领
+ 一键领取优惠券→
+
+
+
diff --git a/packageA/pages/myGiftDetails/myGiftDetails.wxss b/packageA/pages/myGiftDetails/myGiftDetails.wxss
index 2431c64..db13e1a 100644
--- a/packageA/pages/myGiftDetails/myGiftDetails.wxss
+++ b/packageA/pages/myGiftDetails/myGiftDetails.wxss
@@ -81,4 +81,21 @@ page {
.ling_btn{ background: #c0283a; color: #fff; width: 100rpx; height: 50rpx;
display: inline-block; line-height: 50rpx; border-radius: 10rpx}
-.ling_btn.c_a{ background: darkgrey}
\ No newline at end of file
+.ling_btn.c_a{ background: darkgrey}
+
+.lb_quan{
+ width: 48%;
+ height: 120rpx;
+ background-size: 100% 100%;
+ background-position: center;
+ background-repeat: no-repeat;
+ color: #fff;
+ font-size: 22rpx;
+ text-align: center;
+ margin-top:20rpx;
+ margin-left:10rpx;
+}
+.fir_view{
+ justify-content: space-between; height: 98rpx; line-height: 98rpx; padding: 0 8rpx;
+}
+.exp_title{text-align: center;height: 60rpx; line-height: 60rpx;background-color: #cccdce;color: #c0283a}
\ No newline at end of file
diff --git a/packageA/pages/my_service2/appment_main.js b/packageA/pages/my_service2/appment_main.js
index 413a898..06f63c9 100644
--- a/packageA/pages/my_service2/appment_main.js
+++ b/packageA/pages/my_service2/appment_main.js
@@ -329,7 +329,7 @@ Page({
is_textea: 0
})
var itemId = th.data.itemId; //服务id
- var url = "/api/weshop/marketing/reservation/storage/pageAll";
+ var url = "/api/weshop/marketing/reservation/service/storage/page";
var key_word = th.data.key_word;
key_word = key_word.replace(/\s+/g, "");
getApp().request.promiseGet(url, {
@@ -344,7 +344,7 @@ Page({
}
}).then(res => {
wx.hideLoading();
- if (res.data.code == 0) {
+ if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0) {
th.data.curpage++;
var arr1 = th.data.store_list;
var arr2 = res.data.data.pageData;
diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml
index 3cb7378..c60a1f9 100644
--- a/pages/index/index/index.wxml
+++ b/pages/index/index/index.wxml
@@ -212,7 +212,7 @@
-
+