|
|
@@ -80,7 +80,7 @@
|
|
|
<div class="box-buttom">
|
|
|
<div class="box-buttom-con">
|
|
|
<p>邮费</p>
|
|
|
- <p class="box-buttom-p">¥0</p>
|
|
|
+ <p class="box-buttom-p">¥10</p>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="box-buttom">
|
|
|
@@ -242,7 +242,7 @@ export default {
|
|
|
this.$http
|
|
|
.get('/orderInfo/get/' + this.$mp.query.id)
|
|
|
.then(res => {
|
|
|
- wx.hideLoading();
|
|
|
+ this.hideLoading();
|
|
|
this.caseId = res.caseId;
|
|
|
this.status = res;
|
|
|
this.addressList = res.address;
|
|
|
@@ -275,7 +275,7 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
.catch(e => {
|
|
|
- wx.hideLoading();
|
|
|
+ this.hideLoading();
|
|
|
wx.showToast({
|
|
|
icon: 'none',
|
|
|
title: '请返回首页操作'
|
|
|
@@ -285,7 +285,7 @@ export default {
|
|
|
// if (this.status.orderStatus == 'COMPETED' || this.status.orderStatus == 'SEND') {
|
|
|
// console.log(this.status.orderStatus);
|
|
|
this.$http.get('/orderInfo/checkLogistic', { orderInfoId: this.$mp.query.id }).then(res => {
|
|
|
- wx.hideLoading();
|
|
|
+ this.hideLoading();
|
|
|
this.logisTics = res.logistic.result;
|
|
|
let steps = [];
|
|
|
res.logistic.result.list.forEach(item => {
|
|
|
@@ -298,6 +298,7 @@ export default {
|
|
|
this.stepsList = steps;
|
|
|
this.stepsShow = res.logistic.result.list[0];
|
|
|
});
|
|
|
+
|
|
|
// }
|
|
|
// }, 1000);
|
|
|
},
|
|
|
@@ -307,20 +308,29 @@ export default {
|
|
|
logistics() {
|
|
|
this.showLoading();
|
|
|
// 查看物流
|
|
|
- this.$http.get('/orderInfo/checkLogistic', { orderInfoId: this.$mp.query.id }).then(res => {
|
|
|
- wx.hideLoading();
|
|
|
- this.logisTics = res.logistic.result;
|
|
|
- let steps = [];
|
|
|
- res.logistic.result.list.forEach(item => {
|
|
|
- let newStep = {
|
|
|
- desc: item.status,
|
|
|
- text: item.time
|
|
|
- };
|
|
|
- steps.push(newStep);
|
|
|
+ this.$http
|
|
|
+ .get('/orderInfo/checkLogistic', { orderInfoId: this.$mp.query.id })
|
|
|
+ .then(res => {
|
|
|
+ this.hideLoading();
|
|
|
+ this.logisTics = res.logistic.result;
|
|
|
+ let steps = [];
|
|
|
+ res.logistic.result.list.forEach(item => {
|
|
|
+ let newStep = {
|
|
|
+ desc: item.status,
|
|
|
+ text: item.time
|
|
|
+ };
|
|
|
+ steps.push(newStep);
|
|
|
+ });
|
|
|
+ this.stepsList = steps;
|
|
|
+ this.show = true;
|
|
|
+ })
|
|
|
+ .catch(e => {
|
|
|
+ this.hideLoading();
|
|
|
+ wx.showToast({
|
|
|
+ title: '暂无物流信息',
|
|
|
+ icon: 'none'
|
|
|
+ });
|
|
|
});
|
|
|
- this.stepsList = steps;
|
|
|
- });
|
|
|
- this.show = true;
|
|
|
},
|
|
|
comfrim() {
|
|
|
wx.showModal({
|
|
|
@@ -328,16 +338,18 @@ export default {
|
|
|
content: '确定收货？',
|
|
|
success: res => {
|
|
|
if (res.confirm) {
|
|
|
- this.$http.post('/orderInfo/finish', { orderInfoId: this.$mp.query.id }).then(res => {
|
|
|
- wx.hideLoading();
|
|
|
- wx.showToast({
|
|
|
- icon: 'none',
|
|
|
- title: '收货成功'
|
|
|
- });
|
|
|
- setTimeout(() => {
|
|
|
- this.getFn();
|
|
|
- }, 1000);
|
|
|
- });
|
|
|
+ this.$http
|
|
|
+ .post('/orderInfo/finish', { orderInfoId: this.$mp.query.id })
|
|
|
+ .then(res => {
|
|
|
+ wx.showToast({
|
|
|
+ icon: 'none',
|
|
|
+ title: '收货成功'
|
|
|
+ });
|
|
|
+ setTimeout(() => {
|
|
|
+ this.getFn();
|
|
|
+ }, 1000);
|
|
|
+ })
|
|
|
+ .catch(() => {});
|
|
|
}
|
|
|
}
|
|
|
});
|
|
|
@@ -403,16 +415,18 @@ export default {
|
|
|
content: '确定取消订单？',
|
|
|
success: res => {
|
|
|
if (res.confirm) {
|
|
|
- this.$http.post('/orderInfo/cancel', { orderInfoId: this.$mp.query.id }).then(res => {
|
|
|
- wx.hideLoading();
|
|
|
- wx.showToast({
|
|
|
- icon: 'none',
|
|
|
- title: '订单已取消'
|
|
|
- });
|
|
|
- setTimeout(() => {
|
|
|
- this.getFn();
|
|
|
- }, 1000);
|
|
|
- });
|
|
|
+ this.$http
|
|
|
+ .post('/orderInfo/cancel', { orderInfoId: this.$mp.query.id })
|
|
|
+ .then(res => {
|
|
|
+ wx.showToast({
|
|
|
+ icon: 'none',
|
|
|
+ title: '订单已取消'
|
|
|
+ });
|
|
|
+ setTimeout(() => {
|
|
|
+ this.getFn();
|
|
|
+ }, 1000);
|
|
|
+ })
|
|
|
+ .catch(() => {});
|
|
|
}
|
|
|
}
|
|
|
});
|
|
|
@@ -423,16 +437,18 @@ export default {
|
|
|
content: '确定删除订单？',
|
|
|
success: res => {
|
|
|
if (res.confirm) {
|
|
|
- this.$http.post('orderInfo/delete', { orderInfoId: this.$mp.query.id }).then(res => {
|
|
|
- wx.hideLoading();
|
|
|
- wx.showToast({
|
|
|
- icon: 'none',
|
|
|
- title: '订单已删除'
|
|
|
- });
|
|
|
- setTimeout(() => {
|
|
|
- this.navigateTo('/pages/allorder');
|
|
|
- }, 1000);
|
|
|
- });
|
|
|
+ this.$http
|
|
|
+ .post('orderInfo/delete', { orderInfoId: this.$mp.query.id })
|
|
|
+ .then(res => {
|
|
|
+ wx.showToast({
|
|
|
+ icon: 'none',
|
|
|
+ title: '订单已删除'
|
|
|
+ });
|
|
|
+ setTimeout(() => {
|
|
|
+ this.navigateTo('/pages/allorder');
|
|
|
+ }, 1000);
|
|
|
+ })
|
|
|
+ .catch(() => {});
|
|
|
}
|
|
|
}
|
|
|
});
|
xuqiang-97