diff --git a/public/css/vc.css b/public/css/vc.css index aeb3d92af..3ee010e6c 100644 --- a/public/css/vc.css +++ b/public/css/vc.css @@ -352,6 +352,11 @@ padding-bottom: 25px; } +.font-1 { + font-size: 14px; + font-weight: 600; +} + .border { border: 1px solid #e7eaec; } diff --git a/public/pages/property/communitySpaceConfirm/communitySpaceConfirm.html b/public/pages/property/communitySpaceConfirm/communitySpaceConfirm.html new file mode 100644 index 000000000..780b7db2e --- /dev/null +++ b/public/pages/property/communitySpaceConfirm/communitySpaceConfirm.html @@ -0,0 +1,165 @@ +
+
+
+
+
+
+ +
+
+ +
+
+
+
+ 核销结果 + {{communitySpaceConfirmInfo.order.remark}} +
+
+ 核销时间 + {{communitySpaceConfirmInfo.order.createTime}} +
+
+ 场地 + {{communitySpaceConfirmInfo.order.spaceName}} +
+
+ 预约日期 + {{communitySpaceConfirmInfo.order.appointmentTime}} +
+
+ 预约小时 + {{communitySpaceConfirmInfo.order.hours}} +
+
+ 预约人 + {{communitySpaceConfirmInfo.order.personName}} +
+
+ 预约电话 + {{communitySpaceConfirmInfo.order.personTel}} +
+
+
+
+
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+ +
+
+
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 核销订单 + + 场地 + + 预约日期 + + 预约时间 + + 预约人 + + 预约电话 + + 核销时间 + + 备注 +
{{item.orderId}} + {{item.spaceName}} + + {{item.appointmentTime}} + + {{item.hours}} + + {{item.personName}} + + {{item.personTel}} + + {{item.createTime}} + + {{item.remark}} +
+
    +
    + + +
    +
    +
    +
    +
    +
    + + +
    \ No newline at end of file diff --git a/public/pages/property/communitySpaceConfirm/communitySpaceConfirm.js b/public/pages/property/communitySpaceConfirm/communitySpaceConfirm.js new file mode 100644 index 000000000..a435b2a15 --- /dev/null +++ b/public/pages/property/communitySpaceConfirm/communitySpaceConfirm.js @@ -0,0 +1,121 @@ +/** + 入驻小区 +**/ +(function(vc) { + var DEFAULT_PAGE = 1; + var DEFAULT_ROWS = 10; + vc.extends({ + data: { + communitySpaceConfirmInfo: { + orders: [], + order: { + remark: '', + appointmentTime: '', + createTime: '', + hours: '', + spaceName: '', + personName: '', + personTel: '', + }, + timeId: '', + total: 0, + records: 1, + moreCondition: false, + conditions: { + spaceId: '', + personName: '', + personTel: '', + appointmentTime: '', + communityId: vc.getCurrentCommunity().communityId + } + } + }, + _initMethod: function() { + $that._listCommunitySpaceConfirms(1, 10); + }, + _initEvent: function() { + vc.on('pagination', 'page_event', function(_currentPage) { + vc.component._listCommunitySpaceConfirms(_currentPage, DEFAULT_ROWS); + }); + }, + methods: { + _listCommunitySpaceConfirms: function(_page, _rows) { + vc.component.communitySpaceConfirmInfo.conditions.page = _page; + vc.component.communitySpaceConfirmInfo.conditions.row = _rows; + let param = { + params: vc.component.communitySpaceConfirmInfo.conditions + }; + //发送get请求 + vc.http.apiGet('/communitySpace.listCommunitySpaceConfirmOrder', + param, + function(json, res) { + let _communitySpaceConfirmInfo = JSON.parse(json); + vc.component.communitySpaceConfirmInfo.total = _communitySpaceConfirmInfo.total; + vc.component.communitySpaceConfirmInfo.records = _communitySpaceConfirmInfo.records; + vc.component.communitySpaceConfirmInfo.orders = _communitySpaceConfirmInfo.data; + vc.emit('pagination', 'init', { + total: vc.component.communitySpaceConfirmInfo.records, + currentPage: _page + }); + }, + function(errInfo, error) { + console.log('请求失败处理'); + } + ); + }, + _confirmCommunitySpace: function(_page, _rows) { + + let _timeId = $that.communitySpaceConfirmInfo.timeId; + if (!_timeId) { + vc.toast('请扫码'); + return; + } + + let _data = { + timeId: _timeId, + communityId: vc.getCurrentCommunity().communityId + } + + vc.http.apiPost( + '/communitySpace.saveCommunitySpaceConfirmOrder', + JSON.stringify(_data), { + emulateJSON: true + }, + function(json, res) { + //vm.menus = vm.refreshMenuActive(JSON.parse(json),0); + $that.communitySpaceConfirmInfo.timeId = ''; + let _json = JSON.parse(json); + if (_json.code != 0) { + vc.toast(_json.msg); + return; + } + $that._listCommunitySpaceConfirms(1, 10); + vc.toast("核销成功"); + if (!_json.data || _json.data.length < 1) { + return; + } + vc.copyObject(_json.data[0], $that.communitySpaceConfirmInfo.order); + + if (!$that.communitySpaceConfirmInfo.order.remark) { + $that.communitySpaceConfirmInfo.order.remark = "核销成功"; + } + }, + function(errInfo, error) { + console.log('请求失败处理'); + $that.communitySpaceConfirmInfo.timeId = ''; + vc.toast(errInfo); + }); + }, + _moreCondition: function() { + if (vc.component.communitySpaceConfirmInfo.moreCondition) { + vc.component.communitySpaceConfirmInfo.moreCondition = false; + } else { + vc.component.communitySpaceConfirmInfo.moreCondition = true; + } + }, + _queryCommunitySpaceConfirmMethod: function() { + $that._listCommunitySpaceConfirms(1, 10); + } + } + }); +})(window.vc); \ No newline at end of file diff --git a/public/pages/property/communitySpacePersonManage/communitySpacePersonManage.html b/public/pages/property/communitySpacePersonManage/communitySpacePersonManage.html index 1112cbecb..d8ef9a8b8 100644 --- a/public/pages/property/communitySpacePersonManage/communitySpacePersonManage.html +++ b/public/pages/property/communitySpacePersonManage/communitySpacePersonManage.html @@ -61,7 +61,7 @@
    - +
    @@ -100,7 +100,7 @@ {{communitySpacePerson.createTime}} {{communitySpacePerson.remark}} -
    +