解決衝突

src/@types/index.ts

@@ -33,7 +33,7 @@ export type ModalOpenMode = 'edit' | 'add' | 'other'
 //TODO: 请根据实际情况调整定义的实体对象
 /**
  * @description 模拟定义菜单信息
- * 
+ *
  */
 export interface AuthMenuType {
   menuId: number
@@ -210,10 +210,11 @@ export type StandardStatus = {
 
 export type RoomType = {
   TypeId:number,
-  TypeName:string
+  TypeName:string,
+  Filed?:string
 }
 
 export type OrderType={
   TypeId:number,
   TypeName:string
-}
+}
\ No newline at end of file

src/components/hotel/list/ListCar.vue

@@ -253,7 +253,7 @@ export default defineComponent({
       removeHotelHandler(x:number,y:number){
         $q.dialog({
           title: t('dialog.titles.hotel'),
-          message: t('dialog.contents.hotel',{day:cars.value[x].Date,hotel:cars.value[x].Hotels[y].HotelName}),
+          message: `${t('dialog.contents.hotel.t1')} ${cars.value[x].Date} ${t('dialog.contents.hotel.t2')}${cars.value[x].Hotels[y].HotelName}`,
           cancel: true,
           persistent: true
         }).onOk(() => {

src/pages/hotel/ModifyHotelOrder.vue

@@ -23,12 +23,17 @@
           <q-btn color="negative" icon="delete" rounded dense size="sm" flat />
         </div>
         <div class="q-pa-sm rounded-borders bg-blue-grey-1 q-mt-sm" v-for="y in x.data">
-          <div class="text-subtitle1 text-primary" style="border-bottom: 1px dashed #607d8b">{{ y.HotelName }}</div>
+          <div class="row items-center item-hide-opera" style="border-bottom: 1px dashed #607d8b33">
+            <div class="text-subtitle1 text-primary ellipsis col">{{ y.HotelName }}</div>
+            <div class="q-ml-sm opera-box-item">
+              <q-btn color="negative" icon="delete" rounded dense size="sm" flat />
+            </div>
+          </div>
           <div v-for="(z,i) in y.RoomList" class="q-mb-md">
             <div class="row no-wrap items-center q-mt-sm f12">
               <span class="col">
                 {{ z.RoomInfo.TypeName }}
-                <div>{{ z.Unit_Price }}/{{ $t('unit.ren') }}</div>
+                <div class="text-blue-grey-6">{{ moneyFormat(z.Unit_Price) }}/{{ $t('unit.ren') }}</div>
               </span>
               <div class="col">
                 <div class="f12 text-grey-6 text-center col">
@@ -48,11 +53,15 @@
               </span>
             </div>
           </div>
-          <div class="row items-center justify-between" style="border-top: 1px dashed #607d8b">
-            <div class="q-mt-sm">{{ $t('hotelorder.col.t') }}：{{ moneyFormat(y.TaxesPrice) }}/{{ $t('unit.ren') }}</div>
-            <div class="q-mt-sm">{{ $t('hotelorder.col.t2') }}：{{ moneyFormat(y.PriceInTangTax) }}/{{ $t('unit.ren') }}</div>
+          <div class="text-right q-mb-sm">
+            <span class="q-mr-md f12">暫無其他可用房型</span>
+            <q-btn color="accent" dense outline :label="$t('hotelm.otherRoom')" size="sm" />
+          </div>
+          <div class="row items-center justify-between" style="border-top: 1px dashed #607d8b33">
+            <div class="q-mt-sm text-blue-grey-6">{{ $t('hotelorder.col.t') }}：{{ moneyFormat(y.TaxesPrice) }}/{{ $t('unit.ren') }}</div>
+            <div class="q-mt-sm text-blue-grey-6">{{ $t('hotelorder.col.t2') }}：{{ moneyFormat(y.PriceInTangTax) }}/{{ $t('unit.ren') }}</div>
           </div>
-          <div class="text-right text-primary q-mt-sm" style="border-top: 1px dashed #607d8b">
+          <div class="text-right text-primary q-mt-sm" style="border-top: 1px dashed #607d8b33">
             <span class="text-weight-thin">{{ $t('hotel.groupPrice') }}：</span>
             <span class="fz14">¥</span>
             <span class="text-subtitle1">{{ moneyFormat(y.HotelMoeny) }}</span>
@@ -169,4 +178,11 @@ export default defineComponent({
 })
 </script>
 
-<style></style>
+<style>
+.opera-box-item{
+  display: none !important;
+}
+.item-hide-opera:hover .opera-box-item{
+  display: block !important;
+}
+</style>

src/utils/tools.ts

@@ -131,10 +131,12 @@ export function getHotelRoomType(getNormal:boolean = false):Array<RoomType>{
     })
   }
   let roomLangs=[t('hotel.rooms.normal'),t('hotel.rooms.big'),t('hotel.rooms.sing'),t('hotel.rooms.three'),t('hotel.rooms.driver')]
+  let fileds = ['CostPrice', 'BidroomPrice', 'SingleroomPrice', 'AddBedPrice', 'GuideRoomPrice']
   roomLangs.forEach((x:string,i:number)=>{
     rooms.push({
       TypeId:(i+1),
-      TypeName:x
+      TypeName:x,
+      Filed:fileds[i]
     })
   })
   return rooms