diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js
index d7763e3..8169a1e 100644
--- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js
+++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js
@@ -1,5 +1,8 @@
const app = getApp()
+import Dialog from '@vant/weapp/dialog/dialog';
+import Notify from '@vant/weapp/notify/notify';
+
import {
selfFormatTimeYMD,
selfFormatTimeHM,
@@ -7,7 +10,8 @@ import {
} from "../../../../../utils/util.js"
import {
- selectReservationByIdRq
+ selectReservationByIdRq,
+ cancelOrderRq
} from "../../../../../api/meeting/meetingRoom.js"
Page({
@@ -100,6 +104,53 @@ Page({
})
},
+ // 取消订单
+ cancelOrder(e) {
+ console.log('cancelOrder', e);
+ let _this = this;
+ let id = e.currentTarget.dataset.id
+ const beforeClose = (action) => {
+ console.log('action', action);
+ return new Promise((resolve) => {
+ if (action === 'confirm') {
+ cancelOrderRq({
+ id,
+ cancelResaon: ""
+ }).then(res => {
+ console.log('cancelOrderRq', res);
+ if (res.code == 0) {
+ // 刷新数据
+ _this.getDetail();
+ } else {
+ // 危险通知
+ Notify({
+ type: 'danger',
+ message: res.msg
+ });
+ }
+ resolve(true);
+ })
+ } else {
+ // 拦截取消操作
+ resolve(true);
+ }
+ });
+ }
+ Dialog.confirm({
+ title: '提示',
+ message: '是否要取消订单!',
+ beforeClose,
+ });
+ },
+
+ // 跳转-支付
+ jumpPay(e) {
+ console.log('jumpPay', e);
+ wx.navigateTo({
+ url: "/pages/meeting/pay/waitPay/waitPay?id=" + e.currentTarget.dataset.id
+ })
+ },
+
/**
* 生命周期函数--监听页面初次渲染完成
*/
diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.json b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.json
index eb25d5e..d90d0a5 100644
--- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.json
+++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.json
@@ -1,4 +1,7 @@
{
- "usingComponents": {},
- "navigationBarTitleText": "会议预约详情"
+ "usingComponents": {
+ "van-dialog": "@vant/weapp/dialog/index",
+ "van-notify": "@vant/weapp/notify/index"
+ },
+ "navigationBarTitleText": "会议预约详情"
}
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml
index 108ad9e..08d6d19 100644
--- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml
+++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml
@@ -67,10 +67,16 @@
- 去支付
+ 去支付
去邀请
- 取消订单
+ 取消订单
+
+
+
+
+
+
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js
index ac2f448..36c0af1 100644
--- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js
+++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js
@@ -234,9 +234,10 @@ Page({
},
// 跳转-支付
- jumpPay() {
+ jumpPay(e) {
+ console.log('jumpPay' , e);
wx.navigateTo({
- url: "/pages/meeting/pay/waitPay/waitPay"
+ url: "/pages/meeting/pay/waitPay/waitPay?id=" + e.currentTarget.dataset.id
})
},
@@ -282,7 +283,7 @@ Page({
}).then(res => {
console.log('cancelOrderRq', res);
if (res.code == 0) {
- // 清空预约数据
+ // 刷新预约数据
_this.setData({
reservationPageNum: 1,
reservationDataList: [],
diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxml b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxml
index 1268b3c..fd5d7ac 100644
--- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxml
+++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxml
@@ -19,7 +19,7 @@
¥{{item.orderMoney}}
- 去支付
+ 去支付
去邀请