From 92492680e13118c1b8aa71caef97870e035d7147 Mon Sep 17 00:00:00 2001 From: "1098226878@qq.com" <1098226878@qq.com> Date: Thu, 13 Jan 2022 10:50:38 +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 --- app.js | 16 ++--- .../admin/editCouponPool/editCouponPool.html | 10 +-- .../parkingAreaControlVideo.html | 3 + .../parkingAreaControlVideo.js | 13 ++++ .../unlicensedCarMachineQrCode.html | 24 +++++++ .../unlicensedCarMachineQrCode.js | 72 +++++++++++++++++++ .../couponDetailManage.html | 6 +- .../couponPoolManage/couponPoolManage.html | 4 +- 8 files changed, 129 insertions(+), 19 deletions(-) create mode 100644 public/components/property/unlicensedCarMachineQrCode/unlicensedCarMachineQrCode.html create mode 100644 public/components/property/unlicensedCarMachineQrCode/unlicensedCarMachineQrCode.js diff --git a/app.js b/app.js index 8759bb48e..e5172f2c6 100755 --- a/app.js +++ b/app.js @@ -31,17 +31,17 @@ let opts = { } -//app.use('/callComponent',proxy('https://app.demo.winqi.cn/',opts)); -//app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts)); -//app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts)); +// app.use('/callComponent',proxy('https://app.demo.winqi.cn/',opts)); +// app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts)); +// app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts)); - //app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts)); - //app.use('/app',proxy('http://api.demo.winqi.cn:8012',opts)); + app.use('/callComponent',proxy('http://owner.homecommunity.cn:8008',opts)); + app.use('/app',proxy('http://owner.homecommunity.cn:8008',opts)); -app.use('/callComponent',proxy('http://127.0.0.1:8008',opts)); -app.use('/app',proxy('http://127.0.0.1:8008',opts)); -app.use('/ws',proxy('http://127.0.0.1:8008',opts)); +// app.use('/callComponent',proxy('http://127.0.0.1:8008',opts)); +// app.use('/app',proxy('http://127.0.0.1:8008',opts)); +// app.use('/ws',proxy('http://127.0.0.1:8008',opts)); // app.use('/callComponent',proxy('http://192.168.1.106:8012',opts)); // app.use('/app',proxy('http://192.168.1.106:8012',opts)); diff --git a/public/components/admin/editCouponPool/editCouponPool.html b/public/components/admin/editCouponPool/editCouponPool.html index e4548d5b9..0f5f4c5a8 100644 --- a/public/components/admin/editCouponPool/editCouponPool.html +++ b/public/components/admin/editCouponPool/editCouponPool.html @@ -10,7 +10,7 @@
- @@ -19,7 +19,7 @@
-
@@ -36,7 +36,7 @@
-
@@ -57,14 +57,14 @@
-
- +
diff --git a/public/components/property/parkingAreaControlVideo/parkingAreaControlVideo.html b/public/components/property/parkingAreaControlVideo/parkingAreaControlVideo.html index c54d3d0f2..7919caced 100644 --- a/public/components/property/parkingAreaControlVideo/parkingAreaControlVideo.html +++ b/public/components/property/parkingAreaControlVideo/parkingAreaControlVideo.html @@ -20,6 +20,9 @@
+ diff --git a/public/components/property/parkingAreaControlVideo/parkingAreaControlVideo.js b/public/components/property/parkingAreaControlVideo/parkingAreaControlVideo.js index a669f73f3..e1ac21f5e 100644 --- a/public/components/property/parkingAreaControlVideo/parkingAreaControlVideo.js +++ b/public/components/property/parkingAreaControlVideo/parkingAreaControlVideo.js @@ -229,8 +229,21 @@ type: _type, machineId: _machineId }) + }, + unlicensedCarIn: function (_type) { + let _machineId = $that.parkingAreaControlVideoInfo.inMachineId; + + if (!_machineId) { + vc.toast('请选择入场摄像头'); + return; + } + vc.emit('unlicensedCarMachineQrCode', 'open', { + type: '1101', + machineId: _machineId + }) } + } }); })(window.vc); \ No newline at end of file diff --git a/public/components/property/unlicensedCarMachineQrCode/unlicensedCarMachineQrCode.html b/public/components/property/unlicensedCarMachineQrCode/unlicensedCarMachineQrCode.html new file mode 100644 index 000000000..ee951b251 --- /dev/null +++ b/public/components/property/unlicensedCarMachineQrCode/unlicensedCarMachineQrCode.html @@ -0,0 +1,24 @@ + \ No newline at end of file diff --git a/public/components/property/unlicensedCarMachineQrCode/unlicensedCarMachineQrCode.js b/public/components/property/unlicensedCarMachineQrCode/unlicensedCarMachineQrCode.js new file mode 100644 index 000000000..a633eb081 --- /dev/null +++ b/public/components/property/unlicensedCarMachineQrCode/unlicensedCarMachineQrCode.js @@ -0,0 +1,72 @@ +(function (vc, vm) { + + vc.extends({ + data: { + unlicensedCarMachineQrCodeInfo: { + carNum: '', + amount: '', + remark: '', + type: '1101', + payCharge: '', + machineId: '' + } + }, + _initMethod: function () { + + }, + _initEvent: function () { + vc.on('unlicensedCarMachineQrCode', 'open', function (_params) { + vc.component.refreshUnlicensedCarMachineQrCodeInfoInfo(); + $('#unlicensedCarMachineQrCodeModel').modal('show'); + // = _params; + vc.copyObject(_params, vc.component.unlicensedCarMachineQrCodeInfo); + vc.component.unlicensedCarMachineQrCodeInfo.communityId = vc.getCurrentCommunity().communityId; + }); + }, + methods: { + _loadQrCodeUrl:function(){ + //判断是否支付 + var param = { + params: { + communityId: vc.getCurrentCommunity().communityId, + boxId: $that.parkingAreaControlFeeInfo.boxId, + machineId: $that.parkingAreaControlFeeInfo.machineId, + } + }; + //发送get请求 + vc.http.apiGet('/machine.unlicensedCarMachineQrCodeUrl', + param, + function (json, res) { + let _info = JSON.parse(json); + $that._viewQr(_info.data) + }, function (errInfo, error) { + console.log('请求失败处理'); + } + ); + }, + _viewQr: function (_data) { + document.getElementById("qrcode").innerHTML = ""; + let qrcode = new QRCode(document.getElementById("qrcode"), { + text: "无牌车入场二维码", //你想要填写的文本 + width: 200, //生成的二维码的宽度 + height: 200, //生成的二维码的高度 + colorDark: "#000000", // 生成的二维码的深色部分 + colorLight: "#ffffff", //生成二维码的浅色部分 + correctLevel: QRCode.CorrectLevel.H + }); + qrcode.makeCode(_data.url); + }, + refreshUnlicensedCarMachineQrCodeInfoInfo: function () { + vc.component.unlicensedCarMachineQrCodeInfo = { + carNum: '', + amount: '', + remark: '', + type: '1101', + payCharge: '', + machineId: '' + } + } + } + }); + +})(window.vc, window.vc.component); \ No newline at end of file diff --git a/public/pages/admin/couponDetailManage/couponDetailManage.html b/public/pages/admin/couponDetailManage/couponDetailManage.html index 4f7190d8a..616283ca1 100644 --- a/public/pages/admin/couponDetailManage/couponDetailManage.html +++ b/public/pages/admin/couponDetailManage/couponDetailManage.html @@ -46,8 +46,7 @@ 商家购买记录表ID - 优惠券 - 店铺ID + 店铺 优惠券名称 面值 购买价格 @@ -62,8 +61,7 @@ {{couponDetail.detailId}} - {{couponDetail.poolId}} - {{couponDetail.shopId}} + {{couponDetail.shopName}} {{couponDetail.couponName}} {{couponDetail.actualPrice}} {{couponDetail.buyPrice}} diff --git a/public/pages/admin/couponPoolManage/couponPoolManage.html b/public/pages/admin/couponPoolManage/couponPoolManage.html index d9ce1c1d8..4a94ae5f1 100644 --- a/public/pages/admin/couponPoolManage/couponPoolManage.html +++ b/public/pages/admin/couponPoolManage/couponPoolManage.html @@ -74,10 +74,10 @@
-
+