no message

src/components/searchdida/kkday.vue

@@ -27,9 +27,9 @@
           EndDate:msg.CheckOutDate,
           searchroomGroup:msg.searchroomGroup}"
           Type="1"
-          @change="clearQuery"
+          @change="changQuery"
           @changeCity="changCity"
-          @clear="clearQuery"></destination>
+          @clear="changQuery"></destination>
           <div class="q-pt-sm cursor-pointer">
               <div v-show="regionList.length" class="self-center no-outline text-s" 
               tabindex="0"
@@ -213,9 +213,8 @@
           EndDate:msg.CheckOutDate,
           searchroomGroup:msg.searchroomGroup}"
           Type="2"
-          @change="clearQuery"
-          @changeCity="changCity"
-          @clear="clearQuery"></destination>
+          @change="changQuery"
+          @changeCity="changCity"></destination>
           
           <div class="q-pt-sm cursor-pointer">
               <div v-show="msg.CityCode&&regionList.length" class="self-center no-outline text-s" 
@@ -679,7 +678,6 @@ export default {
     qMsg: {
       handler(newVal, oldVal) {
         this.msg = JSON.parse(JSON.stringify(this.qMsg));
-        console.log(newVal.KeyWords2,'----222')
         this.msg.priceRange = {
           min: 1,
           max: 100000,
@@ -737,7 +735,7 @@ export default {
     }
   },
   methods: {
-    clearQuery(msg) {
+    changQuery(msg) {
       this.msg = {
         ...this.msg,
         ...msg
@@ -1181,7 +1179,7 @@ export default {
       this.PageCount = 0;
       this.TotalCount = 0;
       let msg = JSON.parse(JSON.stringify(this.msg));
-      if(this.msg.KeyWords2){
+      if((!this.msg.KeyWords||this.msg.KeyWords=='')&&this.msg.KeyWords2){
         // msg.CityName = ''
         // msg.CityCode = ''
         // msg.CityCode2 = this.msg.CityCode

src/pages/didaHotel/destination.vue

@@ -255,12 +255,14 @@ export default {
             if(y.Type==1){
                 this.HotalMsg.CityCode = y.Id
                 this.HotalMsg.CityCode2 = ''//y.Id
-                this.HotalMsg.CityName = y.Name.split(' ')[0]
+                let Obj = y.Name.split(' ')[0]
+                let Name = Obj.split(',')[0]
+                this.HotalMsg.CityName = Name
                 if(this.Type>0)this.HotalMsg.KeyWords = ''
-                this.HotalMsg.KeyWords2 = y.Name.split(' ')[0]
+                this.HotalMsg.KeyWords2 = Name
                 this.KeyWords3 = ''
                 if(!this.Type) {
-                    this.KeyWords3 = y.Name.split(' ')[0]
+                    this.KeyWords3 = Name
                     this.searchChangeHandler(0)
                 }
                 else this.$emit('changeCity', this.HotalMsg)
@@ -368,7 +370,7 @@ export default {
             // this.HotalMsg.hotelId = ''
             this.HotalMsg.StartDate = this.HotalMsg.StartDate?this.HotalMsg.StartDate:date.formatDate(date.addToDate(new Date(), { days: 8 }), "YYYY/MM/DD")
             this.HotalMsg.EndDate = this.HotalMsg.EndDate?this.HotalMsg.EndDate:date.formatDate(date.addToDate(new Date(), { days: 9}), "YYYY/MM/DD")
-            if(!type) this.$emit('clear',this.HotalMsg)
+            if(!type||this.Type>0) this.$emit('change',this.HotalMsg)
             return
             this.showSplitPannel = true
             this.showKeyWordsList = false