@@ -968,79 +983,78 @@ export default {
if (type == 1 && combination_id > 0) {
status.type = 6;
status.class_status = 1;
- } //查看拼团
- if (type == 2 && delivery_type == "express") status.class_status = 2; //查看物流
- if (type == 2) status.class_status = 3; //确认收货
- if (type == 4 || type === 0) status.class_status = 4; //删除订单
+ } // 查看拼团
+ if (type == 2 && delivery_type == "express") status.class_status = 2; // 查看物流
+ if (type == 2) status.class_status = 3; // 确认收货
+ if (type == 4 || type === 0) status.class_status = 4; // 删除订单
if (
- !seckill_id &&
- !bargain_id &&
- !combination_id &&
- (type == 3 || type == 4)
+ !seckill_id &&
+ !bargain_id &&
+ !combination_id &&
+ (type == 3 || type == 4)
)
- status.class_status = 5; //再次购买
+ status.class_status = 5; // 再次购买
if (type == 9) {
- //线下付款
+ // 线下付款
status.class_status = 0;
- this.offlineStatus = false;
+ this.offlineStatus = false
}
- this.status = status;
+ this.status = status
},
getDetail() {
- const id = this.id;
+ const id = this.id
if (!id) {
uni.showToast({
title: "订单不存在",
icon: "none",
duration: 2000
- });
- return;
+ })
+ return
}
uni.showLoading({
title: '加载中'
})
this.loading = true
- orderDetail(id)
- .then(res => {
- this.orderInfo = res.data;
- this.getOrderStatus();
- if (this.orderInfo.combinationId > 0) {
- this.orderTypeName = "拼团订单";
- this.orderTypeNameStatus = false;
- } else if (this.orderInfo.bargainId > 0) {
- this.orderTypeName = "砍价订单";
- this.orderTypeNameStatus = false;
- } else if (this.orderInfo.seckillId > 0) {
- this.orderTypeName = "秒杀订单";
- this.orderTypeNameStatus = false;
- } else if (this.orderInfo.isGiftCardReceive === 1 || this.orderInfo.isGiftCardSend === 1) {
- this.orderTypeName = "礼包订单";
- this.orderTypeNameStatus = false;
+ orderDetail(id).then(res => {
+ this.orderInfo = res.data
+ this.orderInfo._status._type = parseInt(this.orderInfo._status._type)
+ this.getOrderStatus()
+ if (this.orderInfo.combinationId > 0) {
+ this.orderTypeName = "拼团订单"
+ this.orderTypeNameStatus = false
+ } else if (this.orderInfo.bargainId > 0) {
+ this.orderTypeName = "砍价订单"
+ this.orderTypeNameStatus = false
+ } else if (this.orderInfo.seckillId > 0) {
+ this.orderTypeName = "秒杀订单"
+ this.orderTypeNameStatus = false
+ } else if (this.orderInfo.isGiftCardReceive === 1 || this.orderInfo.isGiftCardSend === 1) {
+ this.orderTypeName = "礼包订单"
+ this.orderTypeNameStatus = false
+ }
+ this.system_store = res.data.systemStore || {}
+ this.mapKey = res.data.mapKay
+ this.setOfflinePayStatus(this.orderInfo.offlinePayStatus)
+ const statusType = this.orderInfo._status._type
+ if([-1, -2, 4, 3].includes(statusType) || (statusType === 2 && this.orderInfo.isTickets !== 1)) {
+ for(let i = 0; i < this.orderInfo.deliveryInfo.length; i++) {
+ this.orderInfo.deliveryInfo[i].estimatedTime = ''
+ this.getExpressInfo(this.orderInfo.deliveryInfo[i], i)
+ if (statusType === 2) {
+ this.getDay(this.orderInfo.deliveryInfo[i], i)
}
- this.system_store = res.data.systemStore || {};
- this.mapKey = res.data.mapKay;
- this.setOfflinePayStatus(this.orderInfo.offlinePayStatus);
- const orderInfo = this.orderInfo
- if(orderInfo._status._type == -1 || orderInfo._status._type == -2 || orderInfo._status._type == 4 || orderInfo._status._type == 3 || (orderInfo._status._type == 2 && orderInfo.isTickets!==1)) {
- for(let i = 0; i < orderInfo.deliveryInfo.length; i++) {
- orderInfo.deliveryInfo[i].estimatedTime = ''
- this.getExpressInfo(orderInfo.deliveryInfo[i], i)
- if (orderInfo._status._type === 2) {
- this.getDay(orderInfo.deliveryInfo[i], i)
- }
- }
- }
- })
- .catch(err => {
- uni.showToast({
- title: err.response.data.msg,
- icon: "none",
- duration: 2000
- });
- }).finally(() => {
- this.loading = false
- uni.hideLoading()
- });
+ }
+ }
+ }).catch(err => {
+ uni.showToast({
+ title: err.response.data.msg,
+ icon: "none",
+ duration: 2000
+ })
+ }).finally(() => {
+ this.loading = false
+ uni.hideLoading()
+ })
},
async toPay(type) {
var that = this;
diff --git a/pages/order/ReturnList/index.vue b/pages/order/ReturnList/index.vue
index 2d14f34..ea2d317 100644
--- a/pages/order/ReturnList/index.vue
+++ b/pages/order/ReturnList/index.vue
@@ -1,9 +1,9 @@
-
-
-
+
+
+
订单号：{{ order.orderId }}