页面修改

src/components/trip/order/TripOrderList.vue

@@ -161,9 +161,7 @@ export default defineComponent({
               x.typeInfo = data.status.find(y => y.StatusId == x.orderState) ?? data.status[1]
             })
             data.orders = r.data.data.pageData
-            console.log(r)
             data.pages.pageCount = r.data.data.pageCount
-           // methods.GetWaitDealOrderPageList()
           } else {
             message.errorMsg(r.data.message)
           }

src/pages/scheduledTrip/TripOrderPreview.vue

@@ -277,7 +277,7 @@
               </div>
             </div>
             <div v-if="price.visaPrice > 0 || price.otherPrice > 0">
-              <hr
+              <!-- <hr
                 style="border: none; border-top: 1px dashed #eee !important"
                 class="bg-transparent q-mb-sm"
               />
@@ -297,7 +297,7 @@
                     )
                   }}
                 </div>
-              </div>
+              </div> -->
               <div class="row q-mb-sm" v-if="price.otherPrice > 0">
                 <div class="col">
                   {{ $t("v103.scheduledTripDetails.miscellaneous") }} x
@@ -322,7 +322,8 @@
                 {{ $t("v103.scheduledTripDetails.surcharge") }} x {{ chosenObj.etCount }}
               </div>
               <div>
-                {{ domain == `id.oytour` ? "IDR" : "CNY" }} {{ price.babyChargePrice }}
+                {{ domain == `id.oytour` ? "IDR" : "CNY" }}
+                {{ price.babyChargePrice * chosenObj.etCount }}
               </div>
             </div>
             <div class="row q-mb-sm" v-if="chosenObj.df > 0">
@@ -550,15 +551,19 @@ export default defineComponent({
         data.price.discountPrice = data.price.discountPrice
           ? data.price.discountPrice
           : 0;
-        //成人价格
+        //成人价格=成人人数*(成交单价-早鸟优惠)
         let crMoney = data.price.originalB2BPrice * data.chosenObj.crCount;
         //儿童不占床价格
         let etbzcMoney =
-          (data.price.originalB2BPrice - data.price.childNoNeedPrice) *
+          (data.price.originalB2BPrice -
+            data.price.childNoNeedPrice +
+            data.price.babyChargePrice) *
           data.chosenObj.etbzcCount;
         //儿童占床价格
         let etzcMoney =
-          (data.price.originalB2BPrice + data.price.childNeedPrice) *
+          (data.price.originalB2BPrice +
+            data.price.childNeedPrice +
+            data.price.babyChargePrice) *
           data.chosenObj.etzcCount;
         //婴儿价格
         let babyMoney = data.price.babyPrice * data.chosenObj.yeCount;
@@ -569,8 +574,9 @@ export default defineComponent({
           data.chosenObj.etbzcCount +
           data.chosenObj.etzcCount +
           data.chosenObj.yeCount;
-        //签证费
-        let visaMoney = data.price.visaPrice * sumCount;
+        //签证费（团费包含了签证费）
+        let visaMoney = 0;
+        //visaMoney=data.price.visaPrice * sumCount;
         let safeMoney = data.price.safeMoney * sumCount;
         let otherMoney = data.price.otherPrice * sumCount;
         // console.log("totalPersion", sumCount);
@@ -678,7 +684,7 @@ export default defineComponent({
           PreferPrice: data.sumPrice, //实付价格
           DiscountMoney: 0, //优惠价格
           CouponAllotIds: "", //优惠券id
-          YSeatNum: y, //盈收
+          YSeatNum: y, //
           ESeatNum: f,
           FSeatNum: c,
           Commission: (