From 42d7fe332b1bc003fb9b5776607af86aea214e76 Mon Sep 17 00:00:00 2001
From: xiaohei <11674173+xiaohei102908@user.noreply.gitee.com>
Date: Thu, 7 Dec 2023 19:12:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC1.0.6=20=202023-12-07=20=20lj?=
 =?UTF-8?q?d=201=E3=80=81=E5=A2=9E=E5=8A=A0=E8=AE=BE=E7=BD=AE=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=8C=BA=E5=9F=9F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/my/my.wxml               | 11 +++++++++++
 pages/roomDetail/roomDetail.js |  4 +++-
 project.config.json            |  5 +++--
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/pages/my/my.wxml b/pages/my/my.wxml
index b01f344..e9ef35f 100644
--- a/pages/my/my.wxml
+++ b/pages/my/my.wxml
@@ -55,6 +55,17 @@
         </view>
       </view>
     </navigator>
+    <navigator url="/pages/config/config" wx:if="{{userInfo.type==0}}">
+      <view class="serviceLi">
+        <view class="servicetxt">
+          <icon class="iconfont iconziliao"></icon>
+          <text>设置数据区域</text>
+        </view>
+        <view class="serviceright">
+          <icon class="iconfont icon-right"></icon>
+        </view>
+      </view>
+    </navigator>
     <navigator url="/pages/rentManagement/rentManagement" wx:if="{{userInfo.type==0}}">
       <view class="serviceLi">
         <view class="servicetxt">
diff --git a/pages/roomDetail/roomDetail.js b/pages/roomDetail/roomDetail.js
index 72ff877..2758424 100644
--- a/pages/roomDetail/roomDetail.js
+++ b/pages/roomDetail/roomDetail.js
@@ -167,15 +167,17 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    console.log("onLoad");
     app.globalData.zgBlueStatus = false
     this.AddressPermissions()
     this.getLocationPermissionMethods()
     let deviceinfo = wx.getStorageSync('deviceinfo')
     app.globalData.deviceNum = deviceinfo.deviceNum
     var userInfo1 = wx.getStorageSync('userInfo')
+    console.log(123123);
     let deviceinfoData = JSON.parse(JSON.stringify(deviceinfo))
     console.log(deviceinfoData);
-    if(deviceinfoData.bluetoothMac){
+    if(deviceinfoData.bluetoothMac && (deviceinfoData.manufactureId == 1201 || deviceinfoData.manufactureId == 1241)){
       let superAdmin = []
       var superAdminIdlist = deviceinfoData.bluetoothMac.slice(deviceinfoData.bluetoothMac.length - 11, deviceinfoData.bluetoothMac.length).split(":").join("")
       for (let i = 0; i < superAdminIdlist.length; i++) {
diff --git a/project.config.json b/project.config.json
index 70821de..a5aa306 100644
--- a/project.config.json
+++ b/project.config.json
@@ -36,7 +36,8 @@
             "disablePlugins": [],
             "outputPath": ""
         },
-        "useIsolateContext": false,
+        "enableEngineNative": false,
+        "useIsolateContext": true,
         "userConfirmedBundleSwitch": false,
         "packNpmManually": false,
         "packNpmRelationList": [],
@@ -48,7 +49,7 @@
     },
     "compileType": "miniprogram",
     "libVersion": "2.23.4",
-    "appid": "wx20de9fe5943934a1",
+    "appid": "wx885b65d99da00084",
     "projectname": "appltegy",
     "editorSetting": {
         "tabIndent": "insertSpaces",