no message

src/pages/Pickuporder/orderForm.vue

@@ -516,6 +516,16 @@
               <div class="col">{{CarObj.CarName}} x {{ chosenObj.Count }}</div>
               <div>{{details.CurrencyCode}} {{ moneyFormat(OrderDate.originalB2CPrice,2) }}</div>
             </div>
+            <hr
+              style="border: none; border-top: 1px dashed #eee !important"
+              class="bg-transparent q-mb-sm"
+            />
+            <div class="row q-mb-sm items-center">
+              <div class="col">總金額</div>
+              <div class="text-subtitle2 text-weight-bolder text-primary">
+                CNY {{ moneyFormat(sumPrice, 2) }}
+              </div>
+            </div>
             <hr style="border:none;border-top:1px dashed #EEE !important;" class="bg-transparent q-mb-sm" />
             <div class="row q-mb-sm items-center">
                 <div class="col">優惠金額</div>

src/pages/ScenicSpotTicket/orderForm.vue

@@ -282,6 +282,16 @@
                   </template>
                 </div>
               </template>
+              <hr
+                style="border: none; border-top: 1px dashed #eee !important"
+                class="bg-transparent q-mb-sm"
+              />
+              <div class="row q-mb-sm items-center">
+                <div class="col">總金額</div>
+                <div class="text-subtitle2 text-weight-bolder text-primary">
+                  CNY {{ moneyFormat(sumPrice, 2) }}
+                </div>
+              </div>
               <hr style="border:none;border-top:1px dashed #EEE !important;" class="bg-transparent q-mb-sm" />
               <div class="row q-mb-sm items-center" v-if="parameters.MailingState==2&&parameters.MailingMoney>0">
                 <div class="col">邮寄费</div>

src/pages/detailsHotal.vue

@@ -180,7 +180,7 @@
           unelevated
           class="q-px-xl"
           label="搜索"
-          @click="getData"
+          @click="getRoom"
         />
        </div>
       </div>
@@ -347,7 +347,6 @@
       <hotel-map></hotel-map>
     </div> -->
     <div
-      v-if="dataList"
       class="q-pa-lg bg-grey-3 q-mt-lg text-grey-9"
       ref="pricelist"
     >
@@ -369,7 +368,6 @@
           </div>
           <div
             class="bg-white rounded-borders q-mt-md"
-            v-if="dataList.priceList && dataList.priceList.length > 0"
           >
             <div class="q-pa-md row">
               <div class="col">
@@ -378,29 +376,29 @@
                   v-if="$q.platform.is.desktop"
                 >
                   <span class="q-mr-md">行程標準出行方案</span>
-                  <q-chip
+                  <!-- <q-chip
                     square
                     color="orange"
                     size="sm"
                     text-color="grey-2"
                     class="text-light"
                     label="15天前可免費取消"
-                  />
+                  /> -->
                 </div>
-                <div class="text-grey f12">
+                <!-- <div class="text-grey f12">
                   <ul class="q-pl-md no-margin">
                     <li v-for="(x, i) in warnBuy" class="q-mt-md" :key="i">
                       {{ x }}
                     </li>
                   </ul>
-                </div>
+                </div> -->
               </div>
               <div class="" v-if="$q.platform.is.desktop">
                 <div class="row items-center">
                   <span class="product-price text-h6 q-mr-md"
                     >CNY
                     {{
-                      moneyFormat(dataList.priceList[0].originalB2CPrice, 0)
+                      moneyFormat(MinPrice, 0)
                     }}</span
                   >
                   <q-btn
@@ -412,7 +410,7 @@
                   />
                 </div>
                 <div class="text-info q-mt-md text-right">
-                  最早可預訂日期：{{ dataList.priceList[0].startDate }}
+                  最早可預訂日期：{{ StartDate }}
                 </div>
               </div>
             </div>
@@ -423,15 +421,19 @@
             >
               <div class="q-mt-lg row" v-if="$q.platform.is.desktop">
                 <div class="col">
