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

This commit is contained in:
尹吉欢
2018-05-08 11:46:40 +08:00
4 changed files with 52 additions and 25 deletions
+4 -4
View File
@@ -380,9 +380,9 @@ function getAnalysisDetail(){
//增长率及收益跳转链接是否显示
if(resultsMap.ad!=null){
$('#showAdBox1').show();
$('#showAdBox1Content').html(resultsMap.ad.content + "<i class='icon icon-right icon-right01'></i>");
//如果link有值,添加调整路径
if(resultsMap.ad.link!=null && resultsMap.ad.link.length>0){
if(resultsMap.ad.link!=null && resultsMap.ad.link.length>0 && resultsMap.ad.content!=null && resultsMap.ad.content.length>0){
$('#showAdBox1Content').html(resultsMap.ad.content + "<i class='icon icon-right icon-right01'></i>");
$("#showAdBox1").click(function(){
clicked('../../views/webview_embed.html', true,false,{},{url:resultsMap.ad.link})
})
@@ -403,9 +403,9 @@ function getAnalysisDetail(){
//挂牌建议跳转链接是否显示
if(resultsMap.ad1!=null){
$('#showAdBox2').show();
$('#showAdBox2Content').html(resultsMap.ad1.content + "<i class='icon icon-right icon-right01'></i>");
//如果link有值,添加调整路径
if(resultsMap.ad1.link!=null && resultsMap.ad1.link.length>0){
if(resultsMap.ad1.link!=null && resultsMap.ad1.link.length>0 && resultsMap.ad1.content!=null && resultsMap.ad1.content.length>0){
$('#showAdBox2Content').html(resultsMap.ad1.content + "<i class='icon icon-right icon-right01'></i>");
$("#showAdBox2").click(function(){
clicked('../../views/webview_embed.html', true,false,{},{url:resultsMap.ad1.link})
})
+17 -7
View File
@@ -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();
});
}
/* 定位城市 */
@@ -312,7 +312,7 @@ $.config = {router: false}
$("#img_ad").click(function(){
url=h.link+"?uid="+uid+"&device="+device;
//window.location.href=url;
clicked("../webview_embed.html', true,false,{},{url:this.url});
clicked("/views/webview_embed.html", true,false,{},{url:url});
});
}
loadingChart(h.city,h.region,h.name,2)
+30 -13
View File
@@ -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);