From e1ac04b42be89ca26ff5f94c17c4e2eebe52a0a2 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 03 一月 2023 09:52:39 +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 |   35 ++++++++++++++++++++---------------
 1 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/views/operate/fivepack/threepack/components/content.vue b/src/views/operate/fivepack/threepack/components/content.vue
index 7275754..9e7e0b5 100644
--- a/src/views/operate/fivepack/threepack/components/content.vue
+++ b/src/views/operate/fivepack/threepack/components/content.vue
@@ -37,6 +37,7 @@
           v-if="isStorePage()"
           type="primary"
           icon="el-icon-plus"
+          class="button-addition"
           @click="handleView(null, 'create')"
           >娣诲姞</el-button
         >
@@ -47,9 +48,6 @@
       <el-table
         ref="multipleTable"
         :header-cell-style="{
-          background: '#06122c',
-          'font-size': '12px',
-          color: '#4b9bb7',
           'font-weight': '650',
           'line-height': '45px',
         }"
@@ -77,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">
@@ -143,12 +146,12 @@
       <!-- 鏌ョ湅淇敼椤甸潰 -->
       <el-dialog
         :visible.sync="dialogScore"
-        width="45%"
+        width="60%"
         :destroy-on-close="true"
         title="鏌ョ湅绉垎"
-        :before-close="handleClose"
+        :before-close="handleCloseScoreView"
       >
-        <scoreView :storeInfo="storeInfo" @closeDialog="closeDialog" />
+        <scoreView v-if="dialogScore" :storeInfo="storeInfoScoreView" />
       </el-dialog>
       <!-- 鍒嗛〉 -->
       <div class="pagination">
@@ -200,6 +203,7 @@
       userInfo: null,
       dialogType: "",
       storeInfo: null,
+      storeInfoScoreView: {},
     };
   },
 
@@ -209,6 +213,7 @@
       getStoreInfoList({ keyword: this.storeCode, status })
         .then(({ list, pageSize, totalPage }) => {
           this.tableData = list;
+          console.log(list);
           this.pageSize = pageSize;
           this.totalNum = totalPage;
         })
@@ -227,8 +232,8 @@
       this.dialogType = type;
     },
     handleScoreView(row) {
+      this.storeInfoScoreView = row;
       this.dialogScore = true;
-      this.storeInfo = row;
     },
 
     handleDelete(id) {
@@ -239,15 +244,15 @@
         })
         .catch((err) => this.$message({ type: "error", message: err }));
     },
-
+    handleCloseScoreView() {
+      this.dialogScore = false;
+    },
     handleClose() {
       this.dialogUpdate = false;
-      this.dialogScore = false;
     },
 
     closeDialog() {
       this.dialogUpdate = false;
-      this.dialogScore = false;
       this.search();
     },
 
@@ -309,7 +314,7 @@
   }
 
   main {
-    background-color: #09152f;
+    // background-color: #09152f;
     margin-top: 20px;
     padding-bottom: 50px;
 
@@ -335,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