1

src/components/orderCommon/PriceDetail.vue

@@ -47,20 +47,6 @@
           总金额：  {{Getdetail().datas}}={{Getdetail().Total}}
           <span style="color: red;margin-left: 10px; font-size: 11px;">注：如计算应收与订单应收不一致，请看订单日志可能存在其他修改。</span>
          </div>
-<!--
-         decimal PreferPrice = ((dmodel.Unit_Price ?? 0) - (model.DiscountPrice ?? 0)) * (dmodel.ManNum ?? 0);
-  PreferPrice += ((dmodel.Unit_Price ?? 0) + (model.BabyChargePrice ?? 0) - (model.DiscountPrice ?? 0)) * (dmodel.ChirdNum ?? 0);
-  PreferPrice += (dmodel.BabyNum ?? 0) * (model.BabyPrice ?? 0);
-  PreferPrice += ((dmodel.Unit_Price ?? 0) + (model.OldManChargePrice ?? 0) - (model.DiscountPrice ?? 0)) * (dmodel.OldPeopleNum ?? 0);
-  PreferPrice += (model.OtherPrice ?? 0) * (TotalPNum);
-  PreferPrice += (model.VisaPrice ?? 0) * (TotalPNum);
-  PreferPrice -= (model.BackVisaPrice ?? 0) * (TotalPNum + (dmodel.BabyNum ?? 0) - (dmodel.VisaNum ?? 0));
-  PreferPrice += (dmodel.SingleRoomNum ?? 0) * (model.SingleRoomPrice ?? 0);
-  PreferPrice += (dmodel.ChirdNeedBedNum ?? 0) * (model.ChildNeedPrice ?? 0);
-  PreferPrice -= ((dmodel.ChirdNum ?? 0) - (dmodel.ChirdNeedBedNum ?? 0)) * (model.ChildNoNeedPrice ?? 0);
-  PreferPrice -= (ScenicRefundMoney) * TotalPNum;
-  PreferPrice += UnionPrice;
-  PreferPrice += (model.SingleDMCPrice ?? 0) * (dmodel.AirticketNum ?? 0); -->
         </td>
       </tr>
       <tr>
@@ -278,7 +264,7 @@
             Total = 0
             var TotalPNum=childItem.ChirdNum+childItem.ManNum+childItem.OldPeopleNum
          if(childItem.ManNum>0) {
-          if(childItem.DiscountPrice>0){
+          if(childItem.DiscountPrice>0&&childItem.Unit_Price>0){
             String1 = `${childItem.Unit_Price}-${childItem.DiscountPrice}*${childItem.ManNum}`
           }
           else{
@@ -287,7 +273,7 @@
           Price1 = (childItem.Unit_Price-(childItem.DiscountPrice>0?childItem.DiscountPrice:0))*childItem.ManNum
           console.log(String1,Price1,'------String1')
          }
-         if(childItem.ChirdNum>0){
+         if(childItem.ChirdNum>0&&childItem.Unit_Price>0){
           if(childItem.DiscountPrice>0){
             String2 = `+(${childItem.Unit_Price } + ${OrderPrice.BabyChargePrice} - ${childItem.DiscountPrice>0?childItem.DiscountPrice:0 }) * ${childItem.ChirdNum}`
           }
@@ -298,12 +284,12 @@
           Price2 = (childItem.Unit_Price  + OrderPrice.BabyChargePrice - (childItem.DiscountPrice>0?childItem.DiscountPrice:0 )) * childItem.ChirdNum
           console.log(String1,Price2,'------String2')
         }
-        if(childItem.BabyNum>0){
+        if(childItem.BabyNum>0&&childItem.BabyPrice>0){
           String3 = `+(${childItem.BabyNum} * ${OrderPrice.BabyPrice})`
           Price3 = childItem.BabyNum*OrderPrice.BabyPrice
           console.log(String1,Price3,'------String3')
         }
-        if(childItem.OldPeopleNum>0){
+        if(childItem.OldPeopleNum>0&&childItem.Unit_Price>0){
           if(childItem.DiscountPrice>0){
             String4 = `+(${OrderPrice.Unit_Price} + ${OrderPrice.OldManChargePrice} - ${childItem.DiscountPrice}) * ${childItem.OldPeopleNum}`
           }
@@ -319,31 +305,31 @@
           Price5 = OrderPrice.OtherPrice * TotalPNum
           console.log(String1,Price5,'------String5')
         }
-        if(TotalPNum>0){
+        if(TotalPNum>0&&OrderPrice.VisaPrice >0){
           String6 = `+(${OrderPrice.VisaPrice } * ${TotalPNum})`
           Price6 = OrderPrice.VisaPrice * TotalPNum
           console.log(String1,Price6,'------String6')
         }
-        if((TotalPNum+childItem.BabyNum)!=childItem.VisaNum){
+        if(((TotalPNum+childItem.BabyNum)!=childItem.VisaNum) &&OrderPrice.BackVisaPrice!=0){
           String7 = `+(${OrderPrice.BackVisaPrice } * (${TotalPNum} + ${childItem.BabyNum}  - ${childItem.VisaNum}))`
         Price7 = OrderPrice.BackVisaPrice * (TotalPNum + childItem.BabyNum  - childItem.VisaNum)
         console.log(String7,Price7,'------String7')
         }
 
 
-        if(childItem.SingleRoomNum>0){
+        if(childItem.SingleRoomNum>0&&OrderPrice.SingleRoomPrice>0){
           String8 = `+(${childItem.SingleRoomNum} * ${OrderPrice.SingleRoomPrice})`
         Price8 = childItem.SingleRoomNum * OrderPrice.SingleRoomPrice
         console.log(String8,Price8,'------String8')
         }
 
-        if(childItem.ChirdNeedBedNum>0){
+        if(childItem.ChirdNeedBedNum>0&&OrderPrice.ChildNeedPrice>0){
           String9 = `+(${childItem.ChirdNeedBedNum} * ${OrderPrice.ChildNeedPrice} )`
                 Price9 = childItem.ChirdNeedBedNum * OrderPrice.ChildNeedPrice
                 console.log(String9,Price9,'------String9')
         }
 
-if(childItem.ChirdNum){
+if(childItem.ChirdNum>0&&OrderPrice.ChildNoNeedPrice>0){
   if(childItem.ChirdNeedBedNum >0){
     String10 = `+((${childItem.ChirdNum } - ${childItem.ChirdNeedBedNum }) * ${OrderPrice.ChildNoNeedPrice})`
   }
@@ -363,7 +349,7 @@ if(childItem.ChirdNum){
       }
 
         console.log(String11,Price11,'------String11')
-      if(childItem.AirticketNum>0){
+      if(childItem.AirticketNum>0&&OrderPrice.SingleDMCPrice !=0){
         String12 = `+(${OrderPrice.SingleDMCPrice } * ${childItem.AirticketNum })`
               Price12 = OrderPrice.SingleDMCPrice * childItem.AirticketNum
               console.log(String12,Price12,'------String10')