|
@@ -74,10 +74,9 @@ Page({
|
|
|
var newoption = chart.getOption();
|
|
|
newoption.series[0].data[0] = parseFloat(step / 100.0).toFixed(2);
|
|
|
chart.setOption(newoption, true);
|
|
|
- console.info(newoption)
|
|
|
- console.info("dsfsdfsf")
|
|
|
- console.info(step)
|
|
|
- console.info(newoption.series[0].data[0])
|
|
|
+ // console.info(newoption)
|
|
|
+ // console.info(step)
|
|
|
+ // console.info(newoption.series[0].data[0])
|
|
|
},
|
|
|
stopCharging(e) {
|
|
|
wx.showLoading({
|
|
@@ -203,9 +202,11 @@ Page({
|
|
|
},
|
|
|
method: 'POST',
|
|
|
success(res) {
|
|
|
+
|
|
|
let {
|
|
|
data
|
|
|
} = res;
|
|
|
+
|
|
|
log.info('[充电中]', '[获取订单状态]', '[响应]', data);
|
|
|
if (data && data.code == 200) {
|
|
|
let {
|
|
@@ -293,18 +294,19 @@ Page({
|
|
|
that.delOrder(orderid_r);
|
|
|
console.log(orderid_r);
|
|
|
}
|
|
|
- // } else if(data && data.code == 500){
|
|
|
- // clearInterval(chargingStatus);
|
|
|
- // console.info("xxxxxxxxxxxxxxxxxxxxxxx")
|
|
|
- // console.info(orderid)
|
|
|
- // console.info(userId)
|
|
|
- // console.info(chargPileId)
|
|
|
- // log.info('[充电中]', '[结束充电]', '[成功跳转订单支付界面]', data);
|
|
|
- // let url = `/pages/order/order?orderid=${orderid}&userId=${userId}&chargPileId=${chargPileId}`;
|
|
|
- // wx.redirectTo({
|
|
|
- // url
|
|
|
- // });
|
|
|
- } else{
|
|
|
+ } else if (data && data.code == 500) {
|
|
|
+ console.info("ddddddddddddddddddddddddddd")
|
|
|
+ console.info(orderid)
|
|
|
+ console.info(userId)
|
|
|
+ console.info(chargPileId)
|
|
|
+ console.info("ddddddddddddddddddddddddddd")
|
|
|
+ clearInterval(chargingStatus);
|
|
|
+ log.info('[充电中]', '[充电轮训]', '[chargPileStatus状态3跳转到订单支付界面]', data);
|
|
|
+ let url = `/pages/order/order?orderid=${orderid}&userId=${userId}&chargPileId=${chargPileId}`;
|
|
|
+ wx.redirectTo({
|
|
|
+ url
|
|
|
+ });
|
|
|
+ }else{
|
|
|
console.log(res);
|
|
|
}
|
|
|
},
|
|
@@ -435,8 +437,20 @@ Page({
|
|
|
console.log(orderid_r);
|
|
|
that.delOrder(orderid_r);
|
|
|
}
|
|
|
- } else {
|
|
|
+ } else if (data && data.code == 500) {
|
|
|
+ clearInterval(chargingStatus);
|
|
|
+ log.info('[充电中]', '[充电轮训]', '[chargPileStatus状态3跳转到订单支付界面]', data);
|
|
|
+ let url = `/pages/order/order?orderid=${orderid}&userId=${userId}&chargPileId=${chargPileId}`;
|
|
|
+ wx.redirectTo({
|
|
|
+ url
|
|
|
+ });
|
|
|
+ }else{
|
|
|
+ console.log("2222222222222222222222222222");
|
|
|
console.log(res);
|
|
|
+ console.log(data);
|
|
|
+ console.log(data.code);
|
|
|
+ console.log(data && data.code == 500);
|
|
|
+ console.log("2222222222222222222222222222");
|
|
|
}
|
|
|
}
|
|
|
});
|