diff --git a/App.vue b/App.vue
index 9a44543..5016d2f 100644
--- a/App.vue
+++ b/App.vue
@@ -261,4 +261,7 @@ export default {
@import './common/myIcon.css';
/*每个页面公共css */
@import './common/style.scss';
+
+.one-line-ellipsis {white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}
+.two-line-ellipsis {display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;overflow: hidden;text-overflow: ellipsis;}
diff --git a/bundle/recharge/recharge.vue b/bundle/recharge/recharge.vue
index 11a44e3..e922152 100644
--- a/bundle/recharge/recharge.vue
+++ b/bundle/recharge/recharge.vue
@@ -154,13 +154,6 @@
title: '支付失败',
icon: 'none'
});
-
-
- setTimeout(() => {
- uni.redirectTo({
- url: '/bundle/recharge/card'
- });
- }, 500);
},
});
} else {
diff --git a/bundle/reserve/confirm.vue b/bundle/reserve/confirm.vue
index 0cef3cd..1822db5 100644
--- a/bundle/reserve/confirm.vue
+++ b/bundle/reserve/confirm.vue
@@ -730,11 +730,6 @@
}
},
- // 选择会员卡
- selectCard() {
- this.balance = 200; // 模拟选择会员卡后的余额
- },
-
// 确认选择
confirmCard() {
if (this.userBalance['balance' + this.currentType] <= 0) {
diff --git a/bundle/reserve/details.vue b/bundle/reserve/details.vue
index 370e998..e6ff558 100644
--- a/bundle/reserve/details.vue
+++ b/bundle/reserve/details.vue
@@ -105,7 +105,7 @@
- {{ venue.address }}
+ {{ venue.address }}
diff --git a/pages/order/cashier.vue b/pages/order/cashier.vue
index 3056efe..24301d4 100644
--- a/pages/order/cashier.vue
+++ b/pages/order/cashier.vue
@@ -21,14 +21,14 @@
-
+
diff --git a/pages/order/cg-my-order.vue b/pages/order/cg-my-order.vue
index 8d6ed4b..f76365e 100644
--- a/pages/order/cg-my-order.vue
+++ b/pages/order/cg-my-order.vue
@@ -48,9 +48,10 @@
待付款
已预约
- 已完成
- 订单取消
- 退款成功
+ 进行中
+ 已完成
+ 订单取消
+ 退款成功
diff --git a/pages/order/cg-order-detail.vue b/pages/order/cg-order-detail.vue
index 5df7b00..047d595 100644
--- a/pages/order/cg-order-detail.vue
+++ b/pages/order/cg-order-detail.vue
@@ -36,17 +36,22 @@
感谢预定场馆，期待下次再见！
+
+
+
+ 您的订单正在进行中！
+
-
+
您的订单已取消。期待下次有机会再为您服务！
-
+
- 实际退款￥175.00
-
+ 实际退款￥{{ detail.order_amount }}
+
您的订单已取消。期待下次有机会再为您服务！
@@ -123,7 +128,7 @@
- 距您{{ venue.distance }}km
+
@@ -157,7 +162,8 @@
交易方式：
- {{ detail.pay_way == 1 ? '余额支付' : '微信支付' }}
+ 余额支付-{{ cardType(detail.pay_way) }}
+ 微信支付
@@ -200,7 +206,7 @@
-
+
再次预定
@@ -401,13 +407,15 @@
function(res) {
self.cancelOrderPopup = false;
- uni.hideLoading();
uni.showToast({
title: '操作成功',
duration: 2000,
icon: 'success'
});
self.getData();
+
+ self.loadding = false;
+ uni.hideLoading();
}
);
},
@@ -431,13 +439,15 @@
function(res) {
self.cancelReservePopup = false;
- uni.hideLoading();
- uni.showToast({
- title: '操作成功',
- duration: 2000,
- icon: 'success'
- });
- self.getData();
+ if(res.code) {
+ uni.hideLoading();
+ uni.showToast({
+ title: res.msg,
+ duration: 2000,
+ icon: 'success'
+ });
+ self.getData();
+ }
}
);
},
@@ -533,7 +543,22 @@
name: this.venue.name,
address: this.venue.address
});
- }
+ },
+
+ // 会员卡类型
+ cardType(type) {
+ if (type == 1) {
+ return '白银会员卡'
+ } else if (type == 2) {
+ return '黄金会员卡'
+ } else if (type == 3) {
+ return '铂金会员卡'
+ } else if (type == 4) {
+ return '钻石会员卡'
+ } else if (type == 5) {
+ return '至尊会员卡'
+ }
+ },
}
};