提交 f114176a 编写于 作者: !阳仔's avatar !阳仔

Merge branch 'yjlintp' into 'master'

resolve some problem

See merge request csdn/csdn-datav!16
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<ForceMap v-else :mapStyle="mapStyle" :optionList="optionList" :cityObj="cityObj" @setrankList="setrankList" title="铁粉数"/> <ForceMap v-else :mapStyle="mapStyle" :optionList="optionList" :cityObj="cityObj" @setrankList="setrankList" title="铁粉数"/>
</div> </div>
<div class="user-rank-list" ref="user-rank-list"> <div class="user-rank-list" ref="user-rank-list">
<RankList title="铁粉榜" @clear="clear" :cityObj="cityObj" :dropdownList="dropdownList" @dropdownFn="dropdownFn" listTitle="铁粉数" :city="city" :rankData="rankData" @rankFans="rankFans"/> <RankList title="铁粉榜" @clear="clear" @clearRank="clearRank" :cityObj="cityObj" :dropdownList="dropdownList" @dropdownFn="dropdownFn" listTitle="铁粉数" :city="city" :rankData="rankData" @rankFans="rankFans"/>
</div> </div>
</div> </div>
</template> </template>
...@@ -63,6 +63,11 @@ export default { ...@@ -63,6 +63,11 @@ export default {
this.rankData = this.rankList this.rankData = this.rankList
this.city = '全国' this.city = '全国'
}, },
clearRank() {
this.cityObj = null
this.optionList = this.dataList
console.log('fans clear')
},
rankFans(item) { rankFans(item) {
getFanDistribution(item.username).then(re=>{ getFanDistribution(item.username).then(re=>{
if (re.status === 200){ if (re.status === 200){
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="rank-list-box"> <div class="rank-list-box">
<div class="force-slide" :style="!slideopen?'right:-10px':''" > <div class="force-slide" :style="!slideopen?'right:-10px':''" >
<!-- <div class="force-slide" v-if="userItem || ( title !== '铁粉榜' && city !=='全国')" @click="clear"> --> <!-- <div class="force-slide" v-if="userItem || ( title !== '铁粉榜' && city !=='全国')" @click="clear"> -->
<img src="@/assets/img/go-back.png" style="margin-bottom:16px;" v-if="userItem || ( title !== '铁粉榜' && city !=='全国')" @click="clear" alt=""> <img src="@/assets/img/go-back.png" style="margin-bottom:16px;" v-if="slideopen &&(userItem || (city !=='全国'))" @click="clear" alt="">
<div class="force-slide-open" @click="slideopen = !slideopen"> <div class="force-slide-open" @click="slideopen = !slideopen">
<img src="@/assets/img/rank-open.png" alt=""> <img src="@/assets/img/rank-open.png" alt="">
<span>{{slideopen?'折叠榜单':'展开榜单'}}</span> <span>{{slideopen?'折叠榜单':'展开榜单'}}</span>
...@@ -63,8 +63,12 @@ export default { ...@@ -63,8 +63,12 @@ export default {
}, },
clear () { clear () {
if(!userItem){
this.$emit('clear') this.$emit('clear')
this.userItem = null } else {
this.userItem = null;
this.$emit('clearRank');
}
}, },
rankAdd(item){ rankAdd(item){
if (this.title == '用户原力月榜') { if (this.title == '用户原力月榜') {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册