diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js
index e81bf05..da1be3d 100644
--- a/packageA/pages/goodsInfo/goodsInfo.js
+++ b/packageA/pages/goodsInfo/goodsInfo.js
@@ -637,7 +637,7 @@ Page({
//listServiceItem: t.data.data.listServiceItem,
});
- console.log('0xxxxx999999', t.data.data);
+ // console.log('0xxxxx999999', t.data.data);
//-----商品详情---
if(!t.data.data.serviceContent) t.data.data.serviceContent=" ";
a.wxParse("content", "html", t.data.data.serviceContent, ee, 6);
diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml
index c096111..79deb0d 100644
--- a/packageA/pages/goodsInfo/goodsInfo.wxml
+++ b/packageA/pages/goodsInfo/goodsInfo.wxml
@@ -214,7 +214,8 @@
备注：{{filters.show_default(item.remark, '无')}}
-
+
+ 有效期：{{filters.showStartAndEndDate(item)}}
@@ -231,7 +232,7 @@
备注：{{filters.show_default(item.remark, '无')}}
- 有效期:{{item.effective_days}}天/{{item.effective_date}}
+ 有效期：{{filters.showStartAndEndDate(item)}}
diff --git a/packageB/pages/boxes-details/boxes-details.js b/packageB/pages/boxes-details/boxes-details.js
index bc2edea..f3365f7 100644
--- a/packageB/pages/boxes-details/boxes-details.js
+++ b/packageB/pages/boxes-details/boxes-details.js
@@ -51,7 +51,7 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function() {
- console.log('show~~~');
+ // console.log('show~~~');
if (app.globalData.userInfo) {
if (!this.data.isLogin) {
this.setData({
@@ -60,20 +60,22 @@ Page({
isLogin: true,
});
- let url = '/api/weshop/serviceGoods/list'
+ let url = '/api/weshop/serviceCard/listWriteoffWare'
let data = {
store_id: app.globalData.setting.stoid,
- service_id: this.data.options.service_id,
+ user_id: this.data.userInfo.user_id,
+ Id: this.data.options.formlistid,
};
// 请求数据
- app.promiseGet(url, {
+ app.request.promiseGet(url, {
data: data,
}).then(res => {
if (res.data.code == 0) {
- console.log('请求成功', res);
+ // console.log('请求成功', res);
this.setData({
details: res.data.data,
+ writeOffCode: res.data.data[0].WriteOffCode
});
} else {
throw (res);
@@ -128,42 +130,48 @@ Page({
// 图片异常时加载默认图片
- bind_bnerr(e) {
- var errImg = e.currentTarget.dataset.errorimg;
- var errObj = {};
- errObj[errImg] = 'public/images/default_goods_image_240.gif';
- this.setData(errObj); // this.setData({ details.list[0].img_url});
- },
+ // bind_bnerr(e) {
+ // var errImg = e.currentTarget.dataset.errorimg;
+ // var errObj = {};
+ // errObj[errImg] = 'public/images/default_goods_image_240.gif';
+ // this.setData(errObj); // this.setData({ details.list[0].img_url});
+ // },
- createQr() {
- wx.showLoading({
- title:'生成核销码中',
+ showQr() {
+ // wx.showLoading({
+ // title:'生成核销码中',
+ // });
+
+ let writeOffCode = this.data.details[0].WriteOffCode;
+ self.qrcode(writeOffCode);
+ self.setData({
+ showQr: true,
});
- let store_id = app.globalData.setting.stoid;
- let id = this.data.options.id;
- let url = `/api/weshop/rechargeServicelist/update/${store_id}/${id}`;
+ // 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,
- });
- };
- }
- });
+ // 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,
+ // });
+ // };
+ // }
+ // });
},
- showQr() {
- this.debounce(this.createQr, 300)();
- },
+ // showQr() {
+ // // this.debounce(this.createQr, 300)();
+ // },
closeQr() {
@@ -176,29 +184,78 @@ Page({
title: '刷新中',
mask: true,
});
- 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) {
- // console.log('xxx000', res.data.data.use_state);
+ // let store_id = app.globalData.setting.stoid;
+ // let id = this.data.options.id;
+ let url = '/api/weshop/serviceCard/listWriteoffWare';
+
+ app.request.promiseGet(url, {
+ data: {
+ store_id: app.globalData.setting.stoid,
+ user_id: this.data.userInfo.user_id,
+ Id: this.data.options.formlistid,
+ },
+ }).then(res => {
+ wx.hideLoading();
+ if (res.data.code == 0) {
+
+ let posNo = res.data.data[0].PosNo;
+ if(posNo != '') {
+ self.setData({
+ ['options.usestate']: 1,
+ });
+ } else {
self.setData({
- ['options.usestate']: res.data.data.use_state,
+ ['options.usestate']: 0,
});
};
- }
+
+ } else {
+ throw (res);
+ };
+ }).catch(err => {
+ // wx.showToast({
+ // title: err.data.data,
+ // icon: 'error',
+ // });
});
+
+
+
+ // app.promiseGet(url, {
+ // data: {
+ // store_id: app.globalData.setting.stoid,
+ // user_id: self.data.userInfo.user_id,
+ // Id: self.data.options.formlistid,
+ // },
+ // success: function(res) {
+ // wx.hideLoading();
+ // if(res.data.code == 0) {
+ // console.log('xxx000', res.data.data);
+ // // let posNo = res.data.data[0].PosNo;
+ // // if(posNo != '') {
+ // // self.setData({
+ // // ['options.usestate']: 1,
+ // // });
+ // // } else {
+ // // self.setData({
+ // // ['options.usestate']: 0,
+ // // });
+ // // };
+
+ // };
+ // }
+ // });
+
+
+
},
/**
* 生成二维码
* by sty
*/
- qrcode:function(val){
+ qrcode(val) {
barcode('barcode', val, 600,140);
qrcode('qrcode', val, 300, 300);
},
diff --git a/packageB/pages/boxes-details/boxes-details.wxml b/packageB/pages/boxes-details/boxes-details.wxml
index 30b25eb..b8e2b9e 100644
--- a/packageB/pages/boxes-details/boxes-details.wxml
+++ b/packageB/pages/boxes-details/boxes-details.wxml
@@ -8,12 +8,12 @@
- {{item.goods_name}}
- x{{item.frequency}}
+ {{item.WareName}}
+ x{{item.Qty}}
- {{item.vipprice}}
- 零售价{{item.show_price}}
+ {{filters.show_default(item.VipPrice, '0')}}
+ 零售价{{filters.show_default(item.PosPrice, '0')}}
@@ -47,7 +47,7 @@
- 核销码: {{verify_code}}
+ 核销码: {{writeOffCode}}
diff --git a/packageB/pages/boxes-list/boxes-list.js b/packageB/pages/boxes-list/boxes-list.js
index b806616..a089998 100644
--- a/packageB/pages/boxes-list/boxes-list.js
+++ b/packageB/pages/boxes-list/boxes-list.js
@@ -36,12 +36,11 @@ Page({
let data = {
store_id: app.globalData.setting.stoid,
user_id: this.data.userInfo.user_id,
- service_type: 1,
- use_state: 0,
+ IsPos: 0,
};
// 默认获取'待核销'
- this.getData(true, '/api/weshop/rechargeServicelist/page', data)
+ this.getData(true, '/api/weshop/serviceCard/pageWriteoff', data)
.then(()=>{
this.setData({
currentData: data,
@@ -57,20 +56,20 @@ Page({
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
- this.scrollToLower('/api/weshop/rechargeServicelist/page', this.data.currentData);
+ this.scrollToLower('/api/weshop/serviceCard/pageWriteoff', this.data.currentData);
},
// 图片异常时加载默认图片
- bind_bnerr: function (e) {
- var _errImg = e.target.dataset.errorimg;
- var val = e.target.dataset.val;
- if(val!=undefined && val!=null && val!='null' ){
- var _errObj = {};
- _errObj[_errImg] = "/public/images/default_goods_image_240.gif";
- this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
- }
- },
+ // bind_bnerr: function (e) {
+ // var _errImg = e.target.dataset.errorimg;
+ // var val = e.target.dataset.val;
+ // if(val!=undefined && val!=null && val!='null' ){
+ // var _errObj = {};
+ // _errObj[_errImg] = "/public/images/default_goods_image_240.gif";
+ // this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+ // }
+ // },
@@ -90,17 +89,17 @@ Page({
switch(currentTabIndex) {
case 0: {
- currentData.use_state = 0;
+ currentData.IsPos = 0;
break;
};
case 1: {
- currentData.use_state = 1;
+ currentData.IsPos = 1;
break;
};
};
// 请求
- this.getData(true, '/api/weshop/rechargeServicelist/page', currentData);
+ this.getData(true, '/api/weshop/serviceCard/pageWriteoff', currentData);
},
@@ -180,12 +179,11 @@ Page({
viewDetails(e) {
- let id = e.currentTarget.dataset.id;
+ let formlistid = e.currentTarget.dataset.formlistid;
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}`;
+ let url = `/packageB/pages/boxes-details/boxes-details?formlistid=${formlistid}&title=${title}&usestate=${use_state}&date=${date}`;
app.goto(url);
},
diff --git a/packageB/pages/boxes-list/boxes-list.wxml b/packageB/pages/boxes-list/boxes-list.wxml
index 1241f45..e57f948 100644
--- a/packageB/pages/boxes-list/boxes-list.wxml
+++ b/packageB/pages/boxes-list/boxes-list.wxml
@@ -11,20 +11,20 @@
-
+
- 卡项编号：{{item.service_sn}}
- {{item.service_name}}
+
+ {{item.ItemName}} ({{item.ItemNo}})
- {{item.money}}
- 零售价{{item.show_price}}
+ {{filters.show_default(item.VipPrice, '0')}}
+ 零售价{{filters.show_default(item.PosPrice, '0')}}
- *兑换截止日期：{{item.BeginDates}}至{{item.EffectiveDates}}
+ *兑换截止日期：{{item.BeginDate}}至{{item.EndDate}}
- 已过期
+ 已过期
立即兑换
diff --git a/utils/filter.wxs b/utils/filter.wxs
index 56ead3e..1ed0064 100644
--- a/utils/filter.wxs
+++ b/utils/filter.wxs
@@ -38,6 +38,28 @@ var filters = {
}
return fm;
},
+
+ format_time2: function (ts, isFull) {
+ // 如果数值位数为1，则补0
+ function appendZero(obj) {
+ if (obj < 10) {
+ return "0" + "" + obj;
+ } else {
+ return obj;
+ }
+ };
+
+ if (ts == null || ts == undefined || ts == '') return "";
+ var d = getDate(ts)
+ var fm = [appendZero(d.getFullYear()), appendZero(d.getMonth() + 1), appendZero(d.getDate())].join('-');
+ var md = appendZero(d.getMonth() + 1) + '月' + appendZero(d.getDate()) + '日';
+ if (isFull == 1)
+ fm = fm + ' ' + [appendZero(d.getHours()), appendZero(d.getMinutes()), appendZero(d.getSeconds())].join(':');
+ if (isFull == 2) {
+ fm = md + ' ' + [appendZero(d.getHours()), appendZero(d.getMinutes())].join(':');
+ }
+ return fm;
+ },
pInt: function (t) {
var d = parseInt(t);
@@ -196,6 +218,37 @@ var filters = {
};
},
+ // 显示开始和结束日期
+ showStartAndEndDate: function(o) {
+ var dateType = o.date_type;
+ var currentDate = getDate().getTime();
+ var startDate, endDate, days, begin_days;
+
+ if(dateType === 0) {
+ days = (o.effective_days === 0 ? o.effective_days : (o.effective_days - 1)) * 24 * 60 * 60 * 1000;
+ endDate = filters.format_time2(currentDate + days);
+ currentDate = filters.format_time2(currentDate);
+ return currentDate + '至' + endDate;
+ };
+
+ if(dateType === 1) {
+ return o.begin_date + '至' + o.effective_date;
+ };
+
+ if(dateType === 2) {
+ // N天后开始
+ begin_days = (o.begin_days === 0 ? o.begin_days : (o.begin_days - 1)) * 24 * 60 * 60 * 1000;
+ // 有效天数
+ days = (o.effective_days - 1) * 24 * 60 * 60 * 1000;
+ startDate = filters.format_time2(currentDate + begin_days);
+ endDate = filters.format_time2(getDate(startDate).getTime() + days);
+ return startDate + '至' + endDate;
+ }
+
+ // console.log('999***', currentDate);
+ // return currentDate.toLocaleDateString();
+ },
+
};
@@ -219,4 +272,5 @@ module.exports = {
JSONStringify: filters.JSONStringify,
count: filters.count,
isExpired: filters.isExpired,
+ showStartAndEndDate: filters.showStartAndEndDate,
}
\ No newline at end of file