From 37907df7339e17a2f8779e33417108b847de07fe Mon Sep 17 00:00:00 2001
From: Penny <2500338766@qq.com>
Date: Mon, 27 Feb 2023 20:48:00 +0800
Subject: [PATCH] =?UTF-8?q?hotfix:=E4=BF=AE=E6=AD=A3=E8=89=BA=E6=9C=AF?=
 =?UTF-8?q?=E5=AE=B6=E6=94=B6=E6=AC=BE=E8=B4=A6=E6=88=B7=E7=AD=89=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/img/creatorAccount/index.vue | 54 ++++++++++++--------------
 src/views/img/tiktokImg/index.vue      | 44 +++++++++++++--------
 src/views/img/withdraw/index.vue       | 48 +++++++++--------------
 3 files changed, 70 insertions(+), 76 deletions(-)

diff --git a/src/views/img/creatorAccount/index.vue b/src/views/img/creatorAccount/index.vue
index 00e94c3..f9c8c7d 100644
--- a/src/views/img/creatorAccount/index.vue
+++ b/src/views/img/creatorAccount/index.vue
@@ -13,10 +13,10 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="银行卡号" prop="bankNo">
+          <el-form-item label="账户账号" prop="accountNo">
             <el-input
-              v-model="queryParams.bankNo"
-              placeholder="请输入银行卡号"
+              v-model="queryParams.accountNo"
+              placeholder="请输入账户账号"
               clearable
               style="width: 240px"
             />
@@ -94,15 +94,14 @@
           <el-table-column label="艺术家id" align="center" key="creatorId" prop="creatorId" v-if="columns[1].visible" />
           <el-table-column label="姓名" align="center" key="name" prop="name" v-if="columns[2].visible" />
           <el-table-column label="身份证" align="center" key="idNo" prop="idNo" v-if="columns[3].visible" width="130"/>
-          <el-table-column label="银行卡" align="center" key="bankNo" prop="bankNo" v-if="columns[4].visible" width="140"/>
-          <el-table-column label="支付宝账号" align="center" key="aliPayNo" prop="aliPayNo" v-if="columns[5].visible" width="140"/>
-          <el-table-column label="联系方式" align="center" key="phone" prop="phone" v-if="columns[6].visible" width="100"/>
-          <el-table-column label="类型" align="center" key="type" v-if="columns[7].visible">
+          <el-table-column label="账户账号" align="center" key="accountNo" prop="accountNo" v-if="columns[4].visible" width="140"/>
+          <el-table-column label="联系方式" align="center" key="phone" prop="phone" v-if="columns[5].visible" width="100"/>
+          <el-table-column label="类型" align="center" key="type" v-if="columns[6].visible">
             <template slot-scope="scope">
-              {{scope.row.type == '0' ? "银行卡" : scope.row.type == '1' ? "支付宝" : ''}}
+              {{scope.row.type == '0' ? "微信" : scope.row.type == '1' ? "银行卡" : scope.row.type == '2' ? "支付宝" :''}}
             </template>
           </el-table-column>
-          <el-table-column label="是否显示" align="center" key="isShow" v-if="columns[8].visible">
+          <el-table-column label="是否显示" align="center" key="isShow" v-if="columns[7].visible">
             <template slot-scope="scope">
               <el-switch
                 v-model="scope.row.isShow"
@@ -112,13 +111,13 @@
               ></el-switch>
             </template>
           </el-table-column>
-           <el-table-column label="排序" align="center" key="sort" prop="sort" v-if="columns[9].visible"/>
-          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[10].visible" width="160">
+           <el-table-column label="排序" align="center" key="sort" prop="sort" v-if="columns[8].visible"/>
+          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[9].visible" width="160">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="更新时间" align="center" prop="updateTime" v-if="columns[11].visible" width="160">
+          <el-table-column label="更新时间" align="center" prop="updateTime" v-if="columns[10].visible" width="160">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.updateTime) }}</span>
             </template>
@@ -180,8 +179,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="银行卡号" prop="bankNo">
-              <el-input v-model="form.bankNo" placeholder="请输入银行卡号" maxlength="19" />
+            <el-form-item label="账户账号" prop="accountNo">
+              <el-input v-model="form.accountNo" placeholder="请输入账户卡号" maxlength="19" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -189,11 +188,6 @@
               <el-input v-model="form.phone" placeholder="请输入联系方式" maxlength="11" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="支付宝账号" prop="aliPayNo">
