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

This commit is contained in:
尹吉欢
2018-04-12 10:52:55 +08:00
7 changed files with 143 additions and 134 deletions
@@ -27,8 +27,8 @@ Vue.component('city_increase_ranking',{
'<em class="up">{{!ci.oneMonthUpDownRange||ci.oneMonthUpDownRange==""?"暂无":Math.abs(100*ci.oneMonthUpDownRange).toFixed(2)+"%"}}<i class="icon" v-bind:class="[ci.oneMonthUpDownRange>0?&quot;icon-arrow-red&quot;:&quot;&quot;,ci.oneMonthUpDownRange<0?&quot;icon-arrow-green&quot;:&quot;&quot;]"></i></em>'+
'</div>'+
'<div class="col-20">'+
'<i class="button theme collection collection01" v-on:click="follow(ci.city)">关注</i>'+
'<i class="button collection collection02 dn" v-on:click="abolish(ci.city)">取消</i>'+
'<i class="button theme collection collection01" v-on:click="follow(ci.city,$event)">关注</i>'+
'<i class="button collection collection02 dn" v-on:click="abolish(ci.city,$event)">取消</i>'+
'</div>'+
'</div>'+
'</div>'+
@@ -47,14 +47,18 @@ Vue.component('city_increase_ranking',{
console.log(error)
})
},
follow:function(city){
follow:function(city,event){
axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){
$(event.target).parent().children().removeClass("dn");
$(event.target).addClass("dn");
}).catch(function(error){
console.log(error)
})
},
abolish:function(city){
abolish:function(city,event){
axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){
$(event.target).parent().children().removeClass("dn");
$(event.target).addClass("dn");
}).catch(function(error){
console.log(error)
})
@@ -33,8 +33,8 @@ Vue.component('city_potential_ranking',{
'</span>'+
'</div>'+
'<div class="col-20">'+
'<i class="button theme collection collection01" v-on:click="follow(cp.city)">关注</i>'+
'<i class="button collection collection02 dn" v-on:click="abolish(cp.city)">取消</i>'+
'<i class="button theme collection collection01" v-on:click="follow(cp.city,$event)">关注</i>'+
'<i class="button collection collection02 dn" v-on:click="abolish(cp.city,$event)">取消</i>'+
'</div>'+
'</div>'+
'</div>'+
@@ -48,7 +48,6 @@ Vue.component('city_potential_ranking',{
methods:{
loadCityPotentialRanking:function(){
axios.get("/rest/quotations/potentialUpTopInfos").then(function(response){
// alert(1)
list = response.data.data;
$(list).each(function(i){
var index = this.index;
@@ -66,14 +65,20 @@ Vue.component('city_potential_ranking',{
console.log(error)
})
},
follow:function(city){
follow:function(city,event){
axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){
$(event.target).parent().children().removeClass("dn");
$(event.target).addClass("dn");
loadCityPotentialRanking()
}).catch(function(error){
console.log(error)
})
},
abolish:function(city){
abolish:function(city,event){
axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){
$(event.target).parent().children().removeClass("dn");
$(event.target).addClass("dn");
loadCityPotentialRanking()
}).catch(function(error){
console.log(error)
})
@@ -26,7 +26,7 @@ Vue.component('my_focus',{
'<div class="col-20">{{mf.city}}</div>'+
'<div class="col-25">{{!mf.cityTopMonthAvgPrice||mf.cityTopMonthAvgPrice==""?"暂无":""+mf.cityTopMonthAvgPrice+"元/㎡"}}</div>'+
'<div class="col-25">'+
'<em class="up">{{!mf.oneMonthUpDownRange||mf.oneMonthUpDownRange==""?"暂无":Math.abs(mf.oneMonthUpDownRange*100).toFixed(2)+"%"}}<i class="icon" v-bind:class="[mf.oneMonthUpDownRange>0?&quot;icon-arrow-red&quot;:&quot;&quot;,cp.oneYearUpDownRange<0?&quot;icon-arrow-green&quot;:&quot;&quot;]"></i></em>'+
'<em class="up">{{!mf.oneMonthUpDownRange||mf.oneMonthUpDownRange==""?"暂无":Math.abs(mf.oneMonthUpDownRange*100).toFixed(2)+"%"}}<i class="icon" v-bind:class="[mf.oneMonthUpDownRange>0?&quot;icon-arrow-red&quot;:&quot;&quot;,mf.oneMonthUpDownRange<0?&quot;icon-arrow-green&quot;:&quot;&quot;]"></i></em>'+
'</div>'+
'<div class="col-20">'+
'<em>{{mf.rangeLevel}}</em>'+
@@ -50,14 +50,13 @@ Vue.component('my_focus',{
}else{
axios.get("/rest/quotations/userCollectCityInfo").then(function(response){
if(response.data.data.length==0){
alert("aa");
$("#myFocusFirstPage").hide();
$("#myFocus").hide();
}else{
myFocusDatas.myFocusList = response.data.data;
}
}).catch(function(error){
console.log(error)
console.log(error)
})
}
}
+20 -11
View File
@@ -47,7 +47,7 @@
</div>
</div>
</div>
<a class="add add01 button theme" href="03_evaluation02_inputInfo.html">再估一套</a>
<a class="add add01 button theme" onclick="openaddWindow()">再估一套</a>
</li>
</ul>
</div>
@@ -81,7 +81,7 @@
</span>
</div>
</div>-->
<div class="content-block priceRecovery" id="price_feedback">
<div class="content-block priceRecovery" id="price_feedback" v-bind:style="{display:isShow}">
<p><label>估的准吗?</label></p>
<p><small>您的反馈很重要,是我们努力的动力</small></p>
<div class="row">
@@ -142,13 +142,12 @@ $.config = {router: false}
<script type="text/javascript" src="../../js/axiosPlugin.js"></script>
<script type="text/javascript" src="../../js/log/log_stat.js" ></script>
<script>
document.addEventListener('plusready', onPlusReady, false);
function onPlusReady(){
var self = plus.webview.currentWebview();
var hid = self.hid;
//init();
// document.addEventListener('plusready', onPlusReady, false);
// function onPlusReady(){
// var self = plus.webview.currentWebview();
// var hid = self.hid;
var houseStatus = ""
// hid = '104631167348637696';
hid = '104631167348637696';
var house_info = new Vue({
el:'#house_info',
data:{
@@ -184,7 +183,7 @@ $.config = {router: false}
var price_feedback = new Vue({
el:"#price_feedback",
data:{
isShow:"none"
},
methods:{
feedback:function(i,event){
@@ -196,9 +195,15 @@ $.config = {router: false}
hid:hid,
reason:i
}).then(function(response){
alert("感谢您的反馈!")
$("#price_feedback").hide();
}).catch(function(error){console.log(error)})
},
feedbackable:function(){
}
},mounted(){
}
})
@@ -261,7 +266,7 @@ $.config = {router: false}
console.log(error)
})
}
// }
//添加管理AJAX请求
@@ -475,6 +480,10 @@ function showChat(categories, series) {
}
})
}
function openaddWindow(){
clicked('/views/house/add.html',true,false,{},{type:1},function(){
})
}
</script>
</body>
+6 -14
View File
@@ -1248,8 +1248,8 @@ $.config = {router: false}
<script>
document.addEventListener('plusready', onPlusReady, false);
var houseStatus; //= "186182250936643584";
var type = 1;
//扩展API加载完毕,现在可以正常调用扩展API
var type = 1;
function onPlusReady(){
var self = plus.webview.currentWebview();
type = self.type; //type为1时是我的房产
@@ -1258,7 +1258,6 @@ function onPlusReady(){
}else{
$("#liveStatusDiv").hide();
}
$("#liveStatusDiv").show();
houseStatus = 0;
var city_map = localStorage.getItem("init_city");
if(city_map){
@@ -1765,7 +1764,7 @@ $("#evaluation_btn").on("click", function () {
}
})
.then(function (response) {
if(response.data.data.success){
if(response.data.data && response.data.data.success){
var district = response.data.data
$("#input_city").val(district.city)
$("input[name='address']").val(district.address)
@@ -1776,7 +1775,7 @@ $("#evaluation_btn").on("click", function () {
}else{
// $("#nextBtn").attr("disabled", false)
console.log("error");
$.toast(result.message)
$.toast(response.data.message)
}
})
.catch(function (error) {
@@ -1830,20 +1829,13 @@ function addEvaluation(){
houseStatus:1}
}
axios.get("/rest/index/checkEvalPrice", {
params: {
cityDisplay: $("#input_city").val(),
region:$("input[name=region]").val(),
district:$("#input_address").val(),
address:$("input[name=address]").val(),
estateType:$("#input_houseType").val(),
loudongName:$("#input_building").val(),
floorName:$("#input_floor").val(),
area:$("#input_area").val()
}
params: data
})
.then(function (response) {
if(response.data.data!=null && response.data.data.success){
var id = response.data.data.id;
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
plus.webview.getWebviewById('views/user/userInfo.html').reload();
clicked('/views/evaluate/evaluateReport.html',true,false,{},{hid:id})
}else{
$.toast(response.data.message);
+96 -94
View File
@@ -483,22 +483,101 @@ $.config = {router: false}
<script type="text/javascript" src="../../js/log/log_stat.js" ></script>
<script type="text/javascript" src="../component/cityChooseComponent.js"></script>
<script>
var city = "上海1";
var myFocus = new Vue({
el:"#myFocus"
})
var cityIncreaseRanking = new Vue({
el:"#cityIncreaseRanking"
})
var cityPotentialRanking = new Vue({
el:"#cityPotentialRanking"
})
var cityChoose = new Vue({
el:"#cityChoose",
data:{
city:city
}
})
document.addEventListener('plusready', onPlusReady, false);
function onPlusReady(){
var city = "";
plus.geolocation.getCurrentPosition(function(p){
//province = p.address.province;
city = p.address.city;
//region = p.address.district;
}, function(e){
},
{
provider:'baidu',
enableHighAccuracy:true,
coordsType:'bd09ll'
}
);
alert(city)
var myFocus = new Vue({
el:"#myFocus"
})
var cityIncreaseRanking = new Vue({
el:"#cityIncreaseRanking"
})
var cityPotentialRanking = new Vue({
el:"#cityPotentialRanking"
})
var cityChoose = new Vue({
el:"#cityChoose",
data:{
city:city
}
})
/* 关注&已关注切换 */
$(".collection01").on("click", function () {
$(this).hide();
$(this).next().show();
$.toast("已关注");
});
$(".collection02").on("click", function () {
$(this).hide();
$(this).prev().show();
$.toast("取消关注");
});
/* button状态切换 */
$(".content-block .button").on("click", function () {
$(this).parent().children().removeClass("active");
$(this).addClass("active");
});
/* 图表切换 */
$("#tabAvg").on("click", function () {
$("#tabChart1").css("z-index","1");
$("#tabChart2").css("z-index","-1");
});
$("#tabRent").on("click", function () {
$("#tabChart2").css("z-index","1");
$("#tabChart1").css("z-index","-1");
});
/* 弹出城市选择页面 */
$(document).on("click",".open-about01", function () {
markFocus();
$.popup(".popup-about01");
});
/* 定位城市 */
$("body").on("click", ".letter a", function () {
var s = $(this).html();
$(".popup-about01 .content").scrollTop(0);
$(".popup-about01 .content").scrollTop($("#" + s + "1").offset().top - 106);
});
$("#tabCity1 .content-block01").scroll(function () {
$("#tabCity1 .content-block01 .letter").css("position","absolute");
$("#tabCity1 .content-block01 .letter").css("top", 85 - $("#cityContainer").position().top);
});
/* 获取城市 */
$(".popup-about01 .cityGPS").on("click", function () {
$("#input_city").val($(this).find("p").text());
$(".cityChoice a").text($(this).find("p").text());
$(".popup-about01 p").removeClass("active");
});
$(".popup-about01 p").on("click", function () {
$("#input_city").val($(this).text());
$(".cityChoice a").text($(this).text());
$(".popup-about01 p").removeClass("active");
$(this).addClass("active");
var city = $(this).text()
addFocus(city)
});
/* 点击热门小区跳转到小区详情页 */
$(".cardNearby").on("click", function(){
window.location.href = "01_index04_districtDetail.html";
});
}
//加载首页全国数据
$(function() {
var date=new Date;
@@ -568,38 +647,8 @@ $(document).ready(function () {
}*/
});
/* 关注&已关注切换 */
$(".collection01").on("click", function () {
$(this).hide();
$(this).next().show();
$.toast("已关注");
});
$(".collection02").on("click", function () {
$(this).hide();
$(this).prev().show();
$.toast("取消关注");
});
/* button状态切换 */
$(".content-block .button").on("click", function () {
$(this).parent().children().removeClass("active");
$(this).addClass("active");
});
/* 图表切换 */
$("#tabAvg").on("click", function () {
$("#tabChart1").css("z-index","1");
$("#tabChart2").css("z-index","-1");
});
$("#tabRent").on("click", function () {
$("#tabChart2").css("z-index","1");
$("#tabChart1").css("z-index","-1");
});
/* 点击热门小区跳转到小区详情页 */
$(".cardNearby").on("click", function(){
window.location.href = "01_index04_districtDetail.html";
});
/* 获取热门小区名称字数,截取热门小区名称前5字,并添加... */
$(document).ready(function () {
@@ -614,36 +663,8 @@ $(document).ready(function () {
});
});
/* 弹出城市选择页面 */
$(document).on("click",".open-about01", function () {
markFocus();
$.popup(".popup-about01");
});
/* 定位城市 */
$("body").on("click", ".letter a", function () {
var s = $(this).html();
$(".popup-about01 .content").scrollTop(0);
$(".popup-about01 .content").scrollTop($("#" + s + "1").offset().top - 106);
});
$("#tabCity1 .content-block01").scroll(function () {
$("#tabCity1 .content-block01 .letter").css("position","absolute");
$("#tabCity1 .content-block01 .letter").css("top", 85 - $("#cityContainer").position().top);
});
/* 获取城市 */
$(".popup-about01 .cityGPS").on("click", function () {
$("#input_city").val($(this).find("p").text());
$(".cityChoice a").text($(this).find("p").text());
$(".popup-about01 p").removeClass("active");
});
$(".popup-about01 p").on("click", function () {
$("#input_city").val($(this).text());
$(".cityChoice a").text($(this).text());
$(".popup-about01 p").removeClass("active");
$(this).addClass("active");
var city = $(this).text()
addFocus(city)
});
//$(document).on("click",".open-about01", function () {
// markFocus();
@@ -690,25 +711,6 @@ function addFocus(city){
})
}
//重新加载我的关注
function reloadMyFocus(){
if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){
$("#myFocusFirstPage").hide()
$("#myFocus").hide();
}else{
axios.get("/rest/quotations/userCollectCityInfo").then(function(response){
if(response.data.data.length==0){
alert("aa");
$("#myFocusFirstPage").hide();
$("#myFocus").hide();
}else{
myFocusDatas.myFocusList = response.data.data;
}
}).catch(function(error){
console.log(error)
})
}
}
</script>
<script type="text/javascript" src="../../js/echarts.js" charset="utf-8"></script>
@@ -266,9 +266,7 @@ $(document).ready(function () {
});
function openaddWindow(){
clicked('/views/house/add.html',true,false,{},{},function(){
window.location.reload();
plus.webview.getWebviewById('views/user/userInfo.html').reload();
clicked('/views/house/add.html',true,false,{},{type:1},function(){
})
}