From b221e3944cded30dc3b50c10bf433b211bf18827 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=8F?= <1978476055@qq.com>
Date: Tue, 3 Dec 2024 17:39:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=83=BD=E9=87=8F,=E7=BA=A2=E5=8C=85=E9=9B=A8,?=
 =?UTF-8?q?=E6=8F=90=E7=8E=B0=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/accounts/extract/index.vue     | 23 +++++++++++++++++------
 src/views/marketing/lottery/addGoods.vue | 11 +++++++++++
 src/views/marketing/lottery/create.vue   |  8 ++++----
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/views/accounts/extract/index.vue b/src/views/accounts/extract/index.vue
index d8d73d8..de77a8e 100644
--- a/src/views/accounts/extract/index.vue
+++ b/src/views/accounts/extract/index.vue
@@ -30,10 +30,12 @@
             class="selWidth"
             @change="getList(1)"
           >
-            <el-option label="全部" value="" />
-            <el-option label="审核中" value="0" />
-            <el-option label="已提现" value="1" />
-            <el-option label="已拒绝" value="-1" />
+          <el-option
+              v-for="(item, key) in status_name"
+              :label="item"
+              :value="key"
+            />
+          </el-select>
           </el-select>
         </el-form-item>
         <el-form-item label="提现方式：" prop="extract_type">
@@ -136,7 +138,7 @@
         <el-table-column label="审核状态" min-width="90">
           <template slot-scope="scope">
             <span class="spBlock">{{
-              scope.row.status | extractStatusFilter
+               status_name[scope.row.status]
             }}</span>
             <!-- <template v-if="scope.row.status === 0">
                         <el-button type="danger" icon="el-icon-close" size="mini" @click="onExamine(scope.row.extract_id)">未通过</el-button>
@@ -144,6 +146,13 @@
                     </template> -->
           </template>
         </el-table-column>
+        <el-table-column label="失败原因" min-width="120">
+          <template slot-scope="scope">
+            <span class="spBlock">{{
+              scope.row.error_msg
+            }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="拒绝原因" min-width="120">
           <template slot-scope="scope">
             <span class="spBlock">{{
@@ -245,7 +254,7 @@
             <div class="acea-row">
               <div class="list">
                 <label class="name">审核状态：</label
-                >{{ extractDetail.status | extractStatusFilter }}
+                >{{ status_name[extractDetail.status] }}
               </div>
               <div class="list">
                 <label class="name">审核时间：</label
@@ -300,6 +309,7 @@ export default {
       },
       fromList: fromList,
       extractDetail: {},
+      status_name: [],
       dialogVisible: false,
     };
   },
@@ -458,6 +468,7 @@ export default {
         .then((res) => {
           this.tableData.data = res.data.list;
           this.tableData.total = res.data.count;
+          this.status_name = res.data.status_name;
           this.listLoading = false;
         })
         .catch((res) => {
diff --git a/src/views/marketing/lottery/addGoods.vue b/src/views/marketing/lottery/addGoods.vue
index 874457c..07aeefe 100644
--- a/src/views/marketing/lottery/addGoods.vue
+++ b/src/views/marketing/lottery/addGoods.vue
@@ -13,6 +13,7 @@
           <el-radio :label="11">实物</el-radio>
           <el-radio :label="5">优惠券</el-radio>
           <el-radio :label="2">铸源星</el-radio>
+          <el-radio :label="12">能量</el-radio>
           <!-- <el-radio :label="6">站内商品</el-radio> -->
           <!-- <el-radio :label="4"></el-radio> -->
           <!-- <el-radio :label="3">折扣券</el-radio> -->
@@ -43,6 +44,16 @@
           >添加优惠券</el-button
         >
       </el-form-item>
+      <el-form-item label="能量数量" prop="num" v-if="formValidate.type == 12">
+        <el-input-number
+          :controls="false"
+          v-model="formValidate.num"
+          placeholder="请输入能量数量"
+          :max="9999999999"
+          :min="1"
+          style="width: 300px"
+        ></el-input-number>
+      </el-form-item>
       <el-form-item
         :label="[3, 4].includes(formValidate.type) ? '金额信息' : '铸源星数量'"
         prop="num"
diff --git a/src/views/marketing/lottery/create.vue b/src/views/marketing/lottery/create.vue
index 445f706..d532c0c 100644
--- a/src/views/marketing/lottery/create.vue
+++ b/src/views/marketing/lottery/create.vue
@@ -605,10 +605,10 @@ export default {
         //   name: "订单支付",
         //   type: "3",
         // },
-        // {
-        //   name: "订单评价",
-        //   type: "4",
-        // },
+        {
+          name: "红包雨",
+          type: "4",
+        },
       ],
       title: "添加商品",
       loading: false,