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

This commit is contained in:
bayi
2018-05-07 17:33:43 +08:00
28 changed files with 396 additions and 99 deletions
+2 -7
View File
@@ -1,14 +1,9 @@
/**服务端地址**/
//var BASE_PATH = "http://youfang.fangjia.com";
//var BASE_PATH = "http://192.168.10.128:8084";
<<<<<<< HEAD
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.47:8086";
>>>>>>> 9c25ef0b2e3f9e2a19df5038da587d6c53827469
//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.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";
+5 -2
View File
@@ -542,8 +542,11 @@ function showRentChart2(categories, series, roomDatas){
fontSize: 12
},
formatter: function (params) {
var res = params[0].name + ' <br/>' + "租金:"+params[0].value + '元/月';
return res;
if(params[0].value){
var res = params[0].name + ' <br/>' + "租金:"+params[0].value + '元/月';
return res;
}
}
},
grid:{
+2
View File
@@ -55,7 +55,9 @@ function saveBehaviorLog(event,dataMap) {
var device = plus.device.uuid;
var model = plus.device.model;
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;
+1
View File
@@ -80,6 +80,7 @@ $("#login_btn").on("click", function () {
var data = resData.data;
localStorage.setItem("user_token", data.token);
localStorage.setItem("user_token_add_time", new Date().getTime());
localStorage.setItem("user_id", data.uid);
$.toast(resData.message);
if (data.firstLogin) {
// 显示设置密码页面
+3 -1
View File
@@ -105,8 +105,10 @@ function login(openid, unionid, accessToken, nickname, headImg, loginFrom, uri)
back();
})
}else{
localStorage.setItem("user_token", resData.data);
var data = resData.data;
localStorage.setItem("user_token", data.token);
localStorage.setItem("user_token_add_time", new Date().getTime());
localStorage.setItem("user_id", data.uid);
back();
}
}else{
+13 -1
View File
@@ -122,7 +122,12 @@ $("body").delegate(".open-about02", "click", function () {
eventType = "rentQueryClick";
}else{
cat = "district"
eventType = "priceQueryClick";
if(text=="房价查询"){
eventType = "priceQueryClick";
}else{
eventType = "districtSerachClick";
}
}
saveBehaviorLog(eventType,dataMap);//保存用户点击事件
$('.historyList').show();
@@ -189,6 +194,13 @@ var historyVue = new Vue({
histories: histories
},methods: {
openHistoryDetail:function(index) {
var eventType = "historyDistrictClick";
var dataMap = {};
dataMap["city"]=this.histories[index].city;
dataMap["region"]=this.histories[index].region;
dataMap["name"]=this.histories[index].name;
saveBehaviorLog(eventType,dataMap); //保存用户点击事件
if(cat == "rent"){
clicked('views/rent/rent.html',true,false,{},{city:this.histories[index].city,region:this.histories[index].region,name:this.histories[index].name})
}else{
+8 -4
View File
@@ -28,9 +28,14 @@ function selectHouseInfoList(){
var xqOneMonthUpDownRangeMap = resultsMap.xqOneMonthUpDownRangeMap;
var xqPotentialIndexMap = resultsMap.xqPotentialIndexMap;
var houseInfoTotalMap = resultsMap.houseInfoTotalMap;
//调整统计num的顺序
mh_totalRecords = resultsMap.houseInfoPageList.totalRecords;
tab.mh_num = mh_totalRecords;
if(resultList != null && resultList.length == 0){
// 删除加载提示符
$('#loadTip1').remove();
$('#loadTip1').hide();
//$('#loadTip1').remove();
//$('.infinite-scroll-preloader').remove();
// 加载完毕,则注销无限加载事件,以防不必要的加载
//$.detachInfiniteScroll($('.infinite-scroll'));
@@ -39,7 +44,8 @@ function selectHouseInfoList(){
if(resultsMap.houseInfoPageList.currentPage == resultsMap.houseInfoPageList.totalPages){
//如果此次查询刚好是page = totalPages
// 删除加载提示符
$('#loadTip1').remove();
$('#loadTip1').hide();
//$('#loadTip1').remove();
//$('.infinite-scroll-preloader').remove();
// 加载完毕,则注销无限加载事件,以防不必要的加载
//$.detachInfiniteScroll($('.infinite-scroll'));
@@ -57,8 +63,6 @@ function selectHouseInfoList(){
mh_page = resultsMap.houseInfoPageList.currentPage;
mh_pageSize = resultsMap.houseInfoPageList.limit;
mh_totalPages = resultsMap.houseInfoPageList.totalPages;
mh_totalRecords = resultsMap.houseInfoPageList.totalRecords;
tab.mh_num = mh_totalRecords;
mhAddItems(mh_itemsPerLoad, mh_lastIndex, dataObj, xqOneMonthUpDownRangeMap, xqPotentialIndexMap, houseInfoTotalMap);
}).catch(function (error) {
console.log(error);
+7 -4
View File
@@ -76,10 +76,13 @@ function messageGoto(_this,operation,operationPage,mid){
}
if(operation==1){
var pages = operationPage+'.html';
if(plus.webview.getWebviewById(pages)==null){
plus.webview.create(pages, pages, subpage_style);
}
plus.webview.show(pages);
// if(plus.webview.getWebviewById(pages)==null){
// plus.webview.create(pages, pages, subpage_style);
// }
// plus.webview.show(pages);
mui.fire(plus.webview.getWebviewById('HBuilder'),'switchView',{
name:pages
});
}
if(operation==2){
if (operationPage != null && operationPage != "") {
+53 -22
View File
@@ -30,22 +30,22 @@
</div>
</div>
<nav class="mui-bar mui-bar-tab">
<a class="mui-tab-item mui-active" id="defaultTab" href="yfindex.html">
<a class="mui-tab-item mui-active" id="yfindex.html" href="yfindex.html">
<span class="mui-icon iconfont icon-tab01"></span>
<span class="mui-tab-label">首页</span>
</a>
<a class="mui-tab-item" href="views/house/houseDetail.html">
<a class="mui-tab-item" id="views/house/houseDetail.html" href="views/house/houseDetail.html">
<span class="mui-icon iconfont icon-tab02"></span>
<span class="mui-tab-label">行情</span>
</a>
<a class="mui-tab-item" href="views/house/houseManageList.html">
<a class="mui-tab-item" id="views/house/houseManageList.html" href="views/house/houseManageList.html">
<span class="mui-icon iconfont icon-tab03"></span>
<span class="mui-tab-label">评估</span>
</a>
<a class="mui-tab-item" id="selfInfo" href="views/user/userInfo.html">
<a class="mui-tab-item" id="views/user/userInfo.html" href="views/user/userInfo.html">
<span class="mui-icon iconfont icon-tab04"></span>
<span class="mui-tab-label">我的</span>
</a>
@@ -71,9 +71,8 @@
if (day >= 25) {
localStorage.removeItem("user_token");
localStorage.removeItem("user_token_add_time");
localStorage.removeItem("user_id");
}
//document.getElementById("quotations").setAttribute("href", BASE_PATH + '/quotations/index');
//document.getElementById("selfInfo").setAttribute("href", BASE_PATH + '/selfInfo/index');
//mui初始化
mui.init();
var subpages = ['yfindex.html', 'views/house/houseDetail.html', 'views/house/houseManageList.html', 'views/user/userInfo.html'];
@@ -134,18 +133,20 @@
var title = document.getElementById("title");
//选项卡点击事件
mui('.mui-bar-tab').on('tap', 'a', function(e) {
plus.nativeUI.showWaiting();
var targetTab = this.getAttribute('href');
if (targetTab == activeTab) {
plus.nativeUI.closeWaiting();
return;
}
//更换标题
//title.innerHTML = this.querySelector('.mui-tab-label').innerHTML;
//显示目标选项卡
//若为iOS平台或非首次显示,则直接显示
if(plus.webview.getWebviewById(targetTab)==null){
plus.webview.create(targetTab, targetTab, subpage_style)
}
if(mui.os.ios||aniShow[targetTab]){
if(plus.webview.getWebviewById(targetTab)==null){
plus.webview.create(targetTab, targetTab, subpage_style)
}
plus.webview.show(targetTab);
}else{
//否则,使用fade-in动画,且保存变量
@@ -158,18 +159,7 @@
plus.webview.hide(activeTab);
//更改当前活跃的选项卡
activeTab = targetTab;
});
//自定义事件,模拟点击“首页选项卡”
document.addEventListener('gohome', function() {
var defaultTab = document.getElementById("defaultTab");
//模拟首页点击
mui.trigger(defaultTab, 'tap');
//切换选项卡高亮
var current = document.querySelector(".mui-bar-tab>.mui-tab-item.mui-active");
if (defaultTab !== current) {
current.classList.remove('mui-active');
defaultTab.classList.add('mui-active');
}
plus.nativeUI.closeWaiting();
});
// 加载启动页信息
@@ -195,7 +185,10 @@
if (data.url != null) {
localStorage.setItem("startPageClickUrl", data.url);
}
localStorage.setItem("guidePageUrls",JSON.stringify(data.guideImgs));
if (data.guideImgs != null) {
localStorage.setItem("guidePageUrls",JSON.stringify(data.guideImgs));
}
//存入localStorage Boolean类型变成String
//加载菜单信息,控制是否显示贷款菜单
localStorage.setItem("showLoanMenu", data.showLoanMenu);
@@ -217,6 +210,44 @@
}
})
}
// 推送消息跳转页面
window.addEventListener('switchView',function(event){
console.log(event.detail.name)
plus.webview.show(plus.webview.getWebviewById("HBuilder"));
var targetTab = event.detail.name;
if (targetTab == activeTab) {
plus.webview.show(targetTab);
return;
}
//若为iOS平台或非首次显示,则直接显示
if(mui.os.ios||aniShow[targetTab]){
if(plus.webview.getWebviewById(targetTab)==null){
plus.webview.create(targetTab, targetTab, subpage_style)
}
plus.webview.show(targetTab);
}else{
//否则,使用fade-in动画,且保存变量
var temp = {};
temp[targetTab] = "true";
mui.extend(aniShow,temp);
plus.webview.show(targetTab,"fade-in",300);
}
//隐藏当前;
plus.webview.hide(activeTab);
//更改当前活跃的选项卡
activeTab = targetTab;
var defaultTab = document.getElementById(targetTab);
//模拟首页点击
mui.trigger(defaultTab, 'tap');
//切换选项卡高亮
var current = document.querySelector(".mui-bar-tab>.mui-tab-item.mui-active");
if (defaultTab !== current) {
current.classList.remove('mui-active');
defaultTab.classList.add('mui-active');
}
});
</script>
</body>
+3 -1
View File
@@ -1502,7 +1502,9 @@
"yfindex.html",
"views/house/houseDetail.html"
],
"refer": [],
"refer": [
"views/user/userInfo.html"
],
"priority": 0
},
"yfindex.html": {
+7 -3
View File
@@ -76,7 +76,7 @@ new Vue({
methods: {
skip: function() {
isRun = true;
if (localStorage.getItem("yf_guide_page_status") == null && JSON.parse(localStorage.getItem("guidePageUrls")).length > 0) {
if (localStorage.getItem("yf_guide_page_status") == null && localStorage.getItem("guidePageUrls") != null && JSON.parse(localStorage.getItem("guidePageUrls")).length > 0) {
$(".swiper-container").removeClass("dn");
$(".swiper-container").swiper();
localStorage.setItem("yf_guide_page_status", 1)
@@ -137,7 +137,7 @@ function run(){
if(time.innerHTML == 0 && isShow == false) {
isShow = true;
if (localStorage.getItem("yf_guide_page_status") == null && JSON.parse(localStorage.getItem("guidePageUrls")).length > 0) {
if (localStorage.getItem("yf_guide_page_status") == null && localStorage.getItem("guidePageUrls") != null && JSON.parse(localStorage.getItem("guidePageUrls")).length > 0) {
$(".swiper-container").removeClass("dn");
$(".swiper-container").swiper();
localStorage.setItem("yf_guide_page_status", 1)
@@ -148,7 +148,11 @@ function run(){
}
return false;
}
time.innerHTML = time.innerHTML * 1 - 1;
var ntime = time.innerHTML * 1 - 1;
if(ntime <= 0) {
ntime = 0;
}
time.innerHTML = ntime;
}
</script>
+29 -3
View File
@@ -1353,9 +1353,21 @@ document.addEventListener('plusready', onPlusReady, false);
function onPlusReady() {
var self = plus.webview.currentWebview();
hsId = self.hsId
houseId = self.houseId
if(hsId){
//如果是修改置换建议,则默认将值填入
axios.get(BASE_PATH + "/rest/changeHouse/loadHouseSubInfo",{
updateChangeSubtation(hsId);
}
if(houseId){
//小区报告页带入
fillHouseInfo(houseId);
}
}
//修改置换建议填充默认值
function updateChangeSubtation(hsId){
axios.get(BASE_PATH + "/rest/changeHouse/loadHouseSubInfo",{
params:{
hsId:hsId
}
@@ -1397,7 +1409,22 @@ function onPlusReady() {
}).catch(function (error) {
console.log(error);
});
}
}
function fillHouseInfo(houseId){
axios.get(BASE_PATH + "/rest/index/loadHouse",{
params:{
houseId:houseId
}
}).then(function (response) {
var data = response.data.data;
if(data){
addBaseHouseInfo(data);
baseInfo.houseId = hs.houseId
}
}).catch(function (error) {
console.log(error);
});
}
//填充房产价格信息
@@ -1818,7 +1845,6 @@ $("#citySearchInp").bind('keyup', function() {
});
function openAddHouse(){
alert("ssss")
clicked('/views/house/add.html',true,false,{},{});
}
+2 -2
View File
@@ -129,7 +129,7 @@
<div class="noData">
<img src="../../images/noData.png">
<p>抱歉,没有找到适合您的小区</p>
<a click="updateChangeHouse()">修改置换需求</a>
<a onclick="updateChangeHouse()">修改置换需求</a>
</div>
</div>
@@ -399,7 +399,7 @@ $(document).on('infinite', '.infinite-scroll-bottom', function() {
});
function updateChangeHouse(){
clicked('views/changeHouse/index.html',true,false,{},{hsId:hsId});
clicked('/views/changeHouse/index.html',true,false,{},{hsId:hsId});
}
</script>
@@ -303,5 +303,6 @@ function addSubstitution(sr, hs, house){
// <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").show();
}
+21 -3
View File
@@ -57,13 +57,13 @@
<button class="button button-link button-nav pull-left" onclick="back(),plus.nativeUI.closeWaiting();">
<span class="icon icon-left"></span>
</button>
<button class="button button-link button-nav pull-right open-popover" onclick="shareHref()">
<button class="button button-link button-nav pull-right open-popover" onclick="share()">
<span class="icon icon-share"></span>
</button>
<h1 class="title">{{name}}</h1>
</header>
<div class="content">
<div class="topBg topBg02" id="suggestDiv">
<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>
</div>
@@ -329,6 +329,14 @@ function onPlusReady() {
sharehrefTitle = self.name;
//查看小区
var eventType = "openDistrictDetailClick";
var dataMap = {};
dataMap["city"]=city;
dataMap["region"]=region;
dataMap["name"]=name;
saveBehaviorLog(eventType,dataMap); //保存用户点击事件
// 创建根实例
baseInfo = new Vue({
el: '#districtBaseInfo',
@@ -396,7 +404,17 @@ function loadMap(){
}
}
function share(){
var eventType = "shareDistrictClick";
var dataMap = {};
dataMap["city"]=city;
dataMap["region"]=region;
dataMap["name"]=name;
dataMap["type"]="districtDetail";
saveBehaviorLog(eventType,dataMap); //保存用户点击事件
shareHref();
}
</script>
@@ -29,7 +29,7 @@
<button class="button button-link button-nav pull-left" onclick="back(),plus.nativeUI.closeWaiting();">
<span class="icon icon-left"></span>
</button>
<button class="button button-link button-nav pull-right open-popover" onclick="shareHref()">
<button class="button button-link button-nav pull-right open-popover" onclick="share()">
<span class="icon icon-share"></span>
</button>
<h1 class="title">评估报告</h1>
@@ -151,11 +151,11 @@ $.config = {router: false}
var sharehrefDes = "小区详情介绍!";
var shareId='';
var picUrl = '../../img/default_share.png';
var hid = "";
document.addEventListener('plusready', onPlusReady, false);
function onPlusReady(){
var self = plus.webview.currentWebview();
var hid = self.hid;
hid = self.hid;
var houseStatus = ""
shareUrl = shareUrl+"hid="+hid;
@@ -202,6 +202,13 @@ $.config = {router: false}
},
methods:{
feedback:function(i,event){
var eventType = "priceFeedbackClick";
var dataMap = {};
dataMap["hid"]=hid
dataMap["reason"]=i
saveBehaviorLog(eventType,dataMap); //保存用户点击事件
if($(event.target).hasClass("theme")){
return;
}
@@ -357,6 +364,12 @@ $.config = {router: false}
//添加管理AJAX请求
function addManagement(id, houseStatus, liveStatus){
var eventType = "addManageClick";
var dataMap = {};
dataMap["hid"]=id;
dataMap["liveStatus"]=liveStatus;
saveBehaviorLog(eventType,dataMap); //保存用户点击事件
axios.post(BASE_PATH + "/rest/evaluate/addManagement",
{
id: id,
@@ -547,6 +560,17 @@ function openaddWindow(){
clicked('/views/house/add.html',true,false,{},{type:1},function(){
})
}
function share(){
var eventType = "shareEvaluateClick";
var dataMap = {};
dataMap["hid"]=hid;
dataMap["type"]="evaluate";
saveBehaviorLog(eventType,dataMap); //保存用户点击事件
shareHref();
}
</script>
</body>
+16 -2
View File
@@ -195,7 +195,7 @@
</ul>
</div>
<div class="content-block">
<p><button id="evaluation_btn" class="button button-big button-fill theme" id="evaluation_btn" style="width:100%">提交评估</button></p>
<p><button id="evaluation_btn" class="button button-big button-fill theme" style="width:100%">提交评估</button></p>
</div>
</div>
</div>
@@ -1580,7 +1580,18 @@ $("#input_floor").picker({
textAlign: 'center',
values: getfloorHeight()
}
]
],onOpen:function(p){
//
var input_floor = $("#input_floor").val();
var num = input_floor.replace(/第/g,"").replace(/层/g,"").replace(/共/g,"").split(" ");
if(num[0]!=null &&num[0]!=undefined){
p.cols[0].setValue('第'+num[0]+'层')
}
if(num[1]!=null &&num[1]!=undefined){
p.cols[1].setValue('共'+num[1]+'层')
}
}
});
/* 选择-目前状态 */
@@ -1891,6 +1902,9 @@ function addEvaluation(){
area:$("#input_area").val(),
houseStatus:1}
}
var eventType = "evaluateSubmitClick";
saveBehaviorLog(eventType,data); //保存用户点击事件
axios.get("/rest/index/checkEvalPrice", {
params: data
})
+18 -1
View File
@@ -626,15 +626,32 @@ function gotoLoanApply(){
clicked('/views/loan/loanInfo.html',true,false,{},{houseId: houseId, city: oriCity, mobile: ""},function(){})
}
function gotoRentManager(){
clicked('/views/rent/rentManager.html',true,false,{},{houseId: houseId},function(){})
var eventType = "rentManageClick";
var dataMap = {};
dataMap["hid"]=houseId;
saveBehaviorLog(eventType,dataMap); //保存用户点击事件
clicked('/views/rent/rentManager.html',true,false,{},{houseId: houseId},function(){})
}
//出售分析
function gotoSaleAnalysis(){
var eventType = "saleAnalysisClick";
var dataMap = {};
dataMap["hid"]=houseId;
saveBehaviorLog(eventType,dataMap); //保存用户点击事件
clicked('/views/saleAnalysis/saleAnalysis.html',true,false,{},{houseId: houseId, city: oriCity, region: oriRegion, name: oriName},function(){})
}
function gotoChangeHouse(){
var eventType = "changeHouseClick";
var dataMap = {};
dataMap["hid"]=houseId;
saveBehaviorLog(eventType,dataMap); //保存用户点击事件
clicked('/views/changeHouse/index.html',true,false,{},{houseId: houseId},function(){})
}
</script>
+29 -5
View File
@@ -34,7 +34,7 @@
<!--<button class="button button-link button-nav pull-left" onclick="history.go(-1)">
<span class="icon icon-left"></span>
</button>-->
<button class="button button-link button-nav pull-right" id="shareButton" onclick="shareHref()">
<button class="button button-link button-nav pull-right" id="shareButton" onclick="share()">
<span class="icon icon-share"></span>
</button>
<h1 class="title">房产行情</h1>
@@ -151,7 +151,7 @@
</div>
</div>
</div>
<div class="topic" id="hotCityVue">
<div class="topic" id="hotCityVue" v-cloak>
<div class="topicTitle">房产热点城市</div>
<div class="topicContent cityImgBox row">
<div class="col-33" v-for="(city,index) in hotCitys" @click="openHotCity(index)">
@@ -1502,15 +1502,24 @@ $("a[href='#tabQuotation1'],a[href='#tabQuotation0']").click(function(){
$("#tabCityDiv a").removeClass("active");
$("#contentTabDiv > .tab").removeClass("active");
$("#cityInfo").hide()
var eventType = "changeHotCityClick";
var dataMap = {};
dataMap["city"]=$(this).text();
saveBehaviorLog(eventType,dataMap); //保存用户点击事件
})
function clickCity(val){
var eventType = "changeHotCityClick";
var dataMap = {};
dataMap["city"]=val;
saveBehaviorLog(eventType,dataMap); //保存用户点击事件
shareUrl = BASE_PATH+"/house/cityShare?city="+val;
$("#shareButton").show();
city = val;
plus.nativeUI.showWaiting();
$("#cityInfo").show()
$("#tabCityDiv a").removeClass("active");
@@ -1532,7 +1541,7 @@ function clickCity(val){
$("#trendDiv a").removeClass("active")
$("#trendDiv a[v='2']").addClass("active")// 默认走势显示半年
$("#tabQuotation1").removeClass("active");
$("#tabQuotation0").removeClass("active");
plus.nativeUI.closeWaiting();
@@ -1610,6 +1619,11 @@ function addFocus(city){
}
})
}else{
var eventType = "addHotCityClick";
var dataMap = {};
dataMap["city"]=city;
saveBehaviorLog(eventType,dataMap); //保存用户点击事件
axios.get("/rest/quotations/collectCity",{params:{city:city,type:0}}).then(function(response){
if(response.data.status){
reloadMyFocus()
@@ -1636,11 +1650,21 @@ function addFocus(city){
}
function hotCity(city){
clicked('../house/cityDetail.html',true,false,{},{city:city},function(){
});
}
function share(){
var eventType = "shareHotCityClick";
var dataMap = {};
dataMap["city"]=$("#tabCityDiv .active").text();
dataMap["type"]="hotCity";
saveBehaviorLog(eventType,dataMap); //保存用户点击事件
shareHref();
}
</script>
+6
View File
@@ -387,6 +387,12 @@ $(document).on("click",".confirm-ok", function () {
//获取删除的房产id
var id = $(this).attr("id");
$.confirm("确定删除?", function () {
var eventType = "deleteHouseClick";
var dataMap = {};
dataMap["hid"]=id;
saveBehaviorLog(eventType,dataMap); //保存用户点击事件
axios.post(BASE_PATH + "/rest/index/deleteHouseInfoByStatus",
{
id: id
@@ -147,6 +147,11 @@ $(document).on("click",".confirm-ok", function () {
//获取删除的房产id
var id = $(this).attr("id");
$.confirm("确定删除?", function () {
var eventType = "delateEvaluateClick";
var dataMap = {};
dataMap["hid"]=id;
saveBehaviorLog(eventType,dataMap); //保存用户点击事件
axios.post(BASE_PATH + "/rest/index/deleteHouseInfoByStatus",
{
id: id
@@ -302,6 +307,10 @@ function constructHtmlContent(results, xqOneMonthUpDownRangeMap, cityAvgPriceMap
//立即评估
function openaddWindow(){
var eventType = "evaluateClick";
var dataMap = {};
saveBehaviorLog(eventType,dataMap); //保存用户点击事件
clicked('/views/house/add.html',true,false,{},{type:1},function(){
})
}
+9 -3
View File
@@ -64,8 +64,10 @@
<div class="col-10">{{index+1}}</div>
<div class="col-25">{{info.region}}</div>
<div class="col-33">{{info.avgPrice}}元/㎡</div>
<div class="col-25" v-if="info.oneMonthUpDownRange > 0"><em class="up">{{info.oneMonthUpDownRange}}%<i class="icon icon-arrow-red"></i></em></div>
<div class="col-25" v-if="info.oneMonthUpDownRange < 0"><em class="down">{{info.oneMonthUpDownRange}}%<i class="icon icon-arrow-green"></i></em></div>
<div class="col-25" v-if="info.oneMonthUpDownRange && info.oneMonthUpDownRange >= 0"><em class="up">{{info.oneMonthUpDownRange}}%<i class="icon icon-arrow-red"></i></em></div>
<div class="col-25" v-else-if="info.oneMonthUpDownRange && info.oneMonthUpDownRange < 0"><em class="down">{{info.oneMonthUpDownRange}}%<i class="icon icon-arrow-green"></i></em></div>
<div class="col-25" v-else><em>暂无</em></div>
</div>
</div>
</a>
@@ -137,7 +139,11 @@ $.config = {router: false}
if(msg!=null && msg.length>0){
for(var i in msg){
var da = msg[i]
da.oneMonthUpDownRange = (da.oneMonthUpDownRange*100).toFixed(2)
if(da.oneMonthUpDownRange){
da.oneMonthUpDownRange = (da.oneMonthUpDownRange*100).toFixed(2)
}
}
regionsInfoVue.$data.regionInfos = msg;
}else{
+1 -1
View File
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title id="title"></title>
<title id="title">消息详情</title>
<meta name="viewport" content="initial-scale=1, maximum-scale=1">
<link rel="shortcut icon" href="/favicon.ico">
<meta name="apple-mobile-web-app-capable" content="yes">
+1
View File
@@ -120,6 +120,7 @@ function logout() {
//plus.webview.getWebviewById('yfindex.html').reload();
localStorage.removeItem("user_token");
localStorage.removeItem("user_token_add_time");
localStorage.removeItem("user_id");
//退出登录之前loading下个人中心
if(plus.webview.getWebviewById('views/house/houseDetail.html')!= null) {
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
@@ -200,6 +200,7 @@ var vue = new Vue({
$.toast(resData.message);
localStorage.setItem("user_token", resData.data.token);
localStorage.setItem("user_token_add_time", new Date().getTime());
localStorage.setItem("user_id", resData.data.uid);
back();
} else {
$.toast(resData.message);
+3 -2
View File
@@ -136,9 +136,10 @@ new Vue({
var resData = response.data;
if (resData.status) {
// 用户登录成功的TOKEN
var token = resData.data;
localStorage.setItem("user_token", token);
var data = resData.data;
localStorage.setItem("user_token", data.token);
localStorage.setItem("user_token_add_time", new Date().getTime());
localStorage.setItem("user_id", data.uid)
$.toast(resData.message);
back();
} else {
+76 -23
View File
@@ -54,7 +54,7 @@
<img src="../../images/headPortrait.png">
<p><a class="button theme" href="#" onclick="gotoLogin()" >立即登录</a></p>
</div>
<div class="topic">
<div class="topic" style="display: none;">
<div class="topicContent homeBox" style="padding-left:0;padding-right:0;">
<div class="topicContent_center home homeWin">
<div>
@@ -127,7 +127,7 @@
<div class="topic">
<div class="topicContent homeBox" style="padding-left:0;padding-right:0;">
<div class="topicContent_center home homeWin" id="toolList">
<div>
<!--<div>
<i class="icon icon-personal01"></i>
<span>公积金查询</span>
</div>
@@ -142,9 +142,9 @@
<div>
<i class="icon icon-personal04"></i>
<span>算房贷</span>
</div>
</div>-->
<div v-for="(t,index) in merchantTools">
<img v-bind:src="t.iconUrl" style="width:45px;height:45px;margin:0 auto;" v-on:click="goto(t.url)">
<img v-bind:src="t.iconUrl" style="width:45px;height:45px;margin:0 auto;" v-on:click="goto(t.url,userId,t.id)">
<span>{{t.toolName}}</span>
</div>
</div>
@@ -227,7 +227,7 @@ $.config = {router: false}
<script type="text/javascript" src="../../js/vue.js"></script>
<script type="text/javascript" src="../../js/light7-2.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/cn.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/sm01.js" charset="utf-8"></script>
<!--<script type="text/javascript" src="../../js/sm01.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/common.js' charset='utf-8'></script>
@@ -262,20 +262,7 @@ var tab = new Vue({
mm_num:"0"
}
})
var toolList = new Vue({
el:"#toolList",
data:{
merchantTools:[]
},
methods:{
goto:function(url){
// alert(url)
if (url != null && url != "") {
clicked('../webview_embed.html', true,false,{},{url:url})
}
}
}
})
//判断是否登录
function checkIsLogin(){
if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){
@@ -350,7 +337,8 @@ $(document).on('infinite', '.infinite-scroll',function() {
// 加载完毕,则注销无限加载事件,以防不必要的加载
//$.detachInfiniteScroll($('.infinite-scroll'));
// 删除加载提示符
$('#loadTip1').remove();
//$('#loadTip1').remove();
$('#loadTip1').hide();
return;
}
//控制查询下一页的数据
@@ -466,7 +454,8 @@ $(document).on("click",".confirm-ok", function () {
$.toast(response.data.data);
//删除后,如果需要调用checkIsLogin,需要所有的参数初始化
//checkIsLogin();
window.location.reload();
//window.location.reload();
initMyHouseParams();
//删除房产会影响个人中心房产列表, 刷新
/*if(plus.webview.getWebviewById('views/user/userInfo.html')!= null){
plus.webview.getWebviewById('views/user/userInfo.html').reload();
@@ -482,6 +471,24 @@ $(document).on("click",".confirm-ok", function () {
$(".modal-text").css("text-align","center");
});
//初始化分页参数, 防止回调时候重新请求出错
function initMyHouseParams(){
mh_loading = false;
mh_page = undefined;
var mh_pageSize = undefined;
var mh_totalPages = undefined;
var mh_totalRecords = undefined;
var mh_lastIndex = undefined;
var mh_itemsPerLoad = undefined;
var mh_maxItems = 100;
//清空构造的container
$('#myhouse').html('');
// 删除加载提示符
$('#loadTip1').show();
//加载我的房产
selectHouseInfoList();
}
function openSettingPage() {
clicked('../setting/setting.html',true,false,{},{},function(){})
}
@@ -489,10 +496,38 @@ function openSettingPage() {
document.addEventListener('plusready', onPlusReady, false);
function onPlusReady(){
var toolList = new Vue({
el:"#toolList",
data:{
merchantTools:[],
userId:""
},
methods:{
goto:function(url,userId,id){
var deviceId = plus.device.uuid;
if(url.indexOf("?")>0){
url+=("&uid="+userId+"&deviceId="+deviceId)
}else{
url+=("?uid="+userId+"&deviceId="+deviceId)
}
if (url != null && url != "") {
if(id!=null){
axios.post(BASE_PATH + "/rest/usertool/merchantToolClick",{id:id}).then(function(response){
}).catch(function(error){
});
}
clicked('../webview_embed.html', true,false,{},{url:url})
}
}
}
});
axios.get(BASE_PATH + "/rest/usertool/merchantToolList",{params:{position:0}}).then(function(response){
toolList.merchantTools = response.data.data;
toolList.merchantTools = response.data.data.list;
toolList.userId = response.data.data.uid;
/* 获取homeWin div个数并计算homeWin宽度 */
$(".homeWin").css("width",(90*(4+response.data.data.length))+"px");
var original = 0;//公积金查询等个数
$(".homeWin").css("width",(90*(original+response.data.data.list.length))+"px");
// var html = "";
// for(var i=0;i<toolList.length;i++){
// html += (i%4==0?'':'<div class="swiper-slide">')+
@@ -514,6 +549,24 @@ function onPlusReady(){
checkIsLogin();
}
$("a[href='#tabList1'],a[href='#tabList2'],a[href='#tabList3']").click(function(){
var eventType = "";
var type = $(this).text();
if(type.indexOf("房产") >= 0){
eventType = "userInfo_manageHouseClick";
}else if(type.indexOf("关注") >= 0){
eventType = "userInfo_attentionClick";
}else if(type.indexOf("收藏") >= 0){
eventType = "userInfo_collectClick";
}
saveLog(eventType)
})
function saveLog(eventType){
var dataMap = {};
saveBehaviorLog(eventType,dataMap); //保存用户点击事件
}
saveLog("userInfo_manageHouseClick");//默认第一次会调到该方法
</script>
</body>
+43 -6
View File
@@ -1195,12 +1195,21 @@ $.config = {router: false}
<script type="text/javascript" src="js/city.js" ></script>
<script>
function openHangQing(city){
function openHangQing(city,id){
var eventType = "newsClick";
var dataMap = {};
dataMap["city"]=city;
dataMap["type"]="推荐城市";
saveBehaviorLog(eventType,dataMap); //保存用户点击事件
axios.get("/rest/news/addCount",{params:{newsId:id}}).then(function(response){
if(response.data.code==200){
}
}).catch(function(error){
console.log(error)
});
clicked('views/house/cityDetail.html',true,false,{},{city:city},function(){
})
@@ -1829,7 +1838,7 @@ function addItems(number, lastIndex) {
'</div>';
}
if(dataObj[i].type=="推荐小区"){
html += '<div class="card cardInfo cardInfo02" onclick="openNewsDistWindow(\''+dataObj[i].recommendDistrictCity+'\',\''+dataObj[i].recommendDistrictRegion+'\',\''+dataObj[i].recommendDistrictName+'\')">'+
html += '<div class="card cardInfo cardInfo02" onclick="openNewsDistWindow(\''+dataObj[i].recommendDistrictCity+'\',\''+dataObj[i].recommendDistrictRegion+'\',\''+dataObj[i].recommendDistrictName+'\',\''+dataObj[i].id+'\')">'+
'<div class="card-content">'+
'<div class="list-block media-list"><ul><li class="item-content">'+
'<div class="item-media"><img src="cardInfoPlaceholderImg.png" onload="loadImg(\''+dataObj[i].coverImg+'\',this)"></div>'+
@@ -1853,7 +1862,7 @@ function addItems(number, lastIndex) {
}
if(dataObj[i].type=="活动"){
if(dataObj[i].adUrl!=null && dataObj[i].adUrl!=""){
html += '<div class="card cardInfo cardInfo01 cardInfo01b" onclick="openUrl(\''+BASE_PATH+'/message/openView?url='+dataObj[i].adUrl+'\')">';
html += '<div class="card cardInfo cardInfo01 cardInfo01b" onclick="openUrl(\''+BASE_PATH+'/message/openView?url='+dataObj[i].adUrl+'\',\''+dataObj[i].id+'\')">';
}else{
html += '<div class="card cardInfo cardInfo01 cardInfo01b">';
}
@@ -1862,7 +1871,7 @@ function addItems(number, lastIndex) {
'<div class="card-footer"><span>'+dataObj[i].introduction+'</span></div></div>';
}
if(dataObj[i].type=="推荐城市"){
html += '<div class="card cardInfo cardInfo01 cardInfo01a" onclick="openHangQing(\''+dataObj[i].recommendCity+'\')">'+
html += '<div class="card cardInfo cardInfo01 cardInfo01a" onclick="openHangQing(\''+dataObj[i].recommendCity+'\',\''+dataObj[i].id+'\')">'+
'<div class="card-header">推荐城市——'+dataObj[i].recommendCity+'</div>';
if(dataObj[i].recommendCityTags != "" && dataObj[i].recommendCityTags != null){
var arry = dataObj[i].recommendCityTags.split("_");
@@ -2374,11 +2383,21 @@ function req(cityStr){
//potenialIndex(city,sort);
}
function openUrl(url){
function openUrl(url,id){
var eventType = "newsClick";
var dataMap = {};
dataMap["type"]="活动";
saveBehaviorLog(eventType,dataMap); //保存用户点击事件
axios.get("/rest/news/addCount",{params:{newsId:id}}).then(function(response){
if(response.data.code==200){
}
}).catch(function(error){
console.log(error)
});
clicked(url,true);
}
@@ -2777,7 +2796,7 @@ function openNewView(viewHtml) {
clicked(viewHtml,true,false,{},{})
}
function openNewsDistWindow(city, region, name){
function openNewsDistWindow(city, region, name,id){
var eventType = "newsClick";
var dataMap = {};
dataMap["city"]=city;
@@ -2785,6 +2804,16 @@ function openNewsDistWindow(city, region, name){
dataMap["name"]=name;
dataMap["type"]="推荐小区";
saveBehaviorLog(eventType,dataMap); //保存用户点击事件
axios.get("/rest/news/addCount",{params:{newsId:id}}).then(function(response){
if(response.data.code==200){
}
}).catch(function(error){
console.log(error)
});
clicked('views/district/detail.html',true,false,{},{city:city,region:region,name:name});
}
@@ -2817,6 +2846,14 @@ $("body").delegate("#hotList ul li", "click", function () {
var select_region = $(this).find("a").attr("data-region");
var select_name = $(this).find("a").attr("data-name");
saveHistory({district:select_region,name:select_name,city:select_city})
var eventType = "hotDistrictClick";
var dataMap = {};
dataMap["city"]=select_city;
dataMap["region"]=select_region;
dataMap["name"]=select_name;
saveBehaviorLog(eventType,dataMap); //保存用户点击事件
//clicked(BASE_PATH+'/district/details?city='+select_city+'&region='+select_region+'&name='+select_name,true);
if(cat == "rent"){
clicked('views/rent/rent.html',true,false,{},{city:select_city,region:select_region,name:select_name})