Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1
This commit is contained in:
@@ -32,7 +32,7 @@
|
||||
</button>
|
||||
</header>
|
||||
<div class="content contentError">
|
||||
<img src="img/errorInternet.png">
|
||||
<img src="images/errorInternet.png">
|
||||
<em>网络加载异常</em>
|
||||
<p>请返回重试或检查网络设置</p>
|
||||
<div class="content-block">
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 2.6 KiB |
@@ -542,11 +542,22 @@ function showRentChart2(categories, series, roomDatas){
|
||||
fontSize: 12
|
||||
},
|
||||
formatter: function (params) {
|
||||
if(params[0].value){
|
||||
var res = params[0].name + ' <br/>' + "租金:"+params[0].value + '元/月';
|
||||
return res;
|
||||
if(params && params.length>0){
|
||||
var s = "";
|
||||
for(var i in params){
|
||||
var ob = params[i]
|
||||
if(i == 0){
|
||||
s += ob.name+"<br/>";
|
||||
}
|
||||
if(ob.value){
|
||||
s += ob.seriesName+ ": "+ ob.value + '元/月<br/>';
|
||||
}
|
||||
}
|
||||
|
||||
if(s){
|
||||
return s;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
},
|
||||
grid:{
|
||||
|
||||
@@ -257,7 +257,7 @@
|
||||
<div class="content-block content-block01 content">
|
||||
<div class="container" style="top:0;">
|
||||
<div class="list-block media-list" style="margin-bottom:0;">
|
||||
<div class="searchHistory">房产列表</div>
|
||||
<div class="searchHistory">房产列表<a class="close-popup">取消</a></div>
|
||||
<ul>
|
||||
<li v-for="house in houses" @click="addMyHouseInfo(house)">
|
||||
<a class="item-link item-content close-popup">
|
||||
@@ -1247,6 +1247,8 @@ $.config = {router: false}
|
||||
<script type='text/javascript' src='../../js/common.js' charset='utf-8'></script>
|
||||
<script type="text/javascript" src="../../js/log/log_stat.js" ></script>
|
||||
<script type='text/javascript' src='../../js/searchDistrict-app.js?' charset='utf-8'></script>
|
||||
<script type="text/javascript" src="../../js/city.js" ></script>
|
||||
|
||||
<script type="text/javascript">
|
||||
var jQuery = $;
|
||||
$.config = {router: false}
|
||||
@@ -1254,7 +1256,7 @@ $.config = {router: false}
|
||||
<script type='text/javascript' src='../../js/jquery.cookie.js?version=${version!}' charset='utf-8'></script>
|
||||
|
||||
<script>
|
||||
var dCity = "上海"
|
||||
var dCity = "北京"
|
||||
var hsId = ""
|
||||
var baseInfo = new Vue({
|
||||
el: '#step1',
|
||||
@@ -1294,6 +1296,8 @@ var houseListData = new Vue({
|
||||
},
|
||||
created:function(){
|
||||
this.loadHouses();
|
||||
|
||||
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1307,21 +1311,24 @@ var step2Vue = new Vue({
|
||||
//加载第二步的区域列表
|
||||
loadRegion: function(){
|
||||
|
||||
this.defaultCity = dCity
|
||||
loadingRegion(dCity);
|
||||
/*plus.geolocation.getCurrentPosition(function(p){
|
||||
//this.defaultCity = dCity
|
||||
//loadingRegion(dCity);
|
||||
plus.geolocation.getCurrentPosition(function(p){
|
||||
city = p.address.city;
|
||||
|
||||
var formatCity = formatBaiduCity(city);
|
||||
step2Vue.defaultCity = formatCity
|
||||
loadingRegion(formatCity);
|
||||
}, function(e){
|
||||
loadingRegion(city);
|
||||
step2Vue.defaultCity = dCity
|
||||
loadingRegion(dCity);
|
||||
},
|
||||
{
|
||||
provider:'baidu',
|
||||
enableHighAccuracy:true,
|
||||
coordsType:'bd09ll'
|
||||
}
|
||||
);*/
|
||||
);
|
||||
},
|
||||
clickTags: function(e){
|
||||
|
||||
@@ -1363,6 +1370,7 @@ function onPlusReady() {
|
||||
//小区报告页带入
|
||||
fillHouseInfo(houseId);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
//修改置换建议填充默认值
|
||||
@@ -1848,7 +1856,9 @@ $("#citySearchInp").bind('keyup', function() {
|
||||
});
|
||||
|
||||
function openAddHouse(){
|
||||
clicked('/views/house/add.html',true,false,{},{});
|
||||
clicked('/views/house/add.html',true,false,{},{source:"changeHouse"},function(){
|
||||
houseListData.loadHouses();
|
||||
});
|
||||
}
|
||||
|
||||
/* 定位城市 */
|
||||
|
||||
@@ -285,7 +285,7 @@ $.config = {router: false}
|
||||
var sharehrefTitle = "小区名";
|
||||
var sharehrefDes = "小区详情介绍!";
|
||||
var shareId='';
|
||||
var picUrl = '../../img/default_share.png';
|
||||
var picUrl = '../../images/default_share.png';
|
||||
|
||||
// baseInfo = new Vue({
|
||||
// el: '#districtBaseInfo',
|
||||
|
||||
@@ -150,7 +150,7 @@ $.config = {router: false}
|
||||
var sharehrefTitle = "小区名";
|
||||
var sharehrefDes = "小区详情介绍!";
|
||||
var shareId='';
|
||||
var picUrl = '../../img/default_share.png';
|
||||
var picUrl = '../../images/default_share.png';
|
||||
var hid = "";
|
||||
document.addEventListener('plusready', onPlusReady, false);
|
||||
function onPlusReady(){
|
||||
|
||||
@@ -1246,10 +1246,12 @@ $.config = {router: false}
|
||||
document.addEventListener('plusready', onPlusReady, false);
|
||||
var houseStatus; //= "186182250936643584";
|
||||
//扩展API加载完毕,现在可以正常调用扩展API
|
||||
var type = 1;
|
||||
var type = 1;
|
||||
var source = ""
|
||||
function onPlusReady(){
|
||||
var self = plus.webview.currentWebview();
|
||||
type = self.type; //type为1时是我的房产
|
||||
source = self.source
|
||||
if(type==0){
|
||||
$("#liveStatusDiv").show();
|
||||
}else{
|
||||
@@ -1875,6 +1877,7 @@ function checkIsLogin(){
|
||||
|
||||
function addEvaluation(){
|
||||
var data={};
|
||||
|
||||
if(type==0){
|
||||
data={id:requestId,cityDisplay: $("#input_city").val(),
|
||||
region:$("input[name=region]").val(),
|
||||
@@ -1892,6 +1895,12 @@ function addEvaluation(){
|
||||
lastRentDate:$("#input_time03").val(),
|
||||
houseStatus:0}
|
||||
}else{
|
||||
|
||||
houseStatus = 1;
|
||||
if(source=="changeHouse"){
|
||||
houseStatus = 0;
|
||||
}
|
||||
|
||||
data={id:requestId,cityDisplay: $("#input_city").val(),
|
||||
region:$("input[name=region]").val(),
|
||||
district:$("#input_address").val(),
|
||||
@@ -1900,7 +1909,7 @@ function addEvaluation(){
|
||||
loudongName:$("#input_building").val(),
|
||||
floorName:$("#input_floor").val(),
|
||||
area:$("#input_area").val(),
|
||||
houseStatus:1}
|
||||
houseStatus:houseStatus}
|
||||
}
|
||||
var eventType = "evaluateSubmitClick";
|
||||
saveBehaviorLog(eventType,data); //保存用户点击事件
|
||||
@@ -1910,19 +1919,27 @@ function addEvaluation(){
|
||||
})
|
||||
.then(function (response) {
|
||||
if(response.data.data!=null && response.data.data.success){
|
||||
$("#evaluation_btn").removeAttr("disabled");
|
||||
var id = response.data.data.id;
|
||||
|
||||
if(plus.webview.getWebviewById('views/house/houseManageList.html') != null) {
|
||||
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
|
||||
|
||||
if(source=="changeHouse"){
|
||||
back(),plus.nativeUI.closeWaiting();
|
||||
|
||||
|
||||
}else{
|
||||
$("#evaluation_btn").removeAttr("disabled");
|
||||
var id = response.data.data.id;
|
||||
|
||||
if(plus.webview.getWebviewById('views/house/houseManageList.html') != null) {
|
||||
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
|
||||
}
|
||||
|
||||
if(plus.webview.getWebviewById('views/user/userInfo.html')!= null){
|
||||
plus.webview.getWebviewById('views/user/userInfo.html').reload();
|
||||
}
|
||||
clicked('/views/evaluate/evaluateReport.html',true,false,{},{hid:id},function(){
|
||||
getRequestId();
|
||||
})
|
||||
}
|
||||
|
||||
if(plus.webview.getWebviewById('views/user/userInfo.html')!= null){
|
||||
plus.webview.getWebviewById('views/user/userInfo.html').reload();
|
||||
}
|
||||
clicked('/views/evaluate/evaluateReport.html',true,false,{},{hid:id},function(){
|
||||
getRequestId();
|
||||
})
|
||||
}else{
|
||||
$("#evaluation_btn").removeAttr("disabled");
|
||||
$.toast(response.data.message);
|
||||
|
||||
@@ -1223,7 +1223,7 @@ $.config = {router: false}
|
||||
var sharehrefTitle = "房产行情,小区价格,房租信息全掌握";
|
||||
var sharehrefDes = "客观里面请!";
|
||||
//var shareId='全国';
|
||||
var picUrl = '_www/img/default_share.png';
|
||||
var picUrl = '_www/images/default_share.png';
|
||||
|
||||
var date = new Date();
|
||||
var year = date.getFullYear()+'年';
|
||||
|
||||
@@ -144,7 +144,7 @@ var city;
|
||||
var region;
|
||||
|
||||
//var picUrl = '_www/logo.png';
|
||||
var picUrl = '_www/img/default_share.png';
|
||||
var picUrl = '_www/images/default_share.png';
|
||||
|
||||
|
||||
//新闻评论列表
|
||||
|
||||
Reference in New Issue
Block a user