Commit 1618d785 authored by youjie's avatar youjie

优化

parent a689b0b1
...@@ -745,8 +745,9 @@ export default { ...@@ -745,8 +745,9 @@ export default {
this.$emit('change', this.msg) this.$emit('change', this.msg)
}, },
changCity(y){ changCity(y){
this.msg.CityCode2 = y.CityCode // this.msg.CityCode2 = y.CityCode
this.msg.CityCode = y.CityCode this.msg.CityCode = y.CityCode
this.msg.CityName = y.CityName
this.resetQuery() this.resetQuery()
this.getRegion(this.msg.CityCode) this.getRegion(this.msg.CityCode)
}, },
......
...@@ -1511,8 +1511,6 @@ export default { ...@@ -1511,8 +1511,6 @@ export default {
} }
if(newVal.query&&newVal.query.pageIndex){ if(newVal.query&&newVal.query.pageIndex){
this.qMsg = newVal.query this.qMsg = newVal.query
console.log(newVal.query.KeyWords2,'----')
// this.qMsg.KeyWords = newVal.query.KeyWords?newVal.query.KeyWords:newVal.query.KeyWords2?newVal.query.KeyWords2:''
}else{ }else{
var qsearchKey = this.getUrlKey("qsearchKey", window.location.href); var qsearchKey = this.getUrlKey("qsearchKey", window.location.href);
var qsearchDate = this.getUrlKey("qsearchDate", window.location.href); var qsearchDate = this.getUrlKey("qsearchDate", window.location.href);
......
...@@ -219,12 +219,12 @@ export default { ...@@ -219,12 +219,12 @@ export default {
watch: { watch: {
msg: { msg: {
handler(newVal, oldVal) { handler(newVal, oldVal) {
console.log(newVal.KeyWords2,'----3333')
this.HotalMsg = { this.HotalMsg = {
...this.HotalMsg, ...this.HotalMsg,
...JSON.parse(JSON.stringify(newVal)), ...JSON.parse(JSON.stringify(newVal)),
StartDate: newVal.StartDate? newVal.StartDate:date.formatDate(date.addToDate(new Date(), { days: 8 }), "YYYY/MM/DD"), StartDate: newVal.StartDate? newVal.StartDate:date.formatDate(date.addToDate(new Date(), { days: 8 }), "YYYY/MM/DD"),
EndDate: newVal.EndDate? newVal.EndDate:date.formatDate(date.addToDate(new Date(), { days: 9}), "YYYY/MM/DD"), EndDate: newVal.EndDate? newVal.EndDate:date.formatDate(date.addToDate(new Date(), { days: 9}), "YYYY/MM/DD"),
CityName: newVal.KeyWords2? newVal.KeyWords2: ''
} }
}, },
deep: true deep: true
...@@ -410,20 +410,18 @@ export default { ...@@ -410,20 +410,18 @@ export default {
} }
},200) },200)
}, },
changeRegion(y){
this.HotalMsg.CityName_CN = y.CityName
this.HotalMsg.regionCode = y.CityCode
},
changeCity(y){ changeCity(y){
console.log(y)
this.HotalMsg.CityName = y.CityName this.HotalMsg.CityName = y.CityName
this.HotalMsg.CityCode = y.CityCode this.HotalMsg.CityCode = y.CityCode
this.HotalMsg.StartDate = this.HotalMsg.StartDate?this.HotalMsg.StartDate:date.formatDate(date.addToDate(new Date(), { days: 8 }), "YYYY/MM/DD") 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") this.HotalMsg.EndDate = this.HotalMsg.EndDate?this.HotalMsg.EndDate:date.formatDate(date.addToDate(new Date(), { days: 9}), "YYYY/MM/DD")
this.HotalMsg.KeyWords2 = y.CityName this.HotalMsg.KeyWords2 = y.CityName
if(this.Type>0) { if(this.Type>0) {
this.HotalMsg.KeyWords2 = ''
this.$emit('changeCity', this.HotalMsg) this.$emit('changeCity', this.HotalMsg)
this.showSplitPannel = false this.showSplitPannel = false
this.searchChangeHandler(1) // this.searchChangeHandler(1)
}else{ }else{
this.HotalMsg.KeyWords = '' this.HotalMsg.KeyWords = ''
this.CommonJump('/searchdida', { this.CommonJump('/searchdida', {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment