no message

src/components/scattered/list/DetailsList.vue

@@ -36,7 +36,7 @@
         <span class="q-pl-lg">{{ $t('v101.scatteredDetails.prompt') }}</span>
         </div> 
       <div class="col"></div>
-      <q-btn color="primary" unelevated :label="$t('query')" @click="initHotel"/>
+      <q-btn color="primary" unelevated :label="$t('query')" :loading="loading" @click="initHotel"/>
     </div>
     <div class="bg-light-blue-1 q-pa-md fz14 rounded-borders row items-center">
         <div class="text-weight-bold">{{ $t('v101.scatteredDetails.fuheTJroom') }}</div>
@@ -170,22 +170,32 @@
       for(let i=0;i<6;i++){
         data.childrenList.push(i)
       }
-      
+
       data.scrollStyle = useScrollModule().scrollStyle
       const search = inject(DirtionmaryHelper.HOTEL_QUERY_PARAM) as any
-      if(search.searchroomGroup.length==0){
+      if(search.searchroomGroup&&search.searchroomGroup.length==0){
         search.searchroomGroup.push({
           roomNum: 1,
           numberOfAdults: 1,
           numberOfChildren: 0
         })
       }
-      
-      data.dateRange.to = date.formatDate(date.addToDate(new Date(), { days: 9 }), 'YYYY/MM/DD')
-      data.dateRange.from = date.formatDate(date.addToDate(new Date(), { days: 8 }), 'YYYY/MM/DD')
-      data.dateRangeFormat = `${data.dateRange.from} - ${data.dateRange.to}`
-      search.arrivalDate = data.dateRange.from
-      search.departureDate = data.dateRange.to
+
+      let getParamsMsg = JSON.parse(localStorage.getItem(DirtionmaryHelper.SCATTERED_HOTEL_DATE))
+      data.auditNum = getParamsMsg.auditNum
+      data.childNum = getParamsMsg.childNum?getParamsMsg.childNum:''
+      data.room = data.theRooms[search.searchroomGroup.length-1]
+
+      // data.dateRange.to = date.formatDate(date.addToDate(new Date(), { days: 9 }), 'YYYY/MM/DD')
+      // data.dateRange.from = date.formatDate(date.addToDate(new Date(), { days: 8 }), 'YYYY/MM/DD')
+      // data.dateRangeFormat = `${data.dateRange.from} - ${data.dateRange.to}`
+      // search.arrivalDate = data.dateRange.from
+      // search.departureDate = data.dateRange.to
+
+      data.dateRange.to = search.arrivalDate
+      data.dateRange.from = search.departureDate
+      data.dateRangeFormat = `${search.arrivalDate} - ${search.departureDate}`
+
       data.RoomTypeList = useHotel.getHotelRoomType()
       data.scatteredRoomTypeList = useHotel.getHotelScatRoom()
       data.ScatMeaList = useHotel.getHotelScatMeal()
@@ -370,22 +380,8 @@
           return cd >= date.formatDate(date.addToDate(new Date(), { days: 8 }), 'YYYY/MM/DD')
         },
       }
-      const searchCnt = computed(() => {
-        let setCnt = 0
-        
-        return setCnt
-      })
       watch(search.searchroomGroup, (n, o) => {
         
-      })
-      watch(data.room, (n, o) => {
-        
-      })
-      watch(data.auditNum, (n, o) => {
-        
-      })
-      watch(data.childNum, (n, o) => {
-        
       })
       onMounted(()=>{
         methods.initHotel()
@@ -395,7 +391,6 @@
         ...methods,
         qDateProxy,
         qNameProxy,
-        searchCnt,
         search,
       }
     }

src/components/scattered/list/ListHeader.vue

