Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1
This commit is contained in:
@@ -50,7 +50,8 @@ function selectNewsCollectList(){
|
||||
mc_pageSize = response.data.data.limit;
|
||||
mc_totalPages = response.data.data.totalPages;
|
||||
mc_totalRecords = response.data.data.totalRecords;
|
||||
tab.mc_num = mc_totalRecords;
|
||||
// tab.mc_num = mc_totalRecords;
|
||||
$("#mc_num").html("收藏("+mc_totalRecords+")")
|
||||
mcAddItems(mc_itemsPerLoad, mc_lastIndex, dataObj);
|
||||
}).catch(function (error) {
|
||||
console.log(error);
|
||||
|
||||
@@ -20,7 +20,8 @@ function addEstate(number, lastIndex) {
|
||||
return;
|
||||
}
|
||||
mf_totalCount = data.totalCount;
|
||||
tab.mf_num = mf_totalCount;
|
||||
// tab.mf_num = mf_totalCount;
|
||||
$("#mf_num").html("关注("+mf_totalCount+")")
|
||||
// 生成新条目的HTML
|
||||
var html = '';
|
||||
$.each(data['results'], function(i){
|
||||
|
||||
@@ -30,8 +30,8 @@ function selectHouseInfoList(){
|
||||
var houseInfoTotalMap = resultsMap.houseInfoTotalMap;
|
||||
//调整统计num的顺序
|
||||
mh_totalRecords = resultsMap.houseInfoPageList.totalRecords;
|
||||
tab.mh_num = mh_totalRecords;
|
||||
|
||||
// tab.mh_num = mh_totalRecords;
|
||||
$("#mh_num").html("房产("+mh_totalRecords+")")
|
||||
if(resultList != null && resultList.length == 0){
|
||||
// 删除加载提示符
|
||||
$('#loadTip1').hide();
|
||||
|
||||
@@ -23,7 +23,8 @@ function addMessage(loadNum,startNum){
|
||||
return;
|
||||
}
|
||||
mm_totalCount = response.data.data.totalCount;
|
||||
tab.mm_num = mm_totalCount;
|
||||
// tab.mm_num = mm_totalCount;
|
||||
$("#mm_num").html("消息("+mm_totalCount+")")
|
||||
var html="";
|
||||
$.each(messageList,function(){
|
||||
// var clickStr = "";
|
||||
|
||||
@@ -38,15 +38,13 @@
|
||||
</div>
|
||||
</a>
|
||||
</li>
|
||||
<li v-show="feedBack">
|
||||
<a onclick="clicked('/views/user/feedBack.html',true);" class="item-link item-content">
|
||||
<div class="item-inner">
|
||||
<div class="item-title-row">
|
||||
<div class="item-title">意见反馈</div>
|
||||
</div>
|
||||
<a onclick="clicked('/views/user/feedBack.html',true);" class="item-link item-content">
|
||||
<div class="item-inner">
|
||||
<div class="item-title-row">
|
||||
<div class="item-title">意见反馈</div>
|
||||
</div>
|
||||
</a>
|
||||
</li>
|
||||
</div>
|
||||
</a>
|
||||
<li>
|
||||
<a onclick="clicked('about.html',true);" class="item-link item-content">
|
||||
<div class="item-inner">
|
||||
|
||||
@@ -120,9 +120,9 @@
|
||||
<img src="../../images/headPortrait.png" id="user_headImg" onclick="gotoUpdatePass()">
|
||||
<p id="user_mobile"><br><span class="tag"><!--<small>土豪</small>--></span></p>
|
||||
</div>
|
||||
<div class="topic">
|
||||
<div class="topic" id="toolList" v-bind:style="{display:haveTools}">
|
||||
<div class="topicContent homeBox" style="padding-left:0;padding-right:0;">
|
||||
<div class="topicContent_center home homeWin" id="toolList">
|
||||
<div class="topicContent_center home homeWin" >
|
||||
<!--<div>
|
||||
<i class="icon icon-personal01"></i>
|
||||
<span>公积金查询</span>
|
||||
@@ -511,7 +511,8 @@ function loadToolList (){
|
||||
el:"#toolList",
|
||||
data:{
|
||||
merchantTools:[],
|
||||
userId:""
|
||||
userId:"",
|
||||
haveTools:"none"
|
||||
},
|
||||
methods:{
|
||||
goto:function(url,userId,id){
|
||||
@@ -536,6 +537,9 @@ function loadToolList (){
|
||||
axios.get(BASE_PATH + "/rest/usertool/merchantToolList",{params:{position:0}}).then(function(response){
|
||||
toolList.merchantTools = response.data.data.list;
|
||||
toolList.userId = response.data.data.uid;
|
||||
if(response.data.data.list.length>0){
|
||||
toolList.haveTools = "block";
|
||||
}
|
||||
/* 获取homeWin div个数并计算homeWin宽度 */
|
||||
var original = 0;//公积金查询等个数
|
||||
$(".homeWin").css("width",(90*(original+response.data.data.list.length))+"px");
|
||||
|
||||
Reference in New Issue
Block a user