flat:合并冲突
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<scroll-view scroll-y class="main-scroll">
|
||||
<view class="scrollmain">
|
||||
<view v-if="msgList.length" class="scrollmain">
|
||||
<view
|
||||
class="list-card press-button"
|
||||
v-for="(item, index) in msgList"
|
||||
@@ -37,6 +37,7 @@
|
||||
</view>
|
||||
<empty v-if="!msgList.length"></empty>
|
||||
</view>
|
||||
<empty v-else pdTop="200" content="暂无消息~"></empty>
|
||||
</scroll-view>
|
||||
</template>
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<scroll-view scroll-y class="main-scroll">
|
||||
<view class="scrollmain">
|
||||
<view v-if="unreadMsgList.length" class="scrollmain">
|
||||
<view
|
||||
class="list-card press-button"
|
||||
v-for="(item, index) in unreadMsgList"
|
||||
@@ -35,6 +35,7 @@
|
||||
</view>
|
||||
<empty v-if="!unreadMsgList.length"></empty>
|
||||
</view>
|
||||
<empty v-else pdTop="200" content="暂无消息~"></empty>
|
||||
</scroll-view>
|
||||
</template>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user