no message

src/components/hotel/list/ListCar.vue

@@ -2,7 +2,7 @@
   <q-card class="bg-white q-pb-md" style="width: 500px;">
     <div class="drawerTop row justify-between items-center q-py-md q-px-lg">
       <q-btn rounded class="q-mr-md" color="red" icon="shopping_cart">
-        <q-badge class="text-red" color="white" rounded floating>4</q-badge>
+        <q-badge class="text-red" color="white" rounded floating>{{HotelCarList.length}}</q-badge>
       </q-btn>
       <q-icon class="cursor-pointer" name="close" size="18px" color="grey-5" @click="$emit('close')"></q-icon>
     </div>
@@ -12,34 +12,40 @@
           <q-list>
               <q-item class="rounded-borders q-py-sm">
                   <q-item-section>
-                    <q-card bordered class="q-px-md q-py-md">
-                      <div v-for="(item,index) in 3">
-                        <div class="row no-wrap items-center justify-between">
+                    <q-card bordered class="q-px-md q-py-md" v-for="(item,index) in HotelCarList">
+                      <div class="column">
+                        <div class="row items-center text-red fz18 q-pb-sm">
+                          {{item.HotelName}}
+                        </div>
+                        <div class="row items-center justify-between no-wrap">
                             <div class="text-dark" style="width: 50px;">
-                            <img src="../../../assets/images/lg-logo.png" style="width: 50px;"/>
+                              <img :src="item.img?item.img:'../../../assets/images/lg-logo.png'" style="width: 50px;"/>
                             </div>
-                          <div class="row no-wrap justify-between items-center q-pl-md" style="flex-grow: 1;">
+                            <div class="row justify-between">
                               <div class="q-px-md">
-                              <div class="q-pb-xs ListCar-title f12">标题标题标题标题标题标题标题标题标题标题标题标题</div>
+                                <div class="q-pb-xs ListCar-title f12">{{item.Unit_Price}}</div>
                                 <div class="text-red">
                                   <span class="fz10">¥</span>
-                                <span class="fz16 q-pl-sm">522</span>
+                                  <span class="fz16 q-pl-sm">{{item.Unit_Price}}</span>
                                 </div>
                               </div>
                               <div class="row items-center" style="flex-shrink: 0;">
-                              <div class="q-pr-sm fz12">标间</div>
+                                <div class="q-pr-sm fz12">
+                                  <template v-if="item.RoomType==1">{{$t('hotel.shopping.StandardRooms')}}</template>
+                                  <template v-if="item.RoomType==2">{{$t('hotel.shopping.maxRooms')}}</template>
+                                  <template v-if="item.RoomType==3">{{$t('hotel.shopping.naturalRooms')}}</template>
+                                  <template v-if="item.RoomType==4">{{$t('hotel.shopping.ThreeRooms')}}</template>
+                                  <template v-if="item.RoomType==5">{{$t('hotel.shopping.driverRoom')}}</template>
+                                </div>
                                 <div class="text-red"> 
-                                <span class="fz16">1</span>
+                                  <span class="fz16">{{item.Number}}</span>
                                   <span>{{$t('hotel.car.between')}}</span>
                                 </div>
                               </div>
                             </div>
+                            <q-separator color="grey-3" class="q-my-sm"  dark vertical/>
                           </div>
-                        <q-separator v-if="index!=2" color="grey-3" class="q-my-sm" />
                       </div>
-                      
-                      
-
                     </q-card>
                   </q-item-section>
               </q-item>
@@ -73,11 +79,26 @@
       const data=reactive({
         scrollStyle: {} as any,
         addNum: 1,
-        DataList:[]
+        DataList: [] as Array<any>
       })
       data.scrollStyle = useScrollModule().scrollStyle
       const methods = {
         getList(){
+          let Name = '' as String
+          HotelCarList._value.forEach((item) => {
+            Name = item.HotelName
+            // if(Name==item.HotelName){
+            //   let data = {
+            //     HotelId:  item.HotelId,
+            //     Date: item.Date,
+            //     HotelName: item.HotelName,
+            //     rooms:[
+
+            //     ]
+            //   }
+            // }
+            
+          });
           console.log(HotelCarList._value,'----')
         }
       }

