From 7ebd45112bc2759943655fc48c48e20a4bf42c84 Mon Sep 17 00:00:00 2001 From: taiwan Date: Sat, 12 Feb 2022 16:34:46 +0800 Subject: [PATCH] 套盒商品 --- packageA/pages/goodsInfo/goodsInfo.js | 39 +++++++++++++++++++++++++++++++++++++++ packageA/pages/goodsInfo/goodsInfo.wxml | 27 ++++++++++++++++++++++----- packageA/pages/goodsInfo/goodsInfo.wxss | 19 +++++++++++++++++-- packageB/pages/boxes-details/boxes-details.js | 457 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- packageB/pages/boxes-details/boxes-details.json | 2 +- packageB/pages/boxes-details/boxes-details.wxml | 82 +++++++++++++++++++++++----------------------------------------------------------- packageB/pages/boxes-details/boxes-details.wxss | 15 +++++++++++++++ packageB/pages/boxes-list/boxes-list.js | 188 +++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------- packageB/pages/boxes-list/boxes-list.wxml | 30 +++++++++++++++++++----------- packageB/pages/boxes-list/boxes-list.wxss | 1 + utils/filter.wxs | 13 +++++++++++++ 11 files changed, 270 insertions(+), 603 deletions(-) diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js index 038dd73..e81bf05 100644 --- a/packageA/pages/goodsInfo/goodsInfo.js +++ b/packageA/pages/goodsInfo/goodsInfo.js @@ -555,6 +555,8 @@ Page({ if (fir_com[ind].weapp_img) fir_com[ind].weapp_img = JSON.parse(fir_com[ind].weapp_img); } } + + this.getTaohe(); // if (th.data.is_closecoupon != 1 && (!th.data.fir_quan || th.data.fir_quan.length<=0)) { // //----获取详情页的券的数量---- @@ -2705,6 +2707,43 @@ Page({ }); }, + + // 判断是否开启美业，获取套盒列表 + getTaohe() { + // 判断是否开启美业 + getApp().promiseGet('/api/weshop/store/getTabSys/' + os.stoid, {}).then(res => { + if(res.data.code == 0) { + let enableMeiye = res.data.data.EnableMeiye; + self.setData({ + enableMeiye, + }); + + if(enableMeiye) { // 开启美业 + // 获取套盒列表 + let url = '/api/weshop/serviceGoods/list' + let data = { + store_id: getApp().globalData.setting.stoid, + service_id: this.data.data.id, + }; + // 请求数据 + getApp().promiseGet(url, { + data: data, + }).then(res => { + if (res.data.code == 0) { + console.log('请求成功套盒列表', res); + self.setData({ + taoheList: res.data.data, + }); + } else { + throw (res); + }; + }).catch(err => {}); + + }; + }; + }); + } + }); diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml index b6516a5..c096111 100644 --- a/packageA/pages/goodsInfo/goodsInfo.wxml +++ b/packageA/pages/goodsInfo/goodsInfo.wxml @@ -203,13 +203,13 @@ - + - {{item.projectName}}（{{item.frequency}}次） + {{item.projectName}}（{{item.frequency}}次） - {{item.money}} - 零售价：￥{{item.showPrice}} + {{item.money}} + 零售价：￥{{item.showPrice}} @@ -217,8 +217,25 @@ + - + + + + + {{item.goods_name}} ({{item.goods_sn}}) ({{item.frequency}}个) + + {{item.vipprice}} + 零售价：￥{{item.show_price}} + + + + 备注：{{filters.show_default(item.remark, '无')}} + 有效期:{{item.effective_days}}天/{{item.effective_date}} + + + + diff --git a/packageA/pages/goodsInfo/goodsInfo.wxss b/packageA/pages/goodsInfo/goodsInfo.wxss index 1893f20..500f8d6 100644 --- a/packageA/pages/goodsInfo/goodsInfo.wxss +++ b/packageA/pages/goodsInfo/goodsInfo.wxss @@ -2855,7 +2855,8 @@ button.custom-service::after{ .gray{ background-color: #dcdcdc !important;} -.card { +.card, +.taohe { position: relative; padding: 20rpx; margin-bottom: 20rpx; @@ -2870,7 +2871,7 @@ button.custom-service::after{ .card::before { position: absolute; font-family: iconfont; - content: '\e630'; + content: '\e62a'; color: rgba(255,0,0,.1); font-size: 260rpx; /* transform: rotateZ(45deg); */ @@ -2878,6 +2879,16 @@ button.custom-service::after{ left: -70rpx; } +.taohe::before { + position: absolute; + font-family: iconfont; + content: '\e64e'; + color: rgba(255,0,0,.1); + font-size: 260rpx; + top: -20rpx; + left: -30rpx; +} + .rmb::before { content: '￥'; font-size: 24rpx; @@ -2892,3 +2903,7 @@ button.custom-service::after{ overflow: hidden; margin-right: 10rpx; } + +.del { + text-decoration: line-through; +} diff --git a/packageB/pages/boxes-details/boxes-details.js b/packageB/pages/boxes-details/boxes-details.js index 65c0f1d..bc2edea 100644 --- a/packageB/pages/boxes-details/boxes-details.js +++ b/packageB/pages/boxes-details/boxes-details.js @@ -1,7 +1,13 @@ // packageA/pages/details_serviceCard/details_serviceCard.js const app = getApp(); -const os = app.globalData.setting; +// const os = app.globalData.setting; let self = null; +// 防抖函数用定时器 +let timer; +const { + barcode, + qrcode +} = require('../../../utils/index.js'); Page({ @@ -9,7 +15,7 @@ Page({ * 页面的初始数据 */ data: { - is_summit_ing: 0, + // is_summit_ing: 0, showQr: false, }, @@ -19,12 +25,18 @@ Page({ */ onLoad: function(options) { self = this; - this.data.options = options; + this.setData({ + options, + }); + // this.data.options = options; app.isLogin().then(function(data) { self.setData({ userInfo: data, }); - self.getConfig(); + wx.setNavigationBarTitle({ + title: options.title, + }); + // self.getConfig(); }); }, @@ -39,6 +51,7 @@ Page({ * 生命周期函数--监听页面显示 */ onShow: function() { + console.log('show~~~'); if (app.globalData.userInfo) { if (!this.data.isLogin) { this.setData({ @@ -47,11 +60,10 @@ Page({ isLogin: true, }); - let url = '/api/weshop/recharge/user/page' + let url = '/api/weshop/serviceGoods/list' let data = { store_id: app.globalData.setting.stoid, - user_id: this.data.userInfo.user_id, - order_id: this.data.options.order_id, + service_id: this.data.options.service_id, }; // 请求数据 @@ -61,18 +73,19 @@ Page({ if (res.data.code == 0) { console.log('请求成功', res); this.setData({ - details: res.data.data.pageData[0], + details: res.data.data, }); } else { throw (res); }; }).catch(err => { - wx.showToast({ - title: err.data.data, - icon: 'error', - }); + // wx.showToast({ + // title: err.data.data, + // icon: 'error', + // }); }); - + + }; }; }, @@ -113,21 +126,6 @@ Page({ }, - // 内容复制到剪贴板 - copy() { - console.log('点击了复制按钮'); - wx.setClipboardData({ - data: this.data.details.order_sn, - success(res) { - wx.getClipboardData({ - success(res) { - console.log(res.data); - } - }) - } - }) - }, - // 图片异常时加载默认图片 bind_bnerr(e) { @@ -137,362 +135,85 @@ Page({ this.setData(errObj); // this.setData({ details.list[0].img_url}); }, - - // 查看商品详情 - viewDetails(e) { - let goods_id = e.currentTarget.dataset.gid; - let url = '/packageA/pages/goodsInfo/goodsInfo?goods_id=' + goods_id; - app.goto(url); - }, - - // 获取系统参数 - getConfig() { - app.getConfig2(function(e) { - // console.log('101',e); - let json_d = JSON.parse(e.switch_list); - self.setData({ - sys_switch: json_d, - // weapp_customertype: json_d.weapp_customertype, - }); - }, 1); - }, - - - // 联系微信客服 - contact_wx() { - var url = this.data.sys_switch.weapp_customertype_url; - var id = this.data.sys_switch.weapp_customertype_appid; - wx.openCustomerServiceChat({ - extInfo: { - url: url - }, - corpId: id, - success(res) {} - }) - }, - - - // 联系电话客服 - contactService() { - app.getConfig(function(t) { - if (t.store_tel == undefined) { - app.request.get('/api/weshop/store/get/' + os.stoid, { - isShowLoading: 1, - data: {}, - success: function(rs) { - app.globalData.config = rs.data.data; - if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) { - app.my_warnning('商家未设置电话', 0, self); - return false; - } - app.confirmBox('请联系客服:' + rs.data.data.store_tel); - } - }) - } else { - app.confirmBox('请联系客服:' + t.store_tel); + + createQr() { + wx.showLoading({ + title:'生成核销码中', + }); + + let store_id = app.globalData.setting.stoid; + let id = this.data.options.id; + let url = `/api/weshop/rechargeServicelist/update/${store_id}/${id}`; + + app.request.put(url, { + data: {}, + success: function(res) { + wx.hideLoading(); + if(res.data.code == 0) { + let verify_code = res.data.data.verify_code; + self.qrcode(verify_code); + self.setData({ + verify_code, + showQr: true, + }); + }; } }); }, - - - // 评价商品 - access() { - let listLength = this.data.details.list.length; - let order_id = this.data.details.order_id; - let url = ''; - - // 卡项订单跳转到评论页要多加个参数card=1 - // 卡项订单goods_id要带card_id - if (listLength == 1) { - let price = this.data.details.list[0].price; - let card_id = this.data.details.list[0].card_id; - url = - `/packageB/pages/user/add_comment/add_comment?card=1&goods_id=${card_id}&order_id=${order_id}&price=${price}` - }; - if (listLength > 1) { - url = `/packageB/pages/user/comment/comment?card=1&status=0&order_id=${order_id}`; - }; - f - // console.log('url', url); - app.goto(url); - }, - - - // 查看评论 - viewComment() { - let order_id = this.data.details.order_id; - let card_id = this.data.details.list[0].card_id; - let listLength = this.data.details.list.length; - let url = ''; - - // 卡项订单单个商品 - if (listLength == 1) { - url = `/packageB/pages/user/view_comment/view_comment?card=1&goods_id=${card_id}&order_id=${order_id}`; - }; - // 卡项订单多个商品 - if (listLength > 1) { - // status控制评论列表页的activeStatus - url = `/packageB/pages/user/comment/comment?card=1&status=1&order_id=${order_id}`; - }; - - app.goto(url); + + showQr() { + this.debounce(this.createQr, 300)(); }, - - - // 再来一单 - buy2(t) { - let details = this.data.details; - var th = this; - var ind = 1; // 1：加入购物车 - // var ind = t.currentTarget.dataset.openSpecModal_ind; - // var action= t.currentTarget.dataset.action; - var action = 'add'; // - // if(!ind) ind = t.currentTarget.dataset.openspecmodal_ind; - - th.setData({ - open_ind_store: ind + + + closeQr() { + this.setData({ + showQr: false, }); - - // if(!th.data.sto_sele_name){ - // getApp().my_warnning('请选择门店', 1, th, 450); - // return false; - // } - - - if (action == "buy") { - //--------------此时操作的数据------------ - // var newd = { - // id: th.data.data.id, - // goods_num: th.data.goodsInputNum, - // pick_id: th.data.sto_sele_id, - // keyid: th.data.sto_sele_keyid, - // }; - // newd['pick_name'] = th.data.sto_sele_name; - // newd['guide_id'] = getApp().globalData.guide_id; - // newd['guide_type']=0; - // th.buyNow(newd); - } else { - - var newd = { - // service_id: th.data.data.id, - // service_sn:th.data.data.service_sn, - // service_name:th.data.data.goods_name, - // goods_num: th.data.goodsInputNum, - // pick_id: th.data.sto_sele_id, - // user_id:oo.user_id, - // store_id:os.stoid, - // money:th.data.data.shop_price, - - service_id: details.list[0].card_id, - service_sn: details.list[0].service_sn, - service_name: details.list[0].service_name, - goods_num: details.list[0].qty, - pick_id: details.list[0].pickup_id, - user_id: this.data.userInfo.user_id, - store_id: app.globalData.setting.stoid, - money: details.list[0].price, - }; - if (getApp().globalData.guide_id) { - newd['guide_id'] = getApp().globalData.guide_id; - newd['guide_type'] = 0; - } - - //----先看会员在购物车中是否加入了该商品----- - app.request.get("/api/weshop/cartService/page", { - data: { - store_id: app.globalData.setting.stoid, - user_id: this.data.userInfo.user_id, - service_id: details.list[0].card_id, - pick_id: details.list[0].pickup_id, - }, - success: function(re) { - - //-------如果购物车中有相关的数据--------- - if (re.data.data.total > 0) { - var item = re.data.data.pageData[0]; - var updata = { - id: item.id, - goods_num: details.list[0].qty + item.goods_num, - money: details.list[0].price, - store_id: app.globalData.setting.stoid, - }; - - if (getApp().globalData.guide_id) { - updata['guide_id'] = getApp().globalData.guide_id; - updata['guide_type'] = 1; - } - getApp().request.put("/api/weshop/cartService/update", { - data: updata, - success: function(t) { - // getApp().my_warnning('加入购物车成功', 1, th, 450); - var c_num = th.data.cartGoodsNum + th.data.goodsInputNum; - th.setData({ - cartGoodsNum: c_num - }); - app.goto('/pages/cart/cart/cart'); - // th.closeSpecModal(); - } - }); - } else { - - getApp().request.post("/api/weshop/cartService/save", { - data: newd, - success: function(t) { - // getApp().my_warnning('加入购物车成功', 1, th, 450); - var c_num = th.data.cartGoodsNum + th.data.goodsInputNum; - th.setData({ - cartGoodsNum: c_num - }); - app.goto('/pages/cart/cart/cart'); - // th.closeSpecModal(); - } - }); - } - } - }); - - } - }, - - - // 取消订单 - // api/weshop/recharge/update?store_id=&order_id=&order_status=3 - cancle() { - wx.showModal({ - title: '提示', - content: '确定取消订单吗？', - success(res) { - if (res.confirm) { - console.log('用户点击确定'); - let order_id = self.data.details.order_id; - let order_sn = self.data.details.order_sn; - app.request.put('/api/weshop/recharge/update', { - data: { - store_id: os.stoid, - order_id: order_id, - order_sn: order_sn, - order_status: 3, - }, - success: function(res) { - - //取消成功刷新订单 - let url = '/api/weshop/recharge/user/page' - let data = { - store_id: app.globalData.setting.stoid, - user_id: self.data.userInfo.user_id, - order_id: self.data.options.order_id, - }; - - // 请求数据 - app.promiseGet(url, { - data: data, - }).then(res => { - if (res.data.code == 0) { - console.log('请求成功', res); - wx.showToast({ - title: '取消成功', - }); - self.setData({ - details: res.data.data.pageData[0], - }); - } else { - throw (res); - }; - }).catch(err => { - wx.showToast({ - title: err.data.data, - icon: 'error', - }); - }); - - }, - }) - } else if (res.cancel) { - console.log('用户点击取消'); - } - } + + // 关闭二维码弹窗后，检测核销情况，改变按钮状态 + wx.showLoading({ + title: '刷新中', + mask: true, }); - }, - - - // 立即支付 - pay() { - let order_sn = this.data.details.order_sn; let store_id = app.globalData.setting.stoid; - - app.request.post('/api/weshop/order/pay/createRechargeOrder', { - data: { - parentSn: order_sn, - store_id: store_id, - }, - - success: function(res) { - var n = res.data.data; - self.weixinPay(n, function() { - app.showWarning('支付成功'); - // setTimeout(function() { - // wx.reLaunch({ - // url: '/pages/user/my_service/i_service', - // }) - // }, 1000) - }, function() { - app.showWarning('支付失败'); - // setTimeout(function() { - // wx.reLaunch({ - // url: '/packageA/pages/cardList/cardList', - // }) - // }, 1000) - }); - } - }) - }, - - - //------调起支付框-------- - weixinPay: function(n, success, fail) { - if (!n) return false; - wx.requestPayment({ - timeStamp: String(n.timeStamp), - nonceStr: n.nonceStr, - package: n.packageValue, - signType: n.signType, - paySign: n.paySign, - success: function(n) { - console.log(n), getApp().showSuccess("支付成功！"); - "function" == typeof success && success(); - wx.redirectTo({ - url: "../deposit/deposit" - }); - }, - fail: function(n) { - console.log(n), "requestPayment:fail" == n.errMsg ? getApp().showWarning("支付失败") : - "requestPayment:fail cancel" == n.errMsg ? getApp().showWarning("您已取消支付") : getApp().showWarning("支付失败：" + n - .errMsg.substr("requestPayment:fail ".length)), - "function" == typeof fail && fail(); + let id = this.data.options.id; + let url = `/api/weshop/rechargeServicelist/update/${store_id}/${id}`; + + app.request.put(url, { + data: {}, + success: function(res) { + wx.hideLoading(); + if(res.data.code == 0) { + // console.log('xxx000', res.data.data.use_state); + self.setData({ + ['options.usestate']: res.data.data.use_state, + }); + }; } }); }, + /** + * 生成二维码 + * by sty + */ + qrcode:function(val){ + barcode('barcode', val, 600,140); + qrcode('qrcode', val, 300, 300); + }, + touchMove() {}, - - - - - - showQr() { - this.setData({ - showQr: true, - }); + // 函数防抖 + debounce(func, wait) { + return () => { + clearTimeout(timer); + timer = setTimeout(func, wait); + }; }, - closeQr() { - this.setData({ - showQr: false, - }); - }, - touchMove() {} diff --git a/packageB/pages/boxes-details/boxes-details.json b/packageB/pages/boxes-details/boxes-details.json index af2acc1..feb2bb1 100644 --- a/packageB/pages/boxes-details/boxes-details.json +++ b/packageB/pages/boxes-details/boxes-details.json @@ -1,5 +1,5 @@ { - "navigationBarTitleText": "订单详情", + "navigationBarTitleText": "加载中", "usingComponents": { "nodata": "/components/nodata/nodata", "share_button": "/components/share/share" diff --git a/packageB/pages/boxes-details/boxes-details.wxml b/packageB/pages/boxes-details/boxes-details.wxml index 22c7abf..30b25eb 100644 --- a/packageB/pages/boxes-details/boxes-details.wxml +++ b/packageB/pages/boxes-details/boxes-details.wxml @@ -1,89 +1,53 @@ - + - - - - - - - - - - - - - - 商品名称名称名称名称名称名称名称名称名称名称名称名称名称名称名称名称名称名称 - x1{{item.price}} - - - - 2{{filters.price(item.group_price)}} - 零售价3{{item.market_price}} - - + + + + + + + {{item.goods_name}} + x{{item.frequency}} + + + {{item.vipprice}} + 零售价{{item.show_price}} - - - - - + - - - - - 立即兑换 + + 已核销 + + + 已过期 + 立即兑换 + - - - - diff --git a/packageB/pages/boxes-details/boxes-details.wxss b/packageB/pages/boxes-details/boxes-details.wxss index dca743b..892ffa0 100644 --- a/packageB/pages/boxes-details/boxes-details.wxss +++ b/packageB/pages/boxes-details/boxes-details.wxss @@ -29,6 +29,11 @@ page { background-image: linear-gradient(135deg,#ffba0d,#ffc30d 69%,#ffcf0d); } +.bg-gray { + background-image: -webkit-linear-gradient(315deg,#bfbfbf,#c3c3c3 70%,#d4d3d3); + background-image: linear-gradient(135deg,#bfbfbf,#c3c3c3 70%,#d4d3d3); + } + .c-orange { color: #ff9000; } @@ -177,6 +182,11 @@ page { background-color: pink; } + .barcode { + width: 100%; + height: 140rpx; + } + .qrcode { width: 300rpx; height: 300rpx; @@ -194,6 +204,11 @@ page { .breakall { word-break: break-all; } + + .bar-container { + box-sizing: border-box; + padding: 30rpx 20rpx; + } diff --git a/packageB/pages/boxes-list/boxes-list.js b/packageB/pages/boxes-list/boxes-list.js index b81d0c5..b806616 100644 --- a/packageB/pages/boxes-list/boxes-list.js +++ b/packageB/pages/boxes-list/boxes-list.js @@ -1,5 +1,7 @@ const app = getApp(); let self = null; +// 防抖函数用定时器 +let timer; Page({ data: { @@ -11,26 +13,6 @@ Page({ isLoading: false, // 检测是否已经发送请求,防止重复发送请求 noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据 pageNum: 1, // 当前页数 - - // showReward: false, - // prizesArr: [], - - // typeArr: [{ - // key: 'point', - // name: '积分', - // },{ - // key: 'grow', - // name: '成长值', - // },{ - // key: 'point', - // name: '优惠券', - // },{ - // key: 'prestore_name', - // name: '项目服务', - // },{ - // key: 'prestore_money', - // name: '预存金额', - // }], }, onLoad: function () { @@ -54,10 +36,12 @@ Page({ let data = { store_id: app.globalData.setting.stoid, user_id: this.data.userInfo.user_id, + service_type: 1, + use_state: 0, }; - // 默认获取'全部' - this.getData(true, '/api/weshop/prom/luckyOrder/page', data) + // 默认获取'待核销' + this.getData(true, '/api/weshop/rechargeServicelist/page', data) .then(()=>{ this.setData({ currentData: data, @@ -73,7 +57,7 @@ Page({ * 页面上拉触底事件的处理函数 */ onReachBottom: function () { - this.scrollToLower('/api/weshop/prom/luckyOrder/page', this.data.currentData); + this.scrollToLower('/api/weshop/rechargeServicelist/page', this.data.currentData); }, @@ -91,7 +75,7 @@ Page({ // 点击tab选项卡 - clickTab(e) { + handleTab(e) { this.setData({ currentTabIndex: e.target.dataset.index, noMore: false, @@ -106,28 +90,24 @@ Page({ switch(currentTabIndex) { case 0: { - delete currentData.team_status; + currentData.use_state = 0; break; }; case 1: { - currentData.team_status = 0; - break; - }; - case 2: { - currentData.team_status = 2; - break; - }; - case 3: { - currentData.team_status = 1; + currentData.use_state = 1; break; }; }; // 请求 - this.getData(true, '/api/weshop/prom/luckyOrder/page', currentData); + this.getData(true, '/api/weshop/rechargeServicelist/page', currentData); }, + clickTab(e) { + this.debounce(this.handleTab.bind(this, e), 200)(); + }, + /** * 请求数据 @@ -197,134 +177,28 @@ Page({ }; }, + - //跳转 - go: function (e) { - var url = e.currentTarget.dataset.url; - getApp().goto(url); - }, - - //查看奖励 - showReward: function(e) { - this.setData({ - currentItemIndex: e.target.dataset.index, - currentItemAid: e.target.dataset.aid, - }); - this.getPrizes(this.data.currentItemIndex); - }, - - //关闭奖励 - closeReward: function() { - this.setData({ - showReward: false, - }); + viewDetails(e) { + let id = e.currentTarget.dataset.id; + let title = e.currentTarget.dataset.title; + let serviceId = e.currentTarget.dataset.serviceid; + let date = e.currentTarget.dataset.date; //有效截止日期 + let use_state = this.data.currentTabIndex; //0待核销 1已核销 + let url = `/packageB/pages/boxes-details/boxes-details?service_id=${serviceId}&id=${id}&title=${title}&usestate=${use_state}&date=${date}`; + + app.goto(url); }, - // 获取优惠券奖励和服务项目奖励 - getPrizes: function(currentItemIndex) { - let currentItem = this.data.list.pageData[currentItemIndex]; - let type = currentItem.type; - - // 分割type字符串 - let typeArr = this.splitStringToArr(type); - let prizesArr = []; - let promiseArr = []; - typeArr.forEach(function(item) { - - let obj = {}; - obj.type = item; - - let promise = new Promise((resolve, reject) => { - switch(item) { - case 1: { //积分 - obj.name = '积分'; - obj.num = 'point'; - prizesArr.push(obj); - resolve(); - break; - }; - case 2: { //成长值 - obj.name = '成长值'; - obj.num = 'grow'; - prizesArr.push(obj); - resolve(); - break; - }; - case 3: { //优惠券 - app.request.promiseGet('/api/weshop/prom/luckyCoupon/page', { - data: { - store_id: app.globalData.setting.stoid, - aid: self.data.currentItemAid, - } - }).then(res => { - if(res.data.code == 0) { - obj.couponList = res.data.data.pageData; - prizesArr.push(obj); - resolve(); - }; - }); - break; - }; - case 4: { //服务项目 - app.request.promiseGet('/api/weshop/prom/luckyService/page', { - data: { - store_id: app.globalData.setting.stoid, - aid: self.data.currentItemAid, - } - }).then(res => { - if(res.data.code == 0) { - obj.serviceList = res.data.data.pageData; - prizesArr.push(obj); - resolve(); - }; - }); - break; - }; - case 5: { //预存金额 - obj.name = 'prestore_name'; - obj.num = 'prestore_money'; - prizesArr.push(obj); - resolve(); - break; - }; - }; - }); - - promiseArr.push(promise); - - - Promise.all(promiseArr).then(()=> { - self.setData({ - prizesArr, - showReward: true, - }); - }); - - }); - }, - - // 将type字符串分割成数组 - splitStringToArr: function(typeStr) { - var index; - var newTypeArr = []; - var typeStrArr = typeStr.split(','); - typeStrArr.forEach(function(item) { - index = parseInt(item); - newTypeArr.push(index); - }); - return newTypeArr; + // 函数防抖 + debounce(func, wait) { + return () => { + clearTimeout(timer); + timer = setTimeout(func, wait); + }; }, - - - - viewDetails() { - let url = '/packageB/pages/boxes-details/boxes-details'; - app.goto(url); - } - - }) diff --git a/packageB/pages/boxes-list/boxes-list.wxml b/packageB/pages/boxes-list/boxes-list.wxml index a4d4eb6..1241f45 100644 --- a/packageB/pages/boxes-list/boxes-list.wxml +++ b/packageB/pages/boxes-list/boxes-list.wxml @@ -10,26 +10,34 @@ - - + + - 订单编号：191561561565555 - 卡项名称卡项名称卡项名称卡项名称卡项名称卡项名称卡项名称卡项名称卡项名称项名称卡项名称卡项名称项名称卡项名称卡项名称项名称卡项名称卡项名称项名称卡项名称卡项名称项名称卡项名称卡项名称 + 卡项编号：{{item.service_sn}} + {{item.service_name}} - 2{{filters.price(item.group_price)}} - 零售价3{{item.market_price}} + {{item.money}} + 零售价{{item.show_price}} - *兑换截止日期：2022-01-01至2022-12-31 + *兑换截止日期：{{item.BeginDates}}至{{item.EffectiveDates}} - 已过期 - 立即兑换 + + 已过期 + 立即兑换 + + + + 已核销 + + + - + diff --git a/packageB/pages/boxes-list/boxes-list.wxss b/packageB/pages/boxes-list/boxes-list.wxss index 8d5232d..634ba92 100644 --- a/packageB/pages/boxes-list/boxes-list.wxss +++ b/packageB/pages/boxes-list/boxes-list.wxss @@ -37,6 +37,7 @@ page { .tab-hd-item.active { color: #ff6768; + font-weight: bold; } .tab-hd-item.active::after { diff --git a/utils/filter.wxs b/utils/filter.wxs index c193211..56ead3e 100644 --- a/utils/filter.wxs +++ b/utils/filter.wxs @@ -184,6 +184,18 @@ var filters = { }; }, + // 判断时间是否过期 + isExpired: function(date) { + var mydate = getDate(date).getTime(); + var currentDate = getDate().getTime(); + + if(currentDate >= mydate) { + return true; + } else { + return false; + }; + }, + }; @@ -206,4 +218,5 @@ module.exports = { div100: filters.div100, JSONStringify: filters.JSONStringify, count: filters.count, + isExpired: filters.isExpired, } \ No newline at end of file -- libgit2 0.21.4