diff --git a/manifest.json b/manifest.json
index fb06817..2cd977f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -158,8 +158,8 @@
"scope.userLocation" : {
"desc" : "获取您与体育场馆的距离"
},
- "scope.camera": {
- "desc": "需要获取摄像头权限进行人脸录入"
+ "scope.camera" : {
+ "desc" : "需要获取摄像头权限进行人脸录入"
}
}
},
diff --git a/pages.json b/pages.json
index 91d7df9..9121465 100644
--- a/pages.json
+++ b/pages.json
@@ -952,6 +952,17 @@
}
}
},
+ {
+ "path": "pages/order/invoice",
+ "style": {
+ "navigationBarTitleText": "开发票",
+ "app-plus": {
+ //#ifdef H5
+ "titleNView": false
+ //#endif
+ }
+ }
+ },
{
"path": "pages/order/cg-my-order",
"style": {
diff --git a/pages/order/cg-my-order.vue b/pages/order/cg-my-order.vue
index 3167377..ba6ceb9 100644
--- a/pages/order/cg-my-order.vue
+++ b/pages/order/cg-my-order.vue
@@ -134,6 +134,10 @@
+
+
+
+
@@ -469,13 +473,17 @@
// 跳转支付页面
onPayOrder(groundId = 0, orderId = 0) {
let self = this;
+ console.log("🚀 ~ methods.onPayOrder:", groundId, orderId, self.ballType)
if (self.ballType == 1) {
// 网球场
self.gotoPage(`/bundle/reserve/confirm?orderId=${orderId}&venueId=${groundId}&typeId=1`);
return
+ } else if (self.ballType == 2) {
+ // 篮球场
+ self.gotoPage(`/bundle/reserve/confirm?orderId=${orderId}&venueId=${groundId}&typeId=2`);
+ return
}
},
-
cancelAdvance(e) {
let self = this;
@@ -587,7 +595,15 @@
uni.navigateTo({
url: `/bundle/face/face-info?order_id=${order_id}`
});
- }
+ },
+
+ // 去开票
+ toInvoice(order_id) {
+ console.log("🚀 ~ methods.toInvoice:")
+ uni.navigateTo({
+ url: `/pages/order/invoice?order_id=${order_id}`
+ });
+ },
}
};
diff --git a/pages/order/cg-order-detail.vue b/pages/order/cg-order-detail.vue
index fc72408..7594186 100644
--- a/pages/order/cg-order-detail.vue
+++ b/pages/order/cg-order-detail.vue
@@ -32,14 +32,14 @@
-
+
- 感谢预定场馆,期待下次再见!
+ 您的订单正在进行中!
-
+
- 您的订单正在进行中!
+ 感谢预定场馆,期待下次再见!
@@ -183,7 +183,7 @@
-