Merge branch 'master' of http://gitlab.oytour.com/viitto/million

src/components/hotal/RoomCard.vue

@@ -6,7 +6,7 @@
         <div class="non-selectable">
           <div class="row wrap">
             <div class="relative q-pa-xs cursor-pointer"
-            :class="{'col-4':prices.length>2,'col':prices.length<3}"
+            :class="{'col-4':prices.length>2,'col-6':prices.length<3}"
             v-for="(item,index) in prices" :key="index">
             <div class="rounded-borders overflow-hidden column "
             :style="{'border': chooseObj&&item.id==chooseObj.id?'':'1px solid #eee'}"

src/components/hotal/orderPreview.vue

@@ -151,6 +151,7 @@ export default {
         liveNvm: this.liveNvm,
         id: this.p.id,
         selectedObjId: this.selectedObj.id,
+        roomOptionCd: this.selectedObj.roomOptionCd,
         chosenObj: this.chosenObj,
         sumPrice: this.sumPrice
       }
@@ -166,6 +167,7 @@ export default {
     },
     handleSelect(item){
       this.selectedObj = item
+      console.log(this.selectedObj,'-----')
       setTimeout(()=>{
         this.calcMoney()
       },100)

src/pages/hotel/orderForm.vue

@@ -72,12 +72,12 @@
         <q-card flat class="q-pa-md q-mt-lg" v-if="details">
           <div class="text-subtitle1 text-weight-bolder q-mb-md">旅客資料</div>
           <div class="row">
-            <q-img
+            <!-- <q-img
               :src="roomRateDetails?roomRateDetails[0].roomImageURL:'https://image.kkday.com/v2/image/get/s1.kkday.com/product_138437/20230217083232_t5rcO/jpg'"
               class="rounded-borders"
               spinner-color="grey-3"
               style="width: 80px"
-            />
+            /> -->
             <div class="q-ml-md col">
               <div class="text-subtitle1 ellipsis">
                 {{details.hotelName}}
@@ -137,21 +137,21 @@
           </div>
           </div>
           <div class="rounded-borders bg-blue-1 q-px-md q-py-sm q-mt-sm column">
-            <span class="text-orange-6 q-pb-xs">超过13岁视为成人处理</span>
-            <span class="text-green-6">预定成功后房间将为您整晚保留</span>
-              <span v-if="(details.cancellationPeriod1==-1||details.cancellationPeriod1==0)&&(details.cancellationType1==1||details.cancellationType1==2)">
+            <!-- <span class="text-orange-6 q-pb-xs">超过13岁视为成人处理</span> -->
+            <!-- <span class="text-green-6">预定成功后房间将为您整晚保留</span> -->
+              <span class="text-orange-6 q-pb-xs" v-if="(details.cancellationPeriod1==-1||details.cancellationPeriod1==0)&&(details.cancellationType1==1||details.cancellationType1==2)">
                   <template v-if="details.cancellationPeriod1==-1">没有通知取消，</template>
                   <template v-if="details.cancellationPeriod1==0">入住当日取消，</template>
                   <template v-if="details.cancellationType1==1">手续费：{{details.cancellation1}}%</template>
                   <template v-if="details.cancellationType1==2">手续费：{{details.cancellation1}}</template>
               </span>
-              <span v-if="(details.cancellationPeriod2==-1||details.cancellationPeriod2==0)&&(details.cancellationType2==1||details.cancellationType2==2)">
+              <span class="text-green-6" v-if="(details.cancellationPeriod2==-1||details.cancellationPeriod2==0)&&(details.cancellationType2==1||details.cancellationType2==2)">
                   <template v-if="details.cancellationPeriod2==-1">没有通知取消，</template>
                   <template v-if="details.cancellationPeriod2==0">入住当日取消，</template>
                   <template v-if="details.cancellationType2==1">手续费：{{details.cancellation2}}%</template>
                   <template v-if="details.cancellationType2==2">手续费：{{details.cancellation2}}</template>
               </span>
-              <span v-if="(details.cancellationPeriod3==-1||details.cancellationPeriod3==0)&&(details.cancellationType3==1||details.cancellationType3==2)">
+              <span class="text-green-6" v-if="(details.cancellationPeriod3==-1||details.cancellationPeriod3==0)&&(details.cancellationType3==1||details.cancellationType3==2)">
                   <template v-if="details.cancellationPeriod3==-1">没有通知取消，</template>
                   <template v-if="details.cancellationPeriod3==0">入住当日取消，</template>
                   <template v-if="details.cancellationType3==1">手续费：{{details.cancellation3}}%</template>
@@ -313,12 +313,12 @@
         >
           <div class="text-subtitle1 text-weight-bolder">付款明細</div>
           <div class="row q-mt-md">
-            <q-img
+            <!-- <q-img
               :src="roomRateDetails?roomRateDetails[0].roomImageURL:'https://image.kkday.com/v2/image/get/s1.kkday.com/product_138437/20230217083232_t5rcO/jpg'"
               class="rounded-borders"
               spinner-color="grey-3"
               style="width: 80px"
-            />
+            /> -->
             <div class="q-ml-md col">
               <div class="text-subtitle1 ellipsis">
                 {{details.hotelName}}
@@ -359,7 +359,7 @@
                 <template v-for="y in x.roomOptions">
                   <div class="row q-mb-sm" v-if="y.checked">
                       <div class="col">{{getMealType(y.meals)}} x {{ y.Count }}间</div>
-                      <div>CNY {{ getPrice2(y.chargeableRateInfoPerPersonForANightBySetCurrency) }}</div>
+                      <div>CNY {{ getPrice2(y.totalChargeableRateInfo) }}</div>
                   </div>
                 </template>
               </template>
@@ -478,7 +478,7 @@ export default {
       isBaoChild: true,
       isShowTime: true,
       price: 0,
-      SettlementPrice: 0,
+      SettlementPrice: 0,//实付
       parameters: {
           dataId:'',//订单id
           hotelId:'',//酒店id
@@ -487,7 +487,7 @@ export default {
           checkInTime:'',//入住时间
           departureDate:'',//结束时间
           roomOptionCd:'',//房间计划CD
-          totalChargeableRateInfo:'',//合计费用
+          totalChargeableRateInfo:'',//人民币合计费用
           guestRequestAppendix: 0,//费用合计（日元）
           totalPriceJapanese:'',//日元合计费用
           comment: '',//评论
@@ -562,70 +562,21 @@ export default {
           if (r.data.resultCode == 1) {
             
             this.details = r.data.data;
+            if(Object.prototype.toString.call(this.details.roomGroup) == '[object Object]'){
+                let arr = [];
+                arr.push(this.details.roomGroup);
+                this.details.roomGroup=arr;
+            }
+            console.log(r.data.data,'===')
+            return
             this.parameters.HotelName = this.details.hotelName
             
-            if (
-              Object.prototype.toString.call(r.data.data.roomRateDetails) ==
-              "[object Object]"
-            ) {
-              this.roomRateDetails.push(r.data.data.roomRateDetails);
-            } else {
-              this.roomRateDetails = r.data.data.roomRateDetails;
-            }
-            let arrList = function(arr){
-              arr.forEach(item=>{
-                item.images=[]
-                item.id=null
-                item.checked =false
-              })
-            }
-            arrList(this.roomRateDetails)
-            this.roomRateDetails.forEach((x,index) => {
-              let List = function(arr){
-              arr.forEach(item=>{
-                item.checked =false
-                item.Count = 1
-                item.checkInTime = ''
-              })
-            }
-            List(x.roomOptions)
-              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.roomRateDetails.forEach((x,k)=>{
-              if((k+1)===this.OrderDate.id){
-                
-                
-                x.checked = true
-                x.roomOptions.forEach((y,index)=>{
-                  if((index+1)===this.OrderDate.selectedObjId){
-                    y.checked = true
-                    y.Count = this.OrderDate.chosenObj.Count
-                    y.checkInTime = date.formatDate(date.addToDate(new Date(this.parameters.arrivalDate), { days: 1 }), 'YYYY-MM-DD')
-                    this.parameters.roomOptionCd = y.roomOptionCd
-                  }
-                })
-              }
-            })
             this.parameters.HotelPic = this.roomRateDetails[0].roomImageURL
             this.JapanIncrease = r.data.data.JapanIncrease
 
             this.TotalChildCount = 0;
             let rateGrouoLen = 0;
-            this.details.searchRoomGroup.forEach(x=>{
+            this.details.roomGroup.forEach(x=>{
                     if(Object.prototype.toString.call(x.rateGroup) == '[object Object]'){
                         let arr = [];
                         arr.push(x.rateGroup);
@@ -704,9 +655,6 @@ export default {
                     // childJapanCount+=ChildJapanPrice;
 
                     this.parameters.totalPriceJapanese += parseFloat(AdultJapanCount+childJapanCount+onlyJanpnase);
-                    if (this.isShowTime&&!this.isLoginB2B) {
-                        this.getUserCanUseCouponList();
-                    }
                 })
 
           } else {
@@ -738,8 +686,9 @@ export default {
               }
               this.sumPrice = this.OrderDate.sumPrice
               this.parameters.totalChargeableRateInfo = this.OrderDate.sumPrice
-              this.numberOfAdults = 0,
+              this.numberOfAdults = 0
               this.numberOfChildren = 0,
+              this.msg.roomOptionCd = this.OrderDate.roomOptionCd
               this.msg.searchroomGroup.forEach(x=>{
                 this.numberOfAdults+=x.numberOfAdults
                 this.numberOfChildren+=x.numberOfChildren