Bladeren bron

feat 会议室场景

anxiaoxia 1 jaar geleden
bovenliggende
commit
26920c411a

+ 14 - 13
src/packagesEnv/pages/officehome/components/has-person.wpy

@@ -1,26 +1,27 @@
 <style lang="less" scoped>
 .has-person {
-    margin-left: 24rpx;
-    height: 40rpx;
-    width: 110rpx;
-    border-radius: 20rpx;
-    background: #edf1f5;
     display: flex;
     justify-content: center;
     align-items: center;
+    margin-left: 24rpx;
+    height: 36rpx;
+    width: 92rpx;
+    border-radius: 24rpx;
+    background: rgba(0, 0, 0, 0.16);
+    padding: 0px 8rpx 0px 8rpx;
     .img-box {
         height: 32rpx;
         width: 32rpx;
     }
     .text-box {
         margin-left: 4rpx;
-        font-family: Inter;
-        font-size: 24rpx;
-        font-weight: 400;
-        line-height: 32rpx;
-        color: #626c78;
+        font-family: PingFang SC;
+        font-size: 22rpx;
+        font-weight: 500;
+        line-height: 36rpx;
+        color: rgba(255, 255, 255, 1);;
         .notHas {
-            color: #8b949e;
+            color: rgba(255, 255, 255, 1);
         }
     }
 }
@@ -42,8 +43,8 @@
     </div>
 </template>
 <script>
