From 310495254e6ccdfef5851b2ad8ab2193a9db32f6 Mon Sep 17 00:00:00 2001
From: zhujingzhou <zhangkim3062@gmail.com>
Date: Tue, 8 Jul 2025 19:30:18 +0700
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E5=8D=A1=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=8A=A8=E6=BC=AB/=E6=BC=AB=E7=94=BB/?=
 =?UTF-8?q?=E5=B0=8F=E8=AF=B4=E8=A7=86=E9=A2=91=E5=85=8D=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vipcard/components/AddOrEdit.vue          | 37 ++++++++-----------
 src/views/commodity/vipcard/index.vue         | 36 ++++++++++++------
 2 files changed, 40 insertions(+), 33 deletions(-)

diff --git a/src/views/commodity/vipcard/components/AddOrEdit.vue b/src/views/commodity/vipcard/components/AddOrEdit.vue
index 55489e4..dae115f 100644
--- a/src/views/commodity/vipcard/components/AddOrEdit.vue
+++ b/src/views/commodity/vipcard/components/AddOrEdit.vue
@@ -54,7 +54,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-      
+
       </el-row>
       <el-row :gutter="24">
         <el-col :xs="12" :sm="12" :md="12" :lg="12" :xl="12">
@@ -69,12 +69,12 @@
         </el-col>
       </el-row>
       <!-- <el-row :gutter="24">
-   
+
       <el-col :xs="12" :sm="12" :md="12" :lg="12" :xl="12">
           <el-form-item label="奖励文字">
             <el-input placeholder="请输入奖励文字" v-model="dialogForm.newUserGift" style="width: 180px"> </el-input>
           </el-form-item>
-        </el-col> 
+        </el-col>
       </el-row> -->
       <el-row :gutter="24">
         <el-col :xs="12" :sm="12" :md="12" :lg="12" :xl="12">
@@ -112,15 +112,13 @@
               placeholder="限时卡第一部分的卡ID"
               v-model.number="dialogForm.firstPartCardId"
               clearable
-              @clear="onRemove('firstPartCardId')"
-            >
+              @clear="onRemove('firstPartCardId')">
               <el-option
                 :key="item.id"
                 :label="item.name"
                 :value="item.id"
                 v-for="item in cardList"
-                style="width: 180px"
-              />
+                style="width: 180px"/>
             </el-select>
           </el-form-item>
         </el-col>
@@ -130,15 +128,13 @@
               placeholder="限时卡第二部分ID"
               v-model.number="dialogForm.secondPartCardId"
               clearable
-              @clear="onRemove('secondPartCardId')"
-            >
+              @clear="onRemove('secondPartCardId')">
               <el-option
                 :key="item.id"
                 :label="item.name"
                 :value="item.id"
                 v-for="item in cardList"
-                style="width: 180px"
-              />
+                style="width: 180px"/>
             </el-select>
           </el-form-item>
         </el-col>
@@ -165,7 +161,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-   
+
       <!-- <el-row :gutter="24">
         <el-col :xs="12">
           <el-form-item label="标题字体颜色" prop="goldBase">
@@ -219,8 +215,7 @@
               active-text="是"
               inactive-text="否"
               active-color="#13ce66"
-              inactive-color="#ff4949"
-            >
+              inactive-color="#ff4949">
             </el-switch>
           </el-form-item>
         </el-col>
@@ -247,11 +242,11 @@
             <el-switch v-model="dialogForm.isNewUserCard" active-color="#13ce66" inactive-color="#ff4949"> </el-switch>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <!-- <el-col :span="12">
           <el-form-item  label="是否动漫/漫画/小说视频免费" label-width="200px" prop="isCartoonMediaFree">
             <el-switch v-model="dialogForm.isCartoonMediaFree" active-color="#13ce66" inactive-color="#ff4949"> </el-switch>
           </el-form-item>
-        </el-col>
+        </el-col> -->
           <el-col :span="12">
             <el-form-item label="是否追踪售卖" label-width="200px" prop="isTrack">
               <el-switch v-model="dialogForm.isTrack" active-color="#13ce66"> </el-switch>
