覃浩 2 years ago
parent
commit
cc29ad4255
2 changed files with 15 additions and 6 deletions
  1. 1 0
      .gitignore
  2. 14 6
      src/views/room/fangtailive.vue

+ 1 - 0
.gitignore

@@ -2,3 +2,4 @@ yarn.lock
 .idea/.gitignore
 .idea/
 node_modules/
+dist

+ 14 - 6
src/views/room/fangtailive.vue

@@ -181,8 +181,7 @@
                           预离:{{ roomLive.livingData.livingOrder.dueOutTime }}
                         </p>
                         <p>
-                          已住:{{ roomLive.livingData.livingOrder.dayCount }}晚
-                          已付:0元
+                          已住:{{ roomLive.livingData.livingOrder.liveDayCount }}晚 已付:{{ roomLive.livingData.livingOrder.shouKuan }}元
                         </p>
                         <!-- <p>来源:{{ roomLive.detail.mobile }} 消费:300元</p> -->
                         <p>
@@ -191,7 +190,7 @@
                             roomLive.livingData.price.length > 0
                               ? roomLive.livingData.price[0].price
                               : 0
-                          }}/晚 余额:0
+                          }}/晚 余额:{{ (roomLive.livingData.livingOrder.shouKuan - roomLive.livingData.livingOrder.xiaoFei) }}
                           <!-- {{ roomLive.detail.balance }} -->
                         </p>
                         <p>
@@ -344,7 +343,7 @@
                             <div>
                               <span
                                 >{{
-                                  roomLive.livingData.livingOrder.dayCount
+                                  roomLive.livingData.livingOrder.liveDayCount
                                 }}天/{{
                                   roomLive.livingData.livingOrder.arrivalTime.substr(
                                     5,
@@ -371,10 +370,19 @@
                                   roomLive.livingData.price.length > 0
                                     ? roomLive.livingData.price[0].price
                                     : 0
-                                }}/付0/余0</span
+                                }}/付{{
+                                  roomLive.livingData && roomLive.livingData.livingOrder ?
+                                  roomLive.livingData.livingOrder.shouKuan:0
+                                }}/余{{ 
+                                  roomLive.livingData && roomLive.livingData.livingOrder ?
+                                  (roomLive.livingData.livingOrder.shouKuan - roomLive.livingData.livingOrder.xiaoFei):0
+                                }}</span
                               >
                             </div>
-                            <a-tag color="blue">欠</a-tag>
+                            <a-tag color="blue" v-if="
+                              roomLive.livingData && roomLive.livingData.livingOrder 
+                              && ((roomLive.livingData.livingOrder.shouKuan - roomLive.livingData.livingOrder.xiaoFei) < 0)
+                            ">欠</a-tag>
                             <a-tag
                               color="blue"
                               v-if="