-import wepy from '@wepy/core';
-import config from '@/config';
+import wepy from '@wepy/core'
+import config from '@/config'
 
 wepy.component({
   props: {

+ 127 - 0
src/packagesEnv/pages/officehome/Header/residen-work.wpy

@@ -0,0 +1,127 @@
+<!-- 常驻工区--> 
+<template>
+    <div>
+        <div
+            class="set-residen-work"
+            @click="showSaveSpace"
+            v-show="!IsResiden"
+        >
+            <span class="set-text">设置常驻</span>
+            <image
+                class="spimg"
+                :src="h5StaticPath+'arrow.svg'"
+            />
+        </div>
+        <div class="residen-work" v-show="IsResiden">
+            <span class="just-text">常驻工区</span>
+        </div>
+    </div>
+
+</template>
+
+<script>
+import wepy from '@wepy/core'
+import config from '@/config'
+import {changeDefaultSpace} from '@/packagesEnv/api/officehome.js'
+wepy.component({
+  props: {
+    IsResiden: Boolean,
+    spaceId: String,
+    userInfo: Object
+  },
+  data: {
+    h5StaticPath: config.h5StaticPath + '/page-officehome/'
+  },
+  computed: {},
+  methods: {
+    showSaveSpace() {
+      var _this = this
+      if (_this.spaceId == _this.userInfo.spaceId) {
+        wx.showToast({
+          title: '该空间已是您的常驻工区',
+          icon: 'none',
+          duration: 3000
+        })
+      } else {
+        wx.showModal({
+          title: '设置常驻工区',
+          content: '将该空间设定为您的常驻工区?',
+          confirmText: '确定',
+          cancelText: '取消',
+          cancelColor: '#c4c4c4',
+          confirmColor: '#1DB1B2',
+          success: res => {
+            if (res.confirm) {
+              changeDefaultSpace(_this.options.spaceId).then(res => {
+                // getCurrentPages 小程序自己的方法
+                var pages = getCurrentPages()
+                console.log('res', res, pages)
+                _this.userInfo.spaceId = _this.options.spaceId
+                wx.showToast({
+                  title: '设置成功',
+                  icon: 'success',
+                  duration: 3000,
+                  complete: res => {
+                    if (pages.length <= 1) {
+                      wx.redirectTo({ url: '/pages/homev2' })
+                    } else {
+                      wx.navigateBack()
+                    }
+                  }
+                })
+              })
+            }
+          }
+        })
+      }
+    }
+  },
+    // 生命周期 - 创建完成(可以访问当前this实例)
+  created() {
+
+  },
+    // 生命周期 - 挂载完成(可以访问DOM元素)
+  mounted() {
+
+  }
+})
+</script>
+<style lang='less' scoped>
+.residen-work {
+    margin-right: 40rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 120rpx;
+    height: 46rpx;
+    padding: 8rpx 16rpx 8rpx 16rpx;
+    border-radius: 8rpx;
+    gap: 20rpx;
+    background: rgba(61, 203, 204, 0.3);
+    .just-text {
+        font-family: PingFang SC;
+        font-size: 22rpx;
+        font-weight: 400;
+        line-height: 30rpx;
+        color: rgba(27, 33, 41, 1);
+    }
+}
+.set-residen-work {
+    margin-right: 40rpx;
+    width: 128rpx;
+    display: flex;
+    align-items: center;
+    .set-text {
+        font-family: PingFang SC;
+        font-size: 24rpx;
+        font-weight: 400;
+        line-height: 40rpx;
+        color: #8b949e;
+    }
+    .spimg {
+        margin-left: 8rpx;
+        width: 24rpx;
+        height: 24rpx;
+    }
+}
+</style>

+ 80 - 0
src/packagesEnv/pages/officehome/Header/space-basic.wpy

@@ -0,0 +1,80 @@
+<!-- 头部 空间名称 -->
+<style lang='less' scoped>
+.space-name{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    height: 64rpx;
+    margin-left: 40rpx;
+    padding-top: 32rpx;
+    padding-bottom: 32rpx;
+}
+.name_text{
+    font-family: PingFang SC;
+    font-size: 44rpx;
+    font-weight: 600;
+    line-height: 64px;
+}
+.room-name {
+    display: flex;
+    align-items: center;
+}
+</style>
+<template>
+    <div class="room-bg">
+        <div class="space-name">
+            <div class="g-fl room-name">
+                <span class="name_text">{{officeData.localName}}</span>
+                <has-person
+                    v-if="officeData.isPassengerPass !== undefined"
+                    :isPassengerPass="officeData.isPassengerPass"
+                ></has-person>
+            </div>
+            <div>
+                <residen-work
+                    :IsResiden="true"
+                    :spaceId="options.spaceId"
+                    :userInfo="userInfo"
+                ></residen-work>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import wepy from '@wepy/core'
+import config from '@/config'
+
+wepy.component({
+  props: {
+    officeData: Object,
+    options: Object,
+    userInfo: Object
+  },
+  data: {
+    h5StaticPath: config.h5StaticPath + '/page-officehome/'
+
+  },
+  computed: {},
+  methods: {
+
+  },
+    // 生命周期 - 创建完成(可以访问当前this实例)
+  created() {
+
+  },
+    // 生命周期 - 挂载完成(可以访问DOM元素)
+  mounted() {
+
+  }
+})
+</script>
+
+<config>
+    {
+        usingComponents: {
+            'has-person':'./has-person.wpy',
+            "residen-work":"./residen-work",
+        }
+    }
+</config>

+ 166 - 508
src/packagesEnv/pages/officehome/index.wpy

@@ -1,5 +1,8 @@
 <template>
-    <div class="overflow-wrap" style="position: {{airHandVisible ? 'fixed':'static'}};">
+    <div
+        class="overflow-wrap"
+        style="position: {{airHandVisible ? 'fixed':'static'}};"
+    >
         <page-top-bar-custom
             @component-page-top-bar-custom-ready="setTopBarHeight"
             :bgColor="[navFixed? '#f7f8fa' : 'transparent']"
@@ -59,15 +62,6 @@
                     v-show="!moveToBottom"
                     class="roomImgWrap"
                 >
-                    <div
-                        class="spaceImg"
-                        @click="showSaveSpace"
-                    >
-                        <image
-                            class="spimg"
-                            :src="h5StaticPath+'defaultspace.svg'"
-                        />
-                    </div>
                     <image
                         class="room-img"
                         :src="h5StaticPath+headImg"
@@ -82,16 +76,11 @@
                         class="maproom-detail"
                         v-show="moveToBottom"
                     >
-                        <div class="room-bar"></div>
-                        <div class="room-bg">
-                            <div class="g-fl room-name">
-                                <span>{{officeData.localName}}</span>
-                                <has-person
-                                    v-if="officeData.isPassengerPass !== undefined"
-                                    :isPassengerPass="officeData.isPassengerPass"
-                                ></has-person>
-                            </div>
-                        </div>
+                        <space-basic
+                            :officeData="officeData"
+                            :options="options"
+                            :userInfo="userInfo"
+                        ></space-basic>
                         <!-- 空间信息 -->
                         <div class="office-room-info">
                             <div class="room-envlist g-fl">
@@ -113,16 +102,11 @@
                         class="room-detail"
                         v-show="!moveToBottom"
                     >
-                        <div class="room-bg">
-                            <div class="room-bar"></div>
-                            <div class="g-fl room-name">
-                                <span>{{officeData.localName}}</span>
-                                <has-person
-                                    v-if="officeData.isPassengerPass !== undefined"
-                                    :isPassengerPass="officeData.isPassengerPass"
-                                ></has-person>
-                            </div>
-                        </div>
+                        <space-basic
+                            :officeData="officeData"
+                            :options="options"
+                            :userInfo="userInfo"
+                        ></space-basic>
                         <!-- 空间信息 -->
                         <div class="office-room-info">
                             <div class="room-envlist g-fl">
@@ -187,7 +171,7 @@
                         id="inToView0"
                         :isControl="isControl"
                         :airVisible="airVisible"
- 			:cardWidth="cardWidth"
+                        :cardWidth="cardWidth"
                         :roomHasScene="roomHasScene"
                         :hasAir="spaceEqFlagObj.hasAir"
                         :hasBlowing="spaceEqFlagObj.hasBlowing"
@@ -204,7 +188,7 @@
                         @airTemp="airTemp"
                         v-bind:key="airKey"
                     ></air-adjust>
-                   <air-hand-card
+                    <air-hand-card
                         ref="airHandCard"
                         v-if="spaceEqFlagObj.hasAir&&controlMode==1"
                         id="inToView02"
@@ -397,7 +381,7 @@
             </div>
         </van-popup>
         <!-- 空调 -->
-           <van-popup
+        <van-popup
             overlay-style="background: rgba(0, 0, 0, 0.4)"
             :custom-style="'height:'+airPopHight+'%'"
             round
@@ -407,11 +391,11 @@
         >
             <div style="display:flex;justify-content: center;">
                 <airHand-Pop
-                :airHandItem="airHandItem"
-                :maxValue="airHandData.maxValue"
-                :minValue="airHandData.minValue"
-                :roomType="options.roomType"
-                @change-airHand-order="changeAirHandOrder"
+                    :airHandItem="airHandItem"
+                    :maxValue="airHandData.maxValue"
+                    :minValue="airHandData.minValue"
+                    :roomType="options.roomType"
+                    @change-airHand-order="changeAirHandOrder"
                 ></airHand-Pop>
             </div>
         </van-popup>
@@ -524,12 +508,10 @@
                 v-if="options.roomType !='开放'"
                 class="scene-popup meet-popup"
             >
-                <div class="scene-popup-head">
-                    <div class="head-imgbg">
-                        <div class="head-imgbox">
-                            <image :src="h5StaticPath+sceneDetail.img" />
-                        </div>
-                    </div>
+                <div class="meet_head">
+                </div>
+                <div class="meet_head_bg"></div>
+                <div class="meet_content">
                     <span class="meet-title">切换至<span class="name">{{sceneDetail.name}}</span>场景</span>
                 </div>
                 <div class="scene-popup-body">
@@ -542,10 +524,10 @@
                     </div>
                 </div>
                 <div
-                    class="btns"
+                    class="meet_dis"
                     @click.stop="hideScene"
                 >
-                    <span class="btn btn_com">隐藏</span>
+                    <span class="meet_dis_btn">知道了</span>
                 </div>
             </div>
 
@@ -674,7 +656,6 @@ import {
     switchoverSceneHttp,
     querySpaceSceneConfigHttp,
     queryCustomAndScence,
-    changeDefaultSpace,
     queryEquipmentRunConfig,
     queryProjectConfig,
     queryUserControlInfo,
@@ -819,135 +800,28 @@ wepy.page({
     officeData: null,
     headScene: '', // 头部文案
     headImg: '', // 头部背景图片
-    options: { roomType: null, spaceId: 'Sp1101080259308f5ed92e964bc1b029038dea962de4' }, // 本地数据
-    sceneDetail: null,
+    options: { roomType: null, spaceId: 'Sp1101080259c4434730d12144ba890fe11f796d3143' }, // 本地数据
+        // TODO sceneDetail:null
+    sceneDetail: {
+      id: 2,
+      code: 'ADJOURNMENT',
+      name: '散会',
+      img: 'beover.svg',
+      checked: false,
+      textObj: [
+        {
+          text: '会议室内设备已切换至节能模式',
+          status: 'ok'
+        }
+      ]
+    },
     popList: [],
-    listOffice: [
-      {
-        id: 0,
-        name: '工作',
-        code: 'work',
-        img: 'scene_work.svg',
-        checked: true,
-        textObj: [
-          {
-            text: '办公区灯光已全部为您开启',
-            status: 'ok'
-          },
-          {
-            text: '正在将温度调至 26℃',
-            status: 'ok'
-          },
-          {
-            text: '窗帘已为您全部打开',
-            status: 'ok'
-          },
-          {
-            text: '饮用水已为您准备',
-            status: 'ok'
-          }
-        ]
-      },
-      {
-        id: 1,
-        name: '会客',
-        code: 'guest',
-        img: 'scene_visitor.svg',
-        checked: false,
-        textObj: [
-          {
-            text: '会客区照明已为您开启',
-            status: 'ok'
-          },
-          {
-            text: '空调已为您切换至会客温度,目标温度24℃',
-            status: 'ok'
-          },
-          {
-            text: '窗帘已为您全部开启',
-            status: 'ok'
-          },
-          {
-            text: '演示设备已为您准备',
-            status: 'ok'
-          },
-          {
-            text: '饮用水已为您准备',
-            status: 'ok'
-          }
-        ]
-      },
-      {
-        id: 2,
-        name: '休息',
-        code: 'rest',
-        img: 'scene_rest.svg',
-        checked: false,
-        textObj: [
-          {
-            text: '主灯已关闭,氛围灯将为您开启',
-            status: 'ok'
-          },
-          {
-            text: '空调将为您调节至适宜休息的温度,目标温度26℃',
-            status: 'ok'
-          },
-          {
-            text: '窗帘已为您全部关闭',
-            status: 'ok'
-          }
-        ]
-      }
-    ],
         // 上班=ATWORK 讨论=DISCUSSING 投影=PROJECTING 散会=ADJOURNMENT 下班=OFFWORK
     meetingRoomSence: [
             { code: 'DISCUSSING', name: '讨论' },
             { code: 'PROJECTING', name: '演示' },
             { code: 'ADJOURNMENT', name: '散会' }
     ],
-    listSen: [
-      {
-        id: 0,
-        code: 'DISCUSSING',
-        name: '讨论',
-        img: 'scene_work.svg',
-        checked: true,
-        textObj: [
-          {
-            text: '已为您切换至适宜讨论的环境',
-            status: 'ok'
-          }
-        ]
-      },
-      {
-        id: 1,
-        code: 'PROJECTING',
-        name: '演示',
-        img: 'scene_visitor.svg',
-        checked: false,
-        textObj: [
-          {
-            text: '已为您切换至适宜演示的环境',
-            status: 'ok'
-          }
-
-        ]
-      },
-      {
-        id: 2,
-        code: 'ADJOURNMENT',
-        name: '散会',
-        img: 'scene_rest.svg',
-        checked: false,
-        textObj: [
-          {
-            text: '会议室内设备已切换至节能模式',
-            status: 'ok'
-          }
-
-        ]
-      }
-    ],
     roomHasScene: false, // 是否有加班
     listSen: [],
     envlist: [],
@@ -1001,7 +875,7 @@ wepy.page({
     toView: 'inToView',
     navId: 0,
     visible: false,
-    sceneShow: false,
+    sceneShow: true,
     filtermeeting: {}, // 找到该会议室的数据
     helpOrderShow: false, // 显示帮忙预约窗口
     hasOrderShow: false, // 显示已经被预约窗口
@@ -1267,7 +1141,7 @@ wepy.page({
     setCanScroll(val) {
       this.canscroll = val
     },
-    // 空调弹框
+        // 空调弹框
     openAirHandPop(val, tempObj) {
       this.airHandItem = val
       let hight = 0
@@ -1344,46 +1218,7 @@ wepy.page({
         }
       })
     },
-    showSaveSpace() {
-      if (!checkSpaceControl(this.isControl)) return
-      var _this = this
-      if (_this.options.spaceId == _this.userInfo.spaceId) {
-        wx.showToast({
-          title: '该空间已是您的常驻空间',
-          icon: 'none',
-          duration: 3000
-        })
-      } else {
-        wx.showModal({
-          title: '设置常驻空间',
-          content: '将该空间设定为您的常驻空间?',
-          confirmText: '确定',
-          cancelText: '取消',
-          cancelColor: '#c4c4c4',
-          success: res => {
-            if (res.confirm) {
-              changeDefaultSpace(_this.options.spaceId).then(res => {
-                var pages = getCurrentPages()
-                console.log('res', res, pages)
-                _this.userInfo.spaceId = _this.options.spaceId
-                wx.showToast({
-                  title: '设置成功',
-                  icon: 'success',
-                  duration: 3000,
-                  complete: res => {
-                    if (pages.length <= 1) {
-                      wx.redirectTo({ url: '/pages/homev2' })
-                    } else {
-                      wx.navigateBack()
-                    }
-                  }
-                })
-              })
-            }
-          }
-        })
-      }
-    },
+
     getWorkDayTime() {
             // 获取个人空间使用时间
       return queryCustomAndScence({ spaceId: this.options.spaceId }).then(
@@ -2258,51 +2093,51 @@ wepy.page({
     handleScene(mitem, idx) {
       if (!checkSpaceControl(this.isControl)) return
             // this.judgeHasOrder()                                                                                                                                                                                                                                                                                 ;
-      isWithinLocation()
-                .then(() => {
-                  var name = mitem.name
-                  if (this.helpOrderShow || this.hasOrderShow) return
-                  this.visible = false // 关闭 切换场景
-                  if (!this.visible) {
-                    this.sceneShow = !this.sceneShow // 场景详细信息
-                  }
-                  if (this.options.roomType == '个人') {
-                    wx.uma.trackEvent(`officeHome_personscene_${mitem.code}`, {
-                      key: '环境调节-个人场景弹窗'
-                    })
-                  } else if (this.options.roomType == '会议室') {
-                    wx.uma.trackEvent(`officeHome_meetingscene_${mitem.code}`, {
-                      key: '环境调节-会议室场景弹窗'
-                    })
-                  }
+            //   isWithinLocation()
+            //             .then(() => {
+      var name = mitem.name
+      if (this.helpOrderShow || this.hasOrderShow) return
+      this.visible = false // 关闭 切换场景
+      if (!this.visible) {
+        this.sceneShow = !this.sceneShow // 场景详细信息
+      }
+      if (this.options.roomType == '个人') {
+        wx.uma.trackEvent(`officeHome_personscene_${mitem.code}`, {
+          key: '环境调节-个人场景弹窗'
+        })
+      } else if (this.options.roomType == '会议室') {
+        wx.uma.trackEvent(`officeHome_meetingscene_${mitem.code}`, {
+          key: '环境调节-会议室场景弹窗'
+        })
+      }
 
-                  this.popList.forEach((item, idx) => {
-                    if (name === item.name) {
-                      this.sceneDetail = JSON.parse(JSON.stringify(item))
-                      this.sceneDetail.textObj = []
-                            // 场景切换的对话框动效
-                      item.textObj.forEach((element, idx) => {
-                        setTimeout(() => {
-                          this.sceneDetail.textObj.push(element)
-                        }, 150 * (idx + 1))
-                      })
-                    }
-                  })
-                  if (!this.visit) {
-                        // this.releaseMeeting(name)                                                                                                                                                                                                                                                                            ;
-                  }
-                    // 放在这个位置 是为了 切换场景时直接改变场景 不等待后台
-                  this.headScene = this.sceneDetail.name
-                  this.vanPopupIndex = this.sceneDetail.code
-
-                  this.switchoverScene(this.sceneDetail.code).then(res => {
-                    if (res.result === 'success') {
-                            // this.headScene = this.sceneDetail.name
-                            // this.vanPopupIndex = this.sceneDetail.code
-                    }
-                  })
-                })
-                .catch(() => { })
+      this.popList.forEach((item, idx) => {
+        if (name === item.name) {
+          this.sceneDetail = JSON.parse(JSON.stringify(item))
+          this.sceneDetail.textObj = []
+                    // 场景切换的对话框动效
+          item.textObj.forEach((element, idx) => {
+            setTimeout(() => {
+              this.sceneDetail.textObj.push(element)
+            }, 150 * (idx + 1))
+          })
+        }
+      })
+      if (!this.visit) {
+                // this.releaseMeeting(name)                                                                                                                                                                                                                                                                            ;
+      }
+            // 放在这个位置 是为了 切换场景时直接改变场景 不等待后台
+      this.headScene = this.sceneDetail.name
+      this.vanPopupIndex = this.sceneDetail.code
+
+      this.switchoverScene(this.sceneDetail.code).then(res => {
+        if (res.result === 'success') {
+                    // this.headScene = this.sceneDetail.name
+                    // this.vanPopupIndex = this.sceneDetail.code
+        }
+      })
+            // })
+            // .catch(() => { })
       console.log('handleScene this.popList', this.popList)
     },
 
@@ -2480,17 +2315,6 @@ page {
     padding: 5px 5px 0;
     box-sizing: border-box;
     overflow: hidden;
-    .spaceImg {
-        width: 32px;
-        height: 32px;
-        position: absolute;
-        top: 14px;
-        right: 14px;
-        .spimg {
-            width: 100%;
-            height: 100%;
-        }
-    }
     .room-img {
         border-top-left-radius: 40rpx;
         border-top-right-radius: 40rpx;
@@ -2503,8 +2327,6 @@ page {
     opacity: 0;
 }
 .office-header {
-    // display: flex                                                                                                                                                                                                                                                                                        ;
-    // justify-content: center                                                                                                                                                                                                                                                                              ;
     position: absolute;
     z-index: 1;
     background-color: rgba(255, 255, 255, 0.596637);
@@ -2564,65 +2386,6 @@ page {
     box-sizing: border-box;
     border-top-left-radius: 50rpx;
     border-top-right-radius: 50rpx;
-    .room-bar {
-        width: 64rpx;
-        height: 8rpx;
-        background: rgba(2, 2, 82, 0.12);
-        border-radius: 4rpx;
-        margin: 0 auto;
-    }
-    .room-bg {
-        position: relative;
-        font-family: PingFang SC;
-        font-weight: 600;
-    }
-
-    .room-name {
-        // position: absolute                                                                                                                                                                                                                                                                                   ;
-        width: 100%;
-        box-sizing: border-box;
-        // padding: 0 30rpx                                                                                                                                                                                                                                                                                     ;
-        // height: 100rpx                                                                                                                                                                                                                                                                                       ;
-        // line-height: 100rpx                                                                                                                                                                                                                                                                                  ;
-        padding: 0 30rpx 10rpx;
-        height: 80rpx;
-        justify-content: flex-start;
-        .room-arrow {
-            display: flex;
-            .room-scene {
-            }
-        }
-        .open-sence {
-            display: flex;
-            .btn-off-work {
-                position: absolute;
-                bottom: 122rpx;
-                right: 32rpx;
-                width: 128rpx;
-                height: 40rpx;
-                background: #000000;
-                border-radius: 4rpx;
-                font-size: 24rpx;
-                font-weight: 400;
-                line-height: 40rpx;
-                text-align: center;
-                color: #ffffff;
-                font-family: PingFang SC;
-            }
-            .btn-time {
-                font-weight: 600;
-                font-size: 20rpx;
-                line-height: 28rpx;
-                .btn-time-number {
-                    font-family: Montserrat;
-                    font-size: 30rpx;
-                    font-weight: 500;
-                    line-height: 36rpx;
-                    padding: 0 8rpx;
-                }
-            }
-        }
-    }
 
     .office-room-info {
         position: relative;
@@ -2659,8 +2422,6 @@ page {
 .room-detail {
     position: relative;
     width: 100%;
-    // height: 450rpx                                                                                                                                                                                                                                                                                       ;
-    // background: linear-gradient(to bottom, transparent 50%,                                                                                                                                                                                                                                              #fff 50%);
     background: #ffffff;
     margin-bottom: 15px;
     box-sizing: border-box;
@@ -2686,7 +2447,7 @@ page {
             align-items: center;
             flex-shrink: 0;
             &.selScene {
-                background:  rgba(61, 203, 204, 0.3);
+                background: rgba(61, 203, 204, 0.3);
             }
             &.firstScene {
                 width: auto;
@@ -2700,67 +2461,6 @@ page {
             }
         }
     }
-    .room-bar {
-        width: 64rpx;
-        height: 8rpx;
-        background: rgb(192, 192, 192);
-        border-radius: 4rpx;
-        margin: 0 auto;
-    }
-    .room-bg {
-        position: relative;
-        // height: 100rpx                                                                                                                                                                                                                                                                                       ;
-        // margin: 0 0 22rpx 0                                                                                                                                                                                                                                                                                  ;
-        // padding-bottom: 22rpx                                                                                                                                                                                                                                                                                ;
-        padding-top: 10rpx;
-        font-family: PingFang SC;
-        font-weight: 600;
-    }
-
-    .room-name {
-        // position: absolute                                                                                                                                                                                                                                                                                   ;
-        width: 100%;
-        box-sizing: border-box;
-        padding: 0 30rpx 10rpx;
-        // bottom: 0                                                                                                                                                                                                                                                                                            ;
-        height: 80rpx;
-        justify-content: flex-start;
-        .room-arrow {
-            display: flex;
-            .room-scene {
-            }
-        }
-        .open-sence {
-            display: flex;
-            .btn-off-work {
-                position: absolute;
-                bottom: 122rpx;
-                right: 32rpx;
-                width: 128rpx;
-                height: 40rpx;
-                background: #000000;
-                border-radius: 4rpx;
-                font-size: 24rpx;
-                font-weight: 400;
-                line-height: 40rpx;
-                text-align: center;
-                color: #ffffff;
-                font-family: PingFang SC;
-            }
-            .btn-time {
-                font-weight: 600;
-                font-size: 20rpx;
-                line-height: 28rpx;
-                .btn-time-number {
-                    font-family: Montserrat;
-                    font-size: 30rpx;
-                    font-weight: 500;
-                    line-height: 36rpx;
-                    padding: 0 8rpx;
-                }
-            }
-        }
-    }
 
     .office-room-info {
         position: relative;
@@ -2874,7 +2574,7 @@ page {
         height: 64rpx;
         border-radius: 32rpx;
         gap: 8rpx;
-        background: #EBEEF5;
+        background: #ebeef5;
         image {
             width: 40rpx;
             height: 40rpx;
@@ -2891,25 +2591,6 @@ page {
     padding-bottom: 10rpx;
     box-sizing: border-box;
 }
-// .room-map {
-// margin-left: 20rpx                                                                                                                                                                                                                                                                                   ;
-// position: fixed                                                                                                                                                                                                                                                                                      ;
-// top: 90%                                                                                                                                                                                                                                                                                             ;
-// left: 0                                                                                                                                                                                                                                                                                              ;
-// z-index: 2                                                                                                                                                                                                                                                                                           ;
-// height: 100rpx                                                                                                                                                                                                                                                                                       ;
-// width: 250rpx                                                                                                                                                                                                                                                                                        ;
-// text-align: center                                                                                                                                                                                                                                                                                   ;
-// line-height: 100rpx                                                                                                                                                                                                                                                                                  ;
-// border-radius: 60rpx                                                                                                                                                                                                                                                                                 ;
-// font-size: 28rpx                                                                                                                                                                                                                                                                                     ;
-// background:                                                                                                                                                                                                                                                                                          #ffffff;
-// box-shadow: 0px 0px 2rpx rgba(0, 0, 0, 0.15),
-// 0px 8rpx 6rpx rgba(0, 0, 0, 0.07)                                                                                                                                                                                                                                                                    ;
-// display: flex                                                                                                                                                                                                                                                                                        ;
-// justify-content: center                                                                                                                                                                                                                                                                              ;
-// align-items: center                                                                                                                                                                                                                                                                                  ;
-// }
 .popup-box {
     padding: 40rpx 46rpx;
     .popup-container {
@@ -3054,62 +2735,12 @@ page {
             justify-content: center;
         }
         .body-item {
-            padding-top: 20rpx;
-            font-style: normal;
-            font-weight: 500;
-            font-size: 30rpx;
-            line-height: 42rpx;
-            color: #c4c4c4;
-            .text-status {
-                width: 16rpx;
-                height: 16rpx;
-                background: #f0da21;
-                border-radius: 100%;
-                display: inline-block;
-                margin-right: 16rpx;
-                &.grey {
-                    background: #f3f3f3;
-                }
-            }
-            &.air-body-item {
-                width: 366rpx;
-                .air-body-item-num {
-                    display: flex;
-                    justify-content: center;
-                }
-            }
-            .air-temp-num {
-                font-family: Montserrat;
-                font-size: 24px;
-                font-weight: 400;
-                line-height: 29px;
-                color: rgba(20, 0, 80, 1);
-                &.arrow-cooling {
-                    color: #5e8bcf;
-                    margin: 0 30rpx;
-                    margin-bottom: 70rpx;
-                }
-                &.arrow-warn {
-                    color: rgba(229, 87, 79, 1);
-                    margin: 0 30rpx;
-                    margin-bottom: 70rpx;
-                }
-            }
-            .air-temp-load {
-                font-size: 26px;
-                display: flex;
-                justify-content: center;
-            }
-            .air-notice {
-                text-align: center;
-                display: flex;
-                justify-content: center;
-                font-family: PingFang SC;
-                font-size: 15px;
-                font-weight: 400;
-                line-height: 21px;
-                color: rgba(77, 82, 98, 1);
-            }
+            padding-top: 16rpx;
+            font-family: PingFang SC;
+            font-size: 28rpx;
+            font-weight: 400;
+            line-height: 44rpx;
+            color: #8b949e;
         }
         .order-item {
             font-style: normal;
@@ -3125,18 +2756,56 @@ page {
     }
 }
 .meet-popup {
+    position: relative;
     height: 580rpx;
+    text-align: center;
+    .meet_head {
+        width: 100%;
+        height: 90rpx;
+        background: #96f2e366;
+    }
+    .meet_head_bg {
+        width: 100%;
+        height: 150rpx;
+        border-radius: 0 0 50% 50%;
+        background: #96f2e366;
+    }
+
     .scene-popup-body {
         margin-left: 0rpx;
         margin-right: 0rpx;
         align-items: center;
     }
-    .meet-title {
-        color: #c4c4c4;
-        .name {
-            color: #000000;
-            margin-left: 14rpx;
-            margin-right: 14rpx;
+    .meet_content {
+        .meet-title {
+            font-family: PingFang SC;
+            font-size: 36rpx;
+            font-weight: 600;
+            line-height: 56rpx;
+            color: #8b949e;
+            .name {
+                color: #1b2129;
+                margin-left: 14rpx;
+                margin-right: 14rpx;
+            }
+        }
+    }
+
+    .meet_dis {
+        position: absolute;
+        bottom: 0px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        height: 96rpx;
+        width: 100%;
+        border-top: 1rpx solid #e8ecf0;
+        .meet_dis_btn {
+            font-family: PingFang SC;
+            font-size: 32rpx;
+            font-weight: 400;
+            line-height: 48rpx;
+            color: #1db1b2;
         }
     }
 }
@@ -3192,6 +2861,7 @@ page {
     height: 600rpx;
     background: linear-gradient(0deg, #fff 480rpx, #f3f3f3 120rpx);
 }
+
 .btns {
     display: flex;
     position: absolute;
@@ -3206,18 +2876,6 @@ page {
         font-size: 28rpx;
         font-weight: 500;
         color: #c4c4c4;
-        &.air_btn {
-            height: 100rpx;
-            width: 176rpx;
-            border-radius: 60rpx;
-            padding: 34rpx, 60rpx;
-            border: 1px solid rgba(196, 196, 196, 1);
-            line-height: 100rpx;
-            font-family: PingFang SC;
-            font-size: 28rpx;
-            font-weight: 400;
-            color: rgba(77, 82, 98, 1);
-        }
     }
     .btn_com {
         border: 1px solid #c4c4c4;
@@ -3262,29 +2920,29 @@ page {
 "navigationStyle": "custom",
 backgroundColor: '#f7f8fa',
 usingComponents: {
-"Curtain-Pop":'./Curtain/curtainPop.wpy',
-"Floor-Pop":'./FloorHeating/floorPop.wpy',
-       "airHand-Pop":'./airHand/airHandPop.wpy',
-"Floor-Heating":'./FloorHeating/floorHeating',
-"curtain-card":"./Curtain/curtain-card",
-'has-person':'./components/has-person.wpy',
-'page-top-bar-custom': '~@/components/common/page-top-bar-custom',
-"work-overtime":"./workOvertime",
-"work-overtime-hand":"./workOvertime-hand",
-"work-off":"./components/work-off",
-"work-scene-hand":"./components/work-scene-hand",
-"work-scene":"./components/work-scene",
-"air-adjust":"./components/air-adjust",
-        "air-hand-card":"./airHand/air-hand-card",
-"air-feedback":"./components/air-feedback",
-"lamp-adjust":"./components/lamp-adjust",
-"lamp-colour":"./components/lamp-colour",
-"socket-card":"./components/socket-card",
-"all-close":"./components/all-close",
-"voice-adjust":"./components/voice-adjust",
-"map-home":"../intelligentControl/home2",
-"van-icon": "module:@vant/weapp/dist/icon",
-"van-popup": "module:@vant/weapp/dist/popup"
+    "Curtain-Pop":'./Curtain/curtainPop.wpy',
+    "Floor-Pop":'./FloorHeating/floorPop.wpy',
+    "airHand-Pop":'./airHand/airHandPop.wpy',
+    "Floor-Heating":'./FloorHeating/floorHeating',
+    "curtain-card":"./Curtain/curtain-card",
+    'page-top-bar-custom': '~@/components/common/page-top-bar-custom',
+    "work-overtime":"./workOvertime",
+    "work-overtime-hand":"./workOvertime-hand",
+    "space-basic":"./Header/space-basic",
+    "work-off":"./components/work-off",
+    "work-scene-hand":"./components/work-scene-hand",
+    "work-scene":"./components/work-scene",
+    "air-adjust":"./components/air-adjust",
+    "air-hand-card":"./airHand/air-hand-card",
+    "air-feedback":"./components/air-feedback",
+    "lamp-adjust":"./components/lamp-adjust",
+    "lamp-colour":"./components/lamp-colour",
+    "socket-card":"./components/socket-card",
+    "all-close":"./components/all-close",
+    "voice-adjust":"./components/voice-adjust",
+    "map-home":"../intelligentControl/home2",
+    "van-icon": "module:@vant/weapp/dist/icon",
+    "van-popup": "module:@vant/weapp/dist/popup"
 
 },
 componentPlaceholder: {