Browse Source

Merge branch 'bug_fix' into dev

feature
mk 1 year ago
parent
commit
747ad444cd
  1. 1
      src/views/activity/index.vue
  2. 4
      src/views/communityPublicity/detail.vue
  3. 2
      src/views/communityPublicity/index.vue
  4. 2
      src/views/home/index.vue

1
src/views/activity/index.vue

@ -92,7 +92,6 @@ export default {
return flag || false return flag || false
} }
}, },
}, },
watch: {}, watch: {},
} }

4
src/views/communityPublicity/detail.vue

@ -18,13 +18,13 @@
<van-button size="small" class="m-right7" round @click="communityPublicityGiveLike(info.id,'likes')"> <van-button size="small" class="m-right7" round @click="communityPublicityGiveLike(info.id,'likes')">
<template #icon> <template #icon>
<img src="@/assets/images/icons/link.png" alt="" class="img_20"> <img src="@/assets/images/icons/link.png" alt="" class="img_20">
</template> 点赞{{ info.likes }} </van-button> </template> 点赞{{ info.likes || 0 }} </van-button>
</div> </div>
<div class="flex1 flex flex-center1 flex-center2"> <div class="flex1 flex flex-center1 flex-center2">
<van-button size="small" class="m-right7" round @click="communityPublicityGiveLike(info.id,'transpond')"> <van-button size="small" class="m-right7" round @click="communityPublicityGiveLike(info.id,'transpond')">
<template #icon> <template #icon>
<img src="@/assets/images/icons/share.png" alt="" class="img_20"> <img src="@/assets/images/icons/share.png" alt="" class="img_20">
</template> 转发 {{ info.transpond }} </van-button> </template> 转发 {{ info.transpond || 0 }} </van-button>
</div> </div>
</div> </div>
<Share :show="showShare" @closeShare="showShare = false" /> <Share :show="showShare" @closeShare="showShare = false" />

2
src/views/communityPublicity/index.vue

@ -26,7 +26,7 @@
</div> </div>
<div class="flex flex-end flex-center gray m-top10 font-size13"> <div class="flex flex-end flex-center gray m-top10 font-size13">
<div class="flex flex-center"><img src="@/assets/images/icons/support.png" alt="" <div class="flex flex-center"><img src="@/assets/images/icons/support.png" alt=""
class="img_16 m-right7"><span>{{ item.likes }}</span> class="img_16 m-right7"><span>{{ item.likes || 0 }}</span>
</div> </div>
<div class="flex1 text-align-right">{{ item.releaseTime }}</div> <div class="flex1 text-align-right">{{ item.releaseTime }}</div>
</div> </div>

2
src/views/home/index.vue

@ -115,7 +115,7 @@
<div class="flex"> <div class="flex">
<div class="flex flex-center m-right26" v-if="item.tagId && tagList">{{filterTagId(item.tagId)}}</div> <div class="flex flex-center m-right26" v-if="item.tagId && tagList">{{filterTagId(item.tagId)}}</div>
<div class="flex flex-center" @click.stop="communityPublicityGiveLike(item.id)"><img src="@/assets/images/icons/support.png" <div class="flex flex-center" @click.stop="communityPublicityGiveLike(item.id)"><img src="@/assets/images/icons/support.png"
alt="" class="img_16 m-right7"><span>{{ item.likes }}</span> alt="" class="img_16 m-right7"><span>{{ item.likes || 0}}</span>
</div> </div>
</div> </div>
<div class="flex1 text-align-right">{{item.releaseTime}}</div> <div class="flex1 text-align-right">{{item.releaseTime}}</div>

Loading…
Cancel
Save