|
@@ -1,5 +1,6 @@
|
|
// pages/ucenter/zhanw/zhanw.js
|
|
// pages/ucenter/zhanw/zhanw.js
|
|
let Util = require("../../../utils/util");
|
|
let Util = require("../../../utils/util");
|
|
|
|
+let log = require('../../../utils/log.js');
|
|
Page({
|
|
Page({
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -15,16 +16,12 @@ Page({
|
|
dataLoading: false,
|
|
dataLoading: false,
|
|
finishedLoadTap: 0,
|
|
finishedLoadTap: 0,
|
|
finishedLoadShowTimes: 0,
|
|
finishedLoadShowTimes: 0,
|
|
- chongdianzhuangmingcheng: false,
|
|
|
|
- chongdianzhuangbianhao: false,
|
|
|
|
- chongdianshichang: false,
|
|
|
|
- chongdiankaishijieshu: false,
|
|
|
|
customerServiceFlag: false,
|
|
customerServiceFlag: false,
|
|
cancleBtnFlag: false,
|
|
cancleBtnFlag: false,
|
|
servicetel: getApp().globalData.helpPhoneNum,
|
|
servicetel: getApp().globalData.helpPhoneNum,
|
|
orderid: null,
|
|
orderid: null,
|
|
userId: null,
|
|
userId: null,
|
|
- order: null,
|
|
|
|
|
|
+ order: {},
|
|
},
|
|
},
|
|
switchBar(e){
|
|
switchBar(e){
|
|
let searchIndex = e.currentTarget.dataset.idx;
|
|
let searchIndex = e.currentTarget.dataset.idx;
|
|
@@ -97,9 +94,11 @@ Page({
|
|
wx.showLoading({
|
|
wx.showLoading({
|
|
title: '数据加载中....',
|
|
title: '数据加载中....',
|
|
})
|
|
})
|
|
|
|
+ this.queryOccupyFeeOrder();
|
|
|
|
+ },
|
|
|
|
|
|
- let that = this;
|
|
|
|
-
|
|
|
|
|
|
+ queryOccupyFeeOrder(){
|
|
|
|
+ let that = this;
|
|
wx.request({
|
|
wx.request({
|
|
url: getApp().globalData.postHeadAgreement +'/restapi/wechat/queryOccupyFeeOrder',
|
|
url: getApp().globalData.postHeadAgreement +'/restapi/wechat/queryOccupyFeeOrder',
|
|
data: {
|
|
data: {
|
|
@@ -129,15 +128,13 @@ Page({
|
|
}
|
|
}
|
|
});
|
|
});
|
|
},
|
|
},
|
|
-
|
|
|
|
-
|
|
|
|
formatCharginglogs(formatCharginglogs) {
|
|
formatCharginglogs(formatCharginglogs) {
|
|
formatCharginglogs.forEach((item, index) => {
|
|
formatCharginglogs.forEach((item, index) => {
|
|
try {
|
|
try {
|
|
console.log("item",item);
|
|
console.log("item",item);
|
|
// 时间截取
|
|
// 时间截取
|
|
- item.occupyBeginTime = item.occupyBeginTime.substr(0,16)
|
|
|
|
- item.occupyEndTime = item.occupyEndTime.substr(0,16)
|
|
|
|
|
|
+ item.occupyBeginTime = item.occupyBeginTime.substr(0,19)
|
|
|
|
+ item.occupyEndTime = item.occupyEndTime.substr(0,19)
|
|
// 状态翻译
|
|
// 状态翻译
|
|
if(item.status==3){
|
|
if(item.status==3){
|
|
item.occupyStatusCN = '未支付'
|
|
item.occupyStatusCN = '未支付'
|
|
@@ -148,12 +145,6 @@ Page({
|
|
}else if(item.status==7){
|
|
}else if(item.status==7){
|
|
item.occupyStatusCN = '已退款'
|
|
item.occupyStatusCN = '已退款'
|
|
};
|
|
};
|
|
- // 判断标记为 chongdianzhuangmingcheng chongdianzhuangbianhao chongdianshichang chongdiankaishijieshu
|
|
|
|
- // let chongdianzhuangmingcheng = false
|
|
|
|
- // let chongdianzhuangbianhao = false
|
|
|
|
- // let chongdianshichang = false
|
|
|
|
- // let chongdiankaishijieshu = false
|
|
|
|
- // let chongdianfeiyong = false
|
|
|
|
let customerServiceFlag = false;
|
|
let customerServiceFlag = false;
|
|
let cancleBtnFlag= false;
|
|
let cancleBtnFlag= false;
|
|
let height= 'h3';
|
|
let height= 'h3';
|
|
@@ -164,11 +155,6 @@ Page({
|
|
if(item.status==3 || item.status == 4){
|
|
if(item.status==3 || item.status == 4){
|
|
cancleBtnFlag = true;
|
|
cancleBtnFlag = true;
|
|
}
|
|
}
|
|
- // item.chongdianzhuangmingcheng = chongdianzhuangmingcheng;
|
|
|
|
- // item.chongdianzhuangbianhao = chongdianzhuangbianhao;
|
|
|
|
- // item.chongdianshichang = chongdianshichang;
|
|
|
|
- // item.chongdiankaishijieshu = chongdiankaishijieshu;
|
|
|
|
- // item.chongdianfeiyong = chongdianfeiyong;
|
|
|
|
item.customerServiceFlag = customerServiceFlag;
|
|
item.customerServiceFlag = customerServiceFlag;
|
|
item.cancleBtnFlag = cancleBtnFlag;
|
|
item.cancleBtnFlag = cancleBtnFlag;
|
|
item.height = height;
|
|
item.height = height;
|
|
@@ -176,29 +162,6 @@ Page({
|
|
} catch (err) {
|
|
} catch (err) {
|
|
//在这里处理错误
|
|
//在这里处理错误
|
|
}
|
|
}
|
|
- try {
|
|
|
|
- let chargePile = item.pileLog;
|
|
|
|
- console.info(chargePile)
|
|
|
|
- let startDate = Util.parseDate(chargePile.chargstarttime);
|
|
|
|
- let endDate = Util.parseDate(chargePile.chargendtime)
|
|
|
|
- let totalTime = Math.round((endDate.getTime() - startDate.getTime()) / 60000);
|
|
|
|
- let totalTimeHour = Math.floor(totalTime / 60);
|
|
|
|
- let totalTimeMinute = totalTime % 60;
|
|
|
|
- let startTime = startDate.getFullYear() + "年" + Util.formatNumber(startDate.getMonth() + 1) + '月' + Util.formatNumber(startDate.getDate()) + '日 ' + Util.formatNumber(startDate.getHours()) + ':' + Util.formatNumber(startDate.getMinutes()) + ':' + Util.formatNumber(startDate.getSeconds());
|
|
|
|
- let endTime = endDate.getFullYear() + "年" + Util.formatNumber(endDate.getMonth() + 1) + '月' + Util.formatNumber(endDate.getDate()) + '日 ' + Util.formatNumber(endDate.getHours()) + ':' + Util.formatNumber(endDate.getMinutes()) + ':' + Util.formatNumber(endDate.getSeconds());
|
|
|
|
- totalTime = Util.formatNumber(totalTimeHour) + "时" + Util.formatNumber(totalTimeMinute) + "分";
|
|
|
|
- chargePile.startTime = startTime;
|
|
|
|
- chargePile.endTime = endTime;
|
|
|
|
- chargePile.totalTime = totalTime;
|
|
|
|
- chargePile.chargallmoney = chargePile.chargallmoney.toFixed(2);
|
|
|
|
- chargePile.chargservice = chargePile.chargservice.toFixed(2);
|
|
|
|
- chargePile.chargmoney = chargePile.chargmoney.toFixed(2);
|
|
|
|
- //console.log(chargePile.chargPile);
|
|
|
|
- } catch (err) {
|
|
|
|
- //在这里处理错误
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
-
|
|
|
|
});
|
|
});
|
|
|
|
|
|
},
|
|
},
|
|
@@ -210,145 +173,161 @@ Page({
|
|
}
|
|
}
|
|
},
|
|
},
|
|
customerServiceBtn(e){
|
|
customerServiceBtn(e){
|
|
- console.log("拿纸",e.currentTarget.dataset.idx);
|
|
|
|
let parkId = e.currentTarget.dataset.idx;
|
|
let parkId = e.currentTarget.dataset.idx;
|
|
wx.makePhoneCall({
|
|
wx.makePhoneCall({
|
|
phoneNumber: this.data.servicetel
|
|
phoneNumber: this.data.servicetel
|
|
})
|
|
})
|
|
},
|
|
},
|
|
payOrder(e) {
|
|
payOrder(e) {
|
|
- // log.info('[订单支付]', '[用户触发支付订单]');
|
|
|
|
- // wx.showLoading({
|
|
|
|
- // title: '支付中...',
|
|
|
|
- // mask: true
|
|
|
|
- // });
|
|
|
|
|
|
+ log.info('[订单支付]', '[用户触发支付订单]');
|
|
|
|
+ wx.showLoading({
|
|
|
|
+ title: '支付中...',
|
|
|
|
+ mask: true
|
|
|
|
+ });
|
|
let parkId = e.currentTarget.dataset.idx;
|
|
let parkId = e.currentTarget.dataset.idx;
|
|
let that = this;
|
|
let that = this;
|
|
let userId = wx.getStorageSync('userInfo').userId
|
|
let userId = wx.getStorageSync('userInfo').userId
|
|
- wx.request({
|
|
|
|
- url: getApp().globalData.postHeadAgreement +'/restapi/wechat/queryOccupyFeeOrder',
|
|
|
|
- data: {
|
|
|
|
- userId: userId,
|
|
|
|
- orderId:parkId,
|
|
|
|
- searchIndex: null,
|
|
|
|
- pagenum: that.data.pagenum++,
|
|
|
|
- pagesize: 10,
|
|
|
|
- },
|
|
|
|
- method: 'POST',
|
|
|
|
|
|
+ this.queryOccupyById(userId,parkId).then(res=> {
|
|
|
|
+ wx.hideLoading();
|
|
|
|
+ let {
|
|
|
|
+ order,
|
|
|
|
+ } = that.data;
|
|
|
|
+ log.info('[订单支付]', '[用户触发支付订单]', '[wx.login请求]');
|
|
|
|
+ wx.login({
|
|
success(res) {
|
|
success(res) {
|
|
- console.log("更具订单号插叙",res);
|
|
|
|
- // this.setData({
|
|
|
|
- // order:res.data
|
|
|
|
- // })
|
|
|
|
|
|
+ console.log(res);
|
|
|
|
+ log.info('[订单支付]', '[用户触发支付订单]', '[wx.login响应]',res);
|
|
|
|
+ if (res.code) {
|
|
|
|
+ // 发起网络请求
|
|
|
|
+ log.info('[订单支付]', '[服务端订单支付]', '[请求]', {
|
|
|
|
+ outTradeNo: order.orderId, //订单号
|
|
|
|
+ totalFee: order.occupyFee, //钱
|
|
|
|
+ code: res.code,
|
|
|
|
+ user_id: userId
|
|
|
|
+ });
|
|
|
|
+ wx.request({
|
|
|
|
+ url: getApp().globalData.postHeadAgreement +'/restapi/wechatpay/occupyFeeOrderPayfor',
|
|
|
|
+ data: {
|
|
|
|
+ outTradeNo: order.orderId, //订单号
|
|
|
|
+ totalFee: order.occupyFee, //钱
|
|
|
|
+ code: res.code,
|
|
|
|
+ user_id: userId
|
|
|
|
+ },
|
|
|
|
+ method: 'POST',
|
|
|
|
+ header: {
|
|
|
|
+ 'content-type': 'application/x-www-form-urlencoded;charset=utf-8',
|
|
|
|
+ },
|
|
|
|
+ success(res1) {
|
|
|
|
+ let {
|
|
|
|
+ data
|
|
|
|
+ } = res1;
|
|
|
|
+ log.info('[订单支付]', '[服务端订单支付]', '[响应]', data);
|
|
|
|
+ console.log(res1);
|
|
|
|
+ if (data && data.code == 200) {
|
|
|
|
+ if (data.result) {
|
|
|
|
+ //wx.showModal({
|
|
|
|
+ // showCancel: false,
|
|
|
|
+ // content: '请微信支付'
|
|
|
|
+ // });
|
|
|
|
+ log.info('[订单支付]', '[余额不足微信支付]','[请求]',{
|
|
|
|
+ timeStamp: data.result.timeStamp,
|
|
|
|
+ nonceStr: data.result.nonceStr,
|
|
|
|
+ package: data.result.package,
|
|
|
|
+ signType: data.result.signType,
|
|
|
|
+ paySign: data.result.paySign});
|
|
|
|
+ wx.requestPayment({
|
|
|
|
+ timeStamp: data.result.timeStamp,
|
|
|
|
+ nonceStr: data.result.nonceStr,
|
|
|
|
+ package: data.result.package,
|
|
|
|
+ signType: data.result.signType,
|
|
|
|
+ paySign: data.result.paySign,
|
|
|
|
+ success(res2) {
|
|
|
|
+ log.info('[订单支付]', '[余额不足微信支付成功]', '[响应]', res2);
|
|
|
|
+ log.info('[订单支付]', '[微信支付成功回调服务端]', '[请求]', {
|
|
|
|
+ //chargPileId,
|
|
|
|
+ //userId,
|
|
|
|
+ orderid: order.orderId
|
|
|
|
+ });
|
|
|
|
+ wx.hideLoading();
|
|
|
|
+ wx.showModal({
|
|
|
|
+ showCancel: false,
|
|
|
|
+ content: '支付订单成功',
|
|
|
|
+ confirmColor:'#00AADD',
|
|
|
|
+ success(res) {
|
|
|
|
+ if (res.confirm) {
|
|
|
|
+ that.resetListZero();
|
|
|
|
+ that.getPage();
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+
|
|
|
|
+ },
|
|
|
|
+ fail(res3) {
|
|
|
|
+ wx.hideLoading();
|
|
|
|
+ log.info('[订单支付]', '[余额不足微信支付]', '[fail]', res3);
|
|
|
|
+ console.log(res3);
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ } else {
|
|
|
|
+ wx.hideLoading();
|
|
|
|
+ that.setData({
|
|
|
|
+ orderFlag: true
|
|
|
|
+ });
|
|
|
|
+ wx.showModal({
|
|
|
|
+ showCancel: false,
|
|
|
|
+ content: data.msg,
|
|
|
|
+ confirmColor:'#00AADD',
|
|
|
|
+ });
|
|
|
|
+ }
|
|
|
|
+ log.info('[订单支付]', '[服务端订单支付]', '[余额支付成功]', data);
|
|
|
|
+ } else {
|
|
|
|
+ wx.hideLoading();
|
|
|
|
+ wx.showModal({
|
|
|
|
+ showCancel: false,
|
|
|
|
+ content: data.msg,
|
|
|
|
+ confirmColor:'#00AADD',
|
|
|
|
+ });
|
|
|
|
+ log.info('[订单支付]', '[服务端订单支付]', '[失败data null||data.code<>200]', data);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ } else {
|
|
|
|
+ wx.hideLoading();
|
|
|
|
+ console.log('登录失败!' + res.errMsg);
|
|
|
|
+ log.info('[订单支付]', '[用户触发支付订单]', '[wx.login响应失败code null]', res);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
});
|
|
});
|
|
- // let {
|
|
|
|
- // order,
|
|
|
|
- // } = this.data;
|
|
|
|
- // log.info('[订单支付]', '[用户触发支付订单]', '[wx.login请求]');
|
|
|
|
- // wx.login({
|
|
|
|
- // success(res) {
|
|
|
|
- // console.log(res);
|
|
|
|
- // log.info('[订单支付]', '[用户触发支付订单]', '[wx.login响应]',res);
|
|
|
|
- // if (res.code) {
|
|
|
|
- // // 发起网络请求
|
|
|
|
- // log.info('[订单支付]', '[服务端订单支付]', '[请求]', {
|
|
|
|
- // outTradeNo: order.orderid, //订单号
|
|
|
|
- // totalFee: order.chargallmoney, //钱
|
|
|
|
- // code: res.code,
|
|
|
|
- // user_id: userId
|
|
|
|
- // });
|
|
|
|
- // wx.request({
|
|
|
|
- // url: getApp().globalData.postHeadAgreement +'/restapi/wechatpay/chargpayfor',
|
|
|
|
- // data: {
|
|
|
|
- // outTradeNo: order.orderid, //订单号
|
|
|
|
- // totalFee: order.chargallmoney, //钱
|
|
|
|
- // code: res.code,
|
|
|
|
- // user_id: userId
|
|
|
|
- // },
|
|
|
|
- // method: 'POST',
|
|
|
|
- // header: {
|
|
|
|
- // 'content-type': 'application/x-www-form-urlencoded;charset=utf-8',
|
|
|
|
- // },
|
|
|
|
- // success(res1) {
|
|
|
|
- // let {
|
|
|
|
- // data
|
|
|
|
- // } = res1;
|
|
|
|
- // log.info('[订单支付]', '[服务端订单支付]', '[响应]', data);
|
|
|
|
- // console.log(res1);
|
|
|
|
- // if (data && data.code == 200) {
|
|
|
|
- // if (data.result) {
|
|
|
|
- // //wx.showModal({
|
|
|
|
- // // showCancel: false,
|
|
|
|
- // // content: '请微信支付'
|
|
|
|
- // // });
|
|
|
|
- // log.info('[订单支付]', '[余额不足微信支付]','[请求]',{
|
|
|
|
- // timeStamp: data.result.timeStamp,
|
|
|
|
- // nonceStr: data.result.nonceStr,
|
|
|
|
- // package: data.result.package,
|
|
|
|
- // signType: data.result.signType,
|
|
|
|
- // paySign: data.result.paySign});
|
|
|
|
- // wx.requestPayment({
|
|
|
|
- // timeStamp: data.result.timeStamp,
|
|
|
|
- // nonceStr: data.result.nonceStr,
|
|
|
|
- // package: data.result.package,
|
|
|
|
- // signType: data.result.signType,
|
|
|
|
- // paySign: data.result.paySign,
|
|
|
|
- // success(res2) {
|
|
|
|
- // log.info('[订单支付]', '[余额不足微信支付成功]', '[响应]', res2);
|
|
|
|
- // log.info('[订单支付]', '[微信支付成功回调服务端]', '[请求]', {
|
|
|
|
- // //chargPileId,
|
|
|
|
- // //userId,
|
|
|
|
- // orderid: order.orderid
|
|
|
|
- // });
|
|
|
|
- // wx.hideLoading();
|
|
|
|
- // wx.showModal({
|
|
|
|
- // showCancel: false,
|
|
|
|
- // content: '支付订单成功',
|
|
|
|
- // confirmColor:'#00AADD',
|
|
|
|
- // });
|
|
|
|
-
|
|
|
|
- // that.setData({
|
|
|
|
- // orderFlag:true
|
|
|
|
- // });
|
|
|
|
- // },
|
|
|
|
- // fail(res3) {
|
|
|
|
- // wx.hideLoading();
|
|
|
|
- // log.info('[订单支付]', '[余额不足微信支付]', '[fail]', res3);
|
|
|
|
- // console.log(res3);
|
|
|
|
- // }
|
|
|
|
- // });
|
|
|
|
- // } else {
|
|
|
|
- // wx.hideLoading();
|
|
|
|
- // that.setData({
|
|
|
|
- // orderFlag: true
|
|
|
|
- // });
|
|
|
|
- // wx.showModal({
|
|
|
|
- // showCancel: false,
|
|
|
|
- // content: data.msg,
|
|
|
|
- // confirmColor:'#00AADD',
|
|
|
|
- // });
|
|
|
|
- // }
|
|
|
|
- // log.info('[订单支付]', '[服务端订单支付]', '[余额支付成功]', data);
|
|
|
|
- // } else {
|
|
|
|
- // wx.hideLoading();
|
|
|
|
- // wx.showModal({
|
|
|
|
- // showCancel: false,
|
|
|
|
- // content: data.msg,
|
|
|
|
- // confirmColor:'#00AADD',
|
|
|
|
- // });
|
|
|
|
- // log.info('[订单支付]', '[服务端订单支付]', '[失败data null||data.code<>200]', data);
|
|
|
|
- // }
|
|
|
|
- // }
|
|
|
|
- // });
|
|
|
|
- // } else {
|
|
|
|
- // wx.hideLoading();
|
|
|
|
- // console.log('登录失败!' + res.errMsg);
|
|
|
|
- // log.info('[订单支付]', '[用户触发支付订单]', '[wx.login响应失败code null]', res);
|
|
|
|
- // }
|
|
|
|
- // }
|
|
|
|
- // });
|
|
|
|
-
|
|
|
|
|
|
+ })
|
|
|
|
+ },
|
|
|
|
+ queryOccupyById(userId,parkId) {
|
|
|
|
+ return new Promise((resolve, reject) => {
|
|
|
|
+ let that = this;
|
|
|
|
+ wx.request({
|
|
|
|
+ url: getApp().globalData.postHeadAgreement +'/restapi/wechat/queryOccupyById',
|
|
|
|
+ data: {
|
|
|
|
+ userId: userId,
|
|
|
|
+ id:parkId,
|
|
|
|
+ searchIndex: 3 // 未支付
|
|
|
|
+ },
|
|
|
|
+ method: 'POST',
|
|
|
|
+ success(res) {
|
|
|
|
+ if (res.data.code == 200) {
|
|
|
|
+ console.log("更具订单号插叙",res.data.result);
|
|
|
|
+ that.setData({
|
|
|
|
+ order:res.data.result
|
|
|
|
+ })
|
|
|
|
+ resolve(res.data.result);
|
|
|
|
+ }else{
|
|
|
|
+ resolve(res.data);
|
|
|
|
+ }
|
|
|
|
+ },
|
|
|
|
+ fail(err) {
|
|
|
|
+ console.error('请求失败', err);
|
|
|
|
+ reject(err);
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ });
|
|
},
|
|
},
|
|
cancleBtn(e){
|
|
cancleBtn(e){
|
|
let that = this
|
|
let that = this
|
|
@@ -377,9 +356,6 @@ Page({
|
|
})
|
|
})
|
|
},
|
|
},
|
|
|
|
|
|
- confirmM: function (e) {
|
|
|
|
- console.log("姓名:" + this.data.name + " 电话:" + this.data.phoneNum);
|
|
|
|
- },
|
|
|
|
|
|
|
|
iName: function (e) {
|
|
iName: function (e) {
|
|
this.setData({
|
|
this.setData({
|