diff --git a/components/my_confirm/my_confirm.wxml b/components/my_confirm/my_confirm.wxml
index 94ba02c..b7343e3 100644
--- a/components/my_confirm/my_confirm.wxml
+++ b/components/my_confirm/my_confirm.wxml
@@ -3,12 +3,14 @@
- ⅹ
- {{title}}
-
- {{s_text}}
- {{c_text}}
-
+
+ ⅹ
+ {{title}}
+
+ {{s_text}}
+ {{c_text}}
+
+
diff --git a/components/my_confirm/my_confirm.wxss b/components/my_confirm/my_confirm.wxss
index 55f8f7a..5935b8f 100644
--- a/components/my_confirm/my_confirm.wxss
+++ b/components/my_confirm/my_confirm.wxss
@@ -32,10 +32,10 @@
font-size: 40rpx;
color: #fff;
text-align: center;
- position: fixed;
+ position: absolute;
z-index: 66666;
- right: 75rpx;
- top: 465rpx;
+ right: -20rpx;
+ top: -20rpx;
background: #c8162c;
}
.xc-qr-frame{
diff --git a/packageA/pages/myGift/myGift.js b/packageA/pages/myGift/myGift.js
index d94dd7d..4fc4253 100644
--- a/packageA/pages/myGift/myGift.js
+++ b/packageA/pages/myGift/myGift.js
@@ -122,7 +122,17 @@ Page({
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
- this.scrollToLower('/api/weshop/libao/libaoFormvip/page', {
+
+ var url="";
+ var index=this.data.currentIndex;
+ if(index == 0) {
+ url = '/api/weshop/libao/libaoForm/page';
+ } else if(index == 1) {
+ url = '/api/weshop/libao/libaoFormvip/page';
+ };
+
+
+ this.scrollToLower(url, {
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 171e8ef..9fb2f5b 100644
--- a/packageA/pages/myGift/myGift.wxml
+++ b/packageA/pages/myGift/myGift.wxml
@@ -33,7 +33,7 @@
零售价{{filter.toFix(item.oldprice,2)}}
- 已售{{item.salenum}}件
+ 已售{{item.salenum+item.virtualsales}}件
活动结束日期 {{filter.format_time(item.endtime)}}
diff --git a/packageA/pages/myGiftDetails/myGiftDetails.js b/packageA/pages/myGiftDetails/myGiftDetails.js
index 162a9db..29cdaaf 100644
--- a/packageA/pages/myGiftDetails/myGiftDetails.js
+++ b/packageA/pages/myGiftDetails/myGiftDetails.js
@@ -2,6 +2,7 @@
const app = getApp();
let self = null;
var os = app.globalData.setting;
+var ut = require("../../../utils/util.js");
Page({
@@ -72,6 +73,14 @@ Page({
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.startime>ut.gettimestamp()){
+ self.setData({ is_not_start:1, });
+ }
+
+
+
console.log(da);
//礼包有俩种类型
if(da.lbtype==1){
diff --git a/packageA/pages/myGiftDetails/myGiftDetails.wxml b/packageA/pages/myGiftDetails/myGiftDetails.wxml
index 1e93278..d24e590 100644
--- a/packageA/pages/myGiftDetails/myGiftDetails.wxml
+++ b/packageA/pages/myGiftDetails/myGiftDetails.wxml
@@ -5,7 +5,8 @@
- 活动结束时间：{{filter.format_time(details.endtime,1)}}
+ 活动开始时间：{{filter.format_time(details.startime,1)}}
+ 活动结束时间：{{filter.format_time(details.endtime,1)}}
@@ -37,7 +38,7 @@
零售价{{filter.toFix(details.oldprice,2)}}
- 已售{{details.salenum}}件
+ 已售{{details.salenum+details.virtualsales}}件
@@ -86,7 +87,8 @@
满{{item.condition}}使用
- ￥{{item.money}}
+ 包邮
+ ￥{{item.money}}
@@ -122,8 +124,13 @@
- 立即兑换
- 立即购买
+
+ 活动还未开始
+
+
+ 立即兑换
+ 立即购买
+
@@ -136,8 +143,14 @@
- 立即兑换
- 立即购买
+
+ 活动还未开始
+
+
+ 立即兑换
+ 立即购买
+
+
已领取
diff --git a/packageA/pages/myGiftDetails/myGiftDetails.wxss b/packageA/pages/myGiftDetails/myGiftDetails.wxss
index db13e1a..bbd4da9 100644
--- a/packageA/pages/myGiftDetails/myGiftDetails.wxss
+++ b/packageA/pages/myGiftDetails/myGiftDetails.wxss
@@ -78,6 +78,13 @@ page {
color: #FF6768;
}
+.btn.gray{
+ background-color: #cccccc;
+ color:#fff
+}
+
+
+
.ling_btn{ background: #c0283a; color: #fff; width: 100rpx; height: 50rpx;
display: inline-block; line-height: 50rpx; border-radius: 10rpx}