diff --git a/public/components/property/importMeterWaterFee2/importMeterWaterFee2.html b/public/components/property/importMeterWaterFee2/importMeterWaterFee2.html
index adbb2fe5b..c1a002ed8 100644
--- a/public/components/property/importMeterWaterFee2/importMeterWaterFee2.html
+++ b/public/components/property/importMeterWaterFee2/importMeterWaterFee2.html
@@ -33,9 +33,9 @@
                                 <label class="col-sm-2 col-form-label">选择文件</label>
                                 <div class="col-sm-10">
                                     <div class="custom-file">
-                                        <input id="excelTemplate" ref="excelTemplate" type="file"
-                                            class="custom-file-input form-control" name="excelTemplate"
-                                            v-on:change="getExcelTemplate($event)" accept=".xls,.xlsx">
+                                        <input id="excelTemplate2" ref="excelTemplate" type="file"
+                                            class="custom-file-input form-control" name="excelTemplate2"
+                                            v-on:change="getExcelTemplate2($event)" accept=".xls,.xlsx">
                                         <label for="excelTemplate"
                                             class="custom-file-label">{{importMeterWaterFee2Info.excelTemplate==''?'必填，请选择数据文件':importMeterWaterFee2Info.excelTemplate.name}}</label>
                                     </div>
diff --git a/public/components/property/importMeterWaterFee2/importMeterWaterFee2.js b/public/components/property/importMeterWaterFee2/importMeterWaterFee2.js
index 30f4a7c51..b5095a232 100644
--- a/public/components/property/importMeterWaterFee2/importMeterWaterFee2.js
+++ b/public/components/property/importMeterWaterFee2/importMeterWaterFee2.js
@@ -74,8 +74,8 @@
 
 
                 vc.http.upload(
-                    'importMeterWaterFee2',
-                    'importData',
+                    'importMeterWaterFee',
+                    'importData2',
                     param,
                     {
                         emulateJSON: true,
diff --git a/public/components/property/prestoreAccount/prestoreAccount.js b/public/components/property/prestoreAccount/prestoreAccount.js
index 9907d10c0..840b5be46 100644
--- a/public/components/property/prestoreAccount/prestoreAccount.js
+++ b/public/components/property/prestoreAccount/prestoreAccount.js
@@ -73,8 +73,9 @@
                         if (res.status == 200) {
                             //关闭model
                             $('#prestoreAccountModel').modal('hide');
-                            vc.component.clearAddFloorInfo();
-                            vc.emit('listFloor', 'listFloorData', {});
+                            vc.component.clearPrestoreAccountInfo();
+                            vc.emit('accountManage', 'listshopAccount', {});
+                            vc.toast('预存成功');
 
                             return;
                         }
@@ -88,7 +89,7 @@
 
                     });
             },
