Merge branch 'fix/im-0526' into msb_test

feature/ad-0531-ch
ch 3 years ago
commit dca519590e

@ -2,7 +2,7 @@
* @Author: ch * @Author: ch
* @Date: 2022-05-04 17:48:12 * @Date: 2022-05-04 17:48:12
* @LastEditors: ch * @LastEditors: ch
* @LastEditTime: 2022-05-26 10:50:18 * @LastEditTime: 2022-05-26 21:10:34
* @Description: file content * @Description: file content
--> -->
@ -15,7 +15,6 @@
class="section__item flex" class="section__item flex"
v-for="item in msgData" v-for="item in msgData"
:key="item.id" :key="item.id"
@click="handleDetail(item)"
> >
<img <img
class="section__item-img" class="section__item-img"
@ -27,9 +26,14 @@
<span>{{ item.payload.title || `` }}</span> <span>{{ item.payload.title || `` }}</span>
<span class="section__item-content--time">{{item.createTimeStamp}}</span> <span class="section__item-content--time">{{item.createTimeStamp}}</span>
</div> </div>
<div class="section__item-content--txt"> <div class="section__item-content--txt" v-if="item.payload.customType === 'orderAutoDelivery'">
{{ item.payload.content || `` }} <template v-for="i in item.payload.virtualProductContentList" @click="openLink(i)">
<a v-if="i.shipType === 1" :key="i.shipContent" :href="i.shipContent" target="_blank">[]</a>
<span v-else :key="i.shipContent" >{{i.shipContent}}</span>
</template>
</div> </div>
<div class="section__item-content--txt" v-else
@click="handleDetail(item)" >{{ item.payload.content }}</div>
</div> </div>
</div> </div>
<UiEmpty <UiEmpty
@ -105,7 +109,6 @@ export default {
&__item { &__item {
margin-bottom: 20px; margin-bottom: 20px;
cursor: pointer;
&-img { &-img {
width: 50px; width: 50px;
@ -115,8 +118,9 @@ export default {
&-content { &-content {
width: 840px; width: 840px;
cursor: pointer;
&--title { &--title {
margin-top: 8px; margin: 8px 0;
font-size: 16px; font-size: 16px;
font-family: Microsoft YaHei-Regular, Microsoft YaHei; font-family: Microsoft YaHei-Regular, Microsoft YaHei;
font-weight: 400; font-weight: 400;
@ -136,6 +140,9 @@ export default {
font-family: Microsoft YaHei-Regular, Microsoft YaHei; font-family: Microsoft YaHei-Regular, Microsoft YaHei;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
a{
color: #FF875B;
}
} }
} }
} }

Loading…
Cancel
Save