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 18:24:20 +08:00
9 changed files with 94 additions and 21 deletions
+15 -9
View File
@@ -11,12 +11,18 @@ var BASE_PATH = "http://192.168.10.164:8084";
var lauchFlag = false;
/*广告位类型常量*/
var TOU_ZI_SHOU_YI=0;
var JUN_JIA_PAI_MING=1;
var ZU_SHOU_BI=2;
var LIU_DONG_XING_PING_JI=3;
var XIANG_SI_XIAO_QU=4;
var HOME_PAGE_BANNER=5;
var LOAN_PAGE_BANNER=6;
var SET_QR_CODE=7;
var EVALUATE_REPORT=8;
var TOU_ZI_SHOU_YI=0;//"房产分析/出租管理-租金回报率"
var JUN_JIA_PAI_MING=1;//"房产分析/出租管理-出租状态"
var ZU_SHOU_BI=2;//"出售分析-增长率收益"
var LIU_DONG_XING_PING_JI=3;//"出售分析-挂牌建议"
var XIANG_SI_XIAO_QU=4;//"置换建议-小区详情-顶部描述"
var HOME_PAGE_BANNER=5;//"首页banner"
var LOAN_PAGE_BANNER=6;//"贷款页banner"
var SET_QR_CODE=7;//"设置页二维码"
var EVALUATE_REPORT=8;//"有房评估报告-广告图"
var DISTRICT_DETAIL=9;// "有房小区详情-广告图"
var EVALUATE_LIST=10;// "有房房产评估列表-广告图"
var ESTATE_MARKET_COUNTRY=11;// "有房房产行情全国-广告图"
var ESTATE_MARKET_SHANGHAI=12;// "有房房产行情上海-广告图"
var ESTATE_DETAIL=13;// "有房房产详情-广告图"
var DISTRICT_DETAIL_PRICE=14;// "有房小区详情-广告图"
+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);
});
}
+7 -3
View File
@@ -127,12 +127,14 @@
}
self.append(sub);
}
});
//当前激活选项
var activeTab = subpages[0];
var title = document.getElementById("title");
//选项卡点击事件
mui('.mui-bar-tab').on('tap', 'a', function(e) {
var self = plus.webview.currentWebview();
plus.nativeUI.showWaiting();
var targetTab = this.getAttribute('href');
if (targetTab == activeTab) {
@@ -144,7 +146,8 @@
//显示目标选项卡
//若为iOS平台或非首次显示,则直接显示
if(plus.webview.getWebviewById(targetTab)==null){
plus.webview.create(targetTab, targetTab, subpage_style)
var sub = plus.webview.create(targetTab, targetTab, subpage_style)
self.append(sub);
}
if(mui.os.ios||aniShow[targetTab]){
plus.webview.show(targetTab);
@@ -211,9 +214,9 @@
})
}
// 推送消息跳转页面
window.addEventListener('switchView',function(event){
var self = plus.webview.currentWebview();
console.log(event.detail.name)
plus.webview.show(plus.webview.getWebviewById("HBuilder"));
var targetTab = event.detail.name;
@@ -224,7 +227,8 @@
//若为iOS平台或非首次显示,则直接显示
if(mui.os.ios||aniShow[targetTab]){
if(plus.webview.getWebviewById(targetTab)==null){
plus.webview.create(targetTab, targetTab, subpage_style)
var sub = plus.webview.create(targetTab, targetTab, subpage_style)
self.append(sub);
}
plus.webview.show(targetTab);
}else{
+6 -1
View File
@@ -117,6 +117,8 @@
</div>
</div>
<a class="ad bb"><img id="img"></a>
<div class="topic">
<div class="topicTitle">小区走势分析</div>
<div class="topicContent" style="padding:0;padding-bottom:0.75rem;">
@@ -270,6 +272,8 @@ $.config = {router: false}
<script type='text/javascript' src='../component/baseInfoComponent.js' charset='utf-8'></script>
<script type='text/javascript' src='../component/nearDist.js' charset='utf-8'></script>
<script type="text/javascript" src="../../js/shara/sharaMine.js" ></script>
<script type="text/javascript" src="../../js/ad_position_image.js"></script>
<script type="text/javascript" src="../../config.js"></script>
<script>
var city = "上海"
@@ -369,13 +373,14 @@ function onPlusReady() {
inintChart(city, region, name);
//更新分享服务
updateSerivces();
var device = plus.device.uuid;
add_imgage("img",DISTRICT_DETAIL_PRICE,device);//传入广告位的imgId
}
</script>
<script type="text/javascript" src="../../js/district/districtDetail.js"></script>
<script type='text/javascript' src='../../js/district/district-map.js' charset='utf-8'></script>
<script>
//inintChart(city, region, name);
@@ -47,6 +47,7 @@
<div class="preloader"></div>
</div>
</div>
<div class="content">
<div class="list-block media-list">
<!-- 动态封装部分 begin -->
@@ -86,7 +87,7 @@ $.config = {router: false}
<script>
var uid = "162167854504869888";
//调用mui.init方法
$.init()
$.init();
/* 房产用途 */
$(document).on('click','.open-vertical-modal', function () {
+7
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,9 @@ $.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);
var houseId="191190409534242816"; //= "186182250936643584";
@@ -375,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',
+10 -3
View File
@@ -42,6 +42,9 @@
<div class="page-group">
<div class="page page-current" id="dataList" style="display: none;">
<header class="bar bar-nav">
<!--<button class="button button-link button-nav pull-left" onclick="back(),plus.nativeUI.closeWaiting();">
<span class="icon icon-left"></span>
</button>-->
<h1 class="title">房产评估</h1>
</header>
<div class="loadingBgDiv">
@@ -50,6 +53,7 @@
</div>
</div>
<div class="content">
<a class="ad bb"><img id="img"></a>
<div class="list-block media-list">
<!-- 动态封装部分 begin -->
<ul>
@@ -103,11 +107,11 @@ $.config = {router: false}
<script type="text/javascript" src="../../js/axiosPlugin.js"></script>
<script type="text/javascript" src="../../js/shara/sharaMine.js" ></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>
//调用mui.init方法
$.init()
$.init();
/* 房产用途 */
$(document).on('click','.open-vertical-modal', function () {
//获取对应<li>栏目存储的houseinfo id
@@ -335,6 +339,9 @@ document.addEventListener('plusready', onPlusReady, false);
function onPlusReady(){
checkIsLogin();
var self = plus.webview.currentWebview();
var device = plus.device.uuid;
add_imgage("img",EVALUATE_LIST,device);//传入广告位的imgId
}
</script>
+5
View File
@@ -84,6 +84,7 @@
<room-rent-component></room-rent-component>
</div>
<a class="ad bb"><img id="img"></a>
<div id="baseInfo" class="list-block">
<base-info-component></base-info-component>
@@ -192,6 +193,8 @@ $.config = {router: false}
<script type='text/javascript' src='../component/baseInfoComponent.js' charset='utf-8'></script>
<script type='text/javascript' src='../component/nearDist.js' charset='utf-8'></script>
<script type='text/javascript' src='../component/roomRent.js' charset='utf-8'></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);
function onPlusReady() {
@@ -213,6 +216,8 @@ function onPlusReady() {
})
/* 小区租金走势 */
loadRentTrends(city, region, name,2);
var device = plus.device.uuid;
add_imgage("img",DISTRICT_DETAIL,device);//传入广告位的imgId
}
+10 -4
View File
@@ -116,6 +116,7 @@ $.config = {router: false}
<script type="text/javascript" src="../../js/light7.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/cn.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/sm.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/mui.min.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/vue.js"></script>
<script src="../../config.js"></script>
@@ -128,6 +129,10 @@ document.addEventListener('plusready', onPlusReady, false);
function onPlusReady() {
var self = plus.webview.currentWebview();
id = self.houseId
var edit = new Vue({
el:"#edit",
data:{liveStatus:"",leaseStartDate:"",leaseEndDate:"",lastRentDate:"",nowDay:"",rent:"",cycle:""}
});
axios.get('/rest/rent/queryHouseRent',{params:{id:id}}).then(function(response){
// var data = response.data.data.houses;
// $.each(data,function(i){
@@ -277,6 +282,10 @@ function onPlusReady() {
$.toast("收租日期不能晚于到期日期");
return false;
}
if (next_rent < rent_start) {
$.toast("收租日期不能早于起租日期");
return false;
}
if(next_rent<nowDay){
$.toast("下次收租日期不能早于今天");
return false;
@@ -333,10 +342,7 @@ function getnumber(){
//});
var edit = new Vue({
el:"#edit",
data:{liveStatus:"",leaseStartDate:"",leaseEndDate:"",lastRentDate:"",nowDay:"",rent:"",cycle:""}
});
function getNowFormatDate(time) {
if(typeof(time)=="undefined"||time==null){
return ""