From c5c98ff2cefb318ed16b925e6717b5d0bd977593 Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Wed, 30 Jun 2021 14:06:40 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=95=E4=BB=B7?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/components/property/simplifyRoomFee/simplifyRoomFee.html | 2 +- public/pages/property/listRoomFee/listRoomFee.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/components/property/simplifyRoomFee/simplifyRoomFee.html b/public/components/property/simplifyRoomFee/simplifyRoomFee.html index 1ddf990a9..0531a4264 100755 --- a/public/components/property/simplifyRoomFee/simplifyRoomFee.html +++ b/public/components/property/simplifyRoomFee/simplifyRoomFee.html @@ -80,7 +80,7 @@ :title="_simplifyRoomGetFeeOwnerInfo(fee.feeAttrs)">
上期度数：{{fee.preDegrees}}
本期度数：{{fee.curDegrees}}
-
单价：{{fee.mwPrice?fee.mwPrice:fee.squarePrice}}
+
单价：{{fee.mwPrice && fee.mwPrice != '-1'?fee.mwPrice:fee.squarePrice}}
附加费：{{fee.additionalAmount}}
上期度数：{{fee.preDegrees}}
本期度数：{{fee.curDegrees}}
-
单价：{{fee.mwPrice?fee.mwPrice:fee.squarePrice}}
+
单价：{{fee.mwPrice && fee.mwPrice != '-1'?fee.mwPrice:fee.squarePrice}}
附加费：{{fee.additionalAmount}}
From 1bddb7c0b4c133d3bbee72125b90493c0ea9a581 Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Wed, 30 Jun 2021 14:13:31 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=95=E4=BB=B7?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/components/property/simplifyRoomFee/simplifyRoomFee.html | 2 +- public/pages/property/listRoomFee/listRoomFee.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/components/property/simplifyRoomFee/simplifyRoomFee.html b/public/components/property/simplifyRoomFee/simplifyRoomFee.html index 0531a4264..9a735fca3 100755 --- a/public/components/property/simplifyRoomFee/simplifyRoomFee.html +++ b/public/components/property/simplifyRoomFee/simplifyRoomFee.html @@ -80,7 +80,7 @@ :title="_simplifyRoomGetFeeOwnerInfo(fee.feeAttrs)">
上期度数：{{fee.preDegrees}}
本期度数：{{fee.curDegrees}}
-
单价：{{fee.mwPrice && fee.mwPrice != '-1'?fee.mwPrice:fee.squarePrice}}
+
单价：{{fee.mwPrice && fee.mwPrice != '-1.00'?fee.mwPrice:fee.squarePrice}}
附加费：{{fee.additionalAmount}}
上期度数：{{fee.preDegrees}}
本期度数：{{fee.curDegrees}}
-
单价：{{fee.mwPrice && fee.mwPrice != '-1'?fee.mwPrice:fee.squarePrice}}
+
单价：{{fee.mwPrice && fee.mwPrice != '-1.00'?fee.mwPrice:fee.squarePrice}}
附加费：{{fee.additionalAmount}}
From 79c6e2ede928658b0e12cbf02cb57873c8c51f26 Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Wed, 30 Jun 2021 15:09:45 +0800 Subject: [PATCH 03/11] =?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 --- public/components/property/simplifyRoomFee/simplifyRoomFee.html | 2 +- public/pages/property/listRoomFee/listRoomFee.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/components/property/simplifyRoomFee/simplifyRoomFee.html b/public/components/property/simplifyRoomFee/simplifyRoomFee.html index 9a735fca3..f15b2ba74 100755 --- a/public/components/property/simplifyRoomFee/simplifyRoomFee.html +++ b/public/components/property/simplifyRoomFee/simplifyRoomFee.html @@ -80,7 +80,7 @@ :title="_simplifyRoomGetFeeOwnerInfo(fee.feeAttrs)">
上期度数：{{fee.preDegrees}}
本期度数：{{fee.curDegrees}}
-
单价：{{fee.mwPrice && fee.mwPrice != '-1.00'?fee.mwPrice:fee.squarePrice}}
+
单价：{{fee.mwPrice && fee.mwPrice >0 ?fee.mwPrice:fee.squarePrice}}
附加费：{{fee.additionalAmount}}
上期度数：{{fee.preDegrees}}
本期度数：{{fee.curDegrees}}
-
单价：{{fee.mwPrice && fee.mwPrice != '-1.00'?fee.mwPrice:fee.squarePrice}}
+
单价：{{fee.mwPrice && fee.mwPrice >0 ?fee.mwPrice:fee.squarePrice}}
附加费：{{fee.additionalAmount}}
From 3ceeb898e783b3fe716919d0cedf09f63278ca35 Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Wed, 30 Jun 2021 15:15:40 +0800 Subject: [PATCH 04/11] =?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 --- public/pages/property/listRoomFee/listRoomFee.html | 2 +- public/pages/property/listRoomFee/listRoomFee.js | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/public/pages/property/listRoomFee/listRoomFee.html b/public/pages/property/listRoomFee/listRoomFee.html index 0c8655c11..0ff902086 100755 --- a/public/pages/property/listRoomFee/listRoomFee.html +++ b/public/pages/property/listRoomFee/listRoomFee.html @@ -57,7 +57,7 @@
上期度数：{{fee.preDegrees}}
本期度数：{{fee.curDegrees}}
-
单价：{{fee.mwPrice && fee.mwPrice >0 ?fee.mwPrice:fee.squarePrice}}
+
单价：{{_getOnePrice(fee)}}
附加费：{{fee.additionalAmount}}
diff --git a/public/pages/property/listRoomFee/listRoomFee.js b/public/pages/property/listRoomFee/listRoomFee.js index de67481cb..55f289cad 100755 --- a/public/pages/property/listRoomFee/listRoomFee.js +++ b/public/pages/property/listRoomFee/listRoomFee.js @@ -179,6 +179,16 @@ } ); }, + _getOnePrice: function (fee) { + let _price = fee.mwPrice; + if (!_price) { + return fee.squarePrice; + } + if (parseFloat(_price) > 0) { + return _price; + } + return fee.mwPrice; + } } }); })(window.vc); From ef51a1cd66dd637de2d2e640340a49328e05e1f1 Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Wed, 30 Jun 2021 15:18:25 +0800 Subject: [PATCH 05/11] =?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 --- public/pages/property/listRoomFee/listRoomFee.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/pages/property/listRoomFee/listRoomFee.js b/public/pages/property/listRoomFee/listRoomFee.js index 55f289cad..69c2ac70c 100755 --- a/public/pages/property/listRoomFee/listRoomFee.js +++ b/public/pages/property/listRoomFee/listRoomFee.js @@ -179,7 +179,7 @@ } ); }, - _getOnePrice: function (fee) { + _getOnePrice:function (fee) { let _price = fee.mwPrice; if (!_price) { return fee.squarePrice; From 0a774d79e976c0c376012479cb58c3f0f24244c1 Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Wed, 30 Jun 2021 15:18:58 +0800 Subject: [PATCH 06/11] =?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 --- public/pages/property/listRoomFee/listRoomFee.html | 2 +- public/pages/property/listRoomFee/listRoomFee.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/pages/property/listRoomFee/listRoomFee.html b/public/pages/property/listRoomFee/listRoomFee.html index 0ff902086..f6d18b016 100755 --- a/public/pages/property/listRoomFee/listRoomFee.html +++ b/public/pages/property/listRoomFee/listRoomFee.html @@ -57,7 +57,7 @@
上期度数：{{fee.preDegrees}}
本期度数：{{fee.curDegrees}}
-
单价：{{_getOnePrice(fee)}}
+
单价：{{_getOnePrice1(fee)}}
附加费：{{fee.additionalAmount}}
diff --git a/public/pages/property/listRoomFee/listRoomFee.js b/public/pages/property/listRoomFee/listRoomFee.js index 69c2ac70c..3b13dc3bf 100755 --- a/public/pages/property/listRoomFee/listRoomFee.js +++ b/public/pages/property/listRoomFee/listRoomFee.js @@ -179,7 +179,7 @@ } ); }, - _getOnePrice:function (fee) { + _getOnePrice1:function (fee) { let _price = fee.mwPrice; if (!_price) { return fee.squarePrice; From aa4b35edfffea64b542e041991ceffd5e82013ed Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Wed, 30 Jun 2021 15:19:50 +0800 Subject: [PATCH 07/11] =?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 --- public/pages/property/listRoomFee/listRoomFee.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/pages/property/listRoomFee/listRoomFee.js b/public/pages/property/listRoomFee/listRoomFee.js index 3b13dc3bf..d4f82d0ed 100755 --- a/public/pages/property/listRoomFee/listRoomFee.js +++ b/public/pages/property/listRoomFee/listRoomFee.js @@ -179,7 +179,7 @@ } ); }, - _getOnePrice1:function (fee) { + _getOnePrice1:function(fee) { let _price = fee.mwPrice; if (!_price) { return fee.squarePrice; From 879ba3924f6234bd267bec7d8ae8076e5a55ab82 Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Wed, 30 Jun 2021 15:21:34 +0800 Subject: [PATCH 08/11] =?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 --- public/pages/property/listRoomFee/listRoomFee.html | 2 +- public/pages/property/listRoomFee/listRoomFee.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/pages/property/listRoomFee/listRoomFee.html b/public/pages/property/listRoomFee/listRoomFee.html index f6d18b016..49709e442 100755 --- a/public/pages/property/listRoomFee/listRoomFee.html +++ b/public/pages/property/listRoomFee/listRoomFee.html @@ -57,7 +57,7 @@
上期度数：{{fee.preDegrees}}
本期度数：{{fee.curDegrees}}
-
单价：{{_getOnePrice1(fee)}}
+
单价：{{getOnePrice1(fee)}}
附加费：{{fee.additionalAmount}}
diff --git a/public/pages/property/listRoomFee/listRoomFee.js b/public/pages/property/listRoomFee/listRoomFee.js index d4f82d0ed..fd4104b09 100755 --- a/public/pages/property/listRoomFee/listRoomFee.js +++ b/public/pages/property/listRoomFee/listRoomFee.js @@ -179,7 +179,7 @@ } ); }, - _getOnePrice1:function(fee) { + getOnePrice1:function(fee) { let _price = fee.mwPrice; if (!_price) { return fee.squarePrice; From 78d31b6540a74e59faa30cd2906db9beb8367305 Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Wed, 30 Jun 2021 15:24:34 +0800 Subject: [PATCH 09/11] =?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 --- .../pages/property/listRoomFee/listRoomFee.js | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/public/pages/property/listRoomFee/listRoomFee.js b/public/pages/property/listRoomFee/listRoomFee.js index fd4104b09..14cf36f8c 100755 --- a/public/pages/property/listRoomFee/listRoomFee.js +++ b/public/pages/property/listRoomFee/listRoomFee.js @@ -41,6 +41,16 @@ }); }, methods: { + getOnePrice1:function(fee) { + let _price = fee.mwPrice; + if (!_price) { + return fee.squarePrice; + } + if (parseFloat(_price) > 0) { + return _price; + } + return fee.mwPrice; + }, _loadListRoomCreateFeeInfo: function (_page, _row) { var param = { params: { @@ -178,16 +188,6 @@ console.log('请求失败处理'); } ); - }, - getOnePrice1:function(fee) { - let _price = fee.mwPrice; - if (!_price) { - return fee.squarePrice; - } - if (parseFloat(_price) > 0) { - return _price; - } - return fee.mwPrice; } } }); From 5d98b65b3d0290f2c51ec2034d8d5be398da852d Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Wed, 30 Jun 2021 15:27:35 +0800 Subject: [PATCH 10/11] =?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 --- public/pages/property/listRoomFee/listRoomFee.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/pages/property/listRoomFee/listRoomFee.js b/public/pages/property/listRoomFee/listRoomFee.js index 14cf36f8c..cb33925cb 100755 --- a/public/pages/property/listRoomFee/listRoomFee.js +++ b/public/pages/property/listRoomFee/listRoomFee.js @@ -49,7 +49,7 @@ if (parseFloat(_price) > 0) { return _price; } - return fee.mwPrice; + return fee.squarePrice; }, _loadListRoomCreateFeeInfo: function (_page, _row) { var param = { From 67ea9aeeceab44a940d4203332705c5c7644a4d8 Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Wed, 30 Jun 2021 15:29:53 +0800 Subject: [PATCH 11/11] =?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 --- .../property/simplifyRoomFee/simplifyRoomFee.html | 2 +- .../property/simplifyRoomFee/simplifyRoomFee.js | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/public/components/property/simplifyRoomFee/simplifyRoomFee.html b/public/components/property/simplifyRoomFee/simplifyRoomFee.html index f15b2ba74..cf6af3f3c 100755 --- a/public/components/property/simplifyRoomFee/simplifyRoomFee.html +++ b/public/components/property/simplifyRoomFee/simplifyRoomFee.html @@ -80,7 +80,7 @@ :title="_simplifyRoomGetFeeOwnerInfo(fee.feeAttrs)">
上期度数：{{fee.preDegrees}}
本期度数：{{fee.curDegrees}}
-
单价：{{fee.mwPrice && fee.mwPrice >0 ?fee.mwPrice:fee.squarePrice}}
+
单价：{{getOnePrice1(fee)}}
附加费：{{fee.additionalAmount}}
0) { + return _price; + } + return fee.squarePrice; + }, _listSimplifyRoomFee: function (_page, _row) { let param = { params: {