Skip to content

T
techbook
Commit 3938e400 authored by zhangyanni's avatar zhangyanni
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 2947ba52 cfd16354
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
src/views/index/pages/index.vue
View file @ 3938e400
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
<span style="color: #9197B4" v-if="item.activityState == 5&&item.isJoin==2">{{$t('activityInfo.activityEnd')}}</span> <span style="color: #9197B4" v-if="item.activityState == 5&&item.isJoin==2">{{$t('activityInfo.activityEnd')}}</span>
</span> </span>
<span style="margin-left: 15px;" v-if="item.hasLive == 1" @click="openeventlive(item)"> <span style="margin-left: 15px;" v-if="item.hasLive == 1" @click="openeventlive(item)">
<el-button type="primary" round size="mini" style="width: 110px;font-size: 14px;"> <el-button :type="item.baseLive.liveState == 1?'warning':'primary'" round size="mini" style="width: 110px;font-size: 14px;">
<i class="iconfont icon-zhibo" style="font-size: 14px;"></i> <i class="iconfont icon-zhibo" style="font-size: 14px;"></i>
{{item.baseLive.liveState == 0?$t('activityInfo.liveTitle'):item.baseLive.liveState == 1?$t('activityInfo.living'):$t('activityInfo.liveTitle')}} {{item.baseLive.liveState == 0?$t('activityInfo.liveTitle'):item.baseLive.liveState == 1?$t('activityInfo.living'):$t('activityInfo.liveTitle')}}
</el-button> </el-button>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment