From 1546883bee2e6e39ad60688fb4e2b7af9252b22d Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Tue, 6 Sep 2022 17:48:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../parkingAreaControlCarInout.html | 6 +-- .../parkingAreaControlCarInout.js | 17 ++++++++- .../parkingAreaControlCustomCarInout.js | 1 + .../parkingAreaControlFee.js | 38 ++++++++++--------- 4 files changed, 40 insertions(+), 22 deletions(-) diff --git a/public/components/property/parkingAreaControlCarInout/parkingAreaControlCarInout.html b/public/components/property/parkingAreaControlCarInout/parkingAreaControlCarInout.html index 5ddd7506d..d384230b3 100644 --- a/public/components/property/parkingAreaControlCarInout/parkingAreaControlCarInout.html +++ b/public/components/property/parkingAreaControlCarInout/parkingAreaControlCarInout.html @@ -1,10 +1,10 @@
- +
- +
-
+ \ No newline at end of file diff --git a/public/components/property/parkingAreaControlCarInout/parkingAreaControlCarInout.js b/public/components/property/parkingAreaControlCarInout/parkingAreaControlCarInout.js index aaf91de54..0adafd534 100644 --- a/public/components/property/parkingAreaControlCarInout/parkingAreaControlCarInout.js +++ b/public/components/property/parkingAreaControlCarInout/parkingAreaControlCarInout.js @@ -21,17 +21,30 @@ return; } if (_parkingAreaControl.inMachineId == _data.extMachineId) { - $that.parkingAreaControlCarInoutInfo.inImg = _data.img; + //$that.parkingAreaControlCarInoutInfo.inImg = _data.img; + setTimeout(function() { + $that.parkingAreaControlCarInoutInfo.inImg = _data.img; + }, 1500) } if (_parkingAreaControl.outMachineId == _data.extMachineId) { - $that.parkingAreaControlCarInoutInfo.outImg = _data.img; + //$that.parkingAreaControlCarInoutInfo.outImg = _data.img; + setTimeout(function() { + $that.parkingAreaControlCarInoutInfo.outImg = _data.img; + }, 1500) } }) }, methods: { + imgOnErrorIn: function() { + //let _img = $that.parkingAreaControlCarInoutInfo.inImg + }, + imgOnErrorOut: function() { + //let _img = $that.parkingAreaControlCarInoutInfo.outImg + + } } }); })(window.vc); \ No newline at end of file diff --git a/public/components/property/parkingAreaControlCustomCarInout/parkingAreaControlCustomCarInout.js b/public/components/property/parkingAreaControlCustomCarInout/parkingAreaControlCustomCarInout.js index 26efa3f48..74eadf0ec 100644 --- a/public/components/property/parkingAreaControlCustomCarInout/parkingAreaControlCustomCarInout.js +++ b/public/components/property/parkingAreaControlCustomCarInout/parkingAreaControlCustomCarInout.js @@ -28,6 +28,7 @@ // = _params; vc.copyObject(_params, vc.component.parkingAreaControlCustomCarInoutInfo); vc.component.parkingAreaControlCustomCarInoutInfo.communityId = vc.getCurrentCommunity().communityId; + $that._queryCustomCarMoney(); }); }, methods: { diff --git a/public/components/property/parkingAreaControlFee/parkingAreaControlFee.js b/public/components/property/parkingAreaControlFee/parkingAreaControlFee.js index dcb010d63..9b9cba46b 100644 --- a/public/components/property/parkingAreaControlFee/parkingAreaControlFee.js +++ b/public/components/property/parkingAreaControlFee/parkingAreaControlFee.js @@ -1,7 +1,7 @@ /** 入驻小区 **/ -(function (vc) { +(function(vc) { vc.extends({ data: { parkingAreaControlFeeInfo: { @@ -13,16 +13,16 @@ open: "", openMsg: "", machineId: '-1', - showRefresh:'', - boxId:'' + showRefresh: '', + boxId: '' } }, - _initMethod: function () { + _initMethod: function() { $that.parkingAreaControlFeeInfo.boxId = vc.getParam('boxId'); $that._loadQrCodeUrl(); }, - _initEvent: function () { - vc.on('parkingAreaControlFee', 'notify', function (_data) { + _initEvent: function() { + vc.on('parkingAreaControlFee', 'notify', function(_data) { if (_data.action != 'FEE_INFO') { return; } @@ -33,16 +33,16 @@ $that.parkingAreaControlFeeInfo.remark = ''; $that.parkingAreaControlFeeInfo.machineId = _machineId; }); - vc.on('parkingAreaControlFee', 'changeMachine', function (_data) { + vc.on('parkingAreaControlFee', 'changeMachine', function(_data) { $that.parkingAreaControlFeeInfo.machineId = _data.machineId; }) - vc.on('parkingAreaControlFee', 'clear', function () { + vc.on('parkingAreaControlFee', 'clear', function() { $that.clearParkingAreaControlFeeInfo(); }); }, methods: { - _loadQrCodeUrl:function(){ + _loadQrCodeUrl: function() { //判断是否支付 var param = { params: { @@ -54,25 +54,28 @@ //发送get请求 vc.http.apiGet('/machine.getCarMachineQrCodeUrl', param, - function (json, res) { + function(json, res) { let _info = JSON.parse(json); $that._viewQr(_info.data) - }, function (errInfo, error) { + }, + function(errInfo, error) { console.log('请求失败处理'); } ); }, - saveTempFeeInfo: function () { + saveTempFeeInfo: function() { vc.emit('parkingAreaControlCustomCarInout', 'open', { type: "1102", //1101 手动入场 1102 手动出场 carNum: $that.parkingAreaControlFeeInfo.carNum, amount: $that.parkingAreaControlFeeInfo.pay, payCharge: $that.parkingAreaControlFeeInfo.payCharge, - machineId: $that.parkingAreaControlFeeInfo.machineId + machineId: $that.parkingAreaControlFeeInfo.machineId, + boxId: $that.parkingAreaControlFeeInfo.boxId, }) }, - clearParkingAreaControlFeeInfo: function () { + clearParkingAreaControlFeeInfo: function() { let _machineId = $that.parkingAreaControlFeeInfo.machineId; + let _boxId = $that.parkingAreaControlFeeInfo.boxId; $that.parkingAreaControlFeeInfo = { carNum: "", @@ -82,13 +85,14 @@ remark: "", open: "", openMsg: "", - machineId: _machineId + machineId: _machineId, + boxId: _boxId } }, - _viewQr: function (_data) { + _viewQr: function(_data) { document.getElementById("qrcode").innerHTML = ""; let qrcode = new QRCode(document.getElementById("qrcode"), { - text: "临时车收费二维码", //你想要填写的文本 + text: "临时车收费二维码", //你想要填写的文本 width: 200, //生成的二维码的宽度 height: 200, //生成的二维码的高度 colorDark: "#000000", // 生成的二维码的深色部分