Browse Source

版本1.0.6 2023-12-07 ljd

1、增加设置数据区域功能
master
xiaohei 1 year ago
parent
commit
42d7fe332b
3 changed files with 17 additions and 3 deletions
  1. +11
    -0
      pages/my/my.wxml
  2. +3
    -1
      pages/roomDetail/roomDetail.js
  3. +3
    -2
      project.config.json

+ 11
- 0
pages/my/my.wxml View File

@ -55,6 +55,17 @@
</view> </view>
</view> </view>
</navigator> </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}}"> <navigator url="/pages/rentManagement/rentManagement" wx:if="{{userInfo.type==0}}">
<view class="serviceLi"> <view class="serviceLi">
<view class="servicetxt"> <view class="servicetxt">


+ 3
- 1
pages/roomDetail/roomDetail.js View File

@ -167,15 +167,17 @@ Page({
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function (options) { onLoad: function (options) {
console.log("onLoad");
app.globalData.zgBlueStatus = false app.globalData.zgBlueStatus = false
this.AddressPermissions() this.AddressPermissions()
this.getLocationPermissionMethods() this.getLocationPermissionMethods()
let deviceinfo = wx.getStorageSync('deviceinfo') let deviceinfo = wx.getStorageSync('deviceinfo')
app.globalData.deviceNum = deviceinfo.deviceNum app.globalData.deviceNum = deviceinfo.deviceNum
var userInfo1 = wx.getStorageSync('userInfo') var userInfo1 = wx.getStorageSync('userInfo')
console.log(123123);
let deviceinfoData = JSON.parse(JSON.stringify(deviceinfo)) let deviceinfoData = JSON.parse(JSON.stringify(deviceinfo))
console.log(deviceinfoData); console.log(deviceinfoData);
if(deviceinfoData.bluetoothMac){
if(deviceinfoData.bluetoothMac && (deviceinfoData.manufactureId == 1201 || deviceinfoData.manufactureId == 1241)){
let superAdmin = [] let superAdmin = []
var superAdminIdlist = deviceinfoData.bluetoothMac.slice(deviceinfoData.bluetoothMac.length - 11, deviceinfoData.bluetoothMac.length).split(":").join("") var superAdminIdlist = deviceinfoData.bluetoothMac.slice(deviceinfoData.bluetoothMac.length - 11, deviceinfoData.bluetoothMac.length).split(":").join("")
for (let i = 0; i < superAdminIdlist.length; i++) { for (let i = 0; i < superAdminIdlist.length; i++) {


+ 3
- 2
project.config.json View File

@ -36,7 +36,8 @@
"disablePlugins": [], "disablePlugins": [],
"outputPath": "" "outputPath": ""
}, },
"useIsolateContext": false,
"enableEngineNative": false,
"useIsolateContext": true,
"userConfirmedBundleSwitch": false, "userConfirmedBundleSwitch": false,
"packNpmManually": false, "packNpmManually": false,
"packNpmRelationList": [], "packNpmRelationList": [],
@ -48,7 +49,7 @@
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "2.23.4", "libVersion": "2.23.4",
"appid": "wx20de9fe5943934a1",
"appid": "wx885b65d99da00084",
"projectname": "appltegy", "projectname": "appltegy",
"editorSetting": { "editorSetting": {
"tabIndent": "insertSpaces", "tabIndent": "insertSpaces",


Loading…
Cancel
Save