-                  <calendar
-                    :priceList="dataList.priceList"
+                  <RoomCard
+                    :priceList="SimilarList"
                     @change="changeChosenDateHandler"
-                    ref="calendar"
-                  ></calendar>
+                    ref="RoomCard"
+                  ></RoomCard>
                 </div>
                 <div class="col q-ml-xl">
                   <order-preview
+                    :JapanIncrease="JapanIncrease"
                     :price="currentPrice"
+                    :SimilarList="SimilarList"
+                    :msg="msg"
+                    :liveNvm="liveNvm"
                     @reset="resetHandler"
                   ></order-preview>
                 </div>
@@ -441,19 +443,6 @@
         </div>
       </div>
     </div>
-    <!-- <div style="max-width: 1200px; margin-left: auto; margin-right: auto">
-      <div
-        id="comment"
-        class="text-h5 text-weight-bold text-left q-mt-xl mb"
-        ref="comment"
-        :class="{
-          'q-px-md': $q.screen.width < 1220 && $q.platform.is.mobile,
-        }"
-      >
-        评价
-      </div>
-      <comments></comments>
-    </div> -->
 
     <div
       style="max-width: 1200px; margin-left: auto; margin-right: auto"
@@ -656,11 +645,7 @@
 
 <script>
 import { date } from 'quasar'
-import { slider, slideritem } from "vue-concise-slider";
-import calendar from "../components/trip/calendar.vue";
-import OrderPreview from "src/components/trip/orderPreview.vue";
 import smaple from "src/components/trip/smaple.vue";
-import Trip from "src/components/trip/trip.vue";
 import block from "src/components/trip/block/index";
 import hotelStar from "./hotel/hotelStar.vue";
 import hotelMap from "./hotel/hotelMap.vue";
@@ -669,15 +654,12 @@ import comments from "./hotel/comments.vue";
 import selectRoom from './hotel/selectRoom.vue';
 import componentsMap from 'src/components/car/Map.vue';
 import ImagePreview from 'src/components/common/ImagePreview.vue'
