diff --git a/app.js b/app.js
index 38e250f..f4fc4b8 100644
--- a/app.js
+++ b/app.js
@@ -718,6 +718,12 @@ App({
resolve(user_info);
};
});
+
+
+
+
+
+
},
diff --git a/components/my_confirm/my_confirm.wxml b/components/my_confirm/my_confirm.wxml
index d82fc15..94ba02c 100644
--- a/components/my_confirm/my_confirm.wxml
+++ b/components/my_confirm/my_confirm.wxml
@@ -6,8 +6,8 @@
ⅹ
{{title}}
- {{s_text}}
- {{c_text}}
+ {{s_text}}
+ {{c_text}}
diff --git a/components/my_confirm/my_confirm.wxss b/components/my_confirm/my_confirm.wxss
index f05f462..55f8f7a 100644
--- a/components/my_confirm/my_confirm.wxss
+++ b/components/my_confirm/my_confirm.wxss
@@ -1,4 +1,4 @@
-
+@import '../../app.wxss';
/* 弹窗样式 */
.xc-pop-up{
width: 100%;
@@ -23,19 +23,19 @@
.shut{
display: block;
- width: 54rpx;
- height: 54rpx;
- font-size: 50rpx;
- line-height:47rpx;
+ width: 45rpx;
+ height: 45rpx;
+ line-height:36rpx;
border-radius: 50%;
-moz-border-radius: 50%;
-webkit-border-radius: 50%;
+ font-size: 40rpx;
color: #fff;
text-align: center;
position: fixed;
- margin-top: -23rpx;
z-index: 66666;
- right: 60rpx;
+ right: 75rpx;
+ top: 465rpx;
background: #c8162c;
}
.xc-qr-frame{
@@ -50,7 +50,7 @@
margin-left: -280rpx; border-radius:10rpx
}
-.ck_btn{width:44%;height:52rpx;line-height:60rpx;background:#f35e73;border-radius:10rpx;}
+.ck_btn{color: #000; width:44%;height:52rpx;line-height:60rpx;background:#f35e73;border-radius:10rpx;}
.fs36{ font-size: 36rpx; }
.fs30{ font-size: 30rpx; }
diff --git a/components/qr_code/qr_code.wxml b/components/qr_code/qr_code.wxml
index 216c4fa..5219afc 100644
--- a/components/qr_code/qr_code.wxml
+++ b/components/qr_code/qr_code.wxml
@@ -24,7 +24,7 @@
- ⅹ
+
\ No newline at end of file
diff --git a/components/qr_code/qr_code.wxss b/components/qr_code/qr_code.wxss
index 084783b..d953bbd 100644
--- a/components/qr_code/qr_code.wxss
+++ b/components/qr_code/qr_code.wxss
@@ -1,3 +1,5 @@
+@import '../../app.wxss';
+
.xc-pop-up{
width: 100%;
height: 100%;
@@ -90,36 +92,39 @@ top: 5rpx;
.qrcode{
width:520rpx;
height:520rpx;
- margin-top:-27rpx
+ margin-top:-18rpx
}
.r-code{
font-size:28rpx;
- padding-left: 25rpx;
-margin-top: -5.5rpx;
+ margin-top: -5.5rpx;
+ text-align: center;
}
.shut{
- display: block;
+ /* display: block;
width: 54rpx;
height: 54rpx;
border: 2rpx solid #fff;
font-size: 50rpx;
- z-index:55;
- line-height:47rpx;
+ line-height:54rpx;
margin-top: 45rpx;
border-radius: 50%;
-moz-border-radius: 50%;
- -webkit-border-radius: 50%;
+ -webkit-border-radius: 50%; */
+ z-index:55;
color: #fff;
text-align: center;
position: fixed;
top:940rpx;
- left:345rpx;
-
-
+ left:50%;
+ transform: translateX(-50%);
+}
+.icon-close:before {
+ content: "\e62e";
+ font-size: 50rpx;
}
.mt{ margin-top:130rpx}
diff --git a/packageA/pages/myGift/myGift.js b/packageA/pages/myGift/myGift.js
index 593a01c..d94dd7d 100644
--- a/packageA/pages/myGift/myGift.js
+++ b/packageA/pages/myGift/myGift.js
@@ -144,8 +144,9 @@ Page({
isShowLoading: true,
})
.then(function(res) {
+ console.log(res);
if(res.data.code == 0) {
-
+
self.setData({
isLoading: false
});
@@ -154,10 +155,12 @@ Page({
self.setData({
list: res.data.data
});
+ // console.log(this.data.list);
} else {
self.setData({
'list.pageData': self.data.list.pageData.concat(res.data.data.pageData)
});
+
};
if((res.data.data.pageData.length == 0) || (res.data.data.pageSize * res.data.data.page >= res.data.data.total)) {
@@ -312,5 +315,19 @@ Page({
})
},
+
+
+ show_remark:function(e){
+ var index=e.currentTarget.dataset.index;
+ var item=this.data.list.pageData[index];
+ this.setData({
+ show_rem_pop:1,
+ pop_remark_text:item.lbintro
+ })
+ },
+
+ close_remark:function(){
+ this.setData({show_rem_pop:0,})
+ }
})
\ No newline at end of file
diff --git a/packageA/pages/myGift/myGift.wxml b/packageA/pages/myGift/myGift.wxml
index ccc9103..a41b0ec 100644
--- a/packageA/pages/myGift/myGift.wxml
+++ b/packageA/pages/myGift/myGift.wxml
@@ -8,7 +8,10 @@
-
+
+
+
+
{{item.lbtitle}}
@@ -33,7 +36,7 @@
已售{{item.salenum}}件
- 活动截止日期 {{filter.format_time(item.expdate)}}
+ 活动结束日期 {{filter.format_time(item.endtime)}}
@@ -52,10 +55,11 @@
{{item.lbtitle}}
- 活动截止日期 {{filter.format_time(item.endtime)}}
+ 兑换截止日期 {{filter.format_time(item.expdate,1)}}
+ 活动说明
- *请到线下门店兑换
+ 注:请到线下门店兑换
@@ -68,3 +72,13 @@
+
+
+
+
+
+ 活动说明：
+ {{pop_remark_text}}
+
+
+
\ No newline at end of file
diff --git a/packageA/pages/myGift/myGift.wxss b/packageA/pages/myGift/myGift.wxss
index 04a155b..1e961aa 100644
--- a/packageA/pages/myGift/myGift.wxss
+++ b/packageA/pages/myGift/myGift.wxss
@@ -164,4 +164,28 @@ page {
color: #bbb;
text-align: center;
font-size: 22rpx;
-}
\ No newline at end of file
+}
+.lb_remark{
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ width: 100%;
+ height: 50rpx;
+ line-height: 50rpx;
+ font-size: 30rpx;
+ color: #333;
+ padding-left: 10rpx;
+ background-color: rgba(250,250,250,0.5);
+}
+
+.rem_pop{
+ position: fixed;
+ top: 30%;
+ left: 6%;
+ width: 88%;
+ margin: 0 auto;
+ height: 460rpx;
+ background-color: #fff;
+ z-index: 100; border-radius: 10rpx;
+ padding: 10rpx;
+}
diff --git a/packageA/pages/myGiftDetails/myGiftDetails.js b/packageA/pages/myGiftDetails/myGiftDetails.js
index 7fd7754..162a9db 100644
--- a/packageA/pages/myGiftDetails/myGiftDetails.js
+++ b/packageA/pages/myGiftDetails/myGiftDetails.js
@@ -11,7 +11,7 @@ Page({
data: {
qr_code_object: {
val: "12121",
- content: "请将二维码展示给核销员，服务更快捷！"
+ content: "当前核销码仅限当面使用！"
},
},
@@ -72,7 +72,7 @@ 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, });
-
+ console.log(da);
//礼包有俩种类型
if(da.lbtype==1){
app.request.promiseGet('/api/weshop/libao/libaoList/page', {
@@ -94,6 +94,7 @@ Page({
},
isShowLoading: true,
}).then(function(res) {
+ console.log(res);
if(res.data.code==0){
self.setData({
list: res.data.data,
@@ -150,6 +151,7 @@ Page({
},
isShowLoading: true,
}).then(function(res) {
+ console.log(res);
// console.log('res4-->', res);
if(res.data.code==0 && res.data.data) {
self.setData({
@@ -290,6 +292,7 @@ Page({
getApp().request.get("/api/weshop/libao/libaoListvip/getLibaoCode",{
data:data,
success:function (res){
+ console.log(res);
if(res.data.code==0){
th.data.qr_code_object.val=res.data.data;
var qc_com = th.selectComponent("#qrcode"); //组件的id
diff --git a/packageA/pages/myGiftDetails/myGiftDetails.wxml b/packageA/pages/myGiftDetails/myGiftDetails.wxml
index bd8ba1d..1e93278 100644
--- a/packageA/pages/myGiftDetails/myGiftDetails.wxml
+++ b/packageA/pages/myGiftDetails/myGiftDetails.wxml
@@ -3,7 +3,17 @@
- 兑换结束时间：{{filter.format_time(details.expdate,1)}}
+
+
+ 活动结束时间：{{filter.format_time(details.endtime,1)}}
+
+
+
+ 兑换结束时间：{{filter.format_time(details.expdate,1)}}
+
+
+
+
@@ -30,7 +40,7 @@
已售{{details.salenum}}件
- 活动截止日期 {{details.expdate ? filter.format_time(details.expdate):filter.format_time(details.endtime)}}
+
@@ -71,16 +81,40 @@
-
+
- 满1000.00使用
- ￥1000
+ 满{{item.condition}}使用
+ ￥{{item.money}}
- 活动结束日期： 2022-06-02 00:00:00
+
+
+ {{index==0?'活动结束日期':'截至时间'}}：
+
+
+
+ {{filter.format_time(item.use_end_time,1)}}
+
+
+ 不限
+
+
+
+
+
+ 有效期{{item.days}}天
+
+
+ 不限
+
+
+
+
+
+
-
+
@@ -106,7 +140,7 @@
立即购买
- 已领
+ 已领取
一键领取优惠券→
diff --git a/pages/index/index/index.js b/pages/index/index/index.js
index a3220ea..8ed9600 100644
--- a/pages/index/index/index.js
+++ b/pages/index/index/index.js
@@ -978,15 +978,27 @@ Page({
var giftBagId = res.data.data.gifBagId; //礼包id
var nav_url = "/pages/giftpack/festival/festival?actId=" + actid + '&' + 'actType=' + 3 + '&' + 'giftBagId=' + giftBagId;
var swiperimage = th.data.swiperimage;
- var actBoundImg = res.data.data.actBoundImg;
+ var actBoundImg = res.data.data.actBoundImg?res.data.data.actBoundImg:'/miniapp/images/default_g_img.gif';
th.data.holiday_image= res.data.data.actImg;
th.data.holiday_url=nav_url;
var img = {
image: actBoundImg,
- nav_url: nav_url
+ nav_url: nav_url,
+ id:res.data.data.id,
+ type:'festival'
}
+
+ for(var i in swiperimage){
+ var item=swiperimage[i];
+ if(item.id ==img.id && type==img.type){
+ return false;
+ }
+ }
+
+
+
swiperimage.unshift(img);
th.setData({
swiperimage: swiperimage,
diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml
index 5b326c8..9e69ac7 100644
--- a/pages/index/index/index.wxml
+++ b/pages/index/index/index.wxml
@@ -9,7 +9,7 @@
-
+
diff --git a/pages/index/index/index.wxss b/pages/index/index/index.wxss
index 4c25542..9b2a660 100644
--- a/pages/index/index/index.wxss
+++ b/pages/index/index/index.wxss
@@ -9,7 +9,6 @@
z-index: 99;
}
-
.search-box {
/* position: fixed;
top: 0;
@@ -976,6 +975,10 @@ page {
.container {
overflow: hidden;
+ /* padding-top: 140rpx; */
+}
+
+.container.nor{
padding-top: 140rpx;
}
diff --git a/project.config.json b/project.config.json
index b6d3437..95a50c6 100644
--- a/project.config.json
+++ b/project.config.json
@@ -21,6 +21,7 @@
"checkSiteMap": true,
"uploadWithSourceMap": true,
"compileHotReLoad": false,
+ "lazyloadPlaceholderEnable": false,
"useMultiFrameRuntime": true,
"useApiHook": true,
"useApiHostProcess": false,
@@ -30,12 +31,11 @@
"outputPath": ""
},
"useIsolateContext": true,
- "useCompilerModule": false,
- "userConfirmedUseCompilerModuleSwitch": false,
"userConfirmedBundleSwitch": false,
"packNpmManually": false,
"packNpmRelationList": [],
- "minifyWXSS": true
+ "minifyWXSS": true,
+ "showES6CompileOption": false
},
"compileType": "miniprogram",
"libVersion": "2.16.0",