Browse Source

fix:地图功能

chenzhen2 1 year ago
parent
commit
3819f8467f

+ 52 - 11
src/api/home.js

@@ -1,16 +1,57 @@
+import $http from '@/common/request.js';
+
 function getUserHasFollowed() {
-    return $http({
-        url: `/home/indexWechatPublic`,
-    })
+  return $http({
+    url: `/home/indexWechatPublic`,
+  });
 }
 
 export function getCompanyMapData(companyId) {
-    return $http({
-      url: `/config/map/${companyId}`,
-      method: 'GET'
-    })
-  }
+  return $http({
+    url: `/config/map/${companyId}`,
+    method: 'GET',
+  });
+}
+//查询受控列表
+export function queryControlSpaceCompany(params) {
+  return $http({
+    url: `/controlSpaceUser/getControlSpaceCompany`,
+    method: 'POST',
+    serverSp:'http://192.168.4.29:52015',
+    data: JSON.stringify(params)
+  })
+}
+
+//常驻空间快速调节卡片
+export function querySpaceFunctionCard(params) {
+  return $http({
+    url: `/controlSpaceUser/queryPermanentSpaceFunctionCard?userId=${params.userId}&companyId=${params.companyId}`,
+    method: 'GET',
+    serverSp:'http://192.168.4.29:52015'
+  });
+}
+//常驻空间参数属性
+export function getSpaceProperty(params) {
+  return $http({
+    url: `/duoduo-service/duoduoenv-service/custom/spaceProperty?projectId=${params.projectId}&spaceId=${params.spaceId}`,
+    method: 'GET'
+  });
+}
+//切换公司
+export function switchCompany(companyId) {
+  return $http({
+    url: `/duoduo-service/duoduoenv-service/userNew/switchCompany/${companyId}`,
+    method: 'POST',
+    isComParams: false,
+  });
+}
+// 天气预报
+export function getWeather(projectId) {
+  return $http({
+    isNotShowErrorToast: true,
+    url: `/duoduo-service/object-service/weather/getCurrentWeather?projectId=${projectId}`,
+    method: 'get'
+  });
+}
 
-export {
-    getUserHasFollowed
-}
+export { getUserHasFollowed };

+ 10 - 0
src/app.wpy

@@ -7,6 +7,9 @@
   justify-content: space-between;
   box-sizing: border-box;
 }
+page {
+  height: 100%;
+}
 </style>
 
 <script>
