diff --git a/miniprogram/app.json b/miniprogram/app.json
index 7d88ab1..908be97 100644
--- a/miniprogram/app.json
+++ b/miniprogram/app.json
@@ -72,7 +72,9 @@
"pages/meeting/exhibition/order/order",
"pages/meeting/reservationRecord/exhibitionRecord/list/list",
"pages/meeting/reservationRecord/exhibitionRecord/detail/detail",
- "pages/meeting/meetingRoom/meetingService/meetingService"
+ "pages/meeting/meetingRoom/meetingService/meetingService",
+ "pages/smartDevice/region/region",
+ "pages/smartDevice/room/room"
],
"window": {
"backgroundTextStyle": "light",
diff --git a/miniprogram/pages/index/index.js b/miniprogram/pages/index/index.js
index 94582b9..8bb5ce7 100644
--- a/miniprogram/pages/index/index.js
+++ b/miniprogram/pages/index/index.js
@@ -123,7 +123,11 @@ Page({
img: "/profile/static/index/menu-yyjl.png",
path: "/pages/meeting/reservationRecord/meetingRecord/meetingRecord"
},
-
+ {
+ name: "智能设备",
+ img: "/profile/static/index/menu-ycmj.png",
+ path: "/pages/smartDevice/region/region"
+ },
// {
// name: "远程门禁",
// img: "/profile/static/index/menu-ycmj.png",
diff --git a/miniprogram/pages/smartDevice/region/region.js b/miniprogram/pages/smartDevice/region/region.js
new file mode 100644
index 0000000..02bb7c1
--- /dev/null
+++ b/miniprogram/pages/smartDevice/region/region.js
@@ -0,0 +1,92 @@
+const app = getApp()
+
+import Notify from '@vant/weapp/notify/notify';
+
+import {
+ selfFormatTimeYMD,
+ selfFormatTimeHM
+} from "../../../utils/util.js"
+
+import {
+ cancelOrderRq
+} from "../../../api/meeting/meetingRoom.js"
+
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ IMG_NAME: app.IMG_NAME,
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ let _this = this;
+ _this.setData({
+ userData: wx.getStorageSync('user'),
+ })
+
+ },
+
+ // 跳转房间
+ jumpRoom(){
+ wx.navigateTo({
+ url: '/pages/smartDevice/room/room',
+ })
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+ let _this = this;
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+ console.log('onPullDownRefresh', '页面相关事件处理函数--监听用户下拉动作');
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+ console.log('onReachBottom', '页面上拉触底事件的处理函数');
+ let _this = this;
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage(e) {
+
+ }
+})
\ No newline at end of file
diff --git a/miniprogram/pages/smartDevice/region/region.json b/miniprogram/pages/smartDevice/region/region.json
new file mode 100644
index 0000000..fdcb48e
--- /dev/null
+++ b/miniprogram/pages/smartDevice/region/region.json
@@ -0,0 +1,4 @@
+{
+ "usingComponents": {},
+ "navigationBarTitleText": "智能设备"
+}
\ No newline at end of file
diff --git a/miniprogram/pages/smartDevice/region/region.wxml b/miniprogram/pages/smartDevice/region/region.wxml
new file mode 100644
index 0000000..542760f
--- /dev/null
+++ b/miniprogram/pages/smartDevice/region/region.wxml
@@ -0,0 +1,13 @@
+
+
+
+ 会议室
+
+ 设备数：10
+ 场景数：3
+
+
+
+
+
+
\ No newline at end of file
diff --git a/miniprogram/pages/smartDevice/region/region.wxss b/miniprogram/pages/smartDevice/region/region.wxss
new file mode 100644
index 0000000..ec2eef6
--- /dev/null
+++ b/miniprogram/pages/smartDevice/region/region.wxss
@@ -0,0 +1,52 @@
+.containerView.public {
+ background: none;
+}
+
+.roomContainer {
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-evenly;
+ align-items: center;
+}
+
+.roomContainer .roomItem {
+ box-shadow: rgba(214,214,214,0.5) 0px 1px 0px 0px,rgb(238,238,238) 0px 1px 2px 0px;
+ border-radius: 10rpx;
+ position: relative;
+ width: 330rpx;
+ height: 260rpx;
+ margin-top: 24rpx;
+ background: white;
+
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+
+.roomContainer .roomItem .label {
+ position: absolute;
+ left: 20rpx;
+ top: 20rpx;
+ font-size: 28rpx;
+}
+
+.roomContainer .roomItem .img {
+ width: 100rpx;
+ height: 100rpx;
+}
+
+.roomContainer .roomItem .deviceNum {
+ position: absolute;
+ left: 20rpx;
+ bottom: 20rpx;
+ font-size: 24rpx;
+ color: gray;
+}
+
+.roomContainer .roomItem .sceneNum {
+ position: absolute;
+ right: 20rpx;
+ bottom: 20rpx;
+ font-size: 24rpx;
+ color: gray;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/smartDevice/room/room.js b/miniprogram/pages/smartDevice/room/room.js
new file mode 100644
index 0000000..a56fb08
--- /dev/null
+++ b/miniprogram/pages/smartDevice/room/room.js
@@ -0,0 +1,113 @@
+const app = getApp()
+
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ IMG_NAME: app.IMG_NAME,
+ sceneList: [{
+ name: '茶歇模式',
+ url: 'chaxie1.png',
+ selectUrl: 'chaxie0.png',
+ isSelect: false
+ },
+ {
+ name: '开门模式',
+ url: 'kaimen1.png',
+ selectUrl: 'kaimen0.png',
+ isSelect: true
+ }
+ ]
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ let _this = this
+
+ _this.initScene()
+ },
+
+ initScene() {
+ let _this = this
+ let sceneList = _this.data.sceneList.map(item => {
+ item.url = app.IMG_NAME + '/profile/static/shanghai_changyang/device/scene/' + item.url
+ item.selectUrl = app.IMG_NAME + '/profile/static/shanghai_changyang/device/scene/' + item.selectUrl
+ return item
+ })
+ _this.setData({
+ sceneList
+ })
+ },
+
+ // 选择情景
+ selectScene(e) {
+ console.log('selectScene', e);
+ let _this = this
+ let obj = e.currentTarget.dataset.obj
+ let sceneList = _this.data.sceneList
+ sceneList = sceneList.map(item => {
+ if (item.name == obj.name) {
+ item.isSelect = !item.isSelect
+ } else {
+ item.isSelect = false
+ }
+ return item
+ })
+ _this.setData({
+ sceneList
+ })
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/miniprogram/pages/smartDevice/room/room.json b/miniprogram/pages/smartDevice/room/room.json
new file mode 100644
index 0000000..360ee08
--- /dev/null
+++ b/miniprogram/pages/smartDevice/room/room.json
@@ -0,0 +1,4 @@
+{
+ "usingComponents": {},
+ "navigationBarTitleText": "房间"
+}
\ No newline at end of file
diff --git a/miniprogram/pages/smartDevice/room/room.wxml b/miniprogram/pages/smartDevice/room/room.wxml
new file mode 100644
index 0000000..d5b1690
--- /dev/null
+++ b/miniprogram/pages/smartDevice/room/room.wxml
@@ -0,0 +1,21 @@
+
+
+
+
+ 大会议室
+
+
+ 情景模式
+
+
+
+ 会议模式
+
+
+
+
+
+ 设备列表
+
+
+
\ No newline at end of file
diff --git a/miniprogram/pages/smartDevice/room/room.wxss b/miniprogram/pages/smartDevice/room/room.wxss
new file mode 100644
index 0000000..e91d5cf
--- /dev/null
+++ b/miniprogram/pages/smartDevice/room/room.wxss
@@ -0,0 +1,88 @@
+.view {
+ box-sizing: border-box;
+ line-height: 1;
+ margin: 0;
+ padding: 0;
+}
+
+.containerView.public {
+ padding: 20rpx 32rpx;
+ background: #f8f8f8;
+ min-height: 100vh;
+}
+
+.topHead {
+ display: flex;
+ justify-content: flex-start;
+ align-items: center;
+ margin-top: 20rpx;
+}
+
+.topHead .logoImg {
+ width: 91rpx;
+ height: 91rpx;
+}
+
+.topHead .title {
+ margin-left: 20rpx;
+ color: #363636;
+ font-size: 30rpx;
+}
+
+.leftLineTitle {
+ margin-top: 60rpx;
+}
+
+.sceneView {
+ display: flex;
+ justify-content: flex-start;
+ align-items: center;
+ overflow: auto;
+ margin-top: 30rpx;
+}
+
+.sceneView .sceneItem {
+ border: 1rpx solid rgba(105, 105, 105, 0.1);
+ border-radius: 20rpx;
+ flex-shrink: 0;
+ width: 280rpx;
+ height: 140rpx;
+ margin-right: 30rpx;
+ background: white;
+
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+
+.sceneView .sceneItem.activity {
+ background: #334D77;
+}
+
+
+.sceneView .sceneItem .img {
+ width: 54rpx;
+ height: 54rpx;
+}
+
+.sceneView .sceneItem .label {
+ font-size: 28rpx;
+ margin-left: 16rpx;
+ color: #334D77;
+}
+
+.sceneView .sceneItem .label.activity {
+ color: white;
+}
+
+.sceneView .sceneItem .point {
+ border-radius: 10rpx;
+ width: 10rpx;
+ height: 10rpx;
+ background: #334D77;
+ margin-left: 10rpx;
+}
+
+.sceneView .sceneItem .point.activity {
+ background: white;
+}
\ No newline at end of file