From 3405664eb1da595adfc14c296c66993d1af01492 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Thu, 21 May 2020 11:32:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=88=BF=E5=B1=8B=E7=89=A9?=
 =?UTF-8?q?=E4=B8=9A=E8=B4=B9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                        |  2 +-
 .../property/showOwnerRoom/showOwnerRoom.html | 41 +++----------------
 .../property/showOwnerRoom/showOwnerRoom.js   |  3 ++
 3 files changed, 9 insertions(+), 37 deletions(-)

diff --git a/app.js b/app.js
index e1cf0950f..2d4f69596 100644
--- a/app.js
+++ b/app.js
@@ -31,7 +31,7 @@ let opts = {
 }
 
 //app.use('/callComponent',proxy('http://192.168.0.103:8012',opts));
-app.use('/callComponent',proxy('http://hc.demo.winqi.cn:8012',opts));
+app.use('/callComponent',proxy('https://hc.demo.winqi.cn',opts));
 //app.use('/callComponent',proxy('http://10.10.10.6:8012',opts));
 
 //app.listen(3000);
diff --git a/public/components/property/showOwnerRoom/showOwnerRoom.html b/public/components/property/showOwnerRoom/showOwnerRoom.html
index a0ad0a719..aefd01e50 100644
--- a/public/components/property/showOwnerRoom/showOwnerRoom.html
+++ b/public/components/property/showOwnerRoom/showOwnerRoom.html
@@ -5,6 +5,11 @@
                 <div class="ibox-title">
                     <h5>{{roomInfo.roomNum}}房屋信息</h5>
                     <div class="ibox-tools" style="top:10px;">
+                        <button type="button" class="btn btn-primary btn-sm"
+                                v-if="showOwnerRoomInfo.deleteOwnerRoomFlag == 'false'"
+                                v-on:click="showPropertyFee(roomInfo)">
+                            <i class="glyphicon glyphicon-remove"></i> 物业费
+                        </button>
                         <button type="button" class="btn btn-primary btn-sm"
                                 v-if="showOwnerRoomInfo.deleteOwnerRoomFlag == 'true'"
                                 v-on:click="ownerExitRoomModel(roomInfo.roomId)">
@@ -93,40 +98,4 @@
             <vc:create path="property/ownerExitRoom"></vc:create>
         </div>
     </div>
-    <div class="row"  v-if="showOwnerRoomInfo.deleteOwnerRoomFlag == 'false'">
-        <div class="col-lg-12">
-            <div class="ibox ">
-                <div class="ibox-title">
-                    <h5>{{roomInfo.roomNum}}物业费信息</h5>
-                    <div class="ibox-tools" style="top:10px;">
-
-                    </div>
-                </div>
-                <div class="ibox-content">
-
-                    <div class="row">
-                        <div class="col-sm-4">
-                            <div class="form-group">
-                                <label class="col-form-label">物业费ID：</label>
-                                <label class="">{{roomInfo.feeId}}</label>
-                            </div>
-                        </div>
-                        <div class="col-sm-4">
-                            <div class="form-group">
-                                <label class="col-form-label">物业费开始时间：</label>
-                                <label class="">{{roomInfo.startTime}}</label>
-                            </div>
-                        </div>
-                        <div class="col-sm-4">
-                            <div class="form-group">
-                                <label class="col-form-label">物业费结束时间：</label>
-                                <label class="">{{roomInfo.endTime}}</label>
-                            </div>
-                        </div>
-
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
 </div>
diff --git a/public/components/property/showOwnerRoom/showOwnerRoom.js b/public/components/property/showOwnerRoom/showOwnerRoom.js
index b6686519b..b2ea1cedb 100644
--- a/public/components/property/showOwnerRoom/showOwnerRoom.js
+++ b/public/components/property/showOwnerRoom/showOwnerRoom.js
@@ -65,6 +65,9 @@
                     roomId:_roomId
                 });
             },
+            showPropertyFee:function(_room){
+                vc.jumpToPage("/admin.html#/pages/property/listRoomFee?"+vc.objToGetParam(_room));
+            },
 
             showState:function(_state){
                 if(_state == '2001'){