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

This commit is contained in:
raoyanhui
2018-05-08 19:07:50 +08:00
7 changed files with 98 additions and 31 deletions
+2 -1
View File
@@ -1,8 +1,9 @@
/**服务端地址**/
//var BASE_PATH = "http://youfang.fangjia.com";
//var BASE_PATH = "http://192.168.10.128:8084";
var BASE_PATH = "http://192.168.10.164:8084";
//var BASE_PATH = "http://192.168.10.164:8084";
//var BASE_PATH = "http://192.168.10.53:8084";
var BASE_PATH = "http://192.168.10.47:8086";
//var BASE_PATH = "http://192.168.10.161:8084";
//var BASE_PATH = "http://192.168.10.170:8084";
//var BASE_PATH = "http://192.168.10.171:8084";
+32
View File
@@ -0,0 +1,32 @@
function add_imgage(imageId,adPosition,device){
axios.get("/rest/ad/position",{
params:{position : adPosition}
}).then(function(response){
if(response.data.status){
h = response.data.data;
if(typeof(h.imgId)!="undefined"&&h.imgId!=null&&$.trim(h.imgId)!=""){
$("#"+imageId).attr("src",BASE_PATH+"/img/"+h.imgId);
}
if(typeof(h.link)!="undefined"&&h.link!=null&&$.trim(h.link)!=""){
var uid = localStorage.getItem("user_id");
var aId=h.id;
$("#"+imageId).parent().click(function(){
//1.记录点击日志
axios.post("/rest/ad/adUrlLoad",{
id : aId
}).then(function(res){
console.log(res);
}).catch(function(error){
console.log(error);
});
//2.跳转
url=h.link+"?uid="+uid+"&device="+device;
//window.location.href=url;
clicked("/views/webview_embed.html", true,false,{},{url:url});
});
}
}
}).catch(function(error){
console.log(error);
});
}
+4 -2
View File
@@ -1654,7 +1654,8 @@
"css/theme-blue.css"
],
"refer": [
"views/house/add.html"
"views/house/add.html",
"views/webview_embed.html"
],
"priority": 0
},
@@ -1768,7 +1769,8 @@
"resources": [],
"refer": [
"views/rent/rentManager.html",
"views/loan/loanInfo.html"
"views/loan/loanInfo.html",
"views/changeHouse/index.html"
],
"priority": 0
}
+31 -26
View File
@@ -1301,6 +1301,8 @@ var houseListData = new Vue({
}
})
var step2Vue = new Vue({
el: '#step2Div',
data: {
@@ -1308,28 +1310,7 @@ var step2Vue = new Vue({
regions : []
},
methods:{
//加载第二步的区域列表
loadRegion: function(){
//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){
step2Vue.defaultCity = dCity
loadingRegion(dCity);
},
{
provider:'baidu',
enableHighAccuracy:true,
coordsType:'bd09ll'
}
);
},
clickTags: function(e){
if($(event.target).hasClass("active")){
@@ -1351,11 +1332,11 @@ var step2Vue = new Vue({
}
},
created:function(){
this.loadRegion();
//this.loadRegion();
}
})
document.addEventListener('plusready', onPlusReady, false);
function onPlusReady() {
var self = plus.webview.currentWebview();
@@ -1371,8 +1352,32 @@ function onPlusReady() {
fillHouseInfo(houseId);
}
//加载第二步的区域列表
plus.geolocation.getCurrentPosition(function(p){
city = p.address.city;
var formatCity = formatBaiduCity(city);
if(formatCity){
step2Vue.defaultCity = formatCity
loadingRegion(formatCity);
}else{
step2Vue.defaultCity = dCity
loadingRegion(dCity);
}
}, function(e){
step2Vue.defaultCity = dCity
loadingRegion(dCity);
},
{
provider:'baidu',
enableHighAccuracy:true,
coordsType:'bd09ll'
}
);
}
//修改置换建议填充默认值
function updateChangeSubtation(hsId){
axios.get(BASE_PATH + "/rest/changeHouse/loadHouseSubInfo",{
@@ -1429,7 +1434,7 @@ function fillHouseInfo(houseId){
var data = response.data.data;
if(data){
addBaseHouseInfo(data);
baseInfo.houseId = hs.houseId
baseInfo.houseId = houseId
}
}).catch(function (error) {
console.log(error);
@@ -113,6 +113,7 @@ Vue.component('base-info-component', {
var house = response.data.data.houseInfo;
if(hs && sr){
addSubstitution(sr, hs, house);
addAdvertisement();
}
if(cityPrice){
baseInfo.cityPrice = cityPrice
@@ -302,7 +303,26 @@ function addSubstitution(sr, hs, house){
// <#if advertisement?? && advertisement.content?? && advertisement.content?length gt 0>
// <a <#if advertisement.link?? && advertisement.link?length gt 0>onclick="openUrl('${basePath}/message/openView?url=${basePath}/mad/adUrlLoad?adid=${advertisement.id!?c}')"</#if> ><#if advertisement.content??>${advertisement.content!}</#if><i class="icon icon-right icon-right01"></i></a></p>
// </#if>
$("#suggestDiv").text(s);
$("#suggestDiv p").text(s);
$("#suggestDiv").show();
}
function addAdvertisement(){
axios.get("/rest/changeHouse/position", null).then(function (response) {
var vo = response.data.data
if(vo!=null){
$('#adBox').show();
//如果link有值,添加调整路径
if(vo.link!=null && vo.link.length>0 && vo.content!=null && vo.content.length>0){
$('#adBox').html(vo.content + "<i class='icon icon-right icon-right01'></i>");
$("#adBox").click(function(){
clicked('../../views/webview_embed.html', true,false,{},{url:vo.link})
})
}
}
}).catch(function (error) {
console.log(error);
});
}
+2 -1
View File
@@ -64,7 +64,8 @@
</header>
<div class="content">
<div class="topBg topBg02 dn" id="suggestDiv">
<p>购买 龙盛佳苑 90-110㎡ 的房子,总价预计约为<em>587-717万</em>。<br><a href="">查看详情<i class="icon icon-right icon-right01"></i></a></p>
<p></p>
<a class="adBox" id="adBox" style="background:none;display: none;"></a>
</div>
<div class="list-block media-list topList">
+6
View File
@@ -109,6 +109,8 @@
</div>
</div>
</div>
<a class="ad bb"><img id="img"></a>
<div class="topic rentBox dn">
<div class="topicContent" style="padding:0.5rem 0;">
<div class="list-block dataList">
@@ -352,6 +354,8 @@ $.config = {router: false}
<script type="text/javascript" src="../../js/echarts.js"></script>
<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/ad_position_image.js"></script>
<script type="text/javascript" src="../../config.js"></script>
<script>
document.addEventListener('plusready', onPlusReady, false);
@@ -376,6 +380,8 @@ function onPlusReady(){
$('#gotoLoanApply').hide();
}
init();
var device = plus.device.uuid;
add_imgage("img",ESTATE_DETAIL,device);//传入广告位的imgId
}
var baseInfo = new Vue({
el: '#baseInfo',