diff --git a/miniprogram/app.js b/miniprogram/app.js
index 9cfc822..18e09e5 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -349,5 +349,19 @@ App({
url: '/pages/index/index',
})
}
+ },
+ // 根据房间查询门锁id
+ findDoorLock(roomId) {
+ let lockList = [{
+ roomId: '237',
+ lockId: '43'
+ }, {
+ roomId: '238',
+ lockId: '78'
+ }, {
+ roomId: '239',
+ lockId: '79'
+ }, ]
+ return lockList.find(item => item.roomId == roomId)
}
})
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js
index ccd1c03..bf3716c 100644
--- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js
+++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js
@@ -16,6 +16,11 @@ import {
getMeetingRoomServiceAndEquipmentRq,
} from "../../../../../api/meeting/meetingRoom.js"
+import {
+ callApiByDeviceIdRq,
+} from "../../../../../api/meeting/equipment.js"
+
+
Page({
/**
@@ -59,6 +64,13 @@ Page({
let showInvite = false;
let showCancel = false;
let showDetail = false;
+ let showLock = false;
+ // 是否开门
+ let lock = app.findDoorLock(detail.roomContent.roomId)
+ if (lock) {
+ showLock = true
+ detail.lockId = lock.lockId
+ }
// 待支付 0 :去支付、取消订单、查看详情
if (statusValue == 0) {
showPay = true;
@@ -98,6 +110,7 @@ Page({
}
//
// 赋值
+ detail.showLock = showLock;
detail.showPay = showPay;
detail.showInvite = showInvite;
detail.showCancel = showCancel;
@@ -192,6 +205,24 @@ Page({
})
},
+ // 开门
+ openLockDoor(e) {
+ let _this = this
+ console.log('openLockDoor', e);
+ let lockId = e.currentTarget.dataset.obj.lockId
+ // 调用设备接口
+ callApiByDeviceIdRq({
+ "deviceId": lockId,
+ }).then(res => {
+ console.log('callApiByDeviceIdRq', res);
+ if (res.code == 0) {
+ app.vantNotifySuccess(Notify, res.msg)
+ } else {
+ app.vantNotifyErr(Notify, res.msg)
+ }
+ })
+ },
+
/**
* 生命周期函数--监听页面初次渲染完成
*/
diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml
index 8a46688..0ffd0cf 100644
--- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml
+++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml
@@ -87,6 +87,7 @@
+ 开门
去邀请
diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js
index 714c019..08f067b 100644
--- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js
+++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js
@@ -14,6 +14,10 @@ import {
cancelOrderRq
} from "../../../../api/meeting/meetingRoom.js"
+import {
+ callApiByDeviceIdRq,
+} from "../../../../api/meeting/equipment.js"
+
Page({
/**
@@ -186,6 +190,13 @@ Page({
let showInvite = false;
let showCancel = false;
let showDetail = false;
+ let showLock = false;
+ // 是否开门
+ let lock = app.findDoorLock(item.roomContent.roomId)
+ if (lock) {
+ showLock = true
+ item.lockId = lock.lockId
+ }
// 待支付 0 :去支付、取消订单、查看详情
if (statusValue == 0) {
showPay = true;
@@ -225,6 +236,7 @@ Page({
}
//
// 赋值
+ item.showLock = showLock;
item.showPay = showPay;
item.showInvite = showInvite;
item.showCancel = showCancel;
@@ -323,6 +335,24 @@ Page({
});
},
+ // 开门
+ openLockDoor(e) {
+ let _this = this
+ console.log('openLockDoor', e);
+ let lockId = e.currentTarget.dataset.obj.lockId
+ // 调用设备接口
+ callApiByDeviceIdRq({
+ "deviceId": lockId,
+ }).then(res => {
+ console.log('callApiByDeviceIdRq', res);
+ if (res.code == 0) {
+ app.vantNotifySuccess(Notify, res.msg)
+ } else {
+ app.vantNotifyErr(Notify, res.msg)
+ }
+ })
+ },
+
/**
* 生命周期函数--监听页面初次渲染完成
*/
diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxml b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxml
index 24cb317..67da073 100644
--- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxml
+++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxml
@@ -23,6 +23,7 @@
+ 开门
去邀请
@@ -36,12 +37,12 @@
-
+
{{item.title}}
{{item.statusName}}
-
+
{{item.roomContent.capacityNum}}人间 | {{item.roomContent.roomName}} | {{item.roomContent.buildingName}}
@@ -49,6 +50,9 @@
{{item.timeSlot}}
+
+ 开门
+
数据已全部加载
diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxss b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxss
index 5e9f80e..dd20e47 100644
--- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxss
+++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxss
@@ -104,6 +104,10 @@
margin-left: 10rpx;
}
+.itemView .btnView.right {
+ margin-top: 30rpx;
+}
+
.itemView .btnView {
display: flex;
justify-content: flex-end;