no message

src/components/orderCommon/PriceDetail.vue

@@ -43,9 +43,8 @@
           colspan="6"
           style="text-align: left; padding-left: 10px"
         >
-         总金额：{{Getdetail().Total}} <span style="color: red;margin-left: 10px; font-size: 11px;">注：如计算应收与订单应收不一致，请看订单日志可能存在其他修改。</span>
          <div>
-          {{Getdetail().datas}}
+          总金额：  {{Getdetail().datas}}={{Getdetail().Total}}
          </div>
 <!--
          decimal PreferPrice = ((dmodel.Unit_Price ?? 0) - (model.DiscountPrice ?? 0)) * (dmodel.ManNum ?? 0);
@@ -294,7 +293,7 @@
           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')
         }
@@ -310,34 +309,39 @@
           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(TotalPNum>0){
+        if(TotalPNum>0&&OrderPrice.OtherPrice>0){
           String5 = `+(${OrderPrice.OtherPrice } * ${TotalPNum})`
           Price5 = OrderPrice.OtherPrice * TotalPNum
           console.log(String1,Price5,'------String5')
-
+        }
+        if(TotalPNum>0){
           String6 = `+(${OrderPrice.VisaPrice } * ${TotalPNum})`
           Price6 = OrderPrice.VisaPrice * TotalPNum
           console.log(String1,Price6,'------String6')
-
         }
-
-        String7 = `+(${OrderPrice.BackVisaPrice } * (${TotalPNum} + ${childItem.BabyNum}  - ${childItem.VisaNum}))`
+        if((TotalPNum+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})`
+        if(childItem.SingleRoomNum>0){
+          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})`
@@ -356,14 +360,14 @@ if(childItem.ChirdNum){
         String11 += `+${OrderPrice.BackAddPrice}`
         Price11 += 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