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 18:02:57 +08:00
8 changed files with 61 additions and 30 deletions
+19 -2
View File
@@ -1,11 +1,28 @@
/**服务端地址**/
//var BASE_PATH = "http://youfang.fangjia.com";
//var BASE_PATH = "http://192.168.10.128:8084";
var BASE_PATH = "http://192.168.10.47:8086";
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.161:8084";
//var BASE_PATH = "http://192.168.10.170:8084";
//var BASE_PATH = "http://192.168.10.171:8084";
//var BASE_PATH = "http://192.168.10.164:8084";
/**是否显示过启动页面**/
var lauchFlag = false;
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;//"首页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;// "有房小区详情-广告图"
+6 -1
View File
@@ -116,6 +116,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;">
@@ -269,6 +271,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 = "上海"
@@ -368,13 +372,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 () {
@@ -105,7 +105,7 @@
</li>
</ul>
</div>
<a class="ad" id="img_ad"><img id="img"></a>
<a class="ad bb" id="img_ad"><img id="img"></a>
<div class="topic">
<div class="topicTitle" style="position:relative;">均价走势
<div class="content-block">
@@ -144,6 +144,8 @@ $.config = {router: false}
<script type="text/javascript" src="../../js/axiosPlugin.js"></script>
<script type="text/javascript" src="../../js/log/log_stat.js" ></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 shareUrl = BASE_PATH+"/fsh/evaluateReport?";
@@ -153,6 +155,7 @@ $.config = {router: false}
var picUrl = '../../images/default_share.png';
var hid = "";
document.addEventListener('plusready', onPlusReady, false);
function onPlusReady(){
var self = plus.webview.currentWebview();
hid = self.hid;
@@ -297,24 +300,7 @@ $.config = {router: false}
// evaluate_msg.evaluate_words="暂无"
// }
// evaluate_msg.msg=h.evaluateMsg
if(typeof(h.imgId)!="undefined"&&h.imgId!=null&&$.trim(h.imgId)!=""){
$("#img").attr("src",BASE_PATH+"/img/"+h.imgId);
//控制贷款按钮是否可以显示,便于ios版本审核
// if(localStorage.getItem("showLoanMenu")!=null && localStorage.getItem("showLoanMenu")=="true"){
// $("#img").click(function(){
// clicked('/views/loan/loanInfo.html',true,false,{},{houseId: hid, city: h.city, mobile: ""},function(){})
// })
// }
}
if(typeof(h.link)!="undefined"&&h.link!=null&&$.trim(h.link)!=""){
var device = plus.device.uuid;
var uid = localStorage.getItem("user_id");
$("#img_ad").click(function(){
url=h.link+"?uid="+uid+"&device="+device;
//window.location.href=url;
clicked("/views/webview_embed.html", true,false,{},{url:url});
});
}
loadingChart(h.city,h.region,h.name,2)
//按照时间范围加载数据
$(".avgPriceTrend a").click(function(){
@@ -363,6 +349,8 @@ $.config = {router: false}
});
//更新分享服务
updateSerivces();
var device = plus.device.uuid;
add_imgage("img",EVALUATE_REPORT,device);//传入广告位的imgId
}
+1
View File
@@ -352,6 +352,7 @@ $.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>
document.addEventListener('plusready', onPlusReady, false);
var houseId="191190409534242816"; //= "186182250936643584";
+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>
+6
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() {
@@ -199,6 +202,7 @@ function onPlusReady() {
city = self.city
region = self.region
name = self.name;
rid = self.rid;
// 创建根实例
baseInfo = new Vue({
el: '#districtBaseInfo',
@@ -212,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 ""