-              <el-input v-model="form.aliPayNo" placeholder="请输入支付宝账号" maxlength="30" />
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item label="类型">
               <el-select v-model="form.type">
@@ -250,15 +244,16 @@ export default {
         ],
       //类型
       type: [
-          { value: '0', label: '银行卡'},
-          { value: '1', label: '支付宝'}
+          { value: '0', label: '微信'},
+          { value: '1', label: '银行卡'},
+          { value: '2', label: '支付宝'}
         ],
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         idNo: undefined,
-        bankNo: undefined,
+        accountNo: undefined,
         phone: undefined,
         name: undefined,
         isShow: undefined,
@@ -270,14 +265,13 @@ export default {
         { key: 1, label: `艺术家id`, visible: true },
         { key: 2, label: `姓名`, visible: true },
         { key: 3, label: `身份证`, visible: true },
-        { key: 4, label: `银行卡`, visible: true },
-        { key: 5, label: `支付宝账号`, visible: true },
-        { key: 6, label: `联系方式`, visible: true },
-        { key: 7, label: `类型`, visible: true },
-        { key: 8, label: `是否显示`, visible: true },
-        { key: 9, label: `排序`, visible: true },
-        { key: 10, label: `创建时间`, visible: true },
-        { key: 11, label: `更新时间`, visible: true }
+        { key: 4, label: `账户账号`, visible: true },
+        { key: 5, label: `联系方式`, visible: true },
+        { key: 6, label: `类型`, visible: true },
+        { key: 7, label: `是否显示`, visible: true },
+        { key: 8, label: `排序`, visible: true },
+        { key: 9, label: `创建时间`, visible: true },
+        { key: 10, label: `更新时间`, visible: true }
       ],
       // 表单校验
       rules: {
diff --git a/src/views/img/tiktokImg/index.vue b/src/views/img/tiktokImg/index.vue
index 3edfdbc..f7f6734 100644
--- a/src/views/img/tiktokImg/index.vue
+++ b/src/views/img/tiktokImg/index.vue
@@ -95,23 +95,28 @@
           <el-table-column label="艺术家id" align="center" key="creatorId" prop="creatorId" v-if="columns[2].visible" :show-overflow-tooltip="true" width="150"/>
           <el-table-column label="分类id" align="center" key="typeId" prop="typeId" v-if="columns[3].visible" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-              {{scope.row.typeId == '1' ? "头像" : scope.row.typeId == '2' ? "GIF动图": scope.row.typeId == '3' ? "手机壁纸": scope.row.typeId == '4' ? "微信朋友圈背景": ''}}
+              {{scope.row.typeId == '1' ? "头像" : scope.row.typeId == '2' ? "GIF动图": scope.row.typeId == '3' ? "手机壁纸": scope.row.typeId == '4' ? "背景图" : scope.row.typeId == '5' ? "表情包": scope.row.typeId == '6' ? "iwatch": ''}}
             </template>
           </el-table-column>
           <el-table-column label="下载量" align="center" key="downloadNum" prop="downloadNum" v-if="columns[4].visible"/>
           <el-table-column label="点赞量" align="center" key="greatNum" prop="greatNum" v-if="columns[5].visible"/>
           <el-table-column label="收藏量" align="center" key="collectionNum" prop="collectionNum" v-if="columns[6].visible"/>
-          <el-table-column label="审核状态" align="center" key="status" prop="status" v-if="columns[7].visible">
+          <el-table-column label="是否审核" align="center" key="status" prop="status" v-if="columns[7].visible">
            <template slot-scope="scope">
               <el-switch
                 v-model="scope.row.status"
-                active-value="1"
-                inactive-value="0"
+                active-value="2"
+                inactive-value="1"
                 @change="handleJudgeChange(scope.row)"
               ></el-switch>
             </template>
           </el-table-column>
-          <el-table-column label="是否热门" align="center" key="isHot" prop="isHot" v-if="columns[8].visible">
+          <el-table-column label="图片状态" align="center" key="status" prop="status" v-if="columns[8].visible" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              {{scope.row.status == '0' ? "待审核" : scope.row.status == '1' ? "审核拒绝": scope.row.status == '2' ? "已上架": scope.row.status == '3' ? "已下架" : ''}}
+            </template>
+          </el-table-column>
+          <el-table-column label="是否热门" align="center" key="isHot" prop="isHot" v-if="columns[9].visible">
            <template slot-scope="scope">
               <el-switch
                 v-model="scope.row.isHot"
@@ -121,8 +126,8 @@
               ></el-switch>
             </template>
           </el-table-column>
-          <el-table-column label="序号" align="center" key="sort" prop="sort" v-if="columns[9].visible"/>
-          <el-table-column label="是否显示" align="center" key="isShow" v-if="columns[10].visible">
+          <el-table-column label="序号" align="center" key="sort" prop="sort" v-if="columns[10].visible"/>
+          <el-table-column label="是否显示" align="center" key="isShow" v-if="columns[11].visible">
             <template slot-scope="scope">
               <el-switch
                 v-model="scope.row.isShow"
@@ -132,12 +137,12 @@
               ></el-switch>
             </template>
           </el-table-column>
-          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[11].visible" width="160">
+          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[12].visible" width="160">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="更新时间" align="center" prop="updateTime" v-if="columns[12].visible" width="160">
+          <el-table-column label="更新时间" align="center" prop="updateTime" v-if="columns[13].visible" width="160">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.updateTime) }}</span>
             </template>