-            clearAddFloorInfo: function () {
+            clearPrestoreAccountInfo: function () {
                 vc.component.prestoreAccountInfo = {
                     tel: '',
                     ownerId: '',
diff --git a/public/components/property/simplifyRoomFee/simplifyRoomFee.html b/public/components/property/simplifyRoomFee/simplifyRoomFee.html
index ba52102bf..485a66da9 100755
--- a/public/components/property/simplifyRoomFee/simplifyRoomFee.html
+++ b/public/components/property/simplifyRoomFee/simplifyRoomFee.html
@@ -76,11 +76,11 @@
                 <td class="text-center">{{fee.startTime}}</td>
                 <td class="text-center">{{_getEndTime(fee)}}</td>
                 <td class="text-center">{{_getDeadlineTime(fee)}}</td>
-                <td class="text-center" v-if="fee.computingFormula == '5005'"
+                <td class="text-center" v-if="fee.computingFormula == '5005' || fee.computingFormula == '9009'"
                     :title="_simplifyRoomGetFeeOwnerInfo(fee.feeAttrs)">
                     <div>上期度数：{{fee.preDegrees}}</div>
                     <div>本期度数：{{fee.curDegrees}}</div>
-                    <div>单价：{{fee.squarePrice}}</div>
+                    <div>单价：{{fee.wmPrice?fee.wmPrice:fee.squarePrice}}</div>
                     <div>附加费：{{fee.additionalAmount}}</div>
                 </td>
                 <td class="text-center" v-else-if="fee.computingFormula == '6006'"
diff --git a/public/pages/property/accountDetailManage/accountDetailManage.html b/public/pages/property/accountDetailManage/accountDetailManage.html
new file mode 100644
index 000000000..4ca91e976
--- /dev/null
+++ b/public/pages/property/accountDetailManage/accountDetailManage.html
@@ -0,0 +1,51 @@
+<div>
+    <div class="row">
+        <div class="col-lg-12">
+            <div class="ibox">
+                <div class="ibox-title">
+                    <h5>账户明细</h5>
+                    <div class="ibox-tools" style="top:10px;">
+
+                    </div>
+                </div>
+                <div class="ibox-content">
+
+                    <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
+                        <thead>
+                            <tr>
+                                <th class="text-center">明细编号</th>
+                                <th class="text-center">交易编号</th>
+                                <th class="text-center">账户名称</th>
+                                <th class="text-center">明细类型</th>
+                                <th class="text-center">金额</th>
+                                <th class="text-center">交易时间</th>
+                                <th class="text-center">说明</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <tr v-for="accountDetail in accountDetailManageInfo.accountDetails">
+                                <td class="text-center">{{accountDetail.detailId}}</td>
+                                <td class="text-center">{{accountDetail.orderId}}</td>
+                                <td class="text-center">{{accountDetail.acctName}}</td>
+                                <td class="text-center">{{accountDetail.detailType =='1001'?'转入':'转出'}}</td>
+                                <td class="text-center">{{accountDetail.amount}}</td>
+                                <td class="text-center">{{accountDetail.createTime}}</td>
+                                <td class="text-center">{{accountDetail.remark}}</td>
+                            </tr>
+                        </tbody>
+                        <tfoot>
+                            <tr>
+                                <td colspan="7">
+                                    <ul class="pagination float-right"></ul>
+                                </td>
+                            </tr>
+                        </tfoot>
+                    </table>
+                    <!-- 分页 -->
+                    <vc:create path="frame/pagination"></vc:create>
+                </div>
+            </div>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/public/pages/property/accountDetailManage/accountDetailManage.js b/public/pages/property/accountDetailManage/accountDetailManage.js
new file mode 100644
index 000000000..6664704e9
--- /dev/null
+++ b/public/pages/property/accountDetailManage/accountDetailManage.js
@@ -0,0 +1,76 @@
+/**
+    入驻小区
+**/
+(function (vc) {
+    var DEFAULT_PAGE = 1;
+    var DEFAULT_ROWS = 10;
+    vc.extends({
+        data: {
+            accountDetailManageInfo: {
+                accountDetails: [],
+                shopAccounts: [],
+                total: 0,
+                records: 1,
+                moreCondition: false,
+                scId: '',
+                conditions: {
+                    acctId: '',
+                    detailType: '',
+                    orderId: '',
+                }
+            }
+        },
+        _initMethod: function () {
+            $that.accountDetailManageInfo.conditions.acctId = vc.getParam('acctId');
+            vc.component._listAccountDetails(DEFAULT_PAGE, DEFAULT_ROWS);
+        },
+        _initEvent: function () {
+
+            vc.on('accountDetailManage', 'listAccountDetail', function (_param) {
+                vc.component._listAccountDetails(DEFAULT_PAGE, DEFAULT_ROWS);
+            });
+            vc.on('pagination', 'page_event', function (_currentPage) {
+                vc.component._listAccountDetails(_currentPage, DEFAULT_ROWS);
+            });
+        },
+        methods: {
+            _listAccountDetails: function (_page, _rows) {
+
+                vc.component.accountDetailManageInfo.conditions.page = _page;
+                vc.component.accountDetailManageInfo.conditions.row = _rows;
+                var param = {
+                    params: vc.component.accountDetailManageInfo.conditions
+                };
+
+                //发送get请求
+                vc.http.apiGet('/account/queryOwnerAccountDetail',
+                    param,
+                    function (json, res) {
+                        var _accountDetailManageInfo = JSON.parse(json);
+                        vc.component.accountDetailManageInfo.total = _accountDetailManageInfo.total;
+                        vc.component.accountDetailManageInfo.records = _accountDetailManageInfo.records;
+                        vc.component.accountDetailManageInfo.accountDetails = _accountDetailManageInfo.data;
+                        vc.emit('pagination', 'init', {
+                            total: vc.component.accountDetailManageInfo.records,
+                            currentPage: _page
+                        });
+                    }, function (errInfo, error) {
+                        console.log('请求失败处理');
+                    }
+                );
+            },
+            _queryAccountDetailMethod: function () {
+                vc.component._listAccountDetails(DEFAULT_PAGE, DEFAULT_ROWS);
+            },
+            _moreCondition: function () {
+                if (vc.component.accountDetailManageInfo.moreCondition) {
+                    vc.component.accountDetailManageInfo.moreCondition = false;
+                } else {
+                    vc.component.accountDetailManageInfo.moreCondition = true;
+                }
+            }
+
+
+        }
+    });
+})(window.vc);
diff --git a/public/pages/property/accountManage/accountManage.js b/public/pages/property/accountManage/accountManage.js
index 3c6485beb..badb29846 100644
--- a/public/pages/property/accountManage/accountManage.js
+++ b/public/pages/property/accountManage/accountManage.js
@@ -68,7 +68,10 @@
                 }
             },
             _prestoreAccount: function () {
-                vc.emit('prestoreAccount','openAddModal',{});
+                vc.emit('prestoreAccount', 'openAddModal', {});
+            },
+            _accountDetail: function (_account) {
+                vc.jumpToPage('/admin.html#/pages/property/accountDetailManage?acctId=' + _account.acctId);
             }
 
 
diff --git a/public/pages/property/listCarFee/listCarFee.html b/public/pages/property/listCarFee/listCarFee.html
index 59f3856f1..0b6665243 100755
--- a/public/pages/property/listCarFee/listCarFee.html
+++ b/public/pages/property/listCarFee/listCarFee.html
@@ -51,7 +51,7 @@
                                     v-if="fee.feeTypeCd == '888800010015' || fee.feeTypeCd == '888800010016' ">
                                     <div>上期度数：{{fee.preDegrees}}</div>
                                     <div>本期度数：{{fee.curDegrees}} </div>
-                                    <div>单价：{{fee.squarePrice}} </div>
+                                    <div>单价：{{fee.wmPrice?fee.wmPrice:fee.squarePrice}} </div>
                                     <div>附加费：{{fee.additionalAmount}}</div>
                                 </td>
                                 <td class="text-center" width="150" v-else-if="fee.feeTypeCd == '888800010017'">
diff --git a/public/pages/property/listContractFee/listContractFee.html b/public/pages/property/listContractFee/listContractFee.html
index e519e5c0d..0282c2e45 100755
--- a/public/pages/property/listContractFee/listContractFee.html
+++ b/public/pages/property/listContractFee/listContractFee.html
@@ -49,10 +49,10 @@
                                 <td class="text-center">{{fee.startTime}}</td>
                                 <td class="text-center">{{_getEndTime(fee)}}</td>
                                 <td class="text-center">{{_getDeadlineTime(fee)}}</td>
-                                <td class="text-center" v-if="fee.computingFormula == '5005'">
+                                <td class="text-center" v-if="fee.computingFormula == '5005' || fee.computingFormula == '9009'">
                                     <div>上期度数：{{fee.preDegrees}}</div>
                                     <div>本期度数：{{fee.curDegrees}}</div>
-                                    <div>单价：{{fee.squarePrice}}</div>
+                                    <div>单价：{{fee.wmPrice?fee.wmPrice:fee.squarePrice}}</div>
                                     <div>附加费：{{fee.additionalAmount}}</div>
                                 </td>
                                 <td class="text-center" v-else-if="fee.computingFormula == '6006'">
diff --git a/public/pages/property/listRoomFee/listRoomFee.html b/public/pages/property/listRoomFee/listRoomFee.html
index c4c980a01..13c45d80e 100755
--- a/public/pages/property/listRoomFee/listRoomFee.html
+++ b/public/pages/property/listRoomFee/listRoomFee.html
@@ -54,10 +54,10 @@
                             <td class="text-center">{{fee.startTime}}</td>
                             <td class="text-center">{{_getEndTime(fee)}}</td>
                             <td class="text-center">{{_getDeadlineTime(fee)}}</td>
-                            <td class="text-center" v-if="fee.computingFormula == '5005'">
+                            <td class="text-center" v-if="fee.computingFormula == '5005' || fee.computingFormula == '9009'">
                                 <div>上期度数：{{fee.preDegrees}}</div>
                                 <div>本期度数：{{fee.curDegrees}}</div>
-                                <div>单价：{{fee.squarePrice}}</div>
+                                <div>单价：{{fee.wmPrice?fee.wmPrice:fee.squarePrice}}</div>
                                 <div>附加费：{{fee.additionalAmount}}</div>
                             </td>
                             <td class="text-center" v-else-if="fee.computingFormula == '6006'">