|
|
@@ -61,8 +61,8 @@
|
|
|
<el-col class="lunboList" :span="24" v-for="(item, index) in lunboList" :key="index">
|
|
|
<p>
|
|
|
<span>[{{ item.date }}]</span>
|
|
|
- <span>{{ item.type == '0' ? '欢迎' : '祝贺' }}</span>
|
|
|
- <span v-if="item.type == '0'">{{ item.login_name }}</span>
|
|
|
+ <span>{{ item.type == '0' ? '欢迎' : item.type == '1' ? '祝贺' : '' }}</span>
|
|
|
+ <span v-if="item.type == '0' || item.type == '2'">{{ item.login_name }}</span>
|
|
|
<span v-if="item.type == '1'">{{ item.market_username }}</span>
|
|
|
<span v-if="item.type == '1'">和</span>
|
|
|
<span v-if="item.type == '1'">{{ item.username }}</span>
|
|
|
@@ -80,16 +80,17 @@
|
|
|
: '暂无'
|
|
|
}}</span>
|
|
|
<span v-if="item.type == '0'">位临现场</span>
|
|
|
+ <span v-if="item.type == '2'">{{ item.remark }}</span>
|
|
|
</p>
|
|
|
</el-col>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div>
|
|
|
<el-row type="flex" :gutter="10" style="padding-top:10px;height:30px;line-height:30px">
|
|
|
- <el-col :span="20">
|
|
|
+ <el-col :span="20" style="padding-left:15px;padding-right:0">
|
|
|
<el-input v-model="text" size="mini"></el-input>
|
|
|
</el-col>
|
|
|
- <el-col :span="4">
|
|
|
+ <el-col :span="4" style="text-align:center;padding-left:0;padding-right:0">
|
|
|
<el-button @click="send" size="mini" round style="background: #ff8500;color: #fff;">发送</el-button>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -953,7 +954,7 @@ export default {
|
|
|
margin: 0 10px 10px 10px;
|
|
|
border: 2px solid #ccc;
|
|
|
width: 97%;
|
|
|
- // background-color: #000;
|
|
|
+ background-color: #000;
|
|
|
}
|
|
|
.livemain .livevideo .right {
|
|
|
height: 460px;
|