@@ -278,7 +283,9 @@ export default {
         { value: '1', label: `头像`},
         { value: '2', label: `GIF动图`},
         { value: '3', label: `手机壁纸`},
-        { value: '4', label: `微信朋友圈背景`}
+        { value: '4', label: `背景图`},
+        { value: '5', label: `表情包`},
+        { value: '6', label: `iwatch`},
       ],
       //是否热门
       isHot:[
@@ -288,7 +295,9 @@ export default {
       //状态
       status:[
          { value: '0', label: `待审核`},
-         { value: '1', label: `审核通过`}
+         { value: '1', label: `审核拒绝`},
+         { value: '2', label: `已上架`},
+         { value: '3', label: `已下架`}
       ],
       //是否显示
       isShow: [
@@ -329,12 +338,13 @@ export default {
         { key: 4, label: `下载量`, visible: true },
         { key: 5, label: `点赞量`, visible: true },
         { key: 6, label: `收藏量`, visible: true },
-        { key: 7, label: `审核状态`, visible: true },
-        { key: 8, label: `是否热门`, visible: true },
-        { key: 9, label: `序号`, visible: true },
-        { key: 10, label: `是否显示`, visible: true },
-        { key: 11, label: `创建时间`, visible: true },
-        { key: 12, label: `更新时间`, visible: true }
+        { key: 7, label: `是否审核`, visible: true },
+        { key: 8, label: `图片状态`, visible: true },
+        { key: 9, label: `是否热门`, visible: true },
+        { key: 10, label: `序号`, visible: true },
+        { key: 11, label: `是否显示`, visible: true },
+        { key: 12, label: `创建时间`, visible: true },
+        { key: 13, label: `更新时间`, visible: true }
       ],
       // 表单校验
       rules: {
diff --git a/src/views/img/withdraw/index.vue b/src/views/img/withdraw/index.vue
index f4f158c..a524546 100644
--- a/src/views/img/withdraw/index.vue
+++ b/src/views/img/withdraw/index.vue
@@ -7,11 +7,8 @@
          <el-form-item label="流水号" prop="orderId">
             <el-input v-model="queryParams.orderId" placeholder="请输入流水号" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
           </el-form-item>
-          <el-form-item label="银行卡" prop="bankNo">
-            <el-input v-model="queryParams.bankNo" placeholder="请输入银行卡" clearable style="width: 240px" />
-          </el-form-item>
-          <el-form-item label="支付宝手机号" prop="phone" label-width="100px">
-            <el-input v-model="queryParams.phone" placeholder="请输入支付宝手机号" clearable />
+          <el-form-item label="收款账号" prop="accountNo" label-width="100px">
+            <el-input v-model="queryParams.accountNo" placeholder="请输入收款账号" clearable />
           </el-form-item>
       <el-form-item label="渠道" prop="channel">
           <el-select v-model="queryParams.channel" placeholder="渠道" clearable>
@@ -60,26 +57,25 @@
           <el-table-column label="流水号" align="center" key="orderId" prop="orderId" v-if="columns[1].visible" width="170"/>
           <el-table-column label="艺术家id" align="center" key="creatorId" prop="creatorId" v-if="columns[2].visible" width="100"/>
           <el-table-column label="提现金额" align="center" key="amt" prop="amt" v-if="columns[3].visible" />
-          <el-table-column label="银行卡" align="center" key="bankNo" prop="bankNo" v-if="columns[4].visible" width="170"/>
-          <el-table-column label="支付宝手机号" align="center" key="phone" prop="phone" v-if="columns[5].visible" width="140"/>
-          <el-table-column label="审核理由" align="center" key="reason" prop="reason" v-if="columns[6].visible" :show-overflow-tooltip="true" width="120"/>
-          <el-table-column label="渠道" align="center" key="channel" prop="channel" v-if="columns[7].visible">
+          <el-table-column label="收款账号" align="center" key="accountNo" prop="accountNo" v-if="columns[4].visible" width="140"/>
+          <el-table-column label="审核理由" align="center" key="reason" prop="reason" v-if="columns[5].visible" :show-overflow-tooltip="true" width="120"/>
+          <el-table-column label="渠道" align="center" key="channel" prop="channel" v-if="columns[6].visible">
             <template slot-scope="scope">
               {{scope.row.channel == '0' ? "微信" : scope.row.channel == '1' ? "银行卡": scope.row.channel == '2' ? "支付宝" : ''}}
             </template>
           </el-table-column>
-          <el-table-column label="状态" align="center" key="status" prop="status" v-if="columns[8].visible">
+          <el-table-column label="状态" align="center" key="status" prop="status" v-if="columns[7].visible">
             <template slot-scope="scope">
               {{scope.row.status == '0' ? "待审核" : scope.row.status == '1' ? "提现异常": scope.row.status == '2' ? "提现成功": scope.row.status == '3' ? "提现失败": scope.row.status == '4' ? "审核拒绝": ''}}
             </template>
           </el-table-column>
-          <el-table-column label="排序" align="center" key="sort" prop="sort" v-if="columns[9].visible"/>
-          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[10].visible" width="160">
+          <el-table-column label="排序" align="center" key="sort" prop="sort" v-if="columns[8].visible"/>
+          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[9].visible" width="160">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="更新时间" align="center" prop="updateTime" v-if="columns[11].visible" width="160">
+          <el-table-column label="更新时间" align="center" prop="updateTime" v-if="columns[10].visible" width="160">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.updateTime) }}</span>
             </template>
@@ -149,13 +145,8 @@
             </el-form-item>
           </el-col>
            <el-col :span="12">
-            <el-form-item label="银行卡" prop="bankNo">
-              <el-input v-model="verifyForm.bankNo" disabled/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="支付宝手机号" prop="phone" label-width="120px">
-              <el-input v-model="verifyForm.phone" disabled/>
+            <el-form-item label="收款账号" prop="accountNo">
+              <el-input v-model="verifyForm.accountNo" disabled/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -241,7 +232,7 @@ export default {
         status: undefined,
         channel: undefined,
         orderId: undefined,
-        bankNo: undefined,
+        accountNo: undefined,
         phone: undefined
       },
       // 列信息
@@ -250,14 +241,13 @@ export default {
         { key: 1, label: `流水号`, visible: true },
         { key: 2, label: `艺术家id`, visible: true },
         { key: 3, label: `提现金额`, visible: true },
-        { key: 4, label: `银行卡`, visible: true },
-        { key: 5, label: `支付宝手机号`, visible: true },
-        { key: 6, label: `审核理由`, visible: true },
-        { key: 7, label: `渠道`, visible: true },
-        { key: 8, label: `状态`, visible: true },
-        { key: 9, label: `排序`, visible: true },
-        { key: 10, label: `创建时间`, visible: true },
-        { key: 11, label: `更新时间`, visible: true }
+        { key: 4, label: `收款账号`, visible: true },
+        { key: 5, label: `审核理由`, visible: true },
+        { key: 6, label: `渠道`, visible: true },
+        { key: 7, label: `状态`, visible: true },
+        { key: 8, label: `排序`, visible: true },
+        { key: 9, label: `创建时间`, visible: true },
+        { key: 10, label: `更新时间`, visible: true }
       ],
       // 表单校验
       rules: {