修改行程

src/components/searchdata/rightList.vue

@@ -147,7 +147,7 @@
                   >{{ x.dayNum }} {{$t('v103.scheduledTrip.day')}}</span
                 >
               </div>
-              <div class="text-h6 product-price">CNY：{{ x.b2BPrice }}</div>
+              <div class="text-h6 product-price">{{domain==`id.oytour`?'IDR':'CNY'}}：{{ x.b2BPrice }}</div>
             </div>
           </div>
         </div>
@@ -197,6 +197,7 @@
       const $q = useQuasar()
       const qDateProxy = ref(null) as any
       const qNameProxy = ref(null) as any
+      const domain =inject(DirtionmaryHelper.DOMAIN_NAME)
       const { locale, t } = useI18n()
       const data = reactive({
         ordertype: 0,
@@ -255,7 +256,7 @@
         data.qMsg = JSON.parse(JSON.stringify(n.msg))
         data.msg = JSON.parse(JSON.stringify(n.msg))
         if(n.RetrievalState) methods.setSearchHandler()
-      },{deep:true})
+      },{deep:true,immediate:true})
       const methods = {
         changeOrderType(i){
             if(data.orderindex==i){
@@ -288,10 +289,12 @@
             }else if(x.type==5){
               search.datesId = 0
               search.msg.startDate = ""
+              search.msg.endDate = ""
             }else if(x.type==6){
               search.msg.startDate = ""
               search.msg.endDate = ""
             }
+            search.RetrievalState = true
         },
         // 排序方式
         chosenSortHandler(i) {
@@ -327,18 +330,18 @@
               return false;
             }
           }
-          var companyId = -1;
-          if (localStorage.groupinfo) {
-            var groupinfo = JSON.parse(localStorage.groupinfo);
-            companyId = groupinfo.siteList[0].companyId;
-          }
+          
           if (localStorage.b2bUser) {
             var b2bUser = JSON.parse(window.localStorage.getItem("b2bUser"));
             if (b2bUser) {
               data.msg.priceOrderByField = 2;
             }
           }
