Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1
This commit is contained in:
@@ -105,6 +105,17 @@ function loadMap(){
|
||||
}
|
||||
}
|
||||
}*/
|
||||
function showLoadRentTrends(type) {
|
||||
if(type == 3) {
|
||||
document.getElementById("trendDivTab3").setAttribute("class","tab-link button active");
|
||||
document.getElementById("trendDivTab2").setAttribute("class","tab-link button");
|
||||
} else {
|
||||
document.getElementById("trendDivTab3").setAttribute("class","tab-link button");
|
||||
document.getElementById("trendDivTab2").setAttribute("class","tab-link button active");
|
||||
}
|
||||
|
||||
loadRentTrends(city, region, name,type);
|
||||
}
|
||||
|
||||
//小区详情
|
||||
function loadDistrictInfo(){
|
||||
@@ -299,6 +310,7 @@ function showTrends(v){
|
||||
if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") {
|
||||
clicked('../user/codeSms.html',true,false,{},{},function(){
|
||||
showTrends(v);
|
||||
plus.webview.getWebviewById('views/user/userInfo.html').reload();
|
||||
})
|
||||
return;
|
||||
} else {
|
||||
@@ -370,7 +382,7 @@ var option01 = {
|
||||
type: 'slider',
|
||||
xAxisIndex: [0, 1],
|
||||
realtime: false,
|
||||
start: 50,
|
||||
start: 0,
|
||||
end: 100,
|
||||
top: 65,
|
||||
height: 20,
|
||||
|
||||
@@ -262,71 +262,61 @@ $.config = {router: false}
|
||||
<script>
|
||||
//loadDistrictInfo();
|
||||
|
||||
document.addEventListener('plusready', onPlusReady, false);
|
||||
function onPlusReady() {
|
||||
var self = plus.webview.currentWebview();
|
||||
city = self.city
|
||||
region = self.region
|
||||
name = self.name;
|
||||
// 创建根实例
|
||||
baseInfo = new Vue({
|
||||
el: '#districtBaseInfo',
|
||||
data: {
|
||||
name : "",
|
||||
city:"",
|
||||
region: "",
|
||||
address: "",
|
||||
avgPrice:"",
|
||||
oneMonthUpDownRange:"",
|
||||
priceRate:"",
|
||||
cityPrice:"",
|
||||
finishBuildingDate:"",
|
||||
householdCount:"",
|
||||
cubagePercent:"",
|
||||
carSiteCount:"",
|
||||
virescencePercent:"",
|
||||
estateCharge:"",
|
||||
moreArea:"",
|
||||
developer:"",
|
||||
estateCompany:"",
|
||||
tags:[],
|
||||
nearDists:[],
|
||||
regionIndex:"",
|
||||
schoolIndex:""
|
||||
},
|
||||
methods:{
|
||||
showChat: function(type){
|
||||
if(type == 2) {
|
||||
document.getElementById("tabChart2").style = "z-index:1";
|
||||
document.getElementById("tabChart1").style = "z-index:-1";
|
||||
} else {
|
||||
document.getElementById("tabChart2").style = "z-index:-1";
|
||||
document.getElementById("tabChart1").style = "z-index:1";
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
/* 小区均价分析 */
|
||||
loadKLineData(city, region, name);
|
||||
/* 小区租金走势 */
|
||||
loadRentTrends(city, region, name,2);
|
||||
}
|
||||
//document.addEventListener('plusready', onPlusReady, false);
|
||||
//function onPlusReady() {
|
||||
// var self = plus.webview.currentWebview();
|
||||
// city = self.city
|
||||
// region = self.region
|
||||
// name = self.name;
|
||||
// // 创建根实例
|
||||
// baseInfo = new Vue({
|
||||
// el: '#districtBaseInfo',
|
||||
// data: {
|
||||
// name : "",
|
||||
// city:"",
|
||||
// region: "",
|
||||
// address: "",
|
||||
// avgPrice:"",
|
||||
// oneMonthUpDownRange:"",
|
||||
// priceRate:"",
|
||||
// cityPrice:"",
|
||||
// finishBuildingDate:"",
|
||||
// householdCount:"",
|
||||
// cubagePercent:"",
|
||||
// carSiteCount:"",
|
||||
// virescencePercent:"",
|
||||
// estateCharge:"",
|
||||
// moreArea:"",
|
||||
// developer:"",
|
||||
// estateCompany:"",
|
||||
// tags:[],
|
||||
// nearDists:[],
|
||||
// regionIndex:"",
|
||||
// schoolIndex:""
|
||||
// },
|
||||
// methods:{
|
||||
// showChat: function(type){
|
||||
// if(type == 2) {
|
||||
// document.getElementById("tabChart2").style = "z-index:1";
|
||||
// document.getElementById("tabChart1").style = "z-index:-1";
|
||||
// } else {
|
||||
// document.getElementById("tabChart2").style = "z-index:-1";
|
||||
// document.getElementById("tabChart1").style = "z-index:1";
|
||||
// }
|
||||
//
|
||||
// }
|
||||
// }
|
||||
// })
|
||||
//
|
||||
// /* 小区均价分析 */
|
||||
// loadKLineData(city, region, name);
|
||||
// /* 小区租金走势 */
|
||||
// loadRentTrends(city, region, name,2);
|
||||
//}
|
||||
|
||||
function showLoadRentTrends(type) {
|
||||
if(type == 3) {
|
||||
document.getElementById("trendDivTab3").setAttribute("class","tab-link button active");
|
||||
document.getElementById("trendDivTab2").setAttribute("class","tab-link button");
|
||||
} else {
|
||||
document.getElementById("trendDivTab3").setAttribute("class","tab-link button");
|
||||
document.getElementById("trendDivTab2").setAttribute("class","tab-link button active");
|
||||
}
|
||||
|
||||
loadRentTrends(city, region, name,type);
|
||||
}
|
||||
|
||||
/*baseInfo = new Vue({
|
||||
|
||||
baseInfo = new Vue({
|
||||
el: '#districtBaseInfo',
|
||||
data: {
|
||||
name : "",
|
||||
@@ -365,7 +355,12 @@ function showLoadRentTrends(type) {
|
||||
}
|
||||
}
|
||||
})
|
||||
*/
|
||||
|
||||
/* 小区均价分析 */
|
||||
loadKLineData(city, region, name);
|
||||
/* 小区租金走势 */
|
||||
loadRentTrends(city, region, name,2);
|
||||
|
||||
function openMapWindow(){
|
||||
clicked('arround.html',true,false,{},{city:city,region:region,name:name,lat:lat,lng:lng});
|
||||
}
|
||||
|
||||
@@ -239,9 +239,9 @@
|
||||
<div id="tabChart1" class="tab tabChart1 active">
|
||||
<div class="content-block content-block01a" style="margin:0;padding-left:0;padding-right:0;">
|
||||
<div class="buttons-row theme" style="padding:0 0.75rem;" id="trendDiv1">
|
||||
<a t-v="6" class="tab-link button active">半年</a>
|
||||
<a t-v="12" class="tab-link button">一年</a>
|
||||
<a t-v="36" class="tab-link button">三年</a>
|
||||
<a t-v="6" class="tab-link button active" onclick="showTrends(6)">半年</a>
|
||||
<a t-v="12" class="tab-link button" onclick="showTrends(12)">一年</a>
|
||||
<a t-v="36" class="tab-link button" onclick="showTrends(36)">三年</a>
|
||||
</div>
|
||||
<div class="chart" id="chart01" style="height:360px;"></div>
|
||||
</div>
|
||||
@@ -249,12 +249,10 @@
|
||||
<div id="tabChart2" class="tab tabChart2" style="display: block;">
|
||||
<div class="content-block content-block01a" style="margin:0;padding-left:0;padding-right:0;">
|
||||
<div class="buttons-row theme" style="padding:0 0.75rem;" id="trendDiv2">
|
||||
<a t-v="2" class="tab-link button active">半年</a>
|
||||
<a t-v="3" class="tab-link button">一年</a>
|
||||
</div>
|
||||
<div class="chart" id="chart02" style="margin-top:0.75rem;">
|
||||
|
||||
<a t-v="2" id="trendDivTab2" class="tab-link button active" onclick="showLoadRentTrends(2)">半年</a>
|
||||
<a t-v="3" id="trendDivTab3" class="tab-link button" onclick="showLoadRentTrends(3)">一年</a>
|
||||
</div>
|
||||
<div class="chart" id="chart02" style="margin-top:0.75rem;"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -524,7 +522,7 @@ function addManagement(id, houseStatus, liveStatus){
|
||||
var status = response.data.status;
|
||||
if(status){
|
||||
$.toast("修改状态成功!");
|
||||
//window.location.reload();
|
||||
plus.webview.getWebviewById('views/user/userInfo.html').reload();
|
||||
}else{
|
||||
$.toast(response.data.message);
|
||||
}
|
||||
|
||||
@@ -1235,10 +1235,6 @@ $.config = {router: false}
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
document.addEventListener('plusready', onPlusReady, false);
|
||||
function onPlusReady(){
|
||||
@@ -1544,14 +1540,15 @@ function loadMyCollectCity(){
|
||||
var curDatas = response.data.data
|
||||
if(curDatas && curDatas.length>0){
|
||||
if(positionCity){
|
||||
curDatas.splice(0,0, positionCity)
|
||||
if(!IsInArray(curDatas, positionCity)){
|
||||
curDatas.splice(0,0, positionCity)
|
||||
}
|
||||
}
|
||||
cityDetaiVue.$data.citys = curDatas;
|
||||
}else{
|
||||
if(positionCity){
|
||||
curDatas.splice(0,0, positionCity)
|
||||
cityDetaiVue.$data.citys.push(positionCity);
|
||||
}
|
||||
cityDetaiVue.$data.citys = curDatas;
|
||||
|
||||
$("#cityInfo").hide()
|
||||
}
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
<div class="content" id="app">
|
||||
<div class="list-block media-list">
|
||||
<ul>
|
||||
<li>
|
||||
<li v-show="showPass">
|
||||
<a onclick="clicked('/views/user/updatePass.html',true);" class="item-link item-content">
|
||||
<div class="item-inner">
|
||||
<div class="item-title-row">
|
||||
@@ -87,12 +87,14 @@ new Vue({
|
||||
el: '#app',
|
||||
data: {
|
||||
showLogin:false,
|
||||
showLogout:false
|
||||
showLogout:false,
|
||||
showPass:false
|
||||
},
|
||||
mounted() {
|
||||
if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") {
|
||||
this.showLogin = true;
|
||||
} else {
|
||||
this.showPass = true;
|
||||
this.showLogout = true;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user