@@ -300,7 +295,7 @@ import { vipTypeList } from '@/filters/user/userList'
 import UploadImg from '@/components/UploadImg/index'
 export default {
   name: 'AddOrEdit',
-  props: ['data', 'cardType','vipGradeList'],
+  props: ['data', 'cardType', 'vipGradeList'],
   components: {
     UploadImg
   },
@@ -331,7 +326,7 @@ export default {
         rigtTitle: undefined, // 权益标题
         sort: undefined, // 0,排序
         status: 1, // 0,状态
-        activityDesc:undefined, // 活动倒计时文案
+        activityDesc: undefined, // 活动倒计时文案
         title: undefined, // "string",标题
         vipType: undefined, // 0会员卡所属等级
         giftCoin: undefined,
@@ -352,9 +347,9 @@ export default {
         isNewUserCard: undefined, // 是否新人24小时卡
         aiFreeRemoveClothCount: undefined,
         aiFreeChangeFaceCount: undefined,
-        isJoinFirstExpandActivity:undefined,
-       isActivityCard: undefined, // 是否活动卡
-       isCheckinCashback:undefined, // 是否签到返额
+        isJoinFirstExpandActivity: undefined,
+        isActivityCard: undefined, // 是否活动卡
+        isCheckinCashback: undefined, // 是否签到返额
         activityEndAt: undefined // 活动到期时间
       },
       rules: {
diff --git a/src/views/commodity/vipcard/index.vue b/src/views/commodity/vipcard/index.vue
index e32959f..aea57e3 100644
--- a/src/views/commodity/vipcard/index.vue
+++ b/src/views/commodity/vipcard/index.vue
@@ -21,7 +21,12 @@
     <el-row>
       <el-col>
         <!-- 展示列表 -->
-        <el-table :data="tableData" border height="750" highlight-current-row style="width: 100%"
+        <el-table
+:data="tableData"
+border
+height="750"
+highlight-current-row
+style="width: 100%"
           :row-style="{ height: '70px' }">
           <el-table-column align="center" label="id" width="80">
             <template slot-scope="scope">{{ scope.row.id }}</template>
@@ -49,7 +54,8 @@
           </el-table-column>
           <el-table-column align="center" label="会员头像框">
             <template slot-scope="scope">
-              <ShowImg style="width: 40px; height: 40px; margin: 0 auto; line-height: 40px"
+              <ShowImg
+style="width: 40px; height: 40px; margin: 0 auto; line-height: 40px"
                 :urls="scope.row.avatarFrame"></ShowImg>
             </template>
           </el-table-column>
@@ -69,12 +75,12 @@
                 scope.row.isJoinFirstExpandActivity ? '是' : '否' }}</el-button>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="是否动漫/漫画/小说视频免费" width="100">
+          <!-- <el-table-column align="center" label="是否动漫/漫画/小说视频免费" width="100">
             <template slot-scope="scope">
               <el-button :type="scope.row.isCartoonMediaFree ? 'success' : 'danger'" plain size="mini">{{
                 scope.row.isCartoonMediaFree ? '免费' : '收费' }}</el-button>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column align="center" label="是否允许金币购买" width="100">
             <template slot-scope="scope">{{ scope.row.canUseCoin ? '允许' : '不允许' }}</template>
           </el-table-column>
@@ -133,7 +139,7 @@
             <el-table-column align="center" label="活动到期时间" width="200">
               <template slot-scope="scope">{{ scope.row.activityEndAt }}</template>
             </el-table-column>
-      
+
           <el-table-column align="center" label="活动倒计时文案" width="200">
             <template slot-scope="scope">{{ scope.row.activityDesc }}</template>
           </el-table-column>
@@ -193,12 +199,20 @@
     </el-row>
     <!-- 分页 -->
     <div class="table-pagination">
-      <el-pagination :current-page="searchData.pageNum" :page-sizes="[10, 20, 30, 50, 100]" :total="total"
-        @current-change="handleCurrentChange" @size-change="handleSizeChange"
+      <el-pagination
+:current-page="searchData.pageNum"
+:page-sizes="[10, 20, 30, 50, 100]"
+:total="total"
+        @current-change="handleCurrentChange"
+@size-change="handleSizeChange"
         layout="total, sizes, prev, pager, next, jumper" />
     </div>
     <!-- 新增/编辑弹出框 -->
-    <Edit :cardType="cardType" :vipGradeList="vipGradeList" :data="editData" v-if="dialogFormVisible"
+    <Edit
+:cardType="cardType"
+:vipGradeList="vipGradeList"
+:data="editData"
+v-if="dialogFormVisible"
       @close="closeEdit">
     </Edit>
   </div>
@@ -226,9 +240,9 @@ export default {
           id: 1, name: '暗网会员卡'
         }, {
           id: 2, name: '全网通会员卡'
-        },{
+        }, {
           id: 3, name: '直播卡'
-        },
+        }
       ],
       vipGradeList: [{ id: 0, name: '普通VIP' }, { id: 1, name: '至尊VIP' }],
       vipCardStatus: vipCardStatus(),
@@ -285,8 +299,6 @@ export default {
       })
     },
 
-
-
     // TODO:请求会员礼包列表数据
     getGiftbagList() {
       giftbagList({ pageNum: 1, pageSize: 100 }).then(res => {