src/components/hotel/list/ListHeader.vue

@@ -10,7 +10,7 @@
     <n-select v-if="$q.platform.is.desktop" filterable @update:value="changeHotel" class="q-ml-lg col-2" style="min-width: 190px" clearable v-model:value="search.HotelChooseArray" :placeholder="$t('hotel.searchName')" multiple :options="cacheHotels" max-tag-count="responsive" size="large" value-field="ID" label-field="Name" />
     <div class="col"></div>
     <q-btn unelevated class="bg-grey-3 hover q-mr-md" icon="shopping_cart" :title="$t('hotel.car.shoppingTitle')" @click="rightCarOpen=true">
-      <q-badge color="red" rounded floating>4</q-badge>
+      <q-badge color="red" rounded floating>{{HotelCarList.length}}</q-badge>
     </q-btn>
     <q-btn unelevated class="bg-grey-3 hover q-mr-md" :title="$t('morequery')">
       <q-badge rounded class="din bg-red-2 text-red-14 text-weight-bold" floating :label="searchCnt" v-if="searchCnt > 0" />
@@ -46,7 +46,7 @@
     <q-btn color="primary" unelevated :label="$t('query')" />
     
   </div>
-  <q-dialog v-model="rightCarOpen" maximized full-height position="right">
+  <q-dialog v-if="HotelCarList.length>0" v-model="rightCarOpen" maximized full-height position="right">
     <ListCar @close="rightCarOpen=false"></ListCar>
   </q-dialog>
   
@@ -65,9 +65,12 @@ import { HotelRate, useHotel } from '../../../utils/hotelRate'
 import { useQuasar } from 'quasar'
 import useScrollModule from '../../../module/scrollbar/scrollModule'
 import ListCar from "./ListCar.vue"
+import { DirtionmaryHelper } from '../../../config/dictionary'
 export default defineComponent({
   components: { svgIcon, ListCar },
   setup() {
+    inject(DirtionmaryHelper.HOTEL_CAR_LIST)
+    const HotelCarList = inject(DirtionmaryHelper.HOTEL_CAR_LIST) as any
     const $q = useQuasar()
     const qDateProxy = ref(null) as any
     const qNameProxy = ref(null) as any
@@ -198,7 +201,8 @@ export default defineComponent({
       qDateProxy,
       qNameProxy,
       searchCnt,
-      search
+      search,
+      HotelCarList
     }
   }
 })

src/components/hotel/list/Table-Operation.vue

@@ -121,18 +121,20 @@
             if(data.total<1||data.total>data.hotelInfor.RemainingInventory){
                 message.errorMsg(`${t('hotel.shopping.small')}1${t('hotel.shopping.big')}${data.hotelInfor.RemainingInventory}`)
             }
-            data.parameters.DetailList.forEach(item=>{
+            data.parameters.DetailList.forEach((item,index)=>{
                 if(item.Number>0){
                     HotelCarList._value.push(item)
                 }
             })
         },
+        // 组装可选房间
         setList(){
             data.parameters.DetailList = [] as Array<any>
             // 1:標間成本价 2:大床成本价 3:自然間成本价 4:3人間成本价 5:司機房成本价 稅金 TaxesPrice  入湯稅 PriceInTangTax
             let roomTyps=['CostPrice','BidroomPrice','SingleroomPrice','AddBedPrice','GuideRoomPrice']
             let tempPrice=data.hotelInfor.PriceList[0]
             let hotel=data.hotelInfor
+            console.log(data.HotelRow)
             roomTyps.forEach((x:any,i:number)=>{
                 if(tempPrice[x]>0){
                     let dataMsg = {