@@ -133,7 +133,7 @@ export default defineComponent({
     
     data.scrollStyle = useScrollModule().scrollStyle
     const search = inject(DirtionmaryHelper.HOTEL_QUERY_PARAM) as any
-    if(search.searchroomGroup.length==0){
+    if(search.searchroomGroup&&search.searchroomGroup.length==0){
       search.searchroomGroup.push({
         roomNum: 1,
         numberOfAdults: 1,
@@ -211,6 +211,7 @@ export default defineComponent({
         return cd >= date.formatDate(date.addToDate(new Date(), { days: 8 }), 'YYYY/MM/DD')
       },
       setData(){
+        localStorage.removeItem(DirtionmaryHelper.SCATTERED_HOTEL_DATE)
         let d = {
           searchroomGroup: search.searchroomGroup,
           room: data.room,
@@ -242,7 +243,7 @@ export default defineComponent({
       }
       return setCnt
     })
-    watch(search.searchroomGroup, (n, o) => {
+    watch(search, (n, o) => {
       methods.setData()
     })
     watch(data.room, (n, o) => {

src/i18n/zh-TW/index.ts

@@ -690,26 +690,26 @@ export default {
       prompt1: '超過13歲視為成人處理',
       prompt2: '預定成功後房間將為您整晚保留',
       fangxing: '房型',
-      xiyan: '吸烟',
-      xiyan0: '禁烟',
-      xiyan1: '可吸烟',
-      cesuo: '厕所',
+      xiyan: '吸煙',
+      xiyan0: '禁煙',
+      xiyan1: '可吸煙',
+      cesuo: '廁所',
       you: '有',
-      wu: '无',
+      wu: '無',
       lutiankefang: '露天客房',
-      orderamount: '订单总额',
-      renmingbi: '人民币',
-      youhui: '优惠',
-      shifu: '实付',
-      yudinxinx: '预定信息',
+      orderamount: '訂單總額',
+      renmingbi: '人民幣',
+      youhui: '優惠',
+      shifu: '實付',
+      yudinxinx: '預定信息',
       fangxingxinxi: '房型信息',
-      ruzhurenshu: '入住人数',
+      ruzhurenshu: '入住人數',
       chengren: '成人',
-      ertong: '儿童',
-      noertong: '不能报儿童',
+      ertong: '兒童',
+      noertong: '不能報兒童',
       ren: '人',
       ruzhuriqi: '入住日期',
-      ruzhushijian: '入住时间',
+      ruzhushijian: '入住時間',
       week1: '周一',
       week2: '周二',
       week3: '周三',
@@ -718,38 +718,48 @@ export default {
       week6: '周六',
       week7: '周日',
       zhiqian: '之前',
-      zhihou: '之后',
-      fangjianshuliang: '房间数量',
-      jinsheng: '仅剩',
-      jian: '间',
-      fangfeiqingkuang: '房间情况',
+      zhihou: '之後',
+      fangjianshuliang: '房間數量',
+      jinsheng: '僅剩',
+      jian: '間',
+      fangfeiqingkuang: '房費情況',
       wan: '晚',
       ruzhuxinxi: '入住信息',
-      ruzhuxinxi1: '所填姓名需和入住时所持证件一致',
-      ruzhushijian1: '入住时间',
-      yudinren: '预定人',
+      ruzhuxinxi1: '所填姓名需和入住時所持證件一致',
+      ruzhushijian1: '入住時間',
+      yudinren: '預定人',
       xin: '姓',
       ming: '名',
-      dangqiandizhi: '当前地址',
+      dangqiandizhi: '當前地址',
       Email: 'Email',
-      dianhua: '电话',
-      kehuxuqiu: '客户需求',
-      fangjian: '房间',
+      dianhua: '電話',
+      kehuxuqiu: '客戶需求',
+      fangjian: '房間',
       chengrennan: '成人男',
       chengrennv: '成人女',
-      ertongshu: '儿童数',
-      quxiao1: '没有通知取消',
-      quxiao2: '入住当日取消',
-      shouxufei: '手续费',
-      youhuixingxi: '优惠信息',
-      duihuan: '兑换',
-      youhuiquanduihuan: '优惠券兑换',
-      youhuiquanshiyong: '优惠券使用',
-      nokeyongyouhuiquan: '暂无可用优惠券',
-      xiadan: '下单',
-      Errorruzhushu: '入住人数与总入住数不匹配',
-      duihuanSuccess: '兑换成功',
-      xiadanSuccess: '下单成功',
+      ertongshu: '兒童數',
+      quxiao1: '沒有通知取消',
+      quxiao2: '入住當日取消',
+      shouxufei: '手續費',
+      youhuixingxi: '優惠信息',
+      duihuan: '兌換',
+      youhuiquanduihuan: '優惠券兌換',
+      youhuiquanshiyong: '優惠券使用',
+      nokeyongyouhuiquan: '暫無可用優惠券',
+      xiadan: '下單',
+      Errorruzhushu: '入住人數與總入住數不匹配',
+      duihuanSuccess: '兌換成功',
+      xiadanSuccess: '下單成功',
+      jinxing1: '您還未進行',
+      jinxing2: '實名認證',
+      jinxing3: '，認證後可使用優惠券哦~如果已提認證申請，申請審核通過後即可使用優惠券！',
+      kediejia: '可疊加',
+      nodiejia: '不可疊加',
+      zhe: '折',
+      man: '滿',
+      shiyong: '使用',
+      youxiaoqi: '有效期',
+      notiaojian: '该优惠券不满足使用条件！'
     }
     
   }

src/pages/scattered/hotelDetails.vue

@@ -222,10 +222,10 @@
         hotelId: data.urlParamsMsg.hotelId,
         sort: 1,
         displayFrom: 1,
-        arrivalDate: "",//入住时间
-        departureDate: "",//离房时间
+        arrivalDate: data.getParamsMsg.arrivalDate,//入住时间
+        departureDate: data.getParamsMsg.departureDate,//离房时间
         roomOptionCd: "",
-        searchroomGroup: [],//客房数
+        searchroomGroup: data.getParamsMsg.searchroomGroup,//客房数
       })
       provide(DirtionmaryHelper.HOTEL_QUERY_PARAM, search)
       const methods = {

src/utils/validate.ts

@@ -29,14 +29,14 @@ export function validatAlphabets(str: string) {
 
 export function isEmail(account:string):boolean { 
     let serchfind:boolean; 
-    let regexp = new RegExp('/^(([^<>()\[\]\\.,;:\[email protected]"]+(\.[^<>()\[\]\\.,;:\[email protected]"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/'); 
+    let regexp = new RegExp(/^(([^<>()\[\]\\.,;:\[email protected]"]+(\.[^<>()\[\]\\.,;:\[email protected]"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/); 
     serchfind = regexp.test(account); 
     return serchfind 
 }
 
 export function isPhone(account:string):boolean { 
     let serchfind:boolean; 
-    let regexp = new RegExp('/^((13|14|15|16|17|18|19)[0-9]{1}\d{8})$/'); 
+    let regexp = new RegExp(/^((13|14|15|16|17|18|19)[0-9]{1}\d{8})$/);
     serchfind = regexp.test(account); 
     return serchfind 
 }