From 33dcba80ee50759a7ca06905232f69c8ddc8627c Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期四, 29 十二月 2022 17:59:09 +0800
Subject: [PATCH] Merge branch 'dev1.0' of ssh://42.193.1.25:29418/sccg_ui into dev1.0
---
src/views/operate/fivepack/threepack/components/content.vue | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/views/operate/fivepack/threepack/components/content.vue b/src/views/operate/fivepack/threepack/components/content.vue
index a3ea27b..9e7e0b5 100644
--- a/src/views/operate/fivepack/threepack/components/content.vue
+++ b/src/views/operate/fivepack/threepack/components/content.vue
@@ -48,9 +48,6 @@
<el-table
ref="multipleTable"
:header-cell-style="{
- background: '#06122c',
- 'font-size': '12px',
- color: '#4b9bb7',
'font-weight': '650',
'line-height': '45px',
}"
@@ -78,6 +75,11 @@
<el-table-column prop="videoPoint" label="鍏宠仈鎽勫儚鏈�" min-width="10">
<template v-if="scope.row.videoId" slot-scope="scope">
<span>{{ scope.row.videoPoint.name }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="status" label="鐘舵��" min-width="10">
+ <template slot-scope="scope">
+ <span>{{ scope.row.status==1?'缁忚惀':'鍊掗棴' }}</span>
</template>
</el-table-column>
<el-table-column prop="operation" label="鎿嶄綔" min-width="20">
@@ -211,6 +213,7 @@
getStoreInfoList({ keyword: this.storeCode, status })
.then(({ list, pageSize, totalPage }) => {
this.tableData = list;
+ console.log(list);
this.pageSize = pageSize;
this.totalNum = totalPage;
})
@@ -311,7 +314,7 @@
}
main {
- background-color: #09152f;
+ // background-color: #09152f;
margin-top: 20px;
padding-bottom: 50px;
@@ -337,18 +340,18 @@
&::v-deep li,
&::v-deep .btn-prev,
&::v-deep .btn-next {
- background-color: #071f39;
+ // background-color: #071f39;
color: #4b9bb7;
}
}
}
.el-table {
- color: #4b9bb7;
- font-size: 10px;
+ // color: #4b9bb7;
+ // font-size: 10px;
&::v-deep .el-table__empty-block {
- background-color: #09152f;
+ // background-color: #09152f;
color: #4b9bb7;
}
--
Gitblit v1.8.0