1

src/components/orderCommon/PriceDetail.vue

@@ -20,9 +20,8 @@
           colspan="6"
           style="text-align: left; padding-left: 10px"
         >
-         总金额：{{Getdetail().Total}}
          <div>
-          {{Getdetail().datas}}
+          总金额：  {{Getdetail().datas}}={{Getdetail().Total}}
          </div>
 <!--
          decimal PreferPrice = ((dmodel.Unit_Price ?? 0) - (model.DiscountPrice ?? 0)) * (dmodel.ManNum ?? 0);
@@ -291,24 +290,29 @@
           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