Merge branch 'dev-fixTime-20210309' into 'dev-fixCircle-20210308'

修复时间显示

修复时间显示

See merge request !247

src/views/activitymanagement/activity-management.vue

@@ -55,9 +55,9 @@
         <el-table-column prop="createdName" label="创建者"  align="center"></el-table-column>
         <el-table-column prop="modifiedName" label="最后修改" align="center"></el-table-column>
         <el-table-column prop="createdTime" label="创建时间" min-width="100" align="center">
-          <template slot-scope="scope">
+          <!-- <template slot-scope="scope">
             <span>{{ scope.row.createdTime | liveDateFilter }}</span>
-          </template>
+          </template> -->
         </el-table-column>
         <el-table-column prop="status" label="状态"  align="center">
           <template slot-scope="scope">

src/views/shortvideo/video-manage.vue

@@ -70,9 +70,9 @@
         <el-table-column prop="circleName" label="圈子名称"  align="center"></el-table-column>
         <el-table-column prop="desc" label="视频描述" align="center" min-width="150" show-overflow-tooltip></el-table-column>
         <el-table-column prop="createdTime" label="上传时间" align="center">
-          <template slot-scope="scope">
+          <!-- <template slot-scope="scope">
             <span>{{ scope.row.createdTime | liveDateFilter }}</span>
-          </template>
+          </template> -->
         </el-table-column>
         <el-table-column prop="publisherName" label="发布者"  align="center"></el-table-column>
         <el-table-column prop="publisherAddress" label="所在省市" align="center" min-width="100" show-overflow-tooltip></el-table-column>
@@ -82,9 +82,9 @@
           </template>
         </el-table-column>
         <el-table-column prop="modifiedTime" label="更新时间" align="center">
-          <template slot-scope="scope">
+          <!-- <template slot-scope="scope">
             <span>{{ scope.row.modifiedTime | liveDateFilter }}</span>
-          </template>
+          </template> -->
         </el-table-column>
         <el-table-column prop="reviserName" label="最后修改人" align="center"></el-table-column>
         <el-table-column label="操作" min-width="200" align="center">

src/views/yqrange/yq-range.vue

@@ -37,9 +37,9 @@
       <el-table :data="tableData" class="item-table" style="width: 100%;margin-top: 10px;">
         <el-table-column prop="id" label="圈子ID" min-width="100" align="center"></el-table-column>
         <el-table-column prop="createdTime" label="创建时间" min-width="100" align="center">
-          <template slot-scope="scope">
+          <!-- <template slot-scope="scope">
             <span>{{ scope.row.createdTime | liveDateFilter }}</span>
-          </template>
+          </template> -->
         </el-table-column>
         <el-table-column prop="name" label="圈子名称" min-width="100" align="center"></el-table-column>
         <el-table-column prop="numberOfPeople" label="圈子人数" min-width="100" align="center"></el-table-column>