@@ -52,6 +55,10 @@ wepy.app({
         "root": "packagesEnv/",
         "pages": [
           'pages/home/index',
+          'pages/home/carboncredit',
+          'pages/home/overtime',
+          'pages/home/resident',
+          'pages/home/environment',
           'pages/officehome/index',
           'pages/officehome/detail',
           'pages/officehome/demo',
@@ -68,6 +75,9 @@ wepy.app({
           'pages/personalCenter/personalInfo',
           'pages/personalCenter/operating',
           'pages/personalCenter/xiaosa',
+          'pages/administration/index',
+          'pages/administration/asuccess',
+          'pages/administration/chooseIdentity'
         ]
       },
     ],

+ 71 - 0
src/packagesEnv/pages/administration/asuccess.wpy

@@ -0,0 +1,71 @@
+<style lang="less">
+.aIndex {
+  height: 100%;
+  overflow: hidden;
+  position: relative;
+  background-color: #ebf5fa;
+  background-repeat: no-repeat;
+  background-size: contain;
+  padding-top: 400rpx;
+  box-sizing: border-box;
+  
+  .aImageDiv {
+    text-align: center;
+    margin-bottom: 46rpx;
+    .image {
+      width: 375px;
+    }
+  }
+
+  .aInfo {
+    text-align: center;
+    color: #1b2129;
+    font-size: 18px;
+    line-height: 22px;
+  }
+}
+</style>
+<template>
+<div class="aIndex" :style="{'background-image': 'url('+h5StaticPath+'adminBack.png)'}">
+  <navigationbar></navigationbar>
+  <div class="aImageDiv">
+    <image class="image" :src="h5StaticPath+'successPc.png'" mode="widthFix" />
+  </div>
+  <div class="aInfo">登录成功</div>
+</div>
+</template>
+
+<script>
+import wepy from '@wepy/core';
+import eventHub from '@/common/eventHub';
+import { mapState } from '@wepy/x';
+import store from '@/store';
+import config from '@/config';
+
+wepy.page({
+  store,
+  config: {},
+  data: {
+    h5StaticPath: config.h5StaticPath + '/page-home/',
+  },
+  computed: {
+    ...mapState({
+      userInfo: (state) => state.user.userInfo,
+      projctId: (state) => state.user?.userInfo?.projctId,
+      companyId: (state) => state.user?.userInfo?.companyId,
+    }),
+  },
+  methods: {},
+  onLoad() {},
+  onShow() {},
+});
+</script>
+<config>
+{
+"navigationStyle":"custom",
+usingComponents: {
+  "van-icon": "module:@vant/weapp/dist/icon",
+  "navigationbar":'./navigationbar',
+}
+}
+</config>

+ 191 - 0
src/packagesEnv/pages/administration/chooseIdentity.wpy

@@ -0,0 +1,191 @@
+<style lang="less">
+.overflow-wrap {
+  box-sizing: border-box;
+  position:relative;
+  width: 100%;
+  height: 100%;
+  background-color: #ebf5fa;
+  background-repeat: no-repeat;
+  background-size: contain;
+  padding-left: 40rpx;
+  padding-right: 40rpx;
+  padding-top: 166rpx;
+  padding-bottom: 208rpx;
+  overflow-y: auto;
+
+  .bind-item {
+    position: relative;
+    width: 100%;
+    box-sizing: border-box;
+    padding: 40rpx 48rpx;
+    margin: 0 auto;
+    margin-top: 24rpx;
+    background: #ffffff;
+    border-radius: 20px;
+    overflow: hidden;
+    // &:nth-child(1) {
+    //   margin-top: 34rpx;
+    // }
+    .checked-icon {
+      position: absolute;
+      right: 0;
+      top: 0;
+      width: 56rpx;
+      height: 56rpx;
+    }
+    .tenant-name {
+      font-family: PingFang SC;
+      font-size: 36rpx;
+      font-weight: 500;
+      line-height: 50rpx;
+      letter-spacing: 0px;
+    }
+    .tenant-identity {
+      display: flex;
+      padding-top: 8rpx;
+      justify-content: space-between;
+      font-family: PingFang SC;
+
+      .info {
+        font-size: 28rpx;
+        font-weight: 400;
+        padding: 8rpx;
+        //styleName: 14/常规;
+        font-family: PingFang SC;
+        font-weight: 400;
+        color: #8b949e;
+      }
+      image {
+        width: 112rpx;
+        height: 40rpx;
+      }
+    }
+  }
+  .check-item {
+    background: #3dcbcc4d;
+  }
+  .bind-btn-box {
+    position: fixed;
+    z-index: 333;
+    bottom: 0;
+    left: 0;
+    height: 208rpx;
+    width: 100%;
+    background: linear-gradient(
+      180deg,
+      rgba(235, 245, 250, 0) 0%,
+      #ebf5fa 44.97%
+    );
+    button {
+      margin-top: 20px;
+      width: 670rpx;
+      height: 100rpx;
+      line-height: 100rpx;
+      border: none;
+      border-color: transparent;
+      color: #fff;
+      border-radius: 28px;
+      background: #3dcbcc;
+    }
+  }
+}
+</style>
+<template>
+  <div class="overflow-wrap"  :style="{'background-image': 'url('+h5StaticPath+'/page-home/adminBack.png)'}">
+    <navigationbar :ntitle="'选择登录身份'"></navigationbar>
+   <div class="bind-item" >
+      <div class="tenant-name">博锐尚格技术有限公司</div>
+      <div class="tenant-identity">
+        <div class="info">正式员工</div>
+        <image class="logo-icon"  src="{{h5StaticPath+'/page-bind-tenant/logo_icon.svg'}}"/>
+      </div>
+      <image class="checked-icon"   src="{{h5StaticPath+'/page-bind-tenant/checked.svg'}}"/>
+   </div>
+   <div class="bind-item" >
+      <div class="tenant-name">博锐尚格技术有限公司</div>
+      <div class="tenant-identity">
+        <div class="info">正式员工</div>
+        <image class="logo-icon"  src="{{h5StaticPath+'/page-bind-tenant/logo_icon.svg'}}"/>
+      </div>
+      <image class="checked-icon"   src="{{h5StaticPath+'/page-bind-tenant/checked.svg'}}"/>
+   </div>
+   <div class="bind-item" >
+      <div class="tenant-name">博锐尚格技术有限公司</div>
+      <div class="tenant-identity">
+        <div class="info">正式员工</div>
+        <image class="logo-icon"  src="{{h5StaticPath+'/page-bind-tenant/logo_icon.svg'}}"/>
+      </div>
+      <image class="checked-icon"   src="{{h5StaticPath+'/page-bind-tenant/checked.svg'}}"/>
+   </div>
+   <div class="bind-item" >
+      <div class="tenant-name">博锐尚格技术有限公司</div>
+      <div class="tenant-identity">
+        <div class="info">正式员工</div>
+        <image class="logo-icon"  src="{{h5StaticPath+'/page-bind-tenant/logo_icon.svg'}}"/>
+      </div>
+      <image class="checked-icon"   src="{{h5StaticPath+'/page-bind-tenant/checked.svg'}}"/>
+   </div>
+   <div class="bind-item" >
+      <div class="tenant-name">博锐尚格技术有限公司</div>
+      <div class="tenant-identity">
+        <div class="info">正式员工</div>
+        <image class="logo-icon"  src="{{h5StaticPath+'/page-bind-tenant/logo_icon.svg'}}"/>
+      </div>
+      <image class="checked-icon"   src="{{h5StaticPath+'/page-bind-tenant/checked.svg'}}"/>
+   </div>
+   <div class="bind-item" >
+      <div class="tenant-name">博锐尚格技术有限公司</div>
+      <div class="tenant-identity">
+        <div class="info">正式员工</div>
+        <image class="logo-icon"  src="{{h5StaticPath+'/page-bind-tenant/logo_icon.svg'}}"/>
+      </div>
+      <image class="checked-icon"   src="{{h5StaticPath+'/page-bind-tenant/checked.svg'}}"/>
+   </div>
+   <div class="bind-item" >
+      <div class="tenant-name">博锐尚格技术有限公司</div>
+      <div class="tenant-identity">
+        <div class="info">正式员工</div>
+        <image class="logo-icon"  src="{{h5StaticPath+'/page-bind-tenant/logo_icon.svg'}}"/>
+      </div>
+      <image class="checked-icon"   src="{{h5StaticPath+'/page-bind-tenant/checked.svg'}}"/>
+   </div>
+   <div class="bind-btn-box">
+    <button @click.stop="bindTent">确认</button>
+   </div>
+ </div>
+</template>
+
+<script>
+import wepy from '@wepy/core';
+import eventHub from '@/common/eventHub';
+import { mapState } from '@wepy/x';
+import store from '@/store';
+import config from '@/config';
+
+wepy.page({
+  store,
+  config: {},
+  data: {
+    h5StaticPath: config.h5StaticPath,
+  },
+  computed: {
+    ...mapState({
+      userInfo: (state) => state.user.userInfo,
+      projctId: (state) => state.user?.userInfo?.projctId,
+      companyId: (state) => state.user?.userInfo?.companyId,
+    }),
+  },
+  methods: {},
+  onLoad() {},
+  onShow() {},
+});
+</script>
+<config>
+{
+"navigationStyle":"custom",
+usingComponents: {
+  "van-icon": "module:@vant/weapp/dist/icon",
+  "navigationbar":'./navigationbar',
+}
+}
+</config>

+ 122 - 0
src/packagesEnv/pages/administration/index.wpy

@@ -0,0 +1,122 @@
+<style lang="less">
+.aIndex {
+  height: 100%;
+  overflow: hidden;
+  position: relative;
+  background-color: #ebf5fa;
+  background-repeat: no-repeat;
+  background-size: contain;
+  box-sizing: border-box;
+  .top {
+    position: relative;
+    top: 18%;
+  }
+  .aTitle {
+    text-align: center;
+    color: #2e3742;
+    font-size: 22px;
+    font-weight: 600;
+    line-height: 32px;
+    margin-bottom: 72rpx;
+  }
+  .aImageDiv {
+    position: relative;
+    text-align: center;
+    margin-bottom: 72rpx;
+    .image {
+      width: 204px;
+    }
+  }
+  .aLink {
+    text-align: center;
+    color: #8b949e;
+    font-size: 14px;
+    line-height: 22px;
+    margin-bottom: 16rpx;
+    .copy {
+      margin-left: 8px;
+      color: #1db1b2;
+    }
+  }
+  .aButton {
+    text-align: center;
+    color: #ffffff;
+    font-size: 16px;
+    line-height: 50px;
+    background: #3dcbcc;
+    width: 275px;
+    height: 50px;
+    border-radius: 28px;
+    margin: 0 auto 32rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  .aInfo {
+    text-align: center;
+    color: #8b949e;
+    font-size: 14px;
+    line-height: 22px;
+  }
+  .bottom {
+    position: absolute;
+    bottom: 9%;
+    left: 0;
+    width: 100%;
+  }
+}
+</style>
+<template>
+<div class="aIndex" :style="{'background-image': 'url('+h5StaticPath+'adminBack.png)'}">
+  <navigationbar></navigationbar>
+  <div class="top">
+    <div class="aTitle">登录电脑行政端</div>
+    <div class="aImageDiv">
+      <image class="image" :src="h5StaticPath+'administration.png'" mode="widthFix" />
+    </div>
+    <div class="aLink">行政端:sagacare.tenants.link</div>
+    <div class="aLink">用电脑打开上方行政端网址<span class="copy">复制网址</span></div>
+  </div>
+  <div class="bottom">
+    <div class="aButton">
+      <van-icon name="scan" style="margin-right:8px;"/>扫码登录
+    </div>
+  <div class="aInfo">扫一扫行政端二维码,登录行政端</div>
+  </div>
+</div>
+</template>
+
+<script>
+import wepy from '@wepy/core';
+import eventHub from '@/common/eventHub';
+import { mapState } from '@wepy/x';
+import store from '@/store';
+import config from '@/config';
+
+wepy.page({
+  store,
+  config: {},
+  data: {
+    h5StaticPath: config.h5StaticPath + '/page-home/',
+  },
+  computed: {
+    ...mapState({
+      userInfo: (state) => state.user.userInfo,
+      projctId: (state) => state.user?.userInfo?.projctId,
+      companyId: (state) => state.user?.userInfo?.companyId,
+    }),
+  },
+  methods: {},
+  onLoad() {},
+  onShow() {},
+});
+</script>
+<config>
+{
+"navigationStyle":"custom",
+usingComponents: {
+  "van-icon": "module:@vant/weapp/dist/icon",
+  "navigationbar":'./navigationbar',
+}
+}
+</config>

+ 74 - 0
src/packagesEnv/pages/administration/navigationbar.wpy

@@ -0,0 +1,74 @@
+<style lang="less">
+.nwrap {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  box-sizing: border-box;
+  z-index: 2;
+  // background: rgba(61, 203, 204, 0.2);
+
+  .arrow {
+    position: absolute;
+    top: 0;
+    left: 16px;
+  }
+  .title {
+    font-size: 18px;
+    font-weight: 500;
+    line-height: 24px;
+    text-align: center;
+    color: #1b2129;
+  }
+}
+</style>
+<template>
+  <div class="nwrap" style="height:{{ barHeight }}px;padding-top:{{ barTop }}px;">
+    <div class="arrow" style="top:{{ barTop }}px" @click="goBack"><van-icon name="arrow-left" size="20"/></div>
+    <div class="title" v-if="ntitle">{{ ntitle?ntitle:'' }}</div>
+  </div>
+
+</template>
+
+<script>
+import wepy from '@wepy/core';
+import store from '@/store';
+import config from '@/config';
+
+wepy.component({
+  store,
+  props: { ntitle: String },
+  data: {
+    h5StaticPath: config.h5StaticPath + '/page-home/',
+    barTop: 0,
+    barHeight: 0,
+  },
+  ready() {
+    debugger;
+
+    // 胶囊按钮位置信息
+    const menuButtonInfo = wx.getMenuButtonBoundingClientRect();
+    console.log('menuButtonInfo', menuButtonInfo);
+    this.barTop = menuButtonInfo.top + 4;
+    this.barHeight = menuButtonInfo.top + menuButtonInfo.height;
+  },
+  detached() {
+    debugger;
+    console.log('detacheddetached');
+  },
+  watch: {},
+  methods: {
+    goBack() {
+      wx.navigateBack();
+    },
+  },
+});
+</script>
+<config>
+{
+"navigationStyle":"custom",
+usingComponents: {
+  "van-icon": "module:@vant/weapp/dist/icon",
+}
+}
+</config>

+ 41 - 0
src/packagesEnv/pages/home/carboncredit.wpy

@@ -0,0 +1,41 @@
+<style lang="less">
+.box {
+  padding: 118px 20px 60px;
+  background-color: #ebf5fa;
+  background-repeat: no-repeat;
+  background-size: contain;
+
+  .image {
+    width: 100%;
+  }
+}
+</style>
+<template>
+<div class="box" :style="{'background-image': 'url('+h5StaticPath+'detailBack.jpg)'}">
+  <navigationbar></navigationbar>
+  <image class="image" :src="h5StaticPath+'carboncredit.svg'" mode="widthFix"/></div>
+</template>
+
+<script>
+import wepy from '@wepy/core';
+import store from '@/store';
+import config from '@/config';
+
+wepy.page({
+  store,
+  config: {},
+  data: {
+    h5StaticPath: config.h5StaticPath + '/page-home/',
+  },
+  methods: {},
+  created() {},
+});
+</script>
+<config>
+{
+"navigationStyle":"custom",
+usingComponents: {
+  "navigationbar":'./navigationbar',
+}
+}
+</config>

+ 41 - 0
src/packagesEnv/pages/home/environment.wpy

@@ -0,0 +1,41 @@
+<style lang="less">
+.box {
+  padding: 118px 20px 60px;
+  background-color: #ebf5fa;
+  background-repeat: no-repeat;
+  background-size: contain;
+
+  .image {
+    width: 100%;
+  }
+}
+</style>
+<template>
+<div class="box" :style="{'background-image': 'url('+h5StaticPath+'detailBack.jpg)'}">
+  <navigationbar></navigationbar>
+  <image class="image" :src="h5StaticPath+'envirInfo.svg'" mode="widthFix"/></div>
+</template>
+
+<script>
+import wepy from '@wepy/core';
+import store from '@/store';
+import config from '@/config';
+
+wepy.page({
+  store,
+  config: {},
+  data: {
+    h5StaticPath: config.h5StaticPath + '/page-home/',
+  },
+  methods: {},
+  created() {},
+});
+</script>
+<config>
+{
+"navigationStyle":"custom",
+usingComponents: {
+  "navigationbar":'./navigationbar',
+}
+}
+</config>

+ 470 - 33
src/packagesEnv/pages/home/index.wpy

@@ -1,68 +1,505 @@
 <style lang="less">
-.overflow-wrap {
-  width: 100%;
-  height: 100%;
-  scroll-view {
+.homeIndex {
+  padding: 68px 0px 30px;
+  position: relative;
+  background-color: #ebf5fa;
+  background-repeat: no-repeat;
+  background-size: contain;
+
+  .projectTitle {
+    color: #1f2429;
+    font-size: 22px;
+    line-height: 32px;
+    font-weight: 500;
+    display: flex;
+    padding-left: 20px;
+    .name {
+      margin-right: 5px;
+    }
+  }
+
+  .projectInfo {
+    padding-left: 20px;
+    color: #626c78;
+    font-size: 13px;
+    line-height: 20px;
+    margin-top: 8px;
+  }
+  .weather {
+    color: #626c78;
+    font-size: 13px;
+    position: absolute;
+    top: 108px;
+    right: 12px;
+    display: flex;
+
+    .image {
+      width: 20px;
+      height: 20px;
+    }
+    .value {
+      margin-left: 8px;
+      margin-right: 8px;
+    }
+    .text {
+    }
+  }
+  .scroll-view {
     position: relative;
     width: 100%;
-    height: 100%;
+    height: 350px;
     z-index: 2;
+    white-space: nowrap;
+    margin-top: 27px;
+    // padding: 0 20px;
+    overflow: hidden;
+  }
+  .scroll-view-item {
+    position: relative;
+    overflow: hidden;
+    display: inline-block;
+    width: 280px;
+    height: 350px;
+    background: red;
+    border-radius: 24px;
+    margin-right: 12px;
+    .itemCont {
+      position: relative;
+      bottom: -260px;
+      padding-left: 20px;
+      line-height: 32px;
+      font-size: 22px;
+      color: #fff;
+      .spaceName {
+        font-weight: 600;
+        display: flex;
+        align-items: center;
+        .name {
+          max-width: 180px;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
+        .resident {
+          color: #1b2129;
+          font-size: 11px;
+          margin-left: 8px;
+          padding: 0 5px;
+          line-height: 18px;
+          height: 18px;
+          background: #96f2e3;
+          border-radius: 4px;
+          vertical-align: middle;
+        }
+      }
+      .environment {
+        font-size: 13px;
+        color: rgba(255, 255, 255, 0.8);
+        .param {
+          margin-right: 20px;
+        }
+      }
+    }
+    .envirItem {
+      // top: 270px;
+    }
+  }
+  .scroll-view-item:nth-child(1) {
+    margin-left: 20px;
+  }
+  .scroll-view-item:nth-last-child(1) {
+    margin-right: 20px;
+  }
+  .scroll-view2 {
+    position: relative;
+    width: 100%;
+    height: 76px;
+    z-index: 2;
+    white-space: nowrap;
+    margin-top: 25px;
+    // padding: 0 20px;
+    overflow: hidden;
+  }
+  .scroll-view-item2 {
+    display: inline-block;
+    min-width: 164px;
+    height: 76px;
+    margin-right: 8px;
+    background: #fff;
+    border-radius: 20px;
+    padding-top: 15px;
+    padding-left: 20px;
+    padding-right: 20px;
+    box-sizing: border-box;
+    position: relative;
+    .title {
+      color: #1b2129;
+      font-size: 16px;
+      line-height: 24px;
+      font-weight: 600;
+    }
+    .info {
+      margin-top: 3px;
+      color: #8b949e;
+      font-size: 13px;
+      line-height: 20px;
+      display: flex;
+    }
+    .imageDiv {
+      position: absolute;
+      top: 0;
+      right: 0;
+      .image {
+        width: 76px;
+        height: 76px;
+      }
+    }
+  }
+  .scroll-view-item2:nth-child(1) {
+    margin-left: 20px;
+  }
+  .scroll-view-item2:nth-last-child(1) {
+    margin-right: 20px;
+  }
+  .menuWrap {
+    padding: 0 20px;
+    .menuHeader {
+      color: #626c78;
+      line-height: 24px;
+      font-size: 16px;
+      margin-top: 24px;
+    }
+    .menuList {
+      margin-top: 8px;
+      overflow: hidden;
+    }
+    .menuItem {
+      width: 205rpx;
+      height: 84px;
+      border-radius: 20px;
+      margin-right: 15rpx;
+      float: left;
+      background: #fff;
+      margin-bottom: 8px;
+      padding-top: 12px;
+      box-sizing: border-box;
+      .menuImg {
+        text-align: center;
+        .image {
+          height: 32px;
+          width: 32px;
+        }
+      }
+      .menuTitle {
+        font-size: 13px;
+        color: #1b2129;
+        text-align: center;
+      }
+    }
+  }
+  .projectPop {
+    position: relative;
+    overflow: hidden;
+    .projectWrap {
+      overflow-y: auto;
+      max-height: 400px;
+      .projectItem {
+        height: 50px;
+        text-align: center;
+        line-height: 50px;
+        font-size: 16px;
+        color: #1b2129;
+        &:hover {
+          background: #f1f4f6;
+        }
+        &.sel {
+          color: #1db1b2;
+        }
+      }
+    }
+    .button {
+      width: 100%;
+      font-size: 16px;
+      background: #fff;
+      color: #8b949e;
+      height: 50px;
+      text-align: center;
+      line-height: 50px;
+      border-top: 5px solid #f1f4f6;
+    }
   }
 }
+.van-popup {
+}
 </style>
-</wxs>
 <template>
-<div class="overflow-wrap">
-<div @click="goEnv">
-环境控制
-</div>
-<div @click="goPortrait">
-节能评分
+<div class="homeIndex" :style="{'background-image': 'url('+h5StaticPath+'homeBack.jpg)'}">
+  <div class="projectTitle"  @click="showProject"><span class="name">{{nowCompanyName}}</span><van-icon name="arrow-down" size="20"/></div>
+  <div class="projectInfo">成为一家牛的让员工幸福的企业</div>
+  <div class="weather"><image class="image" :src="h5StaticPath+weather.imgname"/><span class="value">{{weather.temperature}}℃</span><span class="text">{{weather.text}}</span></div>
+  <scroll-view scroll-x="true" class="scroll-view">
+    <view class="scroll-view-item">
+      <div class="itemCont" v-if="reSpaceId"   @click="goEnv('homeShowEnv')">
+        <div class="spaceName"><div class="name">{{ reSpaceName }}</div><span class="resident">常驻工区</span></div>
+        <div class="environment"><span class="param">{{spaceParam.temperature||'--'}}℃</span><span class="param">{{spaceParam.co2||'--'}}ppm</span><span class="param">{{spaceParam.pm25||'--'}}μg/m³</span></div>
+      </div>
+      <div class="itemCont" v-if="!reSpaceId"   @click="goEnv('homeSetSpace')">去设置<br>您的常驻工区<van-icon name="arrow" size="20"/></div>
+    </view>
+    <view class="scroll-view-item"><div class="itemCont envirItem" @click="goToIntroduce('environment')">环境健康小知识<van-icon name="arrow" size="20"/></div></view>
+  </scroll-view>  
+   <scroll-view scroll-x="true" class="scroll-view2">
+    <view class="scroll-view-item2" v-if="showCard.openLight" @click="goEnv('openLamp')"><div class="title">开启照明</div><div class="info">快速启动</div><div class="imageDiv">
+      <image class="image" :src="h5StaticPath+'lamb.png'"/>
+    </div></view>
+    <view class="scroll-view-item2"  v-if="showCard.raiseTemperature"  @click="goEnv('airAddOne')"><div class="title">调高温度</div><div class="info">快速启动</div><div class="imageDiv">
+      <image class="image" :src="h5StaticPath+'airAdjust.png'"/>
+    </div></view>
+    <view class="scroll-view-item2"  v-if="showCard.lowerTemperature"  @click="goEnv('airReduceOne')"><div class="title">调低温度</div><div class="info">快速启动</div><div class="imageDiv">
+      <image class="image" :src="h5StaticPath+'airAdjust.png'"/>
+    </div></view>
+    <view class="scroll-view-item2"  v-if="showCard.oneClickFullClose"  @click="goEnv('closeLampAir')"><div class="title">一键全关</div><div class="info">快速全关</div><div class="imageDiv">
+      <image class="image" :src="h5StaticPath+'allClose.png'"/>
+    </div></view>
+    <view class="scroll-view-item2" @click="goToIntroduce('overtime')"><div class="title">如何预约加时?</div><div class="info">点击查看<van-icon name="arrow" size="14"/></div></view>
+    <view class="scroll-view-item2" @click="goToIntroduce('resident')"><div class="title">如何设置常驻工区?</div><div class="info">点击查看<van-icon name="arrow" size="14"/></div></view>
+    <view class="scroll-view-item2" @click="goToIntroduce('carboncredit')"><div class="title">如何获取碳积分?</div><div class="info">点击查看<van-icon name="arrow" size="14"/></div></view>
+  </scroll-view>
+<div class="menuWrap">
+  <div class="menuHeader">服务</div>
+  <div class="menuList">
+    <div class="menuItem" @click="goEnv('homeShowEnv')"><div class="menuImg"><image class="image" :src="h5StaticPath+'environment.png'"/></div><div class="menuTitle">环境调节</div></div>
+    <div class="menuItem"><div class="menuImg"><image class="image" :src="h5StaticPath+'find.png'"/></div><div class="menuTitle">找一找</div></div>
+    <div class="menuItem" @click="goPortrait"><div class="menuImg"><image class="image" :src="h5StaticPath+'myhabits.png'"/></div><div class="menuTitle">我的习惯</div></div>
+    <div class="menuItem" @click="goPersonCenter"><div class="menuImg"><image class="image" :src="h5StaticPath+'myself.png'"/></div><div class="menuTitle">个人中心</div></div>
+  </div>
+  <div class="menuHeader">管理</div>
+  <div class="menuList">
+    <div class="menuItem"><div class="menuImg"  @click="goAdministration"><image class="image" :src="h5StaticPath+'control.png'"/></div><div class="menuTitle">行政端管理</div></div>
 </div>
-<div @click="goPersonCenter">
-个人中心
 </div>
+<van-popup :show="show" position="bottom"  @close="hideProject" round>
+  <div class="projectPop">
+    <div class="projectWrap" style="max-height:{{screenHeight-200}}px">
+      <div class="projectItem"  :class="{'sel':item.id==userInfo.companyId}" v-for="(item, index) in companyList" :key="index" @click="projectClick(item)">{{ item.name }}</div>
+    </div>
+    <div class="button">取消</div>
+  </div>
+</van-popup>
 </div>
 </template>
 
 <script>
-import wepy from '@wepy/core'
-import eventHub from '@/common/eventHub'
-import { mapState } from '@wepy/x'
-import store from '@/store'
-import testMixin from '@/mixins/test'
+import wepy from '@wepy/core';
+import eventHub from '@/common/eventHub';
+import { mapState } from '@wepy/x';
+import store from '@/store';
+import config from '@/config';
+import {
+  queryControlSpaceCompany,
+  querySpaceFunctionCard,
+  getSpaceProperty,
+  switchCompany,
+  getWeather,
+} from '@/api/home.js';
+import { getCompanyDataByPhone, wxLogin } from '@/service/user.js';
 
 wepy.page({
   store,
-  config: {
-    navigationBarTitleText: 'test'
+  config: {},
+  data: {
+    show: false,
+    h5StaticPath: config.h5StaticPath + '/page-home/',
+    screenHeight: 560,
+    companyList: [],
+    controlSpaces: [], //租户可控空间
+    reSpaceId: '', //常驻空间
+    reSpaceName: '',
+    showCard: {},
+    spaceParam: {},
+    weather: {},
+  },
+  computed: {
+    ...mapState({
+      userInfo: (state) => state.user.userInfo,
+      projctId: (state) => state.user?.userInfo?.projctId,
+      companyId: (state) => state.user?.userInfo?.companyId,
+    }),
+    nowCompanyName: function() {
+      console.log('watchwatchwatch', this.companyId, this.companyList);
+      var filter = this.companyList.filter((item) => {
+        return item.id == this.companyId;
+      });
+      return filter[0]?.name;
+    },
+  },
+  watch: {
+    // companyId: function(newSpaceId, oldSpaceId) {
+    //   console.log('watchwatchwatch', this);
+    //   var filter = this.companyList.filter((item) => {
+    //     return item.id == newSpaceId;
+    //   });
+    //   this.nowCompanyName = filter[0]?.name;
+    // },
   },
-
-  data: {},
   methods: {
-    goEnv() {
-      wx.navigateTo({
-        url: '/packagesEnv/pages/officehome/index?spaceId=Sp1101080259b3510e26e7dd4dd9bf9784f06f3feb68'
+    loadData() {
+      var paramObj = {
+        criteria: {
+          companyId: this.userInfo.companyId,
+        },
+      };
+      //查找租户可控空间
+      queryControlSpaceCompany(paramObj)
+        .then((res) => {
+          this.controlSpaces = res.data || [];
+        })
+        .catch((err) => {});
+      //常驻空间快速调节卡片
+      querySpaceFunctionCard({
+        userId: this.userInfo.userId,
+        companyId: this.userInfo.companyId,
       })
+        .then((res) => {
+          //console.log('querySpaceFunctionCard', res);
+          if (res.message == '该用户没有常驻空间') {
+            this.reSpaceId = '';
+            this.reSpaceName = '';
+            this.showCard = {};
+            return;
+          }
+          this.reSpaceId = res.spaceId || ''; //有常驻空间
+          this.reSpaceName = res.spaceName || '';
+          this.showCard = res || {};
+          //console.log('showCardshowCard', this.showCard);
+
+          //常驻空间参数属性
+          this.reSpaceId &&
+            getSpaceProperty({
+              projectId: this.userInfo.projectId,
+              spaceId: this.reSpaceId,
+            })
+              .then((res) => {
+                this.spaceParam = res || {};
+              })
+              .catch((err) => {});
+        })
+        .catch((err) => {});
+    },
+    projectClick: function(item) {
+      var _this = this;
+      this.show = false;
+      switchCompany(item.id)
+        .then((res) => {
+          if (res.result == 'success') {
+            console.log('switchCompanyswitchCompany');
+            wxLogin()
+              .then((res) => {
+                _this.loadData();
+              })
+              .catch((err) => {});
+          }
+        })
+        .catch((err) => {});
+    },
+    hideProject: function() {
+      this.show = false;
+    },
+    showProject: function() {
+      this.show = true;
+    },
+    goEnv(param) {
+      if (this.controlSpaces.length == 0) {
+        wx.showToast({
+          title: '您还未配置可控空间',
+          icon: 'none',
+          duration: 4000,
+        });
+        return;
+      }
+      // switch (param) {
+      //   case 'homeShowEnv':
+      //     break;
+
+      //   case 'homeSetSpace':
+      //     break;
+
+      //   case '':
+      //     break;
+
+      //   default:
+      // }
+
+      wx.navigateTo({
+        url: `/packagesEnv/pages/officehome/index?from=${param}`,
+      });
+    },
+    goToIntroduce(id) {
+      var hasControlSpaces = this.controlSpaces.length == 0 ? 'no' : 'has';
+      wx.navigateTo({
+        url: `/packagesEnv/pages/home/${id}?hasControlSpaces=${hasControlSpaces}`,
+      });
     },
     goPortrait() {
       wx.navigateTo({
-        url: '/packagesEnv/pages/portrait/home'
-      })
+        url: '/packagesEnv/pages/portrait/home',
+      });
     },
     goPersonCenter() {
       wx.navigateTo({
-        url: '/packagesEnv/pages/personalCenter/index'
+        url: '/packagesEnv/pages/personalCenter/index',
+      });
+    },
+    goAdministration() {
+      wx.navigateTo({
+        url: '/packagesEnv/pages/administration/index',
+      });
+    },
+  },
+  onLoad() {
+    // 获取系统信息
+    const systemInfo = wx.getSystemInfoSync();
+    this.screenHeight = systemInfo.screenHeight;
+
+    //获取项目list
+    getCompanyDataByPhone()
+      .then((res) => {
+        this.companyList = res || [];
       })
-    }
+      .catch((err) => {});
+    getWeather(this.userInfo.projectId)
+      .then((res) => {
+        this.weather = res.content || {}; //{ temperature: 30, text: '云' };
+        var text = '云';
+        var imgname = 'sunny.png';
+        if (text.indexOf('晴') > -1) {
+          imgname = 'sunny.png';
+        } else if (text.indexOf('雨') > -1) {
+          imgname = 'rain.png';
+        } else if (text.indexOf('阴') > -1) {
+          imgname = 'cloudy.png';
+        } else if (text.indexOf('云') > -1) {
+          imgname = 'muchCloud.png';
+        } else if (text.indexOf('雾') > -1 || text.indexOf('霾') > -1) {
+          imgname = 'fog.png';
+        } else if (text.indexOf('风') > -1) {
+          imgname = 'wind.png';
+        } else if (text.indexOf('雪') > -1) {
+          imgname = 'snow.png';
+        }
+        this.weather.imgname = imgname;
+      })
+      .catch((err) => {});
+    this.loadData();
   },
-  created() {}
-})
+  onShow() {},
+});
 </script>
 <config>
 {
-navigationBarTitleText: '首页',
+"navigationStyle":"custom",
 usingComponents: {
+  "van-icon": "module:@vant/weapp/dist/icon",
+  "van-popup": "module:@vant/weapp/dist/popup"
 }
 }
 </config>

+ 49 - 0
src/packagesEnv/pages/home/navigationbar.wpy

@@ -0,0 +1,49 @@
+<style lang="less">
+.arrow {
+  position: fixed;
+  left: 16px;
+}
+</style>
+<template>
+<div class="arrow" style="top:{{barTop}}px" @click="goBack"><van-icon name="arrow-left" size="20"/></div>
+</template>
+
+<script>
+import wepy from '@wepy/core';
+import store from '@/store';
+import config from '@/config';
+
+wepy.component({
+  store,
+  props: {},
+  data: {
+    h5StaticPath: config.h5StaticPath + '/page-home/',
+    barTop: 0,
+  },
+  ready() {
+    debugger;
+    // 胶囊按钮位置信息
+    const menuButtonInfo = wx.getMenuButtonBoundingClientRect();
+    // console.log('menuButtonInfo', menuButtonInfo);
+    this.barTop = menuButtonInfo.top + 4;
+  },
+  detached() {
+    debugger;
+    console.log('detacheddetached');
+  },
+  watch: {},
+  methods: {
+    goBack() {
+      wx.navigateBack();
+    },
+  },
+});
+</script>
+<config>
+{
+"navigationStyle":"custom",
+usingComponents: {
+  "van-icon": "module:@vant/weapp/dist/icon",
+}
+}
+</config>

+ 41 - 0
src/packagesEnv/pages/home/overtime.wpy

@@ -0,0 +1,41 @@
+<style lang="less">
+.box {
+  padding: 118px 20px 60px;
+  background-color: #ebf5fa;
+  background-repeat: no-repeat;
+  background-size: contain;
+
+  .image {
+    width: 100%;
+  }
+}
+</style>
+<template>
+<div class="box" :style="{'background-image': 'url('+h5StaticPath+'detailBack.jpg)'}">
+  <navigationbar></navigationbar>
+  <image class="image" :src="h5StaticPath+'overtime.svg'" mode="widthFix"/>
+</div>
+</template>
+<script>
+import wepy from '@wepy/core';
+import store from '@/store';
+import config from '@/config';
+
+wepy.page({
+  store,
+  config: {},
+  data: {
+    h5StaticPath: config.h5StaticPath + '/page-home/',
+  },
+  methods: {},
+  created() {},
+});
+</script>
+<config>
+{
+"navigationStyle":"custom",
+usingComponents: {
+  "navigationbar":'./navigationbar',
+}
+}
+</config>

+ 75 - 0
src/packagesEnv/pages/home/resident.wpy

@@ -0,0 +1,75 @@
+<style lang="less">
+.box {
+  position: relative;
+  padding: 118px 20px 120px;
+  background-color: #ebf5fa;
+  background-repeat: no-repeat;
+  background-size: contain;
+
+  .image {
+    width: 100%;
+  }
+  .button {
+    position: fixed;
+    height: 50px;
+    width: 335px;
+    line-height: 50px;
+    background: #3dcbcc;
+    color: #fff;
+    font-size: 16px;
+    text-align: center;
+    bottom: 35px;
+    border-radius: 28px;
+  }
+}
+</style>
+<template>
+<div class="box" :style="{'background-image': 'url('+h5StaticPath+'detailBack.jpg)'}">
+  <navigationbar></navigationbar>
+  <image class="image" :src="h5StaticPath+'resident.svg'" mode="widthFix"/>
+  <div class="button"  @click="goEnv()">去设置常驻工区</div>
+</div>
+</template>
+
+<script>
+import wepy from '@wepy/core';
+import store from '@/store';
+import config from '@/config';
+
+wepy.page({
+  store,
+  config: {},
+  data: {
+    h5StaticPath: config.h5StaticPath + '/page-home/',
+    hasControlSpaces: 'no',
+  },
+  methods: {
+    goEnv() {
+      if (this.hasControlSpaces == 'no') {
+        wx.showToast({
+          title: '您还未配置可控空间',
+          icon: 'none',
+          duration: 4000,
+        });
+        return;
+      }
+      wx.navigateTo({
+        url: `/packagesEnv/pages/officehome/index?from=homeSetSpace`,
+      });
+    },
+  },
+  created() {},
+  onLoad: function(options) {
+    console.log('optionsoptionsoptions', options.hasControlSpaces);
+    this.hasControlSpaces = options.hasControlSpaces;
+  },
+});
+</script>
+<config>
+{
+"navigationStyle":"custom",
+usingComponents: {
+  "navigationbar":'./navigationbar',
+}
+}
+</config>

+ 5 - 191
src/packagesEnv/pages/officehome/index.wpy

@@ -506,8 +506,6 @@ page {
             >
                 <!--      <map-home    v-if="userInfo&& userInfo.userId" -->
                 <map-home
-                    :spaceIdProp="spaceIdProp"
-                    :companyIdProp="companyIdProp"
                     @mapChangeSpaceInfo="mapChangeSpaceInfo"
                 ></map-home>
             </div>
@@ -978,25 +976,18 @@ import {
     queryEquipmentRunConfig
 } from '../../api/officehome.js'
 
-import {
-    getMeetingList,
-    reserveMeetingroom,
-    endMeetingReserve
-} from '@/api/meetingroom'
+import { getMeetingList} from '@/api/meetingroom'
 import { isWithinLocation } from '@/service/location'
 import config from '@/config'
 import loadFont from '@/common/loadFont'
 import { getCompanyMapData } from '@/api/home'
-import { saveCompanyConfig } from '@/service/companyConfig'
-import { checkHasUserInfo,checkUserControl } from '@/service/user'
-// import { floorInfo, defalutSelectedId } from '../intelligentControl/data/map';
+import { checkHasUserInfo } from '@/service/user'
 import { getNowDate, getTowNum } from '@/service/meetingTimes'
 
 let spaceInfoStatusTimer = null
 let pageSelectedAreaRecord = {
     // key为楼层ID,value 为spceId
 }
-let defalutSelectedId = ''
 
 const switchPanelHeight = 125 // 145是下面块的高
 const roomPicTop = 185 // 135是建筑图片的高度 单位都是px
@@ -1091,12 +1082,7 @@ wepy.page({
     movesign: false,
     scale: 1,
     moveToBottom: false,
-    spaceIdProp: '',
-    companyIdProp: '',
-    preDataFinsh: false,
-    selectedFloor: '', // 选择的楼层
     floorInfo: [],
-    homePageHasHidden: true,
     h5StaticPath: config.h5StaticPath + '/page-officehome/',
     h5StaticLogo: config.h5StaticPath,
     lampHide: false, // 灯列表收起
@@ -1185,8 +1171,6 @@ wepy.page({
     },
     viewOne: '', // 导航条第一个
     airVisible: false, // 弹窗
-    currcompanyId: '',
-    saveCompanyIdRes: '',
     routeParams: {},
     isACATVA: false,
     isACATFC: false,
@@ -1235,90 +1219,16 @@ wepy.page({
     // 加载字体
   onLoad(routeParams) {
     this.getCardWidth()
-    if (!this.homePageHasHidden) return
     var nowTimeStr = moment().format('YYYY-MM-DD')
     var eightTime = moment(nowTimeStr + ' 20:00:00').valueOf()
     var sixTime = moment(nowTimeStr + ' 05:00:00').valueOf()
     this.sixTime = sixTime
     this.eightTime = eightTime
-
     this.routeParams = routeParams
-
-    console.log('this.userInfo==', this.userInfo)
-
-        // checkHasUserInfo().then(userInfo => {
-        //   if (userInfo) {
-        //             // 获取用户对应的空间信息
-        //     let currcompanyId = routeParams.companyId || this.userInfo.companyId // 获取当前公司
-        //     let saveCompanyIdRes = wx.getStorageSync('saveCompanyId') // 获取缓存中公司
-        //     _this.currcompanyId = currcompanyId
-        //     _this.saveCompanyIdRes = saveCompanyIdRes
-
-        //     this.saveCompanyIdM(currcompanyId)
-        //     this.companyIdProp = routeParams.companyId || ''
-        //     if (this.companyIdProp) {
-        //       this.visit = true
-        //     }
-        //     this.setDefaultSpaceId(currcompanyId) // 给变量赋值
-        //     console.log('userInfo', userInfo, currcompanyId)
-        //     saveCompanyConfig(currcompanyId).then(() => {
-        //       this.preDataFinsh = true
-        //       let qspaceId = null
-        //       if (routeParams.q) {
-        //         let queryAll = decodeURIComponent(routeParams.q)
-        //         qspaceId = _this.gup('spaceId', queryAll) // 如果传入了spaceId 扫二维码传入的 链接中携带的
-        //       }
-        //       if (qspaceId) {
-        //         this.spaceIdProp = qspaceId
-        //         this.options.spaceId = qspaceId
-        //         this.getData()
-        //       } else if (routeParams.spaceId) {
-        //                     // 如果跳转链接 传入的
-        //         this.spaceIdProp = routeParams.spaceId
-        //         this.options.spaceId = routeParams.spaceId
-        //         this.getData()
-        //       } else {
-        //         this.getHistorySelectedArea().then(res => {
-        //           this.spaceIdProp = res.spaceId
-        //           this.options.spaceId = res.spaceId
-        //           this.getData() // 获取数据
-        //         })
-        //       }
-        //                 // console.log('onLoad');
-        //       this.spaceInfoStatusTimer()
-        //     })
-        //   }
-        // })
-
-        //     // 加载字体
-        // loadFont(400)
-        // loadFont(500)
   },
   onShow() {
-    checkUserControl().then(res=>{
-      console.log();
-    })
     this.getData() // 获取数据
-    if (!this.homePageHasHidden) {
-            // 这个是从地图搜索回来
-      const lastSearchedSpace = wx.getStorageSync('lastSearchedSpace')
-      if (lastSearchedSpace) {
-        this.spaceIdProp = lastSearchedSpace.spaceId
-        this.options.spaceId = lastSearchedSpace.spaceId
-        this.getData() // 获取数据
-        wx.removeStorageSync('lastSearchedSpace')
-      } else {
-                // 这个是从地图切换按钮回来
-
-        this.getHistorySelectedArea().then(res => {
-          this.spaceIdProp = res.spaceId // 传给子组件
-          this.options.spaceId = res.spaceId
-          this.getData() // 获取数据
-        })
-      }
-            // 2秒测试
-      this.spaceInfoStatusTimer()
-    }
+    this.spaceInfoStatusTimer()
   },
   onReady() {
         // var scale = 750 / wx.getSystemInfoSync().windowWidth                                                                                                                                                                                                                                                 ; // 这是px转rpx 750/ wx.getSystemInfoSync().windowWidth=rpx/px 任何手机都是750rpx
@@ -1369,7 +1279,6 @@ wepy.page({
     changeAirHandOrder(pobj, deviceObjCopy) {
       this.$refs.airHandCard.changeOneAir(pobj.id, pobj.code, pobj.value, deviceObjCopy)
       this.airHandItem = deviceObjCopy
-      console.log('changeAirHandOrderchangeAirHandOrder')
     },
         // 地暖弹框
     openFloorFeatPop(val) {
@@ -1485,76 +1394,6 @@ wepy.page({
       }
     },
 
-    gup(name, url) {
-      if (!url) url = location.href
-            // name = name.replace(/[\[]/, '\\\[').replace(/[\]]/, '\\\]');
-      var regexS = name + '=([^&#]*)'
-      var regex = new RegExp(regexS)
-      var results = regex.exec(url)
-      return results == null ? null : results[1]
-    },
-    saveCompanyIdM(companyId) {
-      wx.setStorage({
-        key: 'saveCompanyId',
-        data: {
-          companyId: companyId
-        },
-        success: function () { },
-        fail: function () { }
-      })
-    },
-    getHistorySelectedArea() {
-      var _this = this
-      var spaceId = ''
-      return new Promise((resolve, reject) => {
-        wx.getStorage({
-          key: 'SelectedASpace',
-          success: res => {
-            if (res.data && res.data.spaceId) {
-              if (
-                                _this.currcompanyId == _this.saveCompanyIdRes.companyId ||
-                                !_this.saveCompanyIdRes.companyId
-                            ) {
-                                // 如果公司id无变化
-                spaceId = res.data.spaceId
-              } else {
-                                // 如果公司id有变化
-                if (_this.routeParams.companyId) {
-                                    // 如果是访客 取默认
-                  spaceId = defalutSelectedId[this.selectedFloor]
-                } else {
-                                    // 取用户
-                  spaceId = _this.userInfo.spaceId
-                }
-              }
-            }
-            console.log(
-                            'getHistorySelectedArea',
-                            _this.currcompanyId,
-                            _this.saveCompanyIdRes.companyId
-                        )
-            spaceId = spaceId || defalutSelectedId[this.selectedFloor]
-
-            resolve({
-              spaceId: spaceId
-            })
-          },
-          fail: () => {
-            if (_this.routeParams.companyId) {
-                            // 如果是访客 取默认
-              spaceId = defalutSelectedId[this.selectedFloor]
-            } else {
-              spaceId = _this.userInfo.spaceId
-            }
-            console.log('getHistorySelectedArea22', spaceId)
-            resolve({
-              spaceId: spaceId
-            })
-          }
-        })
-      })
-    },
-
     getWeatherInfo() {
       getWeather().then(res => {
         const outWeather = res.content ? res.content : {}
@@ -1974,9 +1813,6 @@ wepy.page({
     },
         // 进入地图页
     toRoom() {
-            // wx.navigateTo({
-            // url: `../intelligentControl/home?id=${this.officeData.id}&from=officehome&companyIdProp=${this.companyIdProp}`
-            // })                                                                                                                                                                                                                                                                                                   ;
       this.scrollTop = null
       this.scrollTop = 0
       this.transY = this.transYCopy
@@ -2023,24 +1859,6 @@ wepy.page({
       }
     },
 
-        // 取得所有的会议室
-    getAlllMeeting() {
-      var _this = this
-      return getMeetingList().then(function (res) {
-                // console.log('getMeetingList1111', res)                                                                                                                                                                                                                                                               ;
-        var allmeeting = []
-        var resdata = res.data
-        for (var key in resdata) {
-          var list = (resdata[key] && resdata[key].list) || []
-          allmeeting = allmeeting.concat(list)
-        }
-                // 找到符合条件的会议室 同一个名字
-        var filtermeetingArr = allmeeting.filter(function (item) {
-          return item.meeting.name === _this.officeData.localName
-        })
-        _this.filtermeeting = filtermeetingArr[0] || {}
-      })
-    },
     hideScene() {
       this.sceneShow = false
     },
@@ -2080,13 +1898,9 @@ wepy.page({
       console.log('handleScene this.popList', this.popList)
     },
 
-        // 返回 
+        // 返回 上一
     goPre() {
-      if (this.routeParams.q) {
-        wx.redirectTo({ url: '/pages/homev2' })
-      } else {
-        wx.navigateBack()
-      }
+      wx.navigateBack()
     },
     setTopBarHeight(height) {
       this.topBarHeight = height