页面修改

src/components/scattered/dida/DidaHeader.vue

@@ -4,12 +4,12 @@
       v-if="$q.platform.is.desktop"
       style="min-width: 190px"
       unelevated
-      v-model="placeKeyWords"
+      v-model="search.CityCode"
       dense
       :options="Areas"
       emit-value
-      option-label="name"
-      option-value="name"
+      option-label="CityName_CN"
+      option-value="CityCode"
       map-options
       :label="$t('hotel.area')"
       standout
@@ -137,12 +137,12 @@
           <div class="q-my-md" v-if="$q.platform.is.mobile">
             <q-select
               unelevated
-              v-model="placeKeyWords"
+              v-model="search.CityCode"
               dense
               :options="Areas"
               emit-value
-              option-label="name"
-              option-value="name"
+              option-label="CityName_CN"
+              option-value="CityCode"
               map-options
               :label="$t('hotel.area')"
               standout
@@ -380,7 +380,7 @@ export default defineComponent({
     const { t } = useI18n();
     const data = reactive({
       scrollStyle: {} as any,
-      Areas: [] as Array<HotelArea>, //区域
+      Areas: [] as any, //区域
       cascader: {
         addressValue: null,
       } as any,
@@ -435,18 +435,9 @@ export default defineComponent({
     search.arrivalDate = data.dateRange.from;
     search.departureDate = data.dateRange.to;
     data.hotelsRates = useHotel.getHotelRate();
-     
-    data.Areas = useHotel.getHotelArea();
-
     data.HotelMealTypes = useHotel.getHotelMeal();
     data.HotelConceptTypes = useHotel.getHotelConcept();
-    if (data.keyWords == "") {
-      search.freewordType = 1;
-      search.DestinationID = data.placeKeyWords;
-    } else {
-      search.freewordType = 2;
-      search.DestinationID = data.keyWords;
-    }
+ 
     const methods = {
       //设置房间里面成人数改变总成人数和儿童数
       setPeopleNum() {
@@ -502,16 +493,17 @@ export default defineComponent({
         );
       },
       setData() {
-        localStorage.removeItem(DirtionmaryHelper.SCATTERED_HOTEL_DATE);
-        let d = {
-          searchroomGroup: search.searchroomGroup,
-          room: data.room,
-          auditNum: data.auditNum,
-          childNum: data.childNum,
-          arrivalDate: search.arrivalDate,
-          departureDate: search.departureDate,
-        };
-        localStorage.setItem(DirtionmaryHelper.SCATTERED_HOTEL_DATE, JSON.stringify(d));
+        // localStorage.removeItem(DirtionmaryHelper.SCATTERED_HOTEL_DATE);
+        // let d = {
+        //   searchroomGroup: search.searchroomGroup,
+        //   room: data.room,
+        //   auditNum: data.auditNum,
+        //   childNum: data.childNum,
+        //   arrivalDate: search.arrivalDate,
+        //   departureDate: search.departureDate,
+        // };
+        //先不缓存
+        //localStorage.setItem(DirtionmaryHelper.SCATTERED_HOTEL_DATE, JSON.stringify(d));
       },
       //获取道旅房型
       getdidaPropertyCategory() {
@@ -545,18 +537,22 @@ export default defineComponent({
         var cityParm = {
           CountryCode: "JP",
         };
-        var newCity = [];
+        var newCity = [] as any;
         DidaService.GetDidaCity(cityParm).then((res) => {
-          console.log("getdidaCity", res);
           if (res.data.resultCode == 1) {
             var tempArray = res.data.data;
             if (tempArray && tempArray.length > 0) {
               tempArray.forEach((item) => {
                 if (item.Type == "City") {
-                  newCity.push({});
+                  var obj={
+                   CityCode: item.CityCode,
+                   CityName_CN: item.CityName_CN,
+                  }
+                  newCity.push( obj);
                 }
               });
             }
+            data.Areas=newCity;
           }
         });
       },

src/components/scattered/dida/DidaListTable.vue

@@ -266,6 +266,7 @@ export default defineComponent({
         pageIndex: 1,
         pageSize: 10,
         pageCount: 0,
+        rowsPerPage:10,
         sort:1,
       },
       pageTitle: "" as string | undefined,