Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1

This commit is contained in:
2018-04-16 14:24:55 +08:00
5 changed files with 69 additions and 25 deletions
+3 -1
View File
@@ -1,6 +1,8 @@
@charset "utf-8";
/* CSS Document */
[v-cloak] {
display: none;
}
/* 公用 */
*{font-size:16px;font-family:arial,"华文细黑";}
ul li{list-style:none;}
+1
View File
@@ -1,5 +1,6 @@
axios.defaults.baseURL = BASE_PATH;
axios.defaults.headers.post['Content-Type'] = 'application/json';
axios.defaults.timeout = 10000;
// 添加请求拦截器
axios.interceptors.request.use(function (config) {
+22 -1
View File
@@ -1721,6 +1721,27 @@
}
},
"unpackage": [
"js/update.json"
"js/update.json",
"doc/cache.html",
"doc/console.html",
"doc/contacts.html",
"doc/interface-orientation.html",
"doc/key.html",
"doc/splashscreen.html",
"doc/statistic.html",
"plus/accelerometer_shake.html",
"plus/accelerometer.html",
"plus/audio.html",
"plus/barcode_scan.html",
"plus/barcode_scan2.html",
"plus/barcode.html",
"plus/camera_image.html",
"plus/camera_video.html",
"plus/camera.html",
"plus/device.html",
"plus/doc.html",
"plus/downloader.html",
"plus/webview_pullhead.html",
"plus/webview_pullrefresh.html"
]
}
+21 -10
View File
@@ -64,7 +64,7 @@
<div class="item-title"><label><b>{{name}}</b></label><span class="span01">{{cityRegion}}</span></div>
</div>
<div class="item-title-row">
<div class="item-title"><small><label v-if="roomCount > 0">{{roomCount}}室</label><label v-if="hallCount > 0">{{hallCount}}厅</label>&nbsp;&nbsp;{{area}}m&nbsp;&nbsp;<label v-if="floor > 0 && height">{{floor}}/{{height}}层</label></small></div>
<div class="item-title"><small>{{houseRoomNum}}&nbsp;&nbsp;{{area}}m&nbsp;&nbsp;{{floor_height}}</small></div>
</div>
</div>
</div>
@@ -78,7 +78,7 @@
<a class="add alert-text-title"><i class="icon icon-houseLevel"></i>{{estatetype}}</a>
</div>
<div class="card-content">
<div class="card-content-inner">{{Math.round(totalPrice/10000)}}<span>万</span></div>
<div class="card-content-inner">{{totalPrice}}<span>万</span></div>
</div>
<div class="card-footer">
<span>
@@ -352,11 +352,9 @@ var baseInfo = new Vue({
name : "",
address:"",
cityRegion:"",
roomCount: "",
hallCount: "",
houseRoomNum: "",
area: "",
floor: "",
height: "",
floor_height: "",
liveStatus:"",
estatetype:"",
totalPrice:"",
@@ -411,11 +409,19 @@ function init(){
baseInfo.name = houseInfo.name;
baseInfo.address = houseInfo.address;
baseInfo.cityRegion=houseInfo.city+"-"+houseInfo.region;
baseInfo.roomCount= houseInfo.roomCount;
baseInfo.hallCount= houseInfo.hallCount;
baseInfo.houseRoomNum= houseInfo.houseRoomNum;
baseInfo.area= houseInfo.area;
baseInfo.floor= houseInfo.floor;
baseInfo.height= houseInfo.height;
var floor_height = "";
if(houseInfo.floor!=0){
floor_height = houseInfo.floor;
}
if(houseInfo.height!=0){
floor_height += "/" + houseInfo.height;
}
if(floor_height!=""){
floor_height+="层";
}
baseInfo.floor_height= floor_height;
if(houseInfo.liveStatus){
baseInfo.liveStatus=houseInfo.liveStatus;
}else{
@@ -435,6 +441,11 @@ function init(){
}
baseInfo.estatetype=houseInfo.estatetype;
baseInfo.totalPrice=houseInfo.totalPrice;
if(houseInfo.totalPrice==0){
baseInfo.totalPrice = "暂无";
}else{
baseInfo.totalPrice = (houseInfo.totalPrice/10000).toFixed(2)
}
baseInfo.price=houseInfo.price;
baseInfo.totalScore=houseInfo.totalScore;
baseInfo.index=response.data.data.index;
+22 -13
View File
@@ -36,8 +36,8 @@
</button>-->
<h1 class="title">房产行情</h1>
</header>
<div class="content" >
<div class="buttons-tab theme" id="tabCityDiv" >
<div class="content">
<div class="buttons-tab theme" id="tabCityDiv" v-cloak>
<a href="#tabQuotation1" class="tab-link active button">全国</a>
<div v-for="mycollectcity in citys" >
<a class="tab-link button" @click="clickCity(mycollectcity)" v-bind:vcity="mycollectcity">{{mycollectcity}}</a>
@@ -46,8 +46,8 @@
</div>
<div class="tabs">
<div id="tabQuotation1" class="tab active">
<div class="card cardPrice cardPrice01 cardCity" id="countryInfo">
<div id="tabQuotation1" class="tab active" >
<div class="card cardPrice cardPrice01 cardCity" id="countryInfo" v-cloak>
<div class="card-header">
<label>全国</label>
</div>
@@ -80,7 +80,7 @@
<div id="myFocusFirstPage">
<my_focus></my_focus>
</div>
<div class="cardNearbyBox cardNearbyBox01 cardRankingBox cardRankingBox01" id="countryRank">
<div class="cardNearbyBox cardNearbyBox01 cardRankingBox cardRankingBox01" id="countryRank" v-cloak>
<div class="cardNearbyWin">
<div class="card cardNearby cardRanking" v-for="item in datas">
<div class="card-header" v-if="item.type==0">
@@ -168,7 +168,7 @@
</div>
<div id="cityInfo" class="dn">
<div id="cityInfo" class="dn" v-cloak>
<div class="card cardPrice cardPrice01 cardCity01" v-bind:hrefid="myCityMap.hrefId">
<div class="card-header">
<label>{{myCityMap.city}}</label>
@@ -1511,11 +1511,15 @@ function addFocus(city){
}else{
axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){
reloadMyFocus()
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
plus.webview.getWebviewById('views/user/userInfo.html').reload();
createData(city, myDatasVue.$data.cityDatas.length);
if(response.data.status){
reloadMyFocus()
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
plus.webview.getWebviewById('views/user/userInfo.html').reload();
createData(city, myDatasVue.$data.cityDatas.length);
} else {
$.toast(response.data.message);
}
}).catch(function(error){
console.log(error)
})
@@ -1523,8 +1527,13 @@ function addFocus(city){
})
}else{
axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){
reloadMyFocus()
cityDetaiVue.$data.citys.push(city);
if(response.data.status){
reloadMyFocus()
cityDetaiVue.$data.citys.push(city);
} else {
$.toast(response.data.message);
}
}).catch(function(error){
console.log(error)
})