diff --git a/app.wxss b/app.wxss
index 52b691a..f5e0503 100644
--- a/app.wxss
+++ b/app.wxss
@@ -706,9 +706,9 @@ background: #ffe3e2;
/* 图标字体(ty) */
@font-face {
font-family: 'iconfont'; /* Project id 2054717 */
- src: url('//at.alicdn.com/t/font_2054717_3fwbtkdbxhl.woff2?t=1627893975776') format('woff2'),
- url('//at.alicdn.com/t/font_2054717_3fwbtkdbxhl.woff?t=1627893975776') format('woff'),
- url('//at.alicdn.com/t/font_2054717_3fwbtkdbxhl.ttf?t=1627893975776') format('truetype');
+ src: url('//at.alicdn.com/t/font_2054717_j27uzo13r5f.woff2?t=1628845583213') format('woff2'),
+ url('//at.alicdn.com/t/font_2054717_j27uzo13r5f.woff?t=1628845583213') format('woff'),
+ url('//at.alicdn.com/t/font_2054717_j27uzo13r5f.ttf?t=1628845583213') format('truetype');
}
.iconfont {
@@ -719,6 +719,10 @@ background: #ffe3e2;
-moz-osx-font-smoothing: grayscale;
}
+.icon-nodata:before {
+ content: "\e636";
+}
+
.icon-zhuanfa1:before {
content: "\e614";
}
diff --git a/packageB/pages/coupons/query/index.js b/packageB/pages/coupons/query/index.js
index 5fd4e33..7c59ffb 100644
--- a/packageB/pages/coupons/query/index.js
+++ b/packageB/pages/coupons/query/index.js
@@ -23,7 +23,7 @@ Page({
isBind:true,//控制清空时间日期的按钮
isBinds: true,
select: false,//下拉框
- grade_name: '所有',
+ grade_name: '未使用',
// grades: [ //old
// '所有',
// '已使用',
@@ -198,7 +198,7 @@ Page({
var store_id = os.stoid;
- this.getData(true, '/api/weshop/users/listExchangeCoupons?pageSize=10', {
+ this.getData(true, '/api/weshop/users/listExchangeCoupons', {
user_id: user_id, store_id: store_id,
}).then(()=>{
_this.setData({
@@ -231,7 +231,7 @@ Page({
this.data.integr = item.Integral;
this.data.number = item.Number;
- let content = `确定使用${th.data.integr}积分兑换面值${th.data.monye}元的代金券吗?`;
+ let content = `确定使用${th.data.integr}积分兑换代金券面值${th.data.monye}元吗?`;
wx.showModal({
title: '提示',
content: content,
@@ -479,13 +479,24 @@ Page({
},
+ // 使用说明详情展开
+ clickDetails: function(e) {
+ let details = this.data.details;
+ let index = e.currentTarget.dataset.index;
+ details[index].isShowDetails = !details[index].isShowDetails;
+ this.setData({
+ details,
+ });
+ },
+
+
//---加载更多是靠这个函数----
onReachBottom: function () {
if(this.data.currentIndex != 3) {
this.wjquery();
} else {
- this.scrollToLower('/api/weshop/users/listExchangeCoupons?pageSize=10', {
+ this.scrollToLower('/api/weshop/users/listExchangeCoupons', {
user_id: getApp().globalData.user_id,
store_id: os.stoid,
}, function() {
@@ -499,35 +510,35 @@ Page({
//起始时间
- bindDateChenge: function(e) {
- console.log("是什么", e.detail.value);
- var isBind = false;
- this.setData({
- datet: e.detail.value, isBind: isBind
- });
- },
+ // bindDateChenge: function(e) {
+ // console.log("是什么", e.detail.value);
+ // var isBind = false;
+ // this.setData({
+ // datet: e.detail.value, isBind: isBind
+ // });
+ // },
// 结束时间
- bindDateChenges: function(e) {
- console.log("是什么", e.detail.value);
- var isBinds = false;
- this.setData({
- dates: e.detail.value, isBinds: isBinds
- });
- },
+ // bindDateChenges: function(e) {
+ // console.log("是什么", e.detail.value);
+ // var isBinds = false;
+ // this.setData({
+ // dates: e.detail.value, isBinds: isBinds
+ // });
+ // },
//catchtap阻止冒泡，点击清除开始时间的按钮
- eliminate:function(){
- console.log("试试");
- var isBind= true;
- var data="";
- this.setData({ datet: data, isBind: isBind})
- },
+ // eliminate:function(){
+ // console.log("试试");
+ // var isBind= true;
+ // var data="";
+ // this.setData({ datet: data, isBind: isBind})
+ // },
//catchtap阻止冒泡，点击清除结束时间的按钮
- eliminates: function () {
- console.log("试试");
- var isBinds = true;
- var dates = "";
- this.setData({ dates: dates, isBinds: isBinds })
- },
+ // eliminates: function () {
+ // console.log("试试");
+ // var isBinds = true;
+ // var dates = "";
+ // this.setData({ dates: dates, isBinds: isBinds })
+ // },
diff --git a/packageB/pages/coupons/query/index.wxml b/packageB/pages/coupons/query/index.wxml
index 5ea30f3..1e06d8f 100644
--- a/packageB/pages/coupons/query/index.wxml
+++ b/packageB/pages/coupons/query/index.wxml
@@ -63,25 +63,24 @@
- 20
+ 包邮券
包邮券
微券来源: 微信商城
- 立即使用
+ {{filter.showBtnText(currentIndex)}}
- 有效期:{{detail.use_start_time==null?" " : time.format_time(detail.use_start_time)}}至{{ time.format_time(detail.use_end_time)}}
+ 有效期:{{detail.use_start_time==null?" " : time.format_time(detail.use_start_time)}} 至 {{time.format_time(detail.use_end_time)}}
有效期:不限
-
-
- 使用说明: 包邮券,全场通用,满 {{detail.condition}}元使用{{detail.title?',不包邮地区:'+detail.title:''}}
+
+ 使用说明: 包邮券,全场通用,满 {{detail.condition}}元使用{{detail.title?',不包邮地区:'+detail.title:''}}
@@ -100,15 +99,15 @@
- 有效期:{{detail.BeginDate==null ? " " : time.replace_time2(detail.BeginDate)}} 至 {{time.replace_time2(detail.ValidDate)}}
+ 有效期:{{detail.BeginDate==null ? " " : time.replace_time2(detail.BeginDate)}} 至 {{time.replace_time2(detail.ValidDate)}}
有效期:不限
-
- {{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}};{{detail.Remark}}
- 使用说明: {{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}}
+
+ {{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}};{{detail.Remark}}
+ 使用说明: {{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}}
@@ -123,7 +122,7 @@
- {{result.Integral}}积分兑换{{filter.getNum(result.ToSum)}}元微券
+ {{result.Integral}}积分兑换{{filter.getNum(result.ToSum)}}元微券
立即兑换
@@ -154,15 +153,22 @@