+import RoomCard from 'src/components/hotal/RoomCard.vue'
+import OrderPreview from "src/components/hotal/orderPreview.vue";
 export default {
   props: [],
   components: {
-    slider,
-    slideritem,
-    calendar,
-    OrderPreview,
     smaple,
-    Trip,
     block,
     hotelStar,
     hotelMap,
@@ -685,7 +667,9 @@ export default {
     comments,
     selectRoom,
     componentsMap,
-    ImagePreview
+    ImagePreview,
+    RoomCard,
+    OrderPreview,
   },
   data() {
     return {
@@ -696,6 +680,7 @@ export default {
       clickDate: "",
       slide: 1,
 
+      StartDate: '',
       roomReviewRating: 0,
       currentImage: '',
       showImagePriview: false,
@@ -713,47 +698,35 @@ export default {
       liveNvm: 1,
       dateRange:{},
       dateRangeFormat: '',//入住、离店时间
-      roomGroupObj:{roomNum:null,numberOfAdults:1,numberOfChildren:0},
+      roomGroupObj:{
+        childAges:null,
+        roomNum:null,numberOfAdults:1,numberOfChildren:0
+      },
       msg: {
-        // configId: "",
-        // cityId: 0,
-        // preview: 0,
-        // tcid: 0,
-        // teamType: 0,
-        // isGetPriceFlight: true,
-
-
-        arrivalDate: '',//开始日期
-        departureDate: '',//结束日期
-        searchroomGroup: [
-          {roomNum:1,numberOfAdults:1,numberOfChildren:0}
-        ],//客房数
-        searchHotelIdList: [],
-        freeword: '',//地区名字 酒店名字
-        freewordType: 1, //类型 1，地区，2-酒店名称
-        reviewRatingUpperLimits: '',//最大评分数
-        reviewRatingLowerLimits: '',//最小评分数
-        searchHotelCategory: [], //酒店分类
-        searchHotelFeatures: [], //酒店特征
-        searchRoomType: [], //类型的房间
-        searchMealType: [], //饮食条件搜索	
-        searchMinRate: '', //最小金额
-        searchMaxRate: '', //最大金额
-
-        displayFrom: 1,//页数
-        numberOfResults: 12,
-        rowsPerPage: 15,
-        sort: 1
+        hotelId:'',
+        sort:1,
+        displayFrom:1,
+        arrivalDate:'',//开始时间
+        departureDate:'',//结束时间
+        roomOptionCd:'',
+        searchroomGroup:[{ 
+          childAges:null,
+          roomNum:1,numberOfAdults:1,numberOfChildren:0
+        }],
       },
       detaMsg:{
         groupBookingFlg: "0",
         hotelId: 0,
-        hotelImageSize: 5,
-        photoGalleryGetFlg: 1
+        hotelImageSize: 5,//图片大小
+        photoGalleryGetFlg: 1 //画廊取得标志
       },
-      currentPrice: {},
+      currentPrice: [],
       isShow: false,
-      dataList: null,
+      dataList: {
+        roomGroup: null,
+      },
+      JapanIncrease: '',
+      SimilarList: [],
       isDirect: 1,
       TripConfig: {},
       isShowNav: false,
@@ -774,10 +747,8 @@ export default {
         loop: true,
       },
       warnBuy: [
-        "未满 2 岁幼儿不占位可免费参加（不含座位，餐点，门票，床位），请先于下订时在「备注栏」告知。",
-        "如需要單人房，請購買單房",
-        "不占床2-11(包含)岁幼童可购买儿童价，如需占床請購買成人價",
-        "12歲以上皆視同成人售價",
+        "超过13岁视为成人处理",
+        "预定成功后房间将为您整晚保留"
       ],
       showOrderPreview: false,
       videoPosition: 0,
@@ -846,6 +817,7 @@ export default {
   created() {
     if (this.$route.params.id) {
       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
@@ -854,16 +826,18 @@ export default {
   },
   mounted() {
     window.addEventListener("scroll", this.handleScroll);
+    
     this.dateRange.to = date.formatDate(date.addToDate(new Date(), { days: 9 }), 'YYYY-MM-DD')
     this.dateRange.from = date.formatDate(date.addToDate(new Date(), { days: 8 }), 'YYYY-MM-DD')
-    this.msg.StartDate = date.formatDate(date.addToDate(new Date(), { days: 8 }), 'YYYY-MM-DD')
-    this.msg.EndDate = date.formatDate(date.addToDate(new Date(), { days: 9 }), 'YYYY-MM-DD')
-    this.dateRangeFormat = `${this.msg.StartDate} - ${this.msg.EndDate} `
-
+    this.msg.arrivalDate = date.formatDate(date.addToDate(new Date(), { days: 8 }), 'YYYY-MM-DD')
+    this.msg.departureDate = date.formatDate(date.addToDate(new Date(), { days: 9 }), 'YYYY-MM-DD')
+    this.dateRangeFormat = `${this.msg.arrivalDate} - ${this.msg.departureDate} `
+    this.StartDate = this.msg.arrivalDate
     
 
     window.addEventListener("scroll", this.menu);
     this.getData();
+    this.getRoom()
   },
   beforeDestroy() {
     document.getElementsByTagName("body")[0].style = "";
@@ -908,11 +882,11 @@ export default {
     },
     // 日期筛选
     dateRangeHandler(e) {
-      this.msg.StartDate = `${e.from.year}/${e.from.month}/${e.from.day}`
-      this.msg.EndDate = `${e.to.year}/${e.to.month}/${e.to.day} `
-      this.dateRangeFormat = `${this.msg.StartDate} - ${this.msg.EndDate} `
+      this.msg.arrivalDate = `${e.from.year}-${e.from.month}-${e.from.day}`
+      this.msg.departureDate = `${e.to.year}-${e.to.month}-${e.to.day} `
+      this.dateRangeFormat = `${this.msg.arrivalDate} - ${this.msg.departureDate} `
       if (this.$refs.qDateProxy) this.$refs.qDateProxy.hide()
-      this.liveNvm = this.dateDiffer(this.msg.StartDate,this.msg.EndDate)
+      this.liveNvm = this.dateDiffer(this.msg.arrivalDate,this.msg.departureDate)
     },
     dateDiffer(DateStart,DateEnd) {
         //date1结束时间
@@ -1004,12 +978,20 @@ export default {
       //console.log(e)
     },
     resetHandler() {
-      this.currentPrice.startDate = "";
-      this.$refs.calendar.reset();
+      this.currentPrice = [];
+      this.$refs.RoomCard.reset();
     },
     changeChosenDateHandler(val) {
-      val.price.version = new Date().getTime();
-      this.currentPrice = JSON.parse(JSON.stringify(val.price));
+      let arrList = function(arr){
+        arr.forEach(x=>{
+          x.id=null
+        })
+      }
+      arrList(val.roomOptions)
+      val.roomOptions.forEach((x,index)=>{
+        x.id=(index+1)
+      })
+      this.currentPrice = JSON.parse(JSON.stringify(val));
       this.$refs.qDateProxy.hide();
     },
     showDialog() {
@@ -1028,7 +1010,6 @@ export default {
         (res) => {
           this.$q.loading.hide();
           if (res.data.resultCode == 1) {
-            this.dataList = res.data.data;
             this.hotelDetails = res.data.data.hotelDetails;
             this.hotelSummary = res.data.data.hotelSummary;
             this.roomReviewRating = Number(this.hotelDetails.roomReviewRating);
@@ -1316,6 +1297,7 @@ export default {
                 }
             }
             this.images=dataImgArray;
+            
             this.$nextTick(() => {
               setTimeout(() => {
                 this.navs.forEach((x) => {
@@ -1341,6 +1323,64 @@ export default {
         null
       );
     },
+    // 获取酒店房间
+    getRoom() {
+      this.$q.loading.show();
+      this.apipost(
+        "dmc_post_Get_GetJAPAN_RoomsList",
+        this.msg,
+        (res) => {
+          this.$q.loading.hide();
+          if (res.data.resultCode == 1) {
+            if (
+              Object.prototype.toString.call(res.data.data.roomRateDetails) ==
+              "[object Object]"
+            ) {
+              this.SimilarList.push(res.data.data.roomRateDetails);
+            } else {
+              this.SimilarList = res.data.data.roomRateDetails;
+            }
+            let arrList = function(arr){
+              arr.forEach(item=>{
+                item.images=[]
+                item.id=null
+              })
+            }
+            arrList(this.SimilarList)
+            this.SimilarList.forEach((x,index) => {
+              x.id = (index+1)
+              x.images = []
+              x.images.push(x.roomImageURL)
+              for (let i = 0; i < 4; i++) {
+                  if(x.roomOptions[`planPictureURL${(i+1)}`] && x.roomOptions[`planPictureURL${(i+1)}`].length>0){
+                    x.images.push(x.roomOptions[`planPictureURL${(i+1)}`])
+                  }
+              }
+              if (
+                Object.prototype.toString.call(x.roomOptions) ==
+                "[object Object]"
+              ) {
+                let arr = [];
+                arr.push(x.roomOptions);
+                x.roomOptions = arr;
+              }
+            });
+            this.JapanIncrease = res.data.data.JapanIncrease;
+
+          } else {
+            this.$q.notify({
+              type: "negative",
+              message: res.data.message,
+              position: "top",
+            });
+          }
+          
+        },
+        null
+      );
+    },
+    
+    
     menu() {
       this.scroll =
         document.documentElement.scrollTop || document.body.scrollTop;

src/router/routes.js

@@ -48,6 +48,10 @@ const routes = [{
                 path: '/detailHotal/:id/:b2CPrice',
                 component: () =>
                     import ('pages/detailsHotal.vue')
+            }, { // 酒店下单
+                path: '/HotalForm/:id',
+                component: () =>
+                    import ('pages/hotel/orderForm.vue')
             }, { // 旅程
                 path: '/detail/:id/:tcid/:newConfigId',
                 component: () =>