diff --git a/constant/UrlConstant.js b/constant/UrlConstant.js index 1348157..2c0d7ab 100644 --- a/constant/UrlConstant.js +++ b/constant/UrlConstant.js @@ -36,6 +36,9 @@ const queryAppUserBindingOwner = baseUrl + 'app/owner.listAppUserBindingOwners'; //解绑业主 const appUserUnBindingOwner = baseUrl + 'app/owner.deleteAppUserBindingOwner'; +//查询业主门禁 +const listOwnerMachines = baseUrl + 'app/owner.listOwnerMachines'; + module.exports = { baseUrl: baseUrl, @@ -49,5 +52,6 @@ module.exports = { queryAppUserBindingOwner: queryAppUserBindingOwner, queryOwnerMembers: queryOwnerMembers, listComplaints: listComplaints, - appUserUnBindingOwner: appUserUnBindingOwner + appUserUnBindingOwner: appUserUnBindingOwner, + listOwnerMachines: listOwnerMachines }; \ No newline at end of file diff --git a/constant/CoreFactory.js b/factory/CoreFactory.js similarity index 93% rename from constant/CoreFactory.js rename to factory/CoreFactory.js index 426147a..d93e450 100644 --- a/constant/CoreFactory.js +++ b/factory/CoreFactory.js @@ -26,4 +26,6 @@ class CoreFactory{ } }); } -} \ No newline at end of file +} + +module.exports = new CoreFactory(); \ No newline at end of file diff --git a/factory/index.js b/factory/index.js index ef6fba8..5864c44 100644 --- a/factory/index.js +++ b/factory/index.js @@ -9,11 +9,13 @@ const loginFactory = require("LoginFactory.js"); const userFactory = require("UserFactory.js"); const fileFactory = require("FileFactory.js"); +const coreFactory = require("CoreFactory.js"); module.exports = { login: loginFactory, user: userFactory, - file: fileFactory + file: fileFactory, + core: coreFactory } \ No newline at end of file diff --git a/pages/applicationKeyLocation/applicationKeyLocation.js b/pages/applicationKeyLocation/applicationKeyLocation.js index d79d371..bc56c8c 100644 --- a/pages/applicationKeyLocation/applicationKeyLocation.js +++ b/pages/applicationKeyLocation/applicationKeyLocation.js @@ -1,11 +1,14 @@ // pages/applicationKeyLocation/applicationKeyLocation.js +const context = require('../../context/Java110Context.js'); +const constant = context.constant; + Page({ /** * 页面的初始数据 */ data: { - + locations:[] }, /** @@ -13,6 +16,8 @@ Page({ */ onLoad: function (options) { + //this._loadOwnerLocation(); + }, /** @@ -26,6 +31,7 @@ Page({ * 生命周期函数--监听页面显示 */ onShow: function () { + this._loadOwnerLocation(); }, @@ -62,5 +68,51 @@ Page({ */ onShareAppMessage: function () { + }, + + _loadOwnerLocation:function(){ + + let _that = this; + context.getOwner(function(_owner){ + console.log('数据执行', _owner); + let _data = { + memberId: _owner.memberId, + communityId: _owner.communityId + } + wx.request({ + url: constant.url.listOwnerMachines, + header: context.getHeaders(), + method: "GET", + data: _data, //动态数据 + success: function (res) { + console.log('查询业主门禁', res); + //成功情况下跳转 + if (res.statusCode == 200) { + let _machines = res.data.machines; + _that.setData({ + locations: _machines + }); + } + }, + fail: function (e) { + wx.showToast({ + title: "服务器异常了", + icon: 'none', + duration: 2000 + }) + } + }); + + }); + + }, + gotoApplyApplicationKeyPage:function(e){ + // 跳转至 填写信息页面 + let _item = e.currentTarget.dataset.item; + console.log('gotoApplyApplicationKeyPage', _item); + // wx.navigateTo({ + // url: "/pages/repairList/detail/detail?item=" + JSON.stringify(e.currentTarget.dataset.item) + // }) } + }) \ No newline at end of file diff --git a/pages/applicationKeyLocation/applicationKeyLocation.wxml b/pages/applicationKeyLocation/applicationKeyLocation.wxml index a8dcea9..8d1fcb3 100644 --- a/pages/applicationKeyLocation/applicationKeyLocation.wxml +++ b/pages/applicationKeyLocation/applicationKeyLocation.wxml @@ -7,16 +7,16 @@ - - - - - - - - - - + \ No newline at end of file