diff --git a/miniprogram/api/meeting/meetingRoom.js b/miniprogram/api/meeting/meetingRoom.js
index dc9174e..4661cf0 100644
--- a/miniprogram/api/meeting/meetingRoom.js
+++ b/miniprogram/api/meeting/meetingRoom.js
@@ -169,4 +169,14 @@ export function queryServiceMsgRq(data) {
method: "post",
data
});
-}
\ No newline at end of file
+}
+
+
+// 长阳-提交会议预约
+export function saveChangyangMeetingRecordRq(data) {
+ return request({
+ url: '/api/roomContent/saveChangyangMeetingRecord',
+ method: "post",
+ data
+ });
+}
diff --git a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js
index bf93070..deb807e 100644
--- a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js
+++ b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js
@@ -7,7 +7,8 @@ import {
meetingRoomDetailRq,
getCustomerTicketRq,
calculateMeetingRoomAmountRq,
- saveMeetingRecordRq
+ saveMeetingRecordRq,
+ saveChangyangMeetingRecordRq
} from "../../../../api/meeting/meetingRoom.js"
import {
@@ -25,8 +26,6 @@ Page({
*/
data: {
IMG_NAME: app.IMG_NAME,
- protocolFlag: true,
- protocolTitle: '《会议室服务协议》',
meetingRoomId: null,
startTime: null,
endTime: null,
@@ -35,7 +34,9 @@ Page({
bannerList: [],
room: {},
userData: {},
- serviceList : [],
+ serviceList: [],
+ title: '',
+ personNum: '',
},
/**
@@ -74,10 +75,16 @@ Page({
})
},
- // 主题修改监听
- titleChange(event) {
+ // input修改监听
+ inputChange(e) {
+ console.log('input change', e);
+ let _this = this
+ let name = e.currentTarget.dataset.name
+ let value = e.detail
+ let data = _this.data
+ data[name] = value
this.setData({
- title: event.detail
+ ...data
})
},
@@ -103,16 +110,25 @@ Page({
});
return;
}
-
- saveMeetingRecordRq({
+ if (_this.data.personNum == '') {
+ // 错误提示
+ Notify({
+ type: 'danger',
+ message: '请输入参会人数!'
+ });
+ return;
+ }
+
+ saveChangyangMeetingRecordRq({
"roomContentId": _this.data.meetingRoomId,
"userId": _this.data.userData.id,
- "ticketId": _this.data.couponId,
"customerId": _this.data.userData.icsCustomerId,
"title": _this.data.title,
+ "personNum": _this.data.personNum,
"startTime": _this.data.startTime,
"endDate": _this.data.endTime,
- "orderMoney": _this.data.totalAmount,
+ "orderMoney": 0,
+ "reservationServes" : _this.data.serviceList,
}).then(res => {
console.log('saveMeetingRecordRq', res);
if (res.code == 0) {
@@ -143,7 +159,7 @@ Page({
onShow() {
console.log('onShow');
let _this = this
-
+
},
/**
diff --git a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml
index 95fe050..4954035 100644
--- a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml
+++ b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml
@@ -44,7 +44,13 @@
会议主题
-
+
+
+
+
+ 参会人数
+
+
diff --git a/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.js b/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.js
index e33a822..e10a3d5 100644
--- a/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.js
+++ b/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.js
@@ -1,5 +1,7 @@
const app = getApp()
+import Notify from '@vant/weapp/notify/notify';
+
import {
getMeetingRoomServiceAndEquipmentRq,
queryServiceMsgRq
@@ -108,6 +110,18 @@ Page({
// 确定
submit() {
let _this = this;
+ let serviceList = _this.data.serviceList
+ for (let i = 0; i < serviceList.length; i++) {
+ if (serviceList[i].isSelect && serviceList[i].num == '') {
+ // 错误提示
+ Notify({
+ type: 'danger',
+ message: `"${serviceList[i].serveName}"请输入人数!`
+ });
+ return;
+ }
+ }
+ //
let pages = getCurrentPages(); //获取page
let prevPage = pages[pages.length - 2]; //上一个页面(父页面)
prevPage.setData({
diff --git a/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.json b/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.json
index bfcfdfc..50572c0 100644
--- a/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.json
+++ b/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.json
@@ -3,7 +3,8 @@
"van-icon": "@vant/weapp/icon/index",
"van-checkbox": "@vant/weapp/checkbox/index",
"van-checkbox-group": "@vant/weapp/checkbox-group/index",
- "van-field": "@vant/weapp/field/index"
+ "van-field": "@vant/weapp/field/index",
+ "van-notify": "@vant/weapp/notify/index"
},
"navigationBarTitleText": "会议服务"
}
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.wxml b/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.wxml
index 7fb618e..5009c46 100644
--- a/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.wxml
+++ b/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.wxml
@@ -19,5 +19,6 @@
确定
-
+
+
\ No newline at end of file