合并分支
This commit is contained in:
parent
af50b80479
commit
c488a21a68
@ -52,13 +52,8 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="forward-list-item-top">
|
<div class="forward-list-item-top">
|
||||||
<div class="user-img">
|
<div class="user-img">
|
||||||
<<<<<<< HEAD
|
|
||||||
<img v-if="!rankingTableData[1]" src="@/assets/common/head_default.jpg" alt="">
|
|
||||||
<img v-else-if="rankingTableData[1].avatar == ''" src="@/assets/common/head_default.jpg" alt="">
|
|
||||||
=======
|
|
||||||
<img v-if="!rankingTableData[1]" src="@/assets/common/head_default.jpg" alt="">
|
<img v-if="!rankingTableData[1]" src="@/assets/common/head_default.jpg" alt="">
|
||||||
<img v-else-if="rankingTableData[1].avatar == ''" src="@/assets/common/head_default.jpg" alt="">
|
<img v-else-if="rankingTableData[1].avatar == ''" src="@/assets/common/head_default.jpg" alt="">
|
||||||
>>>>>>> 6faa71cba5db7bfcaa76e90ff4791754b838d8b9
|
|
||||||
<img v-else :src="rankingTableData[1].avatar" alt="">
|
<img v-else :src="rankingTableData[1].avatar" alt="">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -77,13 +72,8 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="forward-list-item-top">
|
<div class="forward-list-item-top">
|
||||||
<div class="user-img">
|
<div class="user-img">
|
||||||
<<<<<<< HEAD
|
|
||||||
<img v-if="!rankingTableData[0]" src="@/assets/common/head_default.jpg" alt="">
|
|
||||||
<img v-else-if="rankingTableData[0].avatar == ''" src="@/assets/common/head_default.jpg" alt="">
|
|
||||||
=======
|
|
||||||
<img v-if="!rankingTableData[0]" src="@/assets/common/head_default.jpg" alt="">
|
<img v-if="!rankingTableData[0]" src="@/assets/common/head_default.jpg" alt="">
|
||||||
<img v-else-if="rankingTableData[0].avatar == ''" src="@/assets/common/head_default.jpg" alt="">
|
<img v-else-if="rankingTableData[0].avatar == ''" src="@/assets/common/head_default.jpg" alt="">
|
||||||
>>>>>>> 6faa71cba5db7bfcaa76e90ff4791754b838d8b9
|
|
||||||
<img v-else :src="rankingTableData[0].avatar" alt="">
|
<img v-else :src="rankingTableData[0].avatar" alt="">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -98,13 +88,8 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="forward-list-item-top">
|
<div class="forward-list-item-top">
|
||||||
<div class="user-img">
|
<div class="user-img">
|
||||||
<<<<<<< HEAD
|
|
||||||
<img v-if="!rankingTableData[2]" src="@/assets/common/head_default.jpg" alt="">
|
|
||||||
<img v-else-if="rankingTableData[2].avatar == ''" src="@/assets/common/head_default.jpg" alt="">
|
|
||||||
=======
|
|
||||||
<img v-if="!rankingTableData[2]" src="@/assets/common/head_default.jpg" alt="">
|
<img v-if="!rankingTableData[2]" src="@/assets/common/head_default.jpg" alt="">
|
||||||
<img v-else-if="rankingTableData[2].avatar == ''" src="@/assets/common/head_default.jpg" alt="">
|
<img v-else-if="rankingTableData[2].avatar == ''" src="@/assets/common/head_default.jpg" alt="">
|
||||||
>>>>>>> 6faa71cba5db7bfcaa76e90ff4791754b838d8b9
|
|
||||||
<img v-else :src="rankingTableData[2].avatar" alt="">
|
<img v-else :src="rankingTableData[2].avatar" alt="">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user