Merge branch 'YOUFANGAPP1.1.5' of http://192.168.0.27/dev0/youfang-app into xh-YOUFANGAPP1.1.5

This commit is contained in:
xuhe@fangjia.com
2018-07-02 09:53:32 +08:00
13 changed files with 141 additions and 58 deletions
+6 -3
View File
@@ -1,9 +1,9 @@
/**服务端地址**/ /**服务端地址**/
//var BASE_PATH = "https://youfang.fangjia.com"; var BASE_PATH = "https://youfang.fangjia.com";
//var BASE_PATH = "http://192.168.10.128:8084"; //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.53:8084";
var BASE_PATH = "http://192.168.10.47:8086"; //var BASE_PATH = "http://test.youfang.fangjia.com";
//var BASE_PATH = "http://192.168.10.161: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.170:8084";
//var BASE_PATH = "http://192.168.10.171:8084"; //var BASE_PATH = "http://192.168.10.171:8084";
@@ -26,4 +26,7 @@ var EVALUATE_LIST=10;// "有房房产评估列表-广告图"
var ESTATE_MARKET_COUNTRY=11;// "有房房产行情全国-广告图" var ESTATE_MARKET_COUNTRY=11;// "有房房产行情全国-广告图"
var ESTATE_MARKET_SHANGHAI=12;// "有房房产行情上海-广告图" var ESTATE_MARKET_SHANGHAI=12;// "有房房产行情上海-广告图"
var ESTATE_DETAIL=13;// "有房房产详情-广告图" var ESTATE_DETAIL=13;// "有房房产详情-广告图"
var DISTRICT_DETAIL_PRICE=14;// "有房小区详情-广告图" var DISTRICT_DETAIL_PRICE=14;// "有房小区详情-广告图"
//渠道
var YOUFANG_CHANNEL = "fangjia";
+42 -1
View File
@@ -84,13 +84,13 @@ w.clicked=function(id,wa,ns,ws, params,callback,callbackParams){
// return null; // return null;
// } // }
if(w.plus){ if(w.plus){
var startTime = new Date().getTime();
wa&&(waiting=plus.nativeUI.showWaiting()); wa&&(waiting=plus.nativeUI.showWaiting());
ws=ws||{}; ws=ws||{};
ws.scrollIndicator||(ws.scrollIndicator='none'); ws.scrollIndicator||(ws.scrollIndicator='none');
ws.scalable||(ws.scalable=false); ws.scalable||(ws.scalable=false);
var pre='';//'http://192.168.1.178:8080/h5/'; var pre='';//'http://192.168.1.178:8080/h5/';
openw=plus.webview.create(pre+id,id,ws,params); openw=plus.webview.create(pre+id,id,ws,params);
ns||openw.addEventListener('loaded',function(){//页面加载完成后才显示 ns||openw.addEventListener('loaded',function(){//页面加载完成后才显示
// setTimeout(function(){//延后显示可避免低端机上动画时白屏 // setTimeout(function(){//延后显示可避免低端机上动画时白屏
openw.show(as); openw.show(as);
@@ -103,6 +103,8 @@ w.clicked=function(id,wa,ns,ws, params,callback,callbackParams){
callback(callbackParams); callback(callbackParams);
} }
openw=null; openw=null;
var endTime = new Date().getTime();
savePageLog(endTime - startTime, id);
},false); },false);
return openw; return openw;
}else{ }else{
@@ -110,6 +112,45 @@ w.clicked=function(id,wa,ns,ws, params,callback,callbackParams){
} }
return null; return null;
}; };
/**
* 记录页面访问日志
*/
function savePageLog(residenceTime, page) {
var device = plus.device.uuid;
var model = plus.device.model;
var pushClientId = "";
var info = plus.push.getClientInfo();
if (info != null) {
pushClientId = info.clientid;
}
plus.geolocation.getCurrentPosition(function(p){
baidu_province = p.address.province;
baidu_city = p.address.city;
baidu_region = p.address.district;
baidu_lng = p.coords.longitude;
baidu_lat = p.coords.latitude;
baidu_address = p.address.street;
doSavePageLog({page:page, lng:baidu_lng, lat:baidu_lat, province:baidu_province, city:baidu_city, region:baidu_region, address:baidu_address, device:device, model:model, pushClientId:pushClientId,channel:YOUFANG_CHANNEL,residenceTime:residenceTime});
}, function(e){
doSavePageLog({page:page, device:device, model:model, pushClientId:pushClientId,channel:YOUFANG_CHANNEL,residenceTime:residenceTime});
},
{
provider:'baidu',
enableHighAccuracy:true,
coordsType:'bd09ll'
}
);
}
function doSavePageLog(data) {
axios.post("/rest/log/save", data).then(function (response) {
}).catch(function (error) {
console.log(error);
});
}
w.openDoc=function(t,c){ w.openDoc=function(t,c){
var d=plus.webview.getWebviewById('document'); var d=plus.webview.getWebviewById('document');
if(d){ if(d){
-40
View File
@@ -3,48 +3,8 @@
* @author yinjihuan * @author yinjihuan
*/ */
document.addEventListener('plusready', function() { document.addEventListener('plusready', function() {
savePageLog()
}, false); }, false);
/**
* 记录页面访问日志
*/
function savePageLog() {
var page = document.getElementsByTagName("title")[0].innerHTML;
var device = plus.device.uuid;
var model = plus.device.model;
var pushClientId = "";
var info = plus.push.getClientInfo();
if (info != null) {
pushClientId = info.clientid;
}
plus.geolocation.getCurrentPosition(function(p){
baidu_province = p.address.province;
baidu_city = p.address.city;
baidu_region = p.address.district;
baidu_lng = p.coords.longitude;
baidu_lat = p.coords.latitude;
baidu_address = p.address.street;
doSavePageLog({page:page, lng:baidu_lng, lat:baidu_lat, province:baidu_province, city:baidu_city, region:baidu_region, address:baidu_address, device:device, model:model, pushClientId:pushClientId,channel:YOUFANG_CHANNEL});
}, function(e){
doSavePageLog({page:page, device:device, model:model, pushClientId:pushClientId,channel:YOUFANG_CHANNEL});
},
{
provider:'baidu',
enableHighAccuracy:true,
coordsType:'bd09ll'
}
);
}
function doSavePageLog(data) {
axios.post("/rest/log/save", data).then(function (response) {
}).catch(function (error) {
console.log(error);
});
}
/** /**
+3 -1
View File
@@ -116,7 +116,9 @@ function mhAddItems(itemsPerLoad, lastIndex, dataObj, xqOneMonthUpDownRangeMap,
}else{ }else{
html += "<div>下跌概率: <em class='down'>暂无<i class='icon'></i></em></div>"; html += "<div>下跌概率: <em class='down'>暂无<i class='icon'></i></em></div>";
} }
if(localStorage.getItem("showLoanMenu")!=null && localStorage.getItem("showLoanMenu")=="true"){
html += "<div>抵押可贷额度: <em style='color:#EB5F34;'>"+tempTotalPricePercent+"</em></div></div></div></a>";
}
html += "</div></div></a>"; html += "</div></div></a>";
//调整最新的等级显示(其它等级不显示start) //调整最新的等级显示(其它等级不显示start)
+69 -4
View File
@@ -58,6 +58,7 @@
<script type="text/javascript" src="js/md5.min.js" ></script> <script type="text/javascript" src="js/md5.min.js" ></script>
<script type="text/javascript" src="js/axios.min.js" ></script> <script type="text/javascript" src="js/axios.min.js" ></script>
<script type="text/javascript" src="js/axiosPlugin.js" ></script> <script type="text/javascript" src="js/axiosPlugin.js" ></script>
<script type="text/javascript" src="../../js/city.js" ></script>
<script> <script>
/* 关闭路由,以实现不同页面之间的相互跳转(仅开发环境需要) */ /* 关闭路由,以实现不同页面之间的相互跳转(仅开发环境需要) */
@@ -99,7 +100,28 @@
plus.navigator.setFullscreen(false); plus.navigator.setFullscreen(false);
} else { } else {
loadStartPage(); plus.geolocation.getCurrentPosition(
function(p){
try {
city = p.address.city;
if(city){
city = formatBaiduCity(city);
}
} catch(e){
city = "上海";
}
loadStartPage(city);
}, function(e){
city = "上海";
loadStartPage(city);
},
{
provider:'baidu',
enableHighAccuracy:true,
coordsType:'bd09ll'
}
);
//显示启动导航 //显示启动导航
mui.openWindow({ mui.openWindow({
@@ -140,7 +162,8 @@
//当前激活选项 //当前激活选项
var activeTab = subpages[0]; var activeTab = subpages[0];
var title = document.getElementById("title"); var title = document.getElementById("title");
//选项卡点击事件 //选项卡点击事件
var pageInitTime = new Date().getTime();
mui('.mui-bar-tab').on('tap', 'a', function(e) { mui('.mui-bar-tab').on('tap', 'a', function(e) {
var self = plus.webview.currentWebview(); var self = plus.webview.currentWebview();
plus.nativeUI.showWaiting(); plus.nativeUI.showWaiting();
@@ -168,16 +191,58 @@
} }
//隐藏当前; //隐藏当前;
plus.webview.hide(activeTab); plus.webview.hide(activeTab);
// 记录主页面的停留时间
var outPageTime = new Date().getTime();
savePageLog(outPageTime - pageInitTime, activeTab);
pageInitTime = new Date().getTime();
//更改当前活跃的选项卡 //更改当前活跃的选项卡
activeTab = targetTab; activeTab = targetTab;
plus.nativeUI.closeWaiting(); plus.nativeUI.closeWaiting();
}); });
/**
* 记录页面访问日志
*/
function savePageLog(residenceTime, page) {
var device = plus.device.uuid;
var model = plus.device.model;
var pushClientId = "";
var info = plus.push.getClientInfo();
if (info != null) {
pushClientId = info.clientid;
}
plus.geolocation.getCurrentPosition(function(p){
baidu_province = p.address.province;
baidu_city = p.address.city;
baidu_region = p.address.district;
baidu_lng = p.coords.longitude;
baidu_lat = p.coords.latitude;
baidu_address = p.address.street;
doSavePageLog({page:page, lng:baidu_lng, lat:baidu_lat, province:baidu_province, city:baidu_city, region:baidu_region, address:baidu_address, device:device, model:model, pushClientId:pushClientId,channel:YOUFANG_CHANNEL,residenceTime:residenceTime});
}, function(e){
doSavePageLog({page:page, device:device, model:model, pushClientId:pushClientId,channel:YOUFANG_CHANNEL,residenceTime:residenceTime});
},
{
provider:'baidu',
enableHighAccuracy:true,
coordsType:'bd09ll'
}
);
}
function doSavePageLog(data) {
axios.post("/rest/log/save", data).then(function (response) {
}).catch(function (error) {
console.log(error);
});
}
// 加载启动页信息 // 加载启动页信息
function loadStartPage() { function loadStartPage(city) {
$.ajax({ $.ajax({
type: "GET", type: "GET",
url:BASE_PATH+"/rest/page/startPage", url:BASE_PATH+"/rest/page/startPage?city="+city,
dataType:'json', dataType:'json',
async : false, async : false,
success: function(resData) { success: function(resData) {
+2 -2
View File
@@ -7,8 +7,8 @@
"id": "H5693FF3D",/*应用的标识,创建应用时自动生成,勿手动修改*/ "id": "H5693FF3D",/*应用的标识,创建应用时自动生成,勿手动修改*/
"name": "有房",/*应用名称,程序桌面图标名称*/ "name": "有房",/*应用名称,程序桌面图标名称*/
"version": { "version": {
"name": "1.1.16",/*应用版本名称*/ "name": "1.1.17",/*应用版本名称*/
"code": "20114" "code": "20115"
}, },
"description": "有房,围绕房产提供全方位数据分析的房产及金融服务平台,通过个性化的智能推荐,定制专属的个人投资或购房计划,多维度管理自有房产并提供房产融资通道。",/*应用描述信息*/ "description": "有房,围绕房产提供全方位数据分析的房产及金融服务平台,通过个性化的智能推荐,定制专属的个人投资或购房计划,多维度管理自有房产并提供房产融资通道。",/*应用描述信息*/
"icons": { "icons": {
+1 -1
View File
@@ -32,7 +32,7 @@
</div> </div>
<div class="page page-current"> <div class="page page-current">
<div class="content contentStart"> <div class="content contentStart">
<a class="time" @click="skip()">跳过 <span id="time">5</span></a> <a class="time" @click="skip()">跳过 <span id="time">3</span></a>
<img :src="imgUrl" class="startImg" @click="openView" onload="imgLoad()"> <img :src="imgUrl" class="startImg" @click="openView" onload="imgLoad()">
</div> </div>
</div> </div>
+3 -1
View File
@@ -375,7 +375,9 @@ function addItems(itemsPerLoad, lastIndex, dataObj, xqOneMonthUpDownRangeMap, xq
}else{ }else{
html += "<div>下跌概率: <em class='down'>暂无<i class='icon'></i></em></div>"; html += "<div>下跌概率: <em class='down'>暂无<i class='icon'></i></em></div>";
} }
if(localStorage.getItem("showLoanMenu")!=null && localStorage.getItem("showLoanMenu")=="true"){
html += "<div>抵押可贷额度: <em style='color:#EB5F34;'>"+tempTotalPricePercent+"</em></div></div></div></a>";
}
html += "</div></div></a>"; html += "</div></div></a>";
//调整最新的等级显示(其它等级不显示start) //调整最新的等级显示(其它等级不显示start)
+1 -1
View File
@@ -57,9 +57,9 @@ $.config = {router: false}
<script type="text/javascript" src="../../js/cn.js" charset="utf-8"></script> <script type="text/javascript" src="../../js/cn.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/mui.min.js" charset="utf-8"></script> <script type="text/javascript" src="../../js/mui.min.js" charset="utf-8"></script>
<script type="text/javascript" src="../../config.js"></script> <script type="text/javascript" src="../../config.js"></script>
<script type='text/javascript' src='../../js/common.js' charset='utf-8'></script>
<script type="text/javascript" src="../../js/axios.min.js"></script> <script type="text/javascript" src="../../js/axios.min.js"></script>
<script type="text/javascript" src="../../js/axiosPlugin.js"></script> <script type="text/javascript" src="../../js/axiosPlugin.js"></script>
<script type='text/javascript' src='../../js/common.js' charset='utf-8'></script>
<script type="text/javascript" src="../../js/shara/sharaMine.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/log/log_stat.js" ></script>
<script type="text/javascript" src="../../js/loan/loanInfo.js" ></script> <script type="text/javascript" src="../../js/loan/loanInfo.js" ></script>
+9 -2
View File
@@ -355,13 +355,20 @@ function addItems(number, lastIndex) {
content = content.substr(0,250)+"..."; content = content.substr(0,250)+"...";
} }
} }
var reply = "";
if(vo.replyStatus==1){//对回复已回复
reply = "<div class='item-title-row'>"+
"<div class='item-title'><span style='border-left:solid 2px #F18D00;padding-left:0.4rem;'>作者</span></div>"+
"</div>"+
"<div class='item-text'>"+vo.commentReply+"</div>";
}
html = html + "<div class='item-after'><span>"+timeString+"</span></div>"+ html = html + "<div class='item-after'><span>"+timeString+"</span></div>"+
"</div>"+ "</div>"+
"<div class='item-text'>"+content+"</div>"+ "<div class='item-text'>"+content+"</div>"+
reply+
"</div>"+ "</div>"+
"</a>"+ "</a>"+
"</li>"; "</li>";
} }
// 添加新条目 // 添加新条目
+3
View File
@@ -84,6 +84,9 @@ $.config = {router: false}
<script type="text/javascript" src="../../js/light7.js" charset="utf-8"></script> <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/cn.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/mui.min.js" charset="utf-8"></script> <script type="text/javascript" src="../../js/mui.min.js" charset="utf-8"></script>
<script type="text/javascript" src="../../config.js" ></script>
<script type="text/javascript" src="../../js/axios.min.js"></script>
<script type="text/javascript" src="../../js/axiosPlugin.js"></script>
<script type="text/javascript" src="../../js/common.js"></script> <script type="text/javascript" src="../../js/common.js"></script>
<script> <script>
document.addEventListener('plusready', function() { document.addEventListener('plusready', function() {
+1 -1
View File
@@ -83,11 +83,11 @@ $.config = {router: false}
</script> </script>
<script type="text/javascript" src="../../js/light7.js" charset="utf-8"></script> <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/cn.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/common.js"></script>
<script type="text/javascript" src="../../js/mui.min.js"></script> <script type="text/javascript" src="../../js/mui.min.js"></script>
<script type="text/javascript" src="../../config.js"></script> <script type="text/javascript" src="../../config.js"></script>
<script type="text/javascript" src="../../js/axios.min.js"></script> <script type="text/javascript" src="../../js/axios.min.js"></script>
<script type="text/javascript" src="../../js/axiosPlugin.js"></script> <script type="text/javascript" src="../../js/axiosPlugin.js"></script>
<script type="text/javascript" src="../../js/common.js"></script>
<script type="text/javascript" src="../../js/vue.js" ></script> <script type="text/javascript" src="../../js/vue.js" ></script>
<script type="text/javascript"> <script type="text/javascript">
new Vue({ new Vue({
+1 -1
View File
@@ -126,7 +126,7 @@ $(".check").on("click", function () {
function openView() { function openView() {
clicked(BASE_PATH + '/user/agreement',true) clicked('/views/setting/agreement.html',true);
} }
/* 防止软键盘弹出所引起的定位问题 */ /* 防止软键盘弹出所引起的定位问题 */