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 @@
+
+
+
+
+ 设置数据区域
+
+
+
+
+
+
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",