解决冲突

src/boot/utils.js

@@ -25,8 +25,8 @@ Vue.prototype.domainManager = function() {
         if (domainNameUrl.indexOf('testerp.oytour') !== -1) {
             domainUrl = "http://testapi.oytour.com";
         } else if (domainNameUrl.indexOf('oytour') !== -1) {
-            // domainUrl = "http://reborn.oytour.com";
-            domainUrl = 'http://192.168.10.206' //'http://192.168.10.206:8015' ''http://192.168.10.11:8083' '
+            domainUrl = "http://reborn.oytour.com";
+            // domainUrl = 'http://192.168.10.206:8015' //'http://192.168.10.206:8015' ''http://192.168.10.11:8083' '
         }
         var obj = {
             //主地址
@@ -41,7 +41,7 @@ Vue.prototype.domainManager = function() {
     //获取当前域名
 Vue.prototype.GetDomain = function() {
     var domainNameUrl = window.location.hostname;
-    domainNameUrl = "t.oytour.com";
+    domainNameUrl = "www.oytour.com";
     return domainNameUrl;
 }
 Vue.prototype.groupBy = function(array, f) {

src/components/navs/city-category.vue

-<<<<<<< HEAD
-<style>
-</style>
-=======
->>>>>>> f1c336638dd7e228f10cc6497760343026d24a12
+
 <style scoped>
 .header-box {
   max-width: 1200px;

src/components/search_sf/search_sf2.vue

@@ -594,9 +594,10 @@ export default {
       console.log(val)
       if(val!='' && typeof val == 'string'){
         this.searchKey=val
+        this.historys=Array.from(new Set([this.searchKey].concat(this.historys)))
+        localStorage['recent_search'] = JSON.stringify(this.historys)
       }
-      this.historys=Array.from(new Set([this.searchKey].concat(this.historys)))
-      localStorage['recent_search'] = JSON.stringify(this.historys)
+      
       this.CommonJump("/search", {
         qsearchKey: this.searchKey,
         qsearchDate: this.searchDate,

src/components/searchdata/kkday.vue

 <template>
-  <div class="items-start q-mt-lg" :class="$q.platform.is.desktop ? 'row' : 'colmuns'">
+  <div class="items-start q-mt-lg travel-list" :class="$q.platform.is.desktop ? 'row' : 'colmuns'">
     <div class="col-3" :class="$q.platform.is.desktop ? 'q-mr-lg' : 'q-ma-md'">
       <q-card flat class="rounded-borders q-py-md">
         <div class="text-subtitle1 text-weight-bold q-mx-md">篩選目的地</div>
@@ -21,6 +21,8 @@
           @update:ticked="handleAreaTicked"
           :ticked="areaTicked"
           text-color="#666"
+          no-nodes-label=" "
+          no-results-label=" "
         />
       </q-card>
       <q-card flat class="rounded-borders q-py-md q-mt-lg">
@@ -744,6 +746,7 @@ this.dayArray = this.dayArray.filter(item => arr.includes(item.id))
 .addr-list:hover {
   background: #f1416c1a;
 }
+
 </style>
 <style scoped>
 .price-stuff {

src/components/trip/calendar.vue

@@ -43,7 +43,7 @@
             class="rounded-borders text-center text-weight-bold"
             :class="{
               'cursor-pointer hover-date': x.value != '' && x.price,
-              'cursor-not-allowed': !x.price && x.value != '',
+              'cursor-not-allowed': (!x.price || x.price.remainNum==0) && x.value != '',
               'bg-primary': x.value != '' && x.value == currentDate,
             }"
             style="padding: 8px 4px; width: 14.285%"
@@ -67,7 +67,7 @@
               }"
             >
               {{
-                x.price ? moneyFormat(x.price.originalB2CPrice, 0) : " "
+                x.price && x.price.remainNum>0 ? moneyFormat(x.price.originalB2CPrice, 0) :(x.price && x.price.remainNum==0?'售罄':' ')
               }}
             </div>
           </div>
@@ -164,7 +164,7 @@ export default {
       }
       while (newBeginDate <= newEndDate) {
         let value = date.formatDate(newBeginDate, "YYYY-MM-DD");
-        let price = this.prices.find((x) => x.startDate == value && x.remainNum>0);
+        let price = this.prices.find((x) => x.startDate == value);
         this.col.push({
           value,
           display: date.formatDate(newBeginDate, "DD"),
@@ -180,7 +180,7 @@ export default {
       }
     },
     chosenDateHandler(item) {
-      if (item.price) {
+      if (item.price && item.price.remainNum>0) {
         this.currentDate = item.value;
         this.$emit("change", item);
       }

src/components/trip/smaple.vue

@@ -42,11 +42,11 @@
           <div class="q-mr-md col-3">餐食：</div>
           <div class="col text-grey-6">{{ dinner }}</div>
         </div>
-        <div class="row items-center q-pt-mb"
+        <!-- <div class="row items-center q-pt-mb"
         :class="{'col-6':$q.platform.is.desktop,'col-12':$q.platform.is.mobile}" >
           <div class="q-mr-md col-3">服務用語</div>
           <div class="col text-grey-6">普通話/日本語</div>
-        </div>
+        </div> -->
     </div>
   </div>
 </template>

src/pages/ScenicSpotTicket/orderForm.vue

@@ -568,7 +568,7 @@
         this.apipost(
           "AddOrderInfo_post",
           {
-            SurName: this.parameters.Name?this.parameters.Name:this.userInfo.FullName,
+            SurName: this.parameters.Name?this.parameters.Name:this.userInfo.Surname+this.userInfo.Name,
             Name: '',
             ContactNumber: this.userInfo.Mobile,//	联系电话
             Mailbox: this.userInfo.Mailbox,//邮箱

src/pages/detailHotal.vue

@@ -579,7 +579,7 @@
                     size="sm"
                     text-color="grey-2"
                     class="text-light"
-                    label="15天前可免費取消"
+                    label="取消需二次確認"
                   /> -->
                 </div>
                 <!-- <div class="text-grey f12">
@@ -1015,9 +1015,7 @@ export default {
       this.detaMsg.hotelId = decodeURIComponent(this.$route.params.id)
       this.msg.hotelId = decodeURIComponent(this.$route.params.id)
     }
-    if(this.$route.params.b2CPrice){
-      this.MinPrice = this.$route.params.b2CPrice
-    }
+   
     
   },
   mounted() {
@@ -1550,6 +1548,8 @@ export default {
             } else {
               this.SimilarList = res.data.data.roomRateDetails;
             }
+            console.log(this.SimilarList[0].roomOptions)
+            
             let arrList = function(arr){
               arr.forEach(item=>{
                 item.images=[]
@@ -1577,8 +1577,16 @@ export default {
                 arr.push(x.roomOptions);
                 x.roomOptions = arr;
               }
+              
             });
             this.JapanIncrease = res.data.data.JapanIncrease;
+            if(this.SimilarList.length>0&&this.SimilarList[0].roomOptions.length>0){
+                this.MinPrice = this.getPrice2(this.SimilarList[0].roomOptions[0].chargeableRateInfoPerPersonForANightBySetCurrency)
+            }else{
+              if(this.$route.params.b2CPrice){
+                this.MinPrice = this.$route.params.b2CPrice
+              }
+            }
           } else {
             this.SimilarList = []
             this.$message.error(res.data.message=='No results match your search.'?'當前入住日期未報價,請選擇其他日期看看吧':res.data.message)
@@ -1589,7 +1597,10 @@ export default {
         null
       );
     },
-    
+    getPrice2(price){
+      if(this.JapanIncrease)
+        return Math.ceil(price / this.JapanIncrease)
+    },
     
     menu() {
       this.scroll =

src/pages/detailsNew.vue

@@ -60,13 +60,13 @@
             class="cursor-pointer"
             @click="CommonJump('/index', {})"
           />
-          <q-breadcrumbs-el label="日本" class="cursor-pointer" />
-          <q-breadcrumbs-el>
+          <q-breadcrumbs-el :label="dataList.aimPlaceName" class="cursor-pointer" />
+          <!-- <q-breadcrumbs-el>
             <span v-for="(x, i) in citys" :key="i">
               <span class="cursor-pointer">{{ x }} </span>
               <span v-if="i + 1 != citys.length" class="q-mr-sm">，</span>
             </span>
-          </q-breadcrumbs-el>
+          </q-breadcrumbs-el> -->
           <q-breadcrumbs-el
             v-if="$q.platform.is.desktop"
             :label="dataList.title"
@@ -133,7 +133,9 @@
               class="q-mr-sm"
             />
             <span
-              >日本 -
+              >{{ dataList.aimPlaceName }} 
+
+              <span class="q-mx-sm">途徑：</span>
 
               <span v-for="(x, i) in citys" :key="i">
                 <span class="cursor-pointer">{{ x }} </span>
@@ -164,7 +166,7 @@
               class="transparent q-mr-xl no-padding"
               square
               icon="iconfont iconcancel"
-              label="15天前可免費取消"
+              label="取消需二次確認"
             />
           </div>
         </div>
@@ -303,7 +305,7 @@
                   size="sm"
                   text-color="grey-2"
                   class="text-light"
-                  label="15天前可免費取消"
+                  label="取消需二次確認"
                 />
               </div>
               <div class="text-grey f12">
@@ -348,7 +350,7 @@
                 class="transparent q-mr-xl no-padding"
                 square
                 icon="iconfont iconcancel"
-                label="15天前可免費取消"
+                label="取消需二次確認"
               />
               <q-chip
                 class="transparent q-mr-xl no-padding"
@@ -424,12 +426,12 @@
           行程特色
         </div>
         <div
-          class="q-mt-md trip-text q-pb-xl"
+          class="q-mt-md trip-text q-pb-xl line-feature"
           v-html="dataList.feature.featureContent"
           v-if="dataList.feature.featureContent != ''"
         ></div>
         <div
-          class="q-mt-md q-pb-xl"
+          class="q-mt-md q-pb-xl line-feature"
           ref="diyContext"
           :style="{ zoom: zoomDiyContext }"
           v-html="dataList.feature.featureHtml"
@@ -934,6 +936,9 @@ export default {
                     this.citys.push(x.cityName);
                   }
                 });
+                if(this.citys.length>0){
+                  this.citys = Array.from(new Set(this.citys))
+                }
               }
             }
             this.dataList.imgCover = JSON.parse(this.dataList.imgCover);
@@ -1160,6 +1165,9 @@ export default {
 </script>
 
 <style>
+.line-feature *{
+  line-height: normal !important;
+}
 .slider-item {
   transform: scale(1);
   transition-timing-function: ease;

src/pages/hotel/orderForm.vue

@@ -777,11 +777,12 @@ export default {
       })
     },
     AddOrderInfo(ErpOrderId){
+      let Name = this.parameters.guestLastName+this.parameters.guestFirstName
       this.apipost(
         "AddOrderInfo_post",
         {
-          SurName: this.parameters.Name?this.parameters.Name:this.userInfo.FullName,
-          Name: '',
+          SurName: this.parameters.guestLastName?this.parameters.guestLastName:this.userInfo.Surname,
+          Name: this.parameters.guestFirstName?this.parameters.guestFirstName:this.userInfo.Name,
           ContactNumber: this.userInfo.Mobile,//	联系电话
           Mailbox: this.userInfo.Mailbox,//邮箱
           GoodsId: this.parameters.hotelId,//商品id

src/pages/line/orderPreview.vue

@@ -713,7 +713,7 @@ export default {
         BrandId: 0,
         TradeWay: 0,
         PlatformOrder: "",
-        GuestNum: this.chosenObj.crCount + this.chosenObj.etCount +this.chosenObj+yeCount,
+        GuestNum: this.chosenObj.crCount + this.chosenObj.etCount +this.chosenObj.yeCount,
         IsChildrenTour: this.price.isSupportChildren,
         IsBirdDiscount: 2,
         PredictRoomNum: