fix:地图模块样式调整

src/api/user.js

@@ -68,6 +68,17 @@ function refreshToken(refreshToken) {
   })
 }
 
+// 获取用户空间权限
+function getUserControlSpace(params) {
+  return $http({
+      url: `http://192.168.88.4:52009/userControlSpace/query`,
+      // url: `${config.setupService}userControlSpace/query`,
+      method: 'POST',
+      data: JSON.stringify(params),
+      isComParams: false    // 是否携带通用的参数
+  })
+}
+
 
 export {
   getCompmayUsers,
@@ -76,5 +87,6 @@ export {
   getCompanyByPhone,
   register,
   login,
+  getUserControlSpace,
   refreshToken
 }

src/common/utils.js

@@ -12,6 +12,12 @@ export default {
   getQrcode,
   formateEnvIndicatorValue,
   random,
+  getAppId,
+  getVersion,
+  getTimeStamp,
+  getMiniProgram,
+  commonParams,
+  getMapSpaceIcon,
   getSearchRegEx
 };
 
@@ -1005,3 +1011,192 @@ function previewAgreement(url, serviceAgreementTitle, cacheKey) {
     });
   })
 }
+
+function getMiniProgram() {
+  const miniProgram = wx.getAccountInfoSync();
+  return miniProgram;
+  // this.version = miniProgram.miniProgram.version;
+}
+function getAppId() {
+  const miniProgram = wx.getAccountInfoSync();
+  return miniProgram && miniProgram.miniProgram && miniProgram.miniProgram.appId || 'wxda2ef261ac3cca32';
+}
+
+// 正式版本上能获取,体验和开发版本无法获取到版本号
+function getVersion() {
+  const miniProgram = wx.getAccountInfoSync();
+  return miniProgram && miniProgram.miniProgram && miniProgram.miniProgram.version;
+}
+
+// 获取时间戳
+function getTimeStamp() {
+  let timeStamp = Date.parse(new Date());
+  return timeStamp;
+}
+
+// http请求通用参数
+function commonParams() {
+  // openid=${storeUser().openId}&
+  let url = `pubname=${config.brsgServer.pubname}`
+  if (storeUser().projectId) {
+    url = url + `&projectId=${storeUser().projectId}`
+  }
+  if (storeUser().userName) {
+    url = url + `&userName=${storeUser().userName}`
+  }
+  if (storeUser().userId) {
+    url = url + `&userId=${storeUser().userId}`
+  }
+  if (storeToken()) {
+    url = url + `&saga-token=${storeToken()}`
+  }
+  return url;
+}
+
+// 获取空间类型
+function getMapSpaceIcon(type) {
+  let typeName = '公共区域'
+  if (type === '300'
+    || type === '313'
+    || type === '314'
+    || type === '315') {
+    typeName = '开放办公区'
+  }
+  else if (type === '312'
+    || type === '311'
+    || type === '310') {
+    typeName = '个人办公区'
+  }
+  else if (type === '120'
+    || type === '140'
+    || type === '130') {
+    typeName = '走廊'
+  }
+  else if (type === '310' ||
+    type === '320'
+    || type === '321'
+    || type === '322'
+    || type === '323'
+    || type === '490'
+    || type === '931'
+  ) {
+    typeName = '会议室'
+  }
+  else if (type === '600'
+    || type === '223'
+    || type === '930') {
+    typeName = '茶水间'
+  }
+  else if (type === '331') {
+    typeName = '接待室'
+  }
+  else if (type === '330') {
+    typeName = '打印室'
+  }
+  else if (type === '112') {
+    typeName = '更衣室'
+  }
+  else if (type === '111') {
+    typeName = '卫生间'
+  }
+  else if (type === '160') {
+    typeName = '前台（大堂）'
+  }
+  else if (type === '936'
+    || type === '935'
+    || type === '937' ||
+    type === '938' ||
+    type === '170'
+    || type === '915') {
+    typeName = '休闲活动区(吸烟室)'
+  }
+  else if (type === '690'
+    || type === '932'
+    || type === '934'
+    || type === '933'
+    || type === '6A0') {
+    typeName = '健身房'
+  }
+  else if (type === '113') {
+    typeName = '母婴室'
+  }
+  else if (type === '333'
+    || type === '250'
+    || type === '253') {
+    typeName = '普通库房'
+  }
+  else if (type === '252'
+    || type === '246'
+    || type === '1B5'
+    || type === '234'
+    || type === '231'
+    || type === '230'
+    || type === '233'
+    || type === '232'
+    || type === '234'
+    || type === '235'
+    || type === '236'
+    || type === '237'
+    || type === '241'
+    || type === '242'
+    || type === '244'
+    || type === '245'
+    || type === '251'
+    || type === '254'
+    || type === '211'
+    || type === '212'
+    || type === '222') {
+    typeName = '通迅机房'
+  } else if (type == '239') {
+    typeName = '空调机房'
+  }
+  else if (type === '430'
+    || type === '410'
+    || type === '220'
+    || type === '221'
+    ||
+    type === '400'
+    || type === '4B0'
+    || type === '441'
+    || type === '442'
+    || type === '451'
+    || type === '452'
+    || type === '461'
+    || type === '462'
+    || type === '471'
+    || type === '472'
+    || type === '733'
+    || type === '440'
+    || type === '450') {
+    typeName = '餐饮区'
+  } else if (type == '500') {
+    typeName = '零售区'
+  } else {
+    typeName = '公共区域'
+  }
+
+  let obj = {
+    "开放办公区": "map-icon1.svg",
+    "个人办公区": "map-icon2.svg",
+    "会议室": "map-icon3.svg",
+    "走廊": "map-icon4.svg",
+    "前台（大堂）": "map-icon5.svg",
+    "茶水间": "map-icon6.svg",
+    "接待室": "map-icon7.svg",
+    "休闲活动区（吸烟室）": "map-icon8.svg",
+    "餐饮区": "map-icon9.svg",
+    "零售区": "map-icon10.svg",
+    "公共区域": "map-icon10.svg",
+    "卫生间": "map-icon11.svg",
+    "健身房": "map-icon12.svg",
+    "母婴室": "map-icon13.svg",
+    "更衣室": "map-icon14.svg",
+    "打印室": "map-icon15.svg",
+    "普通库房": "map-icon16.svg",
+    "通讯机房": "map-icon17.svg",
+    "空调机房": "map-icon18.svg",
+
+  }
+  return obj[typeName]
+}
+

