From f4a10d5b4675a656b5c20b607a218eb383ce26b4 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Thu, 15 Apr 2021 14:37:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=B8=E6=B9=96a=E9=98=BF=E5=BA=95=E9=98=BF?=
 =?UTF-8?q?=E5=A6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                        |  8 +++---
 .../pages/property/payFeeOrder/payFeeOrder.js | 25 +++++++++++++------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/app.js b/app.js
index a1ec5b097..366efffb1 100644
--- a/app.js
+++ b/app.js
@@ -36,11 +36,11 @@ let 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://api.demo.winqi.cn:8012',opts));
+app.use('/app',proxy('http://api.demo.winqi.cn:8012',opts));
 
-app.use('/callComponent',proxy('http://127.0.0.1:8012',opts));
-app.use('/app',proxy('http://127.0.0.1:8012',opts));
+//app.use('/callComponent',proxy('http://127.0.0.1:8012',opts));
+//app.use('/app',proxy('http://127.0.0.1:8012',opts));
 
 //app.use('/callComponent',proxy('http://192.168.1.16:8012',opts));
 //app.use('/app',proxy('http://192.168.1.16:8012',opts));
diff --git a/public/pages/property/payFeeOrder/payFeeOrder.js b/public/pages/property/payFeeOrder/payFeeOrder.js
index e4d1cb93b..6b00043ea 100644
--- a/public/pages/property/payFeeOrder/payFeeOrder.js
+++ b/public/pages/property/payFeeOrder/payFeeOrder.js
@@ -220,9 +220,9 @@
                     vc.component.payFeeOrderInfo.totalFeePrice = 0.00;
                     vc.component.payFeeOrderInfo.receivedAmount = '';
                     return;
-                }else if('-101' == _cycles){
+                } else if ('-101' == _cycles) {
                     $that.payFeeOrderInfo.cycles = "101";
-                    return ;
+                    return;
                 }
                 let _newCycles = _cycles;
                 if (_cycles == '') {
@@ -271,11 +271,11 @@
                     return $that._mathToFixed1(num);
                 } else if ($that.payFeeOrderInfo.toFixedSign == 3) {
                     return $that._mathCeil(num);
-                }else if ($that.payFeeOrderInfo.toFixedSign == 4) {
+                } else if ($that.payFeeOrderInfo.toFixedSign == 4) {
                     return $that._mathFloor(num);
-                }else if ($that.payFeeOrderInfo.toFixedSign == 5) {
+                } else if ($that.payFeeOrderInfo.toFixedSign == 5) {
                     return $that._mathRound(num);
-                }  else {
+                } else {
                     return $that._mathToFixed2(num);
                 }
             },
@@ -310,7 +310,7 @@
             /**
              * 四首五入取整
              */
-             _mathRound: function (_price) {
+            _mathRound: function (_price) {
                 return Math.round(_price);
             },
             /**
@@ -347,10 +347,21 @@
                         // 由于返回的键与档期那页面自定义的键不一致，单独赋值toFiexedSign
                         let toFixedSign = listRoomData.data.val;
                         // 防止后台设置有误
-                        if (toFixedSign == 1 || toFixedSign == 2 || toFixedSign == 3  || toFixedSign == 4  || toFixedSign == 5) {
+                        if (toFixedSign == 1 || toFixedSign == 2 || toFixedSign == 3 || toFixedSign == 4 || toFixedSign == 5) {
                             $that.payFeeOrderInfo.toFixedSign = toFixedSign;
                         }
                         vc.emit('payFeeOrder', 'initData', listRoomData.data);
+
+                        //如果 是一次性费用，计算优惠
+                        if ($that.payFeeOrderInfo.feeFlag == '2006012') {
+                            vc.emit('payFeeDiscount', 'computeFeeDiscount', {
+                                feeId: $that.payFeeOrderInfo.feeId,
+                                cycles: '1',
+                                payerObjId: $that.payFeeOrderInfo.payerObjId,
+                                payerObjType: $that.payFeeOrderInfo.payerObjType,
+                                endTime: $that.payFeeOrderInfo.endTime
+                            });
+                        }
                     }, function (errInfo, error) {
                         console.log('请求失败处理');
                     }