From 89244932c6185cd39e9a9f8aa8bf3acf99329335 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期日, 11 四月 2021 15:00:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

---
 web_src/src/components/PushVideoList.vue |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/web_src/src/components/PushVideoList.vue b/web_src/src/components/PushVideoList.vue
index 0955cc9..1199a39 100644
--- a/web_src/src/components/PushVideoList.vue
+++ b/web_src/src/components/PushVideoList.vue
@@ -15,8 +15,6 @@
 					</el-table-column>
 					<el-table-column prop="stream" label="娴両D" width="240" align="center">
 					</el-table-column>
-					<el-table-column prop="totalReaderCount" label="鍦ㄧ嚎浜烘暟" width="240" align="center">
-					</el-table-column>
 					<el-table-column prop="gbId" label="鍥芥爣缂栫爜" width="150" align="center">
 					</el-table-column>
 					<el-table-column label="寮�濮嬫椂闂�" align="center" >
@@ -28,7 +26,7 @@
 					</el-table-column>
 					<el-table-column label="姝e湪鎺ㄦ祦" align="center" >
 						<template slot-scope="scope">
-							{{!!scope.row.status?'鏄�':'鍚�'}}
+							{{(scope.row.status == false && scope.row.gbId == null) || scope.row.status ?'鏄�':'鍚�'}}
 						</template>
 					</el-table-column>
 					

--
Gitblit v1.8.0