25d06fa3 by 李婷婷

Merge branch 'devmatch' into dev

2 parents e5a30a4b c17e4162
......@@ -165,21 +165,21 @@
<div v-if="matchData.chatQrcode||matchData.liveQrcode||matchData.qrcode">
<div class="father">
<div v-if="matchData.type!=1" class="son">
<div v-if="matchData.chatQrcode">
<div v-if="matchData.liveQrcode">
<div class="qrTitle2">{{ language == 0 ? '赛事直播' : "Live Qrcode" }}</div>
<el-image
:preview-src-list="[fillImgUrl(matchData.chatQrcode)]"
:src="fillImgUrl(matchData.chatQrcode)"
:preview-src-list="[fillImgUrl(matchData.liveQrcode)]"
:src="fillImgUrl(matchData.liveQrcode)"
fit="cover"
preview-teleported
style="width: 50px;height: 50px;margin-left: 10px"
/>
</div>
<div v-if="matchData.liveQrcode">
<div v-if="matchData.chatQrcode">
<div class="qrTitle2">{{ language == 0 ? '群二维码' : 'WhatsApp' }}</div>
<el-image
:preview-src-list="[fillImgUrl(matchData.liveQrcode) ]"
:src="fillImgUrl(matchData.liveQrcode)"
:preview-src-list="[fillImgUrl(matchData.chatQrcode) ]"
:src="fillImgUrl(matchData.chatQrcode)"
fit="cover"
preview-teleported
style="width: 50px;height: 50px;margin-left: 10px"
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!