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

src/components/LocalTour/Appointment.vue

@@ -290,7 +290,7 @@ export default {
         this.UserCanUseCouponList = list
       },
       SaveOrder(formName){
-          this.form.preferPrice=this.SettlementPrice;
+          this.form.preferPrice=this.price;
           if(this.form.useDate==""){
               this.Error("请选择使用日期！")
               return;

src/components/Ticket/Pay.vue

@@ -172,8 +172,9 @@ export default {
       let Visainfo=JSON.parse(sessionStorage.Visainfo);
       this.Commoditydetails=Visainfo;
       this.Commoditydetails.airOrderId=Visainfo.AirOrderId;
+      this.Commoditydetails.customerPayMoney = Visainfo.preferPrice;
       this.code.OrderSource=Visainfo.orderResourceId;
-      this.code.total_fee=Visainfo.customerPayMoney+'';
+      this.code.total_fee=Visainfo.preferPrice+'';
       this.code.body=Visainfo.description;
       this.code.attach=`${Visainfo.costType}|${Visainfo.customerName}|${Visainfo.AirOrderId}|${Visainfo.customerId}|${Visainfo.outBranchId}`
     }else{

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

@@ -214,7 +214,7 @@
               </td>
               <td class="money">
                 <p>总金额：{{item.preferPrice | priceFormat}}</p>
-                <p>实付款：{{item.customerPayMoney | priceFormat}}</p>
+                <p>应付款：{{item.customerPayMoney | priceFormat}}</p>
                 <p>优惠金额：{{item.discountMoney | priceFormat}}</p>
               </td>
               <td class="color333 font-size12">
@@ -294,7 +294,7 @@ export default {
       let data={};
       data=item.payInfo;
       data.AirOrderId=item.payInfo.airOrderId;
-      item.payInfo.preferPrice = item.payInfo.preferPrice - item.discountMoney
+      item.payInfo.preferPrice = item.customerPayMoney
       sessionStorage.Visainfo=JSON.stringify(item.payInfo)
       this.$router.push({
           name: "Pay",