Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/orderCommon/PriceDetail.vue

@@ -276,14 +276,25 @@
               String10 = '',Price10 = 0,String11 = '',Price11 = 0,String12 = '',Price12 = 0
         let datas = '',
             Total = 0
-
+            var TotalPNum=childItem.ChirdNum+childItem.ManNum+childItem.OldPeopleNum
          if(childItem.ManNum>0) {
-          String1 = `${childItem.Unit_Price}-${childItem.DiscountPrice>0?childItem.DiscountPrice:0}*${childItem.ManNum}`
-          Price1 = childItem.Unit_Price-(childItem.DiscountPrice>0?childItem.DiscountPrice:0)*childItem.ManNum
+          if(childItem.DiscountPrice>0){
+            String1 = `${childItem.Unit_Price}-${childItem.DiscountPrice}*${childItem.ManNum}`
+          }
+          else{
+            String1 = `${childItem.Unit_Price}*${childItem.ManNum}`
+          }
+          Price1 = (childItem.Unit_Price-(childItem.DiscountPrice>0?childItem.DiscountPrice:0))*childItem.ManNum
           console.log(String1,Price1,'------String1')
          }
          if(childItem.ChirdNum>0){
+          if(childItem.DiscountPrice>0){
             String2 = `+(${childItem.Unit_Price } + ${OrderPrice.BabyChargePrice} - ${childItem.DiscountPrice>0?childItem.DiscountPrice:0 }) * ${childItem.ChirdNum}`
+          }
+          else{
+            String2 = `+(${childItem.Unit_Price } + ${OrderPrice.BabyChargePrice} ) * ${childItem.ChirdNum}`
+          }
+          
           Price2 = (childItem.Unit_Price  + OrderPrice.BabyChargePrice - (childItem.DiscountPrice>0?childItem.DiscountPrice:0 )) * childItem.ChirdNum
           console.log(String1,Price2,'------String2')
         }
@@ -293,43 +304,66 @@
           console.log(String1,Price3,'------String3')
         }
         if(childItem.OldPeopleNum>0){
+          if(childItem.DiscountPrice>0){
             String4 = `+(${OrderPrice.Unit_Price} + ${OrderPrice.OldManChargePrice} - ${childItem.DiscountPrice}) * ${childItem.OldPeopleNum}`
+          }
+          else{
+            String4 = `+(${OrderPrice.Unit_Price} + ${OrderPrice.OldManChargePrice} ) * ${childItem.OldPeopleNum}`
+          }
+         
           Price4 = (OrderPrice.Unit_Price + OrderPrice.OldManChargePrice - childItem.DiscountPrice) * childItem.OldPeopleNum
           console.log(String1,Price4,'------String4')
         }
-        if(childItem.GuestNum>0){
-          String5 = `+(${OrderPrice.OtherPrice } * ${childItem.GuestNum})`
-          Price5 = OrderPrice.OtherPrice * childItem.GuestNum
+        if(TotalPNum>0){
+          String5 = `+(${OrderPrice.OtherPrice } * ${TotalPNum})`
+          Price5 = OrderPrice.OtherPrice * TotalPNum
           console.log(String1,Price5,'------String5')
 
-          String6 = `+(${OrderPrice.VisaPrice } * ${childItem.GuestNum})`
-          Price6 = OrderPrice.VisaPrice * childItem.GuestNum
+          String6 = `+(${OrderPrice.VisaPrice } * ${TotalPNum})`
+          Price6 = OrderPrice.VisaPrice * TotalPNum
           console.log(String1,Price6,'------String6')
 
         }
-        String7 = `+(${OrderPrice.BackVisaPrice } * (${childItem.GuestNum} + ${childItem.BabyNum}  - ${childItem.VisaNum}))`
-        Price7 = OrderPrice.BackVisaPrice * (childItem.GuestNum + childItem.BabyNum  - childItem.VisaNum)
+        
+        String7 = `+(${OrderPrice.BackVisaPrice } * (${TotalPNum} + ${childItem.BabyNum}  - ${childItem.VisaNum}))`
+        Price7 = OrderPrice.BackVisaPrice * (TotalPNum + childItem.BabyNum  - childItem.VisaNum)
         console.log(String7,Price7,'------String7')
 
         String8 = `+(${childItem.SingleRoomNum} * ${OrderPrice.SingleRoomPrice})`
         Price8 = childItem.SingleRoomNum * OrderPrice.SingleRoomPrice
         console.log(String8,Price8,'------String8')
-
+        if(childItem.ChirdNeedBedNum>0){
           String9 = `+(${childItem.ChirdNeedBedNum} * ${OrderPrice.ChildNeedPrice} )`
                 Price9 = childItem.ChirdNeedBedNum * OrderPrice.ChildNeedPrice
                 console.log(String9,Price9,'------String9')
+        } 
       
+if(childItem.ChirdNum){
+  if(childItem.ChirdNeedBedNum >0){
     String10 = `+((${childItem.ChirdNum } - ${childItem.ChirdNeedBedNum }) * ${OrderPrice.ChildNoNeedPrice})`
+  }
+  else{
+    String10 = `+(${childItem.ChirdNum }  * ${OrderPrice.ChildNoNeedPrice})`
+  }
   Price10 = (childItem.ChirdNum  - childItem.ChirdNeedBedNum ) * OrderPrice.ChildNoNeedPrice
         console.log(String10,Price10,'------String10')
+}
+      if(OrderPrice.GoAddPrice>0){
+        String11 += `+${OrderPrice.GoAddPrice}`
+        Price11 += OrderPrice.GoAddPrice
+      }
+      if(OrderPrice.BackAddPrice>0){
+        String11 += `+${OrderPrice.BackAddPrice}`
+        Price11 += OrderPrice.BackAddPrice
+      }
         
-        String11 = `+(${OrderPrice.GoAddPrice}+${OrderPrice.BackAddPrice})`
-        Price11 = OrderPrice.GoAddPrice+OrderPrice.BackAddPrice
         console.log(String11,Price11,'------String11')
-
+      if(childItem.AirticketNum>0){
         String12 = `+(${OrderPrice.SingleDMCPrice } * ${childItem.AirticketNum })`
               Price12 = OrderPrice.SingleDMCPrice * childItem.AirticketNum
               console.log(String12,Price12,'------String10')
+      }
+       
 
         datas = `${String1}${String2}${String3}${String4}${String5}${String6}${String7}${String8}${String9}${String10}${String11}${String12}`
         Total = Price1+Price2+Price3+Price4+Price5+Price6+Price7+Price8+Price9+Price10+Price11+Price12