Commit 2e120fcc authored by duxinyuan's avatar duxinyuan

1

parent e3117691
...@@ -23,4 +23,4 @@ ...@@ -23,4 +23,4 @@
if(!doc.addEventListener) return; if(!doc.addEventListener) return;
win.addEventListener(resizeEvt, recalc, false); win.addEventListener(resizeEvt, recalc, false);
doc.addEventListener('DOMContentLoaded', recalc, false); doc.addEventListener('DOMContentLoaded', recalc, false);
})(document, window);</script><link href=./static/css/app.fb21eaae80c54d90e56fc7859869951e.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.1b35a927314506fe4a4f.js></script><script type=text/javascript src=./static/js/app.40f3f842c3cace1394fd.js></script></body></html> })(document, window);</script><link href=./static/css/app.446ad456b59d0e8735dccaa39d20994b.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.1b35a927314506fe4a4f.js></script><script type=text/javascript src=./static/js/app.e66a52a013b7107498be.js></script></body></html>
\ No newline at end of file \ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -135,7 +135,10 @@ ...@@ -135,7 +135,10 @@
if ( that.searchData.substation ){ if ( that.searchData.substation ){
data.stations_ids = that.searchData.addr ; data.stations_ids = that.searchData.addr ;
} else { } else {
if ( that.searchData.business_id != '' || that.searchData.business_id != '全上海市'){ console.log(that.searchData.business_id!= '全上海市');
console.log(false || true )
console.log(that.searchData.business_id != '' && that.searchData.business_id != '全上海市')
if ( that.searchData.business_id != '' && that.searchData.business_id != '全上海市'){
data.disc = that.searchData.business_id ; data.disc = that.searchData.business_id ;
} }
if ( that.searchData.addr != '' ){ if ( that.searchData.addr != '' ){
...@@ -163,7 +166,7 @@ ...@@ -163,7 +166,7 @@
} }
} }
if( that.searchData.more && that.searchData.more.clicked){ if( that.searchData.more && that.searchData.more.clicked){
if ( that.searchData.more.officeChoosen != '' || that.searchData.more.officeChoosen.index != 0){ if ( that.searchData.more.officeChoosen != '' && that.searchData.more.officeChoosen.index != 0){
data.type = that.searchData.more.officeChoosen.index ; data.type = that.searchData.more.officeChoosen.index ;
} }
// if ( that.searchData.more.dujia != '') { // if ( that.searchData.more.dujia != '') {
...@@ -181,7 +184,7 @@ ...@@ -181,7 +184,7 @@
// if ( that.searchData.more.shangjia != '' ) { // if ( that.searchData.more.shangjia != '' ) {
// data.status = that.searchData.more.shangjia; // data.status = that.searchData.more.shangjia;
// } // }
if ( that.searchData.more.specialSpan != '' || that.getsign(that.searchData.more.specialSpan) != '全部') { if ( that.searchData.more.specialSpan != '' && that.getsign(that.searchData.more.specialSpan) != '全部') {
data.shop_sign = that.getsign(that.searchData.more.specialSpan); data.shop_sign = that.getsign(that.searchData.more.specialSpan);
} }
if ( that.searchData.more.aread1 != '' ){ if ( that.searchData.more.aread1 != '' ){
......
...@@ -275,18 +275,18 @@ ...@@ -275,18 +275,18 @@
} //更多中的数据封装 } //更多中的数据封装
//重置switch //重置switch
this.switchData1 = {str1:'是',str2:'否'} this.switchData1 = {str1:'是',str2:'否'}
_this.$refs['s1'].map((res) =>{ // _this.$refs['s1'].map((res) =>{
res.choosed = false ; // res.choosed = false ;
}); // });
_this.$refs['s2'].map((res) =>{ _this.$refs['s2'].map((res) =>{
res.choosed = false ; res.choosed = false ;
}); });
_this.$refs['s3'].map((res) =>{ // _this.$refs['s3'].map((res) =>{
res.choosed = false ; // res.choosed = false ;
}); // });
_this.$refs['s4'].map((res) =>{ // _this.$refs['s4'].map((res) =>{
res.choosed = false ; // res.choosed = false ;
}); // });
_this.startTime.time = '开始时间' ; _this.startTime.time = '开始时间' ;
_this.endTime.time = '结束时间' ; _this.endTime.time = '结束时间' ;
_this.multiOption1.inputStyle.color = '#999999' _this.multiOption1.inputStyle.color = '#999999'
......
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