Merge branch 'master' of http://gitlab.oytour.com/huaguohao/athena

src/components/Hotel/HotelSure.vue

@@ -1250,7 +1250,7 @@ export default {
                     costType:res.data.data.costType,
                     orderId:res.data.data.orderId,
                     bookingNumber:res.data.data.parmResult.bookingNumber,
-                    bookMoney:this.sureMsg.totalChargeableRateInfo,
+                    bookMoney:this.sureMsg.CustomerPayMoney,
                     CancelTime:res.data.data.CancelTime,
                     hotelName:res.data.data.parmResult.hotelName,
                     totalPnumber:num

src/components/newPersonalCenter/block/model/HotelOrder.vue

@@ -60,6 +60,7 @@
               </td>
               <td class="money">
                 <p>总额 ¥{{item.TotalPrice | priceFormat}}</p>
+                <p>实付款 ¥{{item.CustomerPayMoney}}</p>
                 <p v-if="item.DiscountMoney">优惠金额 ¥{{item.DiscountMoney | priceFormat}}</p>
                 
               </td>
@@ -193,7 +194,7 @@ export default {
             RB_Branch_id:item.RB_Branch_id,
             costType:item.costType,
             orderId:item.OrderID,
-            bookMoney:item.TotalPrice,
+            bookMoney:item.CustomerPayMoney,
             CancelTime:item.EndTime,
             hotelName:item.HotelName,
             totalPnumber:item.Number

src/components/newPersonalCenter/block/model/OrderInfoModel/VisaTable.vue

@@ -235,7 +235,8 @@
                 <!-- <p>婴儿：0</p> -->
               </td>
               <td class="money">
-                <p>总额 ¥{{item.customerPayMoney | priceFormat}}</p>
+                <p>总额 ¥{{item.totalPrice | priceFormat}}</p>
+                <p>实付款 ¥{{item.customerPayMoney | priceFormat}}</p>
                 <!-- <p class="__cp pay_no" v-if="!item.payShow" @click="item.payShow = true">已付总额 ¥{{item.totalPrice | priceFormat}} <i class="iconfont icon-xia"></i></p> -->
                 <p class="__cp pay_no"  @click="item.payShow = false">已付总额 ¥{{item.income | priceFormat}} 
                 <p>优惠金额 ¥{{item.discountMoney | priceFormat}} 

src/components/newPersonalCenter/block/model/TkOrder.vue

@@ -106,7 +106,7 @@
               <p>总金额：￥{{scope.row.preferPrice | priceFormat}}</p>
               <p>实付金额：￥{{scope.row.customerPayMoney | priceFormat}}</p>
               <p>退款金额：￥{{scope.row.refund | priceFormat}}</p>
-              <p v-if="scope.row.discountMoney>0">优惠金额：￥{{scope.row.discountMoney | priceFormat}}</p>
+              <p>优惠金额：￥{{scope.row.discountMoney | priceFormat}}</p>
             </template>
         </el-table-column>