src/packagesEnv/api/mapApi.js

@@ -24,7 +24,8 @@ function getFloorList(params) {
 // 获取地图数据
 function getMapInfo(params) {
     return $http({
-        url: `${config.setupService}map/queryMapInfo`,
+        url: `http://192.168.88.4:52015/map/queryMapInfo`,
+        // url: `${config.setupService}map/queryMapInfo`,
         method: 'POST',
         data: JSON.stringify(params),
         isComParams: false    // 是否携带通用的参数

src/packagesEnv/pages/intelligentControl/components/floor/floor.wpy

@@ -4,103 +4,66 @@
   background: rgba(255, 255, 255, 0.9);
   .component-wrapper {
     display: flex;
+    max-height: 552rpx;
+    padding: 16rpx 0;
+    overflow-y: scroll;
     justify-content: space-between;
-
     .building-wrapper {
-      padding: 16rpx;
+      padding-right: 16rpx;
+      padding-left: 16rpx;
       border-right: 1px solid #c4c9cf4d;
       .building-item {
+        display: flex;
+        box-sizing: border-box;
+        min-width: 120rpx;
         max-width: 240rpx;
-        height: 72rpx;
-        line-height: 72rpx;
+        // width: 240rpx;
+        padding: 14rpx;
+        line-height: 44rpx;
         font-size: 32rpx;
         font-weight: 400;
+        flex-wrap: wrap;
         color: #626c78;
-        text-align: center;
+        text-align: left;
       }
     }
-  }
-  .floor-wrapper {
-    display: flex;
-    padding: 16rpx;
-    flex-direction: column-reverse;
-  }
-}
-.component-floor.fold .floor-item {
-  background: none;
-}
-.component-floor.fold .building-item {
-  background: none;
-}
 
-.component-floor.expand {
-  .component-wrapper {
-    max-height: 800rpx;
+    .floor-wrapper {
+      // display: flex;
+      box-sizing: border-box;
+      padding-left: 16rpx;
+      padding-right: 16rpx;
+      // flex-direction: column-reverse;
+      .floor-item {
+        min-width: 120rpx;
+        box-sizing: border-box;
+        padding: 14rpx;
+        line-height: 44rpx;
+        font-size: 32rpx;
+        font-weight: 400;
+        color: #626c78;
+        text-align: center;
+      }
+    }
   }
 }
 
-.component-floor .floor-item {
-  width: 112rpx;
-  height: 72rpx;
-  line-height: 72rpx;
-  font-size: 32rpx;
-  font-weight: 400;
-  color: #626c78;
-  text-align: center;
-}
-.component-floor.building .floor-item {
-  width: 224rpx;
-}
-
-.floor-item:first-child {
-  border-radius: 16rpx 16rpx 0 0;
-}
 .floor-item.selected,
 .building-item.selected {
-  background: #d4faf4;
-}
-
-.floor-item:last-child {
-  border-radius: 0 0 8px 8px;
-}
-.icon-arrow {
-  text-align: right;
-  .icon-arrow-box {
-    box-sizing: border-box;
-    padding: 16rpx;
-    display: inline-block;
-    // width: 152rpx;
-    height: 88rpx;
-    label {
-      display: inline-block;
-      vertical-align: middle;
-      font-family: PingFang SC;
-      font-size: 32rpx;
-      font-weight: 500;
-      letter-spacing: 0px;
-    }
-    image {
-      display: inline-block;
-      vertical-align: middle;
-      margin-left: 20rpx;
-      width: 24rpx;
-      height: 24rpx;
-    }
-  }
-}
-.icon-arrow .icon {
-  width: 24rpx;
-  height: 24rpx;
+  background: #D4FAF4;
 }
 </style>
 
 <template>
   <!-- && selectedFloor == item.id -->
   <!-- :class="{'selected' :selectedBuilding == item.id}" -->
-  <div class="{{'component-floor '+status}}">
+  <div class="component-floor">
     <div class="component-wrapper">
-      <div class="building-wrapper">
+      <div class="building-wrapper" 
+        v-if="buildings && buildings.length>1">
         <div class="building-item" 
+        v-on:click.stop="changeBuilding(item.id)"
+        :class="{'selected' :selectedBuilding == item.id}"
         :key="index+'building-map'"
         v-for="(item,index) in buildings">
         {{item.localName}}
@@ -112,6 +75,7 @@
         <div
           class="floor-item"
           :key="index+'map'"
+          :class="{'selected' :selectedFloor == item.id}"
           v-for="(item,index) in floors"
           v-on:click.stop="changeFloor(item.id)">
         {{item.localName}}
@@ -143,14 +107,19 @@ wepy.component({
   didUpdate() {},
   didUnmount() {},
   methods: {
+    // 切换建筑
+    changeBuilding(id){
+      if(id!=this.selectedBuilding){
+        this.$emit('component-building-change', id);
+        
+      }
+    },
+    // 切换楼层
     changeFloor(id) {
       if (id !== this.selectedFloor) {
         this.$emit('component-floor-change', id);
       }
-      this.$emit('component-floor-click');
-    },
-    flodFloor() {
-      this.$emit('component-floor-fold');
+     
     }
   }
 });

src/packagesEnv/pages/officehome/index.wpy

@@ -988,7 +988,7 @@ import config from '@/config'
 import loadFont from '@/common/loadFont'
 import { getCompanyMapData } from '@/api/home'
 import { saveCompanyConfig } from '@/service/companyConfig'
-import { checkHasUserInfo } from '@/service/user'
+import { checkHasUserInfo,checkUserControl } from '@/service/user'
 // import { floorInfo, defalutSelectedId } from '../intelligentControl/data/map';
 import { getNowDate, getTowNum } from '@/service/meetingTimes'
 
@@ -1295,6 +1295,9 @@ wepy.page({
         // loadFont(500)
   },
   onShow() {
+    checkUserControl().then(res=>{
+      console.log();
+    })
     this.getData() // 获取数据
     if (!this.homePageHasHidden) {
             // 这个是从地图搜索回来

src/packagesEnv/pages/search/index.wpy

@@ -0,0 +1,49 @@
+<style lang="less">
+
+</style>
+
+<template>
+   
+</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'
+
+wepy.page({
+  store,
+  config: {
+    navigationBarTitleText: 'test'
+  },
+
+  data: {},
+  methods: {
+    goEnv() {
+      wx.navigateTo({
+        url: '/packagesEnv/pages/officehome/index?spaceId=Sp1101080259b3510e26e7dd4dd9bf9784f06f3feb68'
+      })
+    },
+    goPortrait() {
+      wx.navigateTo({
+        url: '/packagesEnv/pages/portrait/home'
+      })
+    },
+    goPersonCenter() {
+      wx.navigateTo({
+        url: '/packagesEnv/pages/personalCenter/index'
+      })
+    }
+  },
+  created() {}
+})
+</script>
+<config>
+{
+navigationBarTitleText: '首页',
+usingComponents: {
+}
+}
+</config>

src/pages/auth/index.wpy

@@ -155,14 +155,20 @@ wepy.page({
     },
     // code 换取手机号
     getHttpPhoneNumber(code) {
-      getHttpPhoneNumber(code).then(res => {
-        let data = res.data || {};
-        let phoneNumber = data.purePhoneNumber;
-        if (phoneNumber) {
-          store.commit('setUserPhone', phoneNumber);
-          this.goBindTenant();
-        }
-      });
+      getHttpPhoneNumber(code)
+        .then(res => {
+          let data = res.data || {};
+          let phoneNumber = data.purePhoneNumber;
+          if (phoneNumber) {
+            store.commit('setUserPhone', phoneNumber);
+            this.goBindTenant();
+          } else {
+            console.log('没获取到手机号');
+          }
+        })
+        .catch(error => {
+          console.log('获取手机号的接口失败');
+        });
     },
     goBindTenant() {
       console.log('被点击了');

src/pages/index.wpy

@@ -73,8 +73,9 @@ wepy.page({
     if (this.isActivated && this.isActivated == 1) {
       // this.goHome();
       checkLoginNew().then(res => {
-        console.log(res);
-        if (res.data && res.data.isActivated == 1) {
+        console.log("登录过期了==",res);
+        if (res && res.isActivated == 1) {
+          console.log("登录过期了gg==",res);
           this.goHome();
         } else {
           // wx.navigateTo({

src/service/user.js

@@ -1,8 +1,8 @@
 import { getUserInfo, setWxAuthUserInfo, getThirdInfo, createAccount, changePhone } from '@/api/user.js';
 import store from '@/store';
 import config from '@/config';
-import { login, getCompanyByPhone, refreshToken } from '@/api/user.js';
-import { getAppId, getTimeStamp } from '@/utils/index';
+import { login, getCompanyByPhone, refreshToken, getUserControlSpace } from '@/api/user.js';
+import utils from '@/common/utils.js';
 
 // 检查登录
 function checkLogin(needGetetUserInfo = true) {
@@ -96,7 +96,8 @@ function wxLogin(type) {
     wx.login({
       success(wxLoginRes) {
         const jsCode = wxLoginRes.code;
-        const appId = getAppId();
+        console.log(utils)
+        const appId = utils.getAppId();
         if (jsCode) {
           let params = {
             "appId": appId,
@@ -209,23 +210,75 @@ function refreshTokenPage() {
   })
 
 }
-// 检查是否登录过以及过期
+
+// 刷新首页
+function refreshHome() {
+  // wx.redirectTo({ url: '/pages/index' });
+}
+// 检查用户是否有空间控制权限
+function checkUserControl() {
+  return new Promise((resolve, reject) => {
+    let userInfo = store.state.user.userInfo;
+    if (userInfo && userInfo.userId) {
+      let params = {
+        "criteria": {
+          "projectId": userInfo.projectId,
+          "companyId": userInfo.companyId,
+          "userCode": userInfo.userId
+        }
+      }
+      getUserControlSpace(params).then(res => {
+        // console.log("返回用户权限数据")
+        // console.log(res)
+        if (res.result == 'success') {
+          let data = res.data || {}
+          if (data && JSON.stringify(data) != '{}') {
+            if (data.isControlSpace !== 1) {
+              resolve(data)
+            } else {
+              reject("租户下无可控空间");
+              refreshHome();
+            }
+
+          } else {  // 如果无权限和楼层数据返回跳转到首页,不让点击
+            reject("获取租户权限接口失败");
+            refreshHome();
+          }
+        } else {
+          reject("获取租户权限接口失败");
+          refreshHome();
+        }
+      }).catch((error) => { // 如果无权限和楼层数据返回跳转到首页,不让点击
+        reject("获取租户权限接口失败");
+        refreshHome();
+      })
+    } else {
+      reject("用户未登录");
+    }
+  })
+}
+
+// 登录续约逻辑-待处理
 function checkLoginNew() {
   return new Promise((resolve, reject) => {
     let token = store.state.user.token;
     if (!token) {
-      return wxLogin();
+      wxLogin().then((res) => {
+        resolve(res)
+      });
     } else {
       let flag = checkTokenIsValid()
       if (flag == 1) {
-        return refreshTokenPage(); // 续约
+        refreshTokenPage().then(res => {
+          resolve(res)
+        }); // 续约
       } else if (flag == 2) { // 重新登录
-        return wxLogin();
+        wxLogin().then((res) => {
+          resolve(res)
+        });
       } else if (flag == 3) {  // 后续补定时器定时续约逻辑
         resolve({
-          data: {
-            isActivated: 1
-          }
+          isActivated: 1
         })
       }
     }
@@ -238,7 +291,7 @@ function checkTokenIsValid() {
   let tokenInfo = store.state.user.tokenInfo;
   let expireTime = tokenInfo.expireTime;
   let refreshToken = tokenInfo.refreshToken;
-  let nowtime = getTimeStamp();
+  let nowtime = utils.getTimeStamp();
   if (expireTime && expireTime < nowtime && refreshToken >= nowtime) {  // 过期可续约
     flag = 1
   } else if (expireTime && expireTime >= nowtime) { // 没过期
@@ -251,8 +304,6 @@ function checkTokenIsValid() {
 }
 
 
-
-
 // 本地保存用户头像
 function setAvatar(avatar) {
   wx.setStorageSync('avatarBase64', avatar);
@@ -276,5 +327,6 @@ export {
   checkLoginNew,
   checkTokenIsValid,
   getCompanyDataByPhone,
+  checkUserControl,
   setUserInfoByAuth
 }

src/utils/index.js

@@ -1,50 +0,0 @@
-import store from '@/store';
-function getMiniProgram() {
-    const miniProgram = wx.getAccountInfoSync();
-    return miniProgram;
-    // this.version = miniProgram.miniProgram.version;
-}
-function getAppId() {
-    const miniProgram = wx.getAccountInfoSync();
-    return miniProgram && miniProgram.miniProgram && miniProgram.miniProgram.appId || 'wxda2ef261ac3cca32';
-}
-
-// 正式版本上能获取,体验和开发版本无法获取到版本号
-function getVersion() {
-    const miniProgram = wx.getAccountInfoSync();
-    return miniProgram && miniProgram.miniProgram && miniProgram.miniProgram.version;
-}
-
-// 获取时间戳
-function getTimeStamp() {
-    let timeStamp = Date.parse(new Date());
-    return timeStamp;
-}
-
-// http请求通用参数
-function commonParams() {
-    // openid=${storeUser().openId}&
-    let url = `pubname=${config.brsgServer.pubname}`
-    if (storeUser().projectId) {
-        url = url + `&projectId=${storeUser().projectId}`
-    }
-    if (storeUser().userName) {
-        url = url + `&userName=${storeUser().userName}`
-    }
-    if (storeUser().userId) {
-        url = url + `&userId=${storeUser().userId}`
-    }
-    if (storeToken()) {
-        url = url + `&saga-token=${storeToken()}`
-    }
-    return url;
-}
-
-
-export {
-    getAppId,
-    getVersion,
-    getTimeStamp,
-    getMiniProgram,
-    commonParams
-}

static/page-map-icon/map-icon15.svg

@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="20" height="20" rx="10" fill="#9DAACB" fill-opacity="0.5"/>
+<path d="M6.99805 5.53906H13.8021V6.51104H6.99805V5.53906ZM5.90004 6.99704C5.70122 6.99704 5.54004 7.15821 5.54004 7.35703V12.4689C5.54004 12.6678 5.70122 12.8289 5.90004 12.8289H6.99805V15.2589H13.8021V12.8289H14.9001C15.0989 12.8289 15.2601 12.6678 15.2601 12.4689V7.35703C15.2601 7.15821 15.0989 6.99704 14.9001 6.99704H5.90004ZM12.8301 14.2869H7.97005V11.371H12.8301V14.2869ZM14.2881 8.941H12.8301V7.96902H14.2881V8.941Z" fill="white"/>
+</svg>

static/page-map-icon/map-icon17.svg

@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="20" height="20" rx="10" fill="#9DAACB" fill-opacity="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7 5.5C7 5.22386 7.22386 5 7.5 5C7.77614 5 8 5.22386 8 5.5V8H12V5.5C12 5.22386 12.2239 5 12.5 5C12.7761 5 13 5.22386 13 5.5V8H14.2528C14.4043 8 14.5428 8.0856 14.6106 8.22111L15.5 10V13.6C15.5 13.8209 15.3209 14 15.1 14H4.9C4.67909 14 4.5 13.8209 4.5 13.6V10L5.38944 8.22111C5.4572 8.0856 5.5957 8 5.74721 8H7V5.5ZM5.5 11H14.5V13H5.5V11ZM9.5 11.5H10.5V12.5H9.5V11.5ZM12.3 11.5H11.3V12.5H12.3V11.5ZM13.1 11.5H14.1V12.5H13.1V11.5Z" fill="white"/>
+</svg>

static/page-map-icon/select-huise.svg

@@ -0,0 +1,4 @@
+<svg width="74" height="45" viewBox="0 0 74 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="74" height="38" rx="19" fill="#9DAACB"/>
+<path d="M37 45L42.5 38H31.5L37 45Z" fill="#9DAACB"/>
+</svg>

static/page-map-icon/select-lanse.svg

@@ -0,0 +1,4 @@
+<svg width="102" height="45" viewBox="0 0 102 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="102" height="38" rx="19" fill="#6B96D9"/>
+<path d="M51 45L56.5 38H45.5L51 45Z" fill="#6B96D9"/>
+</svg>

static/page-map-icon/select-lvse.svg

@@ -0,0 +1,4 @@
+<svg width="102" height="45" viewBox="0 0 102 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="102" height="38" rx="19" fill="#69CACB"/>
+<path d="M51 45L56.5 38H45.5L51 45Z" fill="#69CACB"/>
+</svg>

static/page-map-icon/select-zise.svg

@@ -0,0 +1,4 @@
+<svg width="102" height="45" viewBox="0 0 102 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="102" height="38" rx="19" fill="#AC8BE8"/>
+<path d="M51 45L56.5 38H45.5L51 45Z" fill="#AC8BE8"/>
+</svg>