Skip to content

T
tl_estate
Commit 35fb1580 authored by duxinyuan's avatar duxinyuan
Browse files
Options

1

parent 4b4223d8
Show whitespace changes
Inline Side-by-side
Showing with 30 additions and 66 deletions
public/app/dist/index.html
View file @ 35fb1580
...@@ -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.07a55a3ee019b3fda5fca852a2390817.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.195e6ddbfdeb141db98c.js></script></body></html> })(document, window);</script><link href=./static/css/app.4190cdb5c58a83ef8a74a58819b0c740.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.9fd8d33170a4f9e3a126.js></script></body></html>
\ No newline at end of file \ No newline at end of file
public/app/dist/static/css/app.26c9d2e1a7a7aaa516d2469cd66a3d84.css 0 → 100644
View file @ 35fb1580
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/css/app.4190cdb5c58a83ef8a74a58819b0c740.css 0 → 100644
View file @ 35fb1580
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/js/app.25a5ba1abdf35dabddcf.js 0 → 100644
View file @ 35fb1580
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/js/app.9fd8d33170a4f9e3a126.js 0 → 100644
View file @ 35fb1580
This source diff could not be displayed because it is too large. You can view the blob instead.
public/appnew/src/components/office_building/buildList.vue
View file @ 35fb1580
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<page-load :canload="true" :distance="10" @load="getList"> <page-load :canload="true" :distance="10" @load="getList">
<div class="officeLI" v-for="item,index in items" v-key="index" @click="turn('ShareOfficeRoom',item.id,item.title)"> <div class="officeLI" v-for="item,index in items" v-key="index" @click="turn('ShareOfficeRoom',item.id,item.title)">
<div style="width:2.1rem ; height : 1.58rem ; overflow:hidden ;border-radius:.25rem; float:left;"> <div style="width:2.1rem ; height : 1.58rem ; overflow:hidden ;border-radius:.25rem; float:left;">
<img :src="icon_down02" style="width:100%;height:100%;"/> <img :src="item.carousel_image[0] ? item.carousel_image[0].image_path : icon_down02" style="width:100%;height:100%;"/>
</div> </div>
<div style="float:left;margin-left:.3rem;overflow:hidden;width:4.46rem;"> <div style="float:left;margin-left:.3rem;overflow:hidden;width:4.46rem;">
<div style="font-size:.30rem;font-family:PingFangSC-Medium;font-weight:500;color:rgba(28,28,28,1);line-height:.34rem;height:.7rem;"> <div style="font-size:.30rem;font-family:PingFangSC-Medium;font-weight:500;color:rgba(28,28,28,1);line-height:.34rem;height:.7rem;">
...@@ -77,13 +77,13 @@ ...@@ -77,13 +77,13 @@
mounted () { mounted () {
let that = this ; let that = this ;
that.getList(0); that.getList(0);
that.test();
}, },
methods: { methods: {
search(e){ search(e){
let that = this ; let that = this ;
if ( e.keyCode == 13 ){ if ( e.keyCode == 13 ){
that.getList(0,true); that.getList(0,true);
that.showSearch = false ;
} }
}, },
turn(str,id,name){ turn(str,id,name){
...@@ -98,7 +98,6 @@ ...@@ -98,7 +98,6 @@
}, },
backSearchData (data){ backSearchData (data){
let that = this ; let that = this ;
console.log(data);
that.searchData = data ; that.searchData = data ;
that.pageNo = 1 ; that.pageNo = 1 ;
that.items = [] ; that.items = [] ;
...@@ -113,28 +112,13 @@ ...@@ -113,28 +112,13 @@
}, },
getList (no,status) { getList (no,status) {
let that = this ; let that = this ;
// console.log(that.searchData) ;
let data = { let data = {
city :'上海市' , city :'上海市' ,
pageSize : that.pageSize , pageSize : that.pageSize ,
pageNo : that.pageNo, pageNo : that.pageNo,
// disc : '',
// id :'' ,
// business_district_id :'' ,
// area_start :that.searchData.area ? that.searchData.area[0] : '' , ,
// area_end :that.searchData.area ? that.searchData.area[1] : '' ,,
// price_start :that.searchData.money ? that.searchData.money[0] : '' ,
// price_end :that.searchData.money ? that.searchData.money[1] : '' ,
// type :that.searchData.more.officeChoosen.index ? that.searchData.more.officeChoosen.index : '' ,
// is_exclusive_type : that.searchData.more.dujia ? that.searchData.more.dujia : '' ,
// agent_start_time :that.searchData.more.startTime ? that.searchData.more.startTime : '' ,
// agent_end_time :that.searchData.more.endTime ? that.searchData.more.endTime : '' ,
// is_rent :that.searchData.more.qiuzu ? that.searchData.more.qiuzu : '' ,
// status :that.searchData.more.shangjia ? that.searchData.more.shangjia : '' ,
// shop_sign :that.getsign(that.searchData.more.specialSpan) ,
} }
if (status){ if (status){
that.items= [] ;
switch ( that.si ){ switch ( that.si ){
case 0 : case 0 :
data.address = that.searchStr; data.address = that.searchStr;
...@@ -147,8 +131,13 @@ ...@@ -147,8 +131,13 @@
break ; break ;
} }
} }
if (that.searchData.addr != ''){ if ( that.searchData.substation ){
data.disc = that.searchData.addr ; data.stations_ids = that.searchData.addr ;
} else {
data.disc = that.searchData.business_id ;
if ( that.searchData.addr != '' ){
data.business_id = that.searchData.addr ;
}
} }
if ( that.searchData.area && that.searchData.area[0] > -1 ){ if ( that.searchData.area && that.searchData.area[0] > -1 ){
if (that.searchData.area[0] > that.searchData.area[1]){ if (that.searchData.area[0] > that.searchData.area[1]){
...@@ -166,8 +155,8 @@ ...@@ -166,8 +155,8 @@
} else if ( that.searchData.money[0] == '' && that.searchData.money[1] == '') { } else if ( that.searchData.money[0] == '' && that.searchData.money[1] == '') {
} else { } else {
data.price_start = that.searchData.money[0]; data.price_total_start = that.searchData.money[0];
data.price_end = that.searchData.money[1] ; data.price_total_end = that.searchData.money[1] ;
} }
} }
if( that.searchData.more && that.searchData.more.clicked){ if( that.searchData.more && that.searchData.more.clicked){
...@@ -199,10 +188,10 @@ ...@@ -199,10 +188,10 @@
data.area_end = that.searchData.more.aread2 ; data.area_end = that.searchData.more.aread2 ;
} }
if ( that.searchData.more.pri1 != '' ){ if ( that.searchData.more.pri1 != '' ){
data.price_start = that.searchData.more.pri1; data.price_total_start = that.searchData.more.pri1;
} }
if ( that.searchData.more.pri2 != '' ){ if ( that.searchData.more.pri2 != '' ){
data.price_end = that.searchData.more.pri2 ; data.price_total_end = that.searchData.more.pri2 ;
} }
if (that.searchData.more.gongkai != ''){ if (that.searchData.more.gongkai != ''){
data.is_show = that.searchData.more.gongkai ; data.is_show = that.searchData.more.gongkai ;
...@@ -216,9 +205,11 @@ ...@@ -216,9 +205,11 @@
data: data data: data
}).then(function(res) { }).then(function(res) {
if(res.data.code == 200) { if(res.data.code == 200) {
console.log(res.data.data);
res.data.data.map( (obj) => { res.data.data.map( (obj) => {
obj.shop_sign="临街旺铺,临近地铁,商业综合体,独家"; // obj.building_image = [{
// img_path : '
// }] ;
// obj.shop_sign="临街旺铺,临近地铁,商业综合体,独家";
let array = obj.shop_sign.split(","); let array = obj.shop_sign.split(",");
obj.shop_sign=array; obj.shop_sign=array;
that.items.push(obj); that.items.push(obj);
...@@ -228,19 +219,9 @@ ...@@ -228,19 +219,9 @@
layer.tipsX(res.data.msg); layer.tipsX(res.data.msg);
} }
}).catch(function(error) { }).catch(function(error) {
console.log(error)
layer.tipsX(error); layer.tipsX(error);
}); });
}, },
test (){
let sttr = '{"name":"duxinyuan","id":"123213"}';
let newStr = JSON.parse(sttr);
console.log(newStr,newStr.name);
}
}, },
computed: { computed: {
......
public/appnew/src/components/office_building/buildSearch.vue
View file @ 35fb1580
...@@ -105,15 +105,13 @@ ...@@ -105,15 +105,13 @@
</div> </div>
</div> </div>
</div> </div>
<div class="more-button" >
<div class="more-button">
<span class="clear-btn" @click="delMore()">清空</span> <span class="clear-btn" @click="delMore()">清空</span>
<span class="save-btn" @click="saveMore()">保存</span> <span class="save-btn" @click="saveMore()">保存</span>
</div> </div>
</div> </div>
</div >
</div style="position:relative;z-index:50"> <div class="more-button" style="overflow:hidden ; position:fixed;top:8.5rem;z-index:100;padding:.1rem .455rem .2rem;padding-bottom:.2rem;background-color:#ffffff;border-top:1xp solid red " v-show="index == 0 && subs">
<div class="more-button" style="margin-left:.4rem;" v-show="index == 0 && subs">
<span class="clear-btn" @click="chooseSubstationOK(false)">取消</span> <span class="clear-btn" @click="chooseSubstationOK(false)">取消</span>
<span class="save-btn" @click="chooseSubstationOK(true)">保存</span> <span class="save-btn" @click="chooseSubstationOK(true)">保存</span>
</div> </div>
...@@ -134,6 +132,7 @@ ...@@ -134,6 +132,7 @@
'switch-d' : switchDiv 'switch-d' : switchDiv
}, },
data : ()=>({ data : ()=>({
ajaxBusinessArea : '',
icon_down02,icon_down, icon_down02,icon_down,
initTabNumMainChoose : -1 , initTabNumMainChoose : -1 ,
mainDataChoose:[{ mainDataChoose:[{
...@@ -257,7 +256,6 @@ ...@@ -257,7 +256,6 @@
mounted () { mounted () {
let that = this ; let that = this ;
that.getChooseList(); that.getChooseList();
// console.log(this.nowData);
}, },
methods: { methods: {
hideall (){ hideall (){
...@@ -309,7 +307,6 @@ ...@@ -309,7 +307,6 @@
if ( i == 0 ){ if ( i == 0 ){
_this.dataMore.specialSpan = ['全部'] _this.dataMore.specialSpan = ['全部']
} else { } else {
console.log()
if ( _this.dataMore.specialSpan.indexOf('全部') > -1 ){ if ( _this.dataMore.specialSpan.indexOf('全部') > -1 ){
_this.dataMore.specialSpan.splice( _this.dataMore.specialSpan.indexOf('全部’') , 1); _this.dataMore.specialSpan.splice( _this.dataMore.specialSpan.indexOf('全部’') , 1);
} }
...@@ -327,7 +324,6 @@ ...@@ -327,7 +324,6 @@
}, },
swithchBack (data,status){ swithchBack (data,status){
let _this = this ; let _this = this ;
console.log(data,status);
switch (status){ switch (status){
case 'one' : case 'one' :
_this.dataMore.dujia = data ; _this.dataMore.dujia = data ;
...@@ -346,10 +342,12 @@ ...@@ -346,10 +342,12 @@
backData (){ backData (){
let _this = this ; let _this = this ;
let obj = { let obj = {
addr : _this.substationChoosen.length > 0 ? _this.resetSubstationData(_this.substationChoosen) : _this.ajaxBusiness, addr : _this.substationChoosen.length > 0 ? _this.resetSubstationData(_this.substationChoosen) : (_this.ajaxBusiness == 0 ? '' : _this.ajaxBusiness),
business_id : _this.substationChoosen.length > 0 ? '' : _this.ajaxDisc ,
money : _this.priceChoosen , money : _this.priceChoosen ,
area : [_this.ajax_shop_area_start , _this.ajax_shop_area_end] , area : [_this.ajax_shop_area_start , _this.ajax_shop_area_end] ,
more :_this.dataMore more :_this.dataMore,
substation : _this.substationChoosen.length > 0
} }
this.$emit('backSearchData',obj) this.$emit('backSearchData',obj)
}, },
...@@ -458,30 +456,21 @@ ...@@ -458,30 +456,21 @@
} }
}) })
.catch(function(error) { .catch(function(error) {
console.log(error)
layer.tipsX(error); layer.tipsX(error);
}); });
// let res = this.nowData ;
// _this.mainDataChooseLi = res;
// _this.mainDataSubstationLi = res.stations;
//// console.log(res.stations)
// _this.mainDataCityLi = res.area[1].business_district;
}, },
tabAreaCity(index,district){ tabAreaCity(index,district){
let _this = this; let _this = this;
_this.initTabNumAreaCity = index; _this.initTabNumAreaCity = index;
_this.ajaxDisc = district; _this.ajaxDisc = district;
// _this.backData();
}, },
tabSubstationLine (index,name) { tabSubstationLine (index,name) {
let _this = this ; let _this = this ;
console.log(index)
_this.substationLineChoose = index ; _this.substationLineChoose = index ;
_this.choosenLineName = name ; _this.choosenLineName = name ;
}, },
tabAreaBusiness(index,business,businessStr){ tabAreaBusiness(index,business,businessStr){
let _this = this; let _this = this;
console.log(index,business,businessStr)
_this.initTabNumBusiness = index; _this.initTabNumBusiness = index;
if(business == 0 && (('全' + _this.initSelectCity) == _this.ajaxDisc ) || _this.ajaxDisc == ''){ if(business == 0 && (('全' + _this.initSelectCity) == _this.ajaxDisc ) || _this.ajaxDisc == ''){
_this.mainDataChoose[_this.initTabNumMainChoose].title = '区域'; _this.mainDataChoose[_this.initTabNumMainChoose].title = '区域';
...@@ -494,8 +483,8 @@ ...@@ -494,8 +483,8 @@
_this.lableColorArr[_this.initTabNumMainChoose] = 1; _this.lableColorArr[_this.initTabNumMainChoose] = 1;
} }
_this.mainDataChoose[_this.initTabNumMainChoose].isShow = false; _this.mainDataChoose[_this.initTabNumMainChoose].isShow = false;
// _this.ajaxBusiness = business; _this.ajaxBusiness = business;
_this.ajaxBusiness = businessStr; // _this.ajaxBusiness = businessStr;
_this.substationChoosen = [] ; _this.substationChoosen = [] ;
this.backData(); this.backData();
}, },
...@@ -506,12 +495,6 @@ ...@@ -506,12 +495,6 @@
} else { } else {
_this.substationChoosen.splice( _this.substationChoosen.indexOf(index-0) , 1) _this.substationChoosen.splice( _this.substationChoosen.indexOf(index-0) , 1)
} }
console.log(_this.substationChoosen);
},
tabYeTai(index,yetai){
let _this = this;
}, },
tabArea(index,area){ tabArea(index,area){
let _this = this; let _this = this;
......
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