-          let param = Object.assign(data.msg,search.msg)
+          
+          let param = Object.assign(search.msg,data.msg)
+          if(domain == 'id.oytour') {
+            param.companyId =  1252
+          }
           scheduledTripService.GetB2BTravelPageList(param).then(r => {
             $q.loading.hide();
             if (r.data.resultCode == ApiResult.SUCCESS) {
@@ -386,6 +389,7 @@
       methods.goSearchHandler();
       return {
         ...toRefs(data),
+        domain,
         search,
         ...methods,
       }

src/components/trip/orderPreview.vue

@@ -19,13 +19,13 @@
           </div>
           <div v-if="$q.platform.is.mobile">
             <span class="text-grey-7 product-price" style="font-size: 13px">
-              CNY {{ p.originalB2BPrice }} /{{$t('v103.scheduledTripDetails.each')}}
+              {{domain==`id.oytour`?'IDR':'CNY'}} {{ p.originalB2BPrice }} /{{$t('v103.scheduledTripDetails.each')}}
             </span>
           </div>
         </div>
         <div class="row items-end">
           <span v-if="$q.platform.is.desktop" class="text-grey-7 product-price" style="font-size: 13px">
-            CNY {{ p.originalB2BPrice }} /{{$t('v103.scheduledTripDetails.each')}}
+            {{domain==`id.oytour`?'IDR':'CNY'}} {{ p.originalB2BPrice }} /{{$t('v103.scheduledTripDetails.each')}}
           </span>
           <q-input
             style="width: 150px"
@@ -74,14 +74,14 @@
           </div>
           <div v-if="$q.platform.is.mobile">
             <span class="text-grey-7 product-price" style="font-size: 13px">
-              CNY
+              {{domain==`id.oytour`?'IDR':'CNY'}}
               {{ p.originalB2BPrice - p.childNoNeedPrice }} /{{$t('v103.scheduledTripDetails.each')}}
             </span>
           </div>
         </div>
         <div class="row items-end">
           <span v-if="$q.platform.is.desktop" class="text-grey-7 product-price" style="font-size: 13px">
-            CNY
+            {{domain==`id.oytour`?'IDR':'CNY'}}
             {{ p.originalB2BPrice - p.childNoNeedPrice }} /{{$t('v103.scheduledTripDetails.each')}}
           </span>
           <q-input
@@ -131,7 +131,7 @@
           </div>
           <div v-if="$q.platform.is.mobile">
             <span class="text-grey-7 product-price" style="font-size: 13px">
-              CNY
+              {{domain==`id.oytour`?'IDR':'CNY'}}
               {{ p.childNeedPrice + p.originalB2BPrice }} /{{$t('v103.scheduledTripDetails.each')}}
             </span>
           </div>
@@ -142,7 +142,7 @@
             class="text-grey-7 product-price"
             style="font-size: 13px"
           >
-            CNY
+          {{domain==`id.oytour`?'IDR':'CNY'}}
             {{ p.childNeedPrice + p.originalB2BPrice }} /{{$t('v103.scheduledTripDetails.each')}}
           </span>
           <q-input
@@ -192,13 +192,13 @@
           </div>
           <div v-if="$q.platform.is.mobile">
             <span v-if="$q.platform.is.desktop" class="text-grey-7 product-price" style="font-size: 13px">
-              CNY {{ p.babyPrice }} /{{$t('v103.scheduledTripDetails.each')}}
+              {{domain==`id.oytour`?'IDR':'CNY'}} {{ p.babyPrice }} /{{$t('v103.scheduledTripDetails.each')}}
             </span>
           </div>
         </div>
         <div class="row items-end">
           <span v-if="$q.platform.is.desktop" class="text-grey-7 product-price" style="font-size: 13px">
-            CNY {{ p.babyPrice }} /{{$t('v103.scheduledTripDetails.each')}}
+            {{domain==`id.oytour`?'IDR':'CNY'}} {{ p.babyPrice }} /{{$t('v103.scheduledTripDetails.each')}}
           </span>
           <q-input
             style="width: 150px"
@@ -256,13 +256,13 @@
             </div>
             <div v-if="$q.platform.is.mobile">
               <span class="text-grey-7 product-price" style="font-size: 13px">
-                CNY {{ p.singleRoomPrice }} /{{$t('v103.scheduledTripDetails.each')}}
+                {{domain==`id.oytour`?'IDR':'CNY'}} {{ p.singleRoomPrice }} /{{$t('v103.scheduledTripDetails.each')}}
               </span>
             </div>
           </div>
           <div class="row items-end">
             <span v-if="$q.platform.is.desktop" class="text-grey-7 product-price" style="font-size: 13px">
-              CNY {{ p.singleRoomPrice }} /{{$t('v103.scheduledTripDetails.each')}}
+              {{domain==`id.oytour`?'IDR':'CNY'}} {{ p.singleRoomPrice }} /{{$t('v103.scheduledTripDetails.each')}}
             </span>
             <q-input
               style="width: 150px"
@@ -309,13 +309,13 @@
         style="border-top: 1px dashed #eee"
       >
         <div class="text-grey-6 f12 col">{{$t('v103.scheduledTripDetails.insurance')}}</div>
-        <div class="product-money f12">CNY {{ p.safeMoney }}/{{$t('v103.scheduledTripDetails.each')}}</div>
+        <div class="product-money f12">{{domain==`id.oytour`?'IDR':'CNY'}} {{ p.safeMoney }}/{{$t('v103.scheduledTripDetails.each')}}</div>
       </div>
     </div>
     <div class="q-mt-md q-pt-md" style="border-top: 1px dashed #eee">
       <div class="row items-center">
         <span class="text-subtitle2 text-grey-6 col">{{$t('v103.scheduledTripDetails.total')}}</span>
-        <span class="text-h6 text-primary product-price">CNY {{ sumPrice }}</span>
+        <span class="text-h6 text-primary product-price">{{domain==`id.oytour`?'IDR':'CNY'}} {{ sumPrice }}</span>
       </div>
       <div class="q-mt-md text-right">
         <span class="q-mr-lg f12 text-negative" v-if="!p.startDate" >{{$q.platform.is.mobile?$t('v103.scheduledTripDetails.selectdatetop'):$t('v103.scheduledTripDetails.selectdateleft')}} </span>
@@ -340,6 +340,7 @@ export default defineComponent({
   components: {  },
   props: ['msg','price'],
   setup(props, context) {
+    const domain =inject(DirtionmaryHelper.DOMAIN_NAME)
     const $router = useRouter()
     const { t } = useI18n()
     const $q = useQuasar()
@@ -462,6 +463,7 @@ export default defineComponent({
     return {
       ...toRefs(data),
       ...methods,
+      domain,
       moneyFormat,
     }
   }

src/pages/scheduledTrip/TripOrderPreview.vue

@@ -198,7 +198,7 @@
                 />
                 x {{ chosenObj.crCount }}
               </div>
-              <div>CNY {{ price.originalB2BPrice }}</div>
+              <div>{{domain==`id.oytour`?'IDR':'CNY'}} {{ price.originalB2BPrice }}</div>
             </div>
             <div class="row q-my-sm" v-if="chosenObj.etzcCount > 0">
               <div class="col">
@@ -214,7 +214,7 @@
                 x {{ chosenObj.etzcCount }}
               </div>
               <div>
-                CNY
+                {{domain==`id.oytour`?'IDR':'CNY'}}
                 {{ price.originalB2BPrice + price.childNeedPrice }}
               </div>
             </div>
@@ -232,7 +232,7 @@
                 x {{ chosenObj.etbzcCount }}
               </div>
               <div>
-                CNY
+                {{domain==`id.oytour`?'IDR':'CNY'}}
                 {{ price.originalB2BPrice - price.childNoNeedPrice }}
               </div>
             </div>
@@ -249,7 +249,7 @@
                 />
                 x {{ chosenObj.yeCount }}
               </div>
-              <div>CNY {{ price.babyPrice }}</div>
+              <div>{{domain==`id.oytour`?'IDR':'CNY'}} {{ price.babyPrice }}</div>
             </div>
 
             <div v-if="price.safeMoney > 0">
@@ -263,7 +263,7 @@
                   {{ price.safeMoney }}/{{ $t("v103.scheduledTripDetails.people") }}
                 </div>
                 <div>
-                  CNY
+                  {{domain==`id.oytour`?'IDR':'CNY'}}
                   {{
                     moneyFormat(
                       price.safeMoney *
@@ -286,7 +286,7 @@
                   }}
                 </div>
                 <div>
-                  CNY
+                  {{domain==`id.oytour`?'IDR':'CNY'}}
                   {{
                     moneyFormat(
                       price.visaPrice *
@@ -302,7 +302,7 @@
                   {{ price.otherPrice }}/{{ $t("v103.scheduledTripDetails.people") }}
                 </div>
                 <div>
-                  CNY
+                  {{domain==`id.oytour`?'IDR':'CNY'}}
                   {{
                     price.otherPrice *
                     (chosenObj.crCount + chosenObj.etCount + chosenObj.yeCount)
@@ -319,13 +319,13 @@
               <div class="col">
                 {{ $t("v103.scheduledTripDetails.surcharge") }} x {{ chosenObj.etCount }}
               </div>
-              <div>CNY {{ price.babyChargePrice }}</div>
+              <div>{{domain==`id.oytour`?'IDR':'CNY'}} {{ price.babyChargePrice }}</div>
             </div>
             <div class="row q-mb-sm" v-if="chosenObj.df > 0">
               <div class="col">
                 {{ $t("v103.scheduledTripDetails.pricedifference") }} x {{ chosenObj.df }}
               </div>
-              <div>CNY {{ price.singleRoomPrice }}</div>
+              <div>{{domain==`id.oytour`?'IDR':'CNY'}} {{ price.singleRoomPrice }}</div>
             </div>
           </div>
           <div class="q-pt-md q-mb-lg text-right" style="border-top: 1px dashed #eee">
@@ -382,6 +382,7 @@ import { useI18n } from "vue-i18n";
 import { DirtionmaryHelper } from "../../config/dictionary";
 import TicketCard from "../../components/ticket/TicketCard.vue";
 import { date, useQuasar } from "quasar";
+import { moneyFormat } from 'src/utils/tools'
 export default defineComponent({
   components: { TicketCard },
   setup(props) {
@@ -392,6 +393,7 @@ export default defineComponent({
     const pageTitle = inject(DirtionmaryHelper.PAGE_TITLE_KEY) as any;
     pageTitle.value = t("v102.ticket.preview.pageTitle");
     setTitle(pageTitle.value);
+    const domain =inject(DirtionmaryHelper.DOMAIN_NAME)
 
     const data = reactive({
       loading: false,
@@ -770,6 +772,8 @@ export default defineComponent({
       guestEName,
       guestMobile,
       guestAddress,
+      domain,
+      moneyFormat
     };
   },
 });

src/pages/scheduledTrip/detailsNew.vue

@@ -34,7 +34,7 @@
             style="text-align: left"
             v-if="dataList.priceList.length > 0"
           >
-            <span>CNY {{ dataList.priceList[0].originalB2BPrice }}</span>
+            <span>{{domain==`id.oytour`?'IDR':'CNY'}} {{ dataList.priceList[0].originalB2BPrice }}</span>
             <span class="q-ml-sm f12 text-grey-7">{{
               $t("v103.scheduledTripDetails.since")
             }}</span>
@@ -172,7 +172,7 @@
             }"
           >
             <div class="product-price text-h6" v-if="dataList.priceList.length > 0">
-              CNY：{{ dataList.priceList[0].originalB2BPrice }}
+              {{domain==`id.oytour`?'IDR':'CNY'}}：{{ dataList.priceList[0].originalB2BPrice }}
               <span class="f12 text-grey-6">{{
                 $t("v103.scheduledTripDetails.since")
               }}</span>
@@ -278,7 +278,7 @@
                   <span
                     class="product-price text-h6 q-mr-md"
                     v-if="dataList.priceList.length > 0"
-                    >CNY {{ dataList.priceList[0].originalB2BPrice }}</span
+                    >{{domain==`id.oytour`?'IDR':'CNY'}} {{ dataList.priceList[0].originalB2BPrice }}</span
                   >
                   <q-btn
                     color="primary"
@@ -638,6 +638,7 @@ export default defineComponent({
   },
   props: [],
   setup(props) {
+    const domain =inject(DirtionmaryHelper.DOMAIN_NAME)
     const $router = useRouter();
     const { t } = useI18n();
     const $q = useQuasar();
@@ -1032,6 +1033,7 @@ export default defineComponent({
       ...toRefs(data),
       ...methods,
       moneyFormat,
+      domain,
       calendarRef,
       qDateProxy,
       getDivDom,

src/utils/validate.ts

@@ -67,16 +67,17 @@ export function compareArray(arrA: any[], arrB: any[]) {
 export function getDomainName() {
 	let domainNameUrl = window.location.hostname;
 	if (domainNameUrl == 'localhost') {
-		return 'pic.oytour'
+		return 'id.oytour'
 	} else if (domainNameUrl.indexOf("192.168.10") > -1) {
 		return "typic.oytour"
 	}
 	else if (domainNameUrl == "typic.oytour.com") {
 		return "typic.oytour"
-	}
-	else if (domainNameUrl == 'pic.oytour.com') {
+	} else if (domainNameUrl == 'pic.oytour.com') {
 		return 'pic.oytour'
 	} else if (domainNameUrl == 'sell.oytour.com') {
 		return 'sell.oytour'
+	} else if (domainNameUrl == 'id.oytour.com') {
+		return 'id.oytour'
 	}
 }