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

This commit is contained in:
gongjin
2018-04-16 17:50:41 +08:00
5 changed files with 10 additions and 11 deletions
+1 -1
View File
@@ -68,7 +68,7 @@
<div class="item-after">
<a class="button theme collection collection01" onclick="doAddCollect()">关注</a>
<a class="button collection collection02 dn" onclick="removeCollect()">取消关注</a>
<a class="button theme collection collection02 dn" onclick="removeCollect()">取消</a>
</div>
</div>
<div class="item-subtitle">
+1 -2
View File
@@ -32,14 +32,13 @@
<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="content" id="cityInfo">
<div class="card cardPrice cardPrice01 cardCity01" v-bind:hrefid="myCityMap.hrefId">
<div class="card-header">
<label>{{myCityMap.city}}</label>
<a v-if="collecd" class="button collection collection02 " @click="collectCity(myCityMap.city)">取消关注</a>
<a v-if="collecd" class="button theme collection collection02 " @click="collectCity(myCityMap.city)">取消</a>
<a v-else class="button theme collection collection01" @click="collectCity(myCityMap.city)">关注</a>
</div>
+2 -2
View File
@@ -172,7 +172,7 @@
<div class="card cardPrice cardPrice01 cardCity01" v-bind:hrefid="myCityMap.hrefId">
<div class="card-header">
<label>{{myCityMap.city}}</label>
<a v-if="collecd" class="button theme collection collection02 " @click="collectCity(myCityMap.city)">取消关注</a>
<a v-if="collecd" class="button theme collection collection02 " @click="collectCity(myCityMap.city)">取消</a>
<a v-else class="button theme collection collection01" @click="collectCity(myCityMap.city)">关注</a>
</div>
@@ -243,7 +243,7 @@
<div class="card cardNearby" v-for="nearDist in nears" @click="showDistrictDetail(nearDist.city, nearDist.region, nearDist.name)">
<div class="card-header">{{nearDist.sname}}</div>
<div class="card-content">
<div class="card-content-inner" v-if="nearDist.avgPrice">{{nearDist.avgPrice}}元/㎡</div>
<div class="card-content-inner" v-if="nearDist.avgPrice > 0">{{nearDist.avgPrice}}元/㎡</div>
<div class="card-content-inner" v-else>暂无</div>
</div>
</div>
+1 -1
View File
@@ -62,7 +62,7 @@
<div class="item-after">
<a class="button theme collection collection01" onclick="doAddCollect()">关注</a>
<a class="button collection collection02 dn" onclick="removeCollect()">取消关注</a>
<a class="button theme collection collection02 dn" onclick="removeCollect()">取消</a>
</div>
</div>
<div class="item-subtitle">
+5 -5
View File
@@ -1571,7 +1571,7 @@ $("#region").click(function(e){
})
})*/
$("body").delegate(".icon-light-red", "click", function () {
$("body").delegate(".vote01 .icon-light-grey", "click", function () {
var id = $(this).attr("data-val");
var voteFavorCount = parseInt($("#voteFavorCount_"+id).text().split("  ")[0].replace("票",""))+1;
var voteNoFavorCount = parseInt($("#voteNoFavorCount_"+id).text().split("  ")[0].replace("票",""));
@@ -1584,7 +1584,7 @@ $("body").delegate(".icon-light-red", "click", function () {
doVote(id,0);
});
$("body").delegate(".icon-light-grey", "click", function () {
$("body").delegate(".vote02 .icon-light-grey", "click", function () {
var id = $(this).attr("data-val");
var voteFavorCount = parseInt($("#voteFavorCount_"+id).text().split("  ")[0].replace("票",""));
var voteNoFavorCount = parseInt($("#voteNoFavorCount_"+id).text().split("  ")[0].replace("票",""))+1;
@@ -1846,7 +1846,7 @@ function addItems(number, lastIndex) {
html += '<div class="card cardInfo cardInfo03"><div class="card-header">'+dataObj[i].title+
'</div><div class="card-content"><div class="card-content-inner row"><div class="vote01 col-50">'+
'<i class="icon icon-light-red" data-val="'+dataObj[i].id+'"></i><span>'+dataObj[i].voteFavorText+'</span>'+
'<i class="icon icon-light-grey" data-val="'+dataObj[i].id+'"></i><span>'+dataObj[i].voteFavorText+'</span>'+
'<font style="width:'+voteFavorCountRate+'%;" id="voteFavorCountRate_'+dataObj[i].id+'"></font><label id="voteFavorCount_'+dataObj[i].id+'">'+voteFavorCount+'票&nbsp;&nbsp;'+voteFavorCountRate+'%</label></div>'+
'<div class="vote02 col-50"><i class="icon icon-light-grey" data-val="'+dataObj[i].id+'"></i><span>'+dataObj[i].voteNoFavorText+'</span>'+
'<font style="width:'+voteNoFavorCountRate+'%;" id="voteNoFavorCountRate'+dataObj[i].id+'"></font><label id="voteNoFavorCount_'+dataObj[i].id+'">'+voteNoFavorCount+'票&nbsp;&nbsp;'+voteNoFavorCountRate+'%</label></div><em>V.S</em></div></div></div>';
@@ -2630,11 +2630,11 @@ function openDistWindow(city, region, name){
});*/
/* 投票 */
$(".vote01 .icon-light-grey").on("click", function(){
$("body").delegate(".vote01 .icon-light-grey", "click", function () {
$(".vote01 .icon-light-grey").addClass("icon-light-red");
$(".vote02 .icon-light-grey").removeClass("icon-light-blue");
});
$(".vote02 .icon-light-grey").on("click", function(){
$("body").delegate(".vote02 .icon-light-grey", "click", function () {
$(".vote01 .icon-light-grey").removeClass("icon-light-red");
$(".vote02 .icon-light-grey").addClass("icon-light-blue");
});