From 56676b12221b9ed0c7ca934d3b3f6ddb0afeaea1 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Fri, 12 Dec 2025 17:12:24 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=85=85=E5=80=BC=E5=A5=97=E9=A4=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  2 +-
 .../WalletRechargePackageForm.vue             | 17 ++--
 .../pay/wallet/rechargePackage/index.vue      |  6 +-
 src/views/system/tenantPackage/index.vue      | 84 +++++--------------
 4 files changed, 40 insertions(+), 69 deletions(-)

diff --git a/package.json b/package.json
index 60b7c681..e728e7a0 100644
--- a/package.json
+++ b/package.json
@@ -153,4 +153,4 @@
     "node": ">= 16.0.0",
     "pnpm": ">=8.6.0"
   }
-}
+}
\ No newline at end of file
diff --git a/src/views/pay/wallet/rechargePackage/WalletRechargePackageForm.vue b/src/views/pay/wallet/rechargePackage/WalletRechargePackageForm.vue
index 409b45a5..be9b31ee 100644
--- a/src/views/pay/wallet/rechargePackage/WalletRechargePackageForm.vue
+++ b/src/views/pay/wallet/rechargePackage/WalletRechargePackageForm.vue
@@ -7,9 +7,12 @@
       <el-form-item label="支付金额(元)" prop="payPrice">
         <el-input-number v-model="formData.payPrice" :min="0" :precision="2" :step="0.01" />
       </el-form-item>
-      <el-form-item label="获得宝石(个)" prop="bonusPrice">
+      <el-form-item v-if="false" label="获得宝石(个)" prop="bonusPrice">
         <el-input-number v-model="formData.bonusPrice" :min="0" :precision="2" :step="0.01" />
       </el-form-item>
+      <el-form-item label="获得宝石(个)" prop="totalPrice">
+        <el-input-number v-model="formData.totalPrice" :min="0" :precision="2" :step="0.01" />
+      </el-form-item>
       <el-form-item label="开启状态" prop="status">
         <el-radio-group v-model="formData.status">
           <el-radio v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)" :key="dict.value" :value="dict.value">
@@ -35,17 +38,18 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formData = ref({
+const formData = ref<any>({
   id: undefined,
   name: undefined,
   payPrice: undefined,
   bonusPrice: undefined,
+  totalPrice: undefined,
   status: undefined
 })
 const formRules = reactive({
   name: [{ required: true, message: '套餐名不能为空', trigger: 'blur' }],
   payPrice: [{ required: true, message: '支付金额不能为空', trigger: 'blur' }],
-  bonusPrice: [{ required: true, message: '赠送金额不能为空', trigger: 'blur' }],
+  totalPrice: [{ required: true, message: '总砖石不能为空', trigger: 'blur' }],
   status: [{ required: true, message: '状态不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
@@ -60,9 +64,11 @@ const open = async (type: string, id?: number) => {
   if (id) {
     formLoading.value = true
     try {
-      formData.value = await WalletRechargePackageApi.getWalletRechargePackage(id)
+      const data: any = await WalletRechargePackageApi.getWalletRechargePackage(id)
+      formData.value = data
       formData.value.payPrice = fenToYuan(formData.value.payPrice)
       formData.value.bonusPrice = fenToYuan(formData.value.bonusPrice)
+      formData.value.totalPrice = Number(data.payPrice) + Number(data.bonusPrice)
     } finally {
       formLoading.value = false
     }
@@ -82,7 +88,8 @@ const submitForm = async () => {
   try {
     const data = { ...formData.value }
     data.payPrice = yuanToFen(data.payPrice)
-    data.bonusPrice = yuanToFen(data.bonusPrice)
+    const _bonusPrice = Number(formData.value.totalPrice) - Number(formData.value.payPrice)
+    data.bonusPrice = yuanToFen(_bonusPrice)
     if (formType.value === 'create') {
       await WalletRechargePackageApi.createWalletRechargePackage(data)
       message.success(t('common.createSuccess'))
diff --git a/src/views/pay/wallet/rechargePackage/index.vue b/src/views/pay/wallet/rechargePackage/index.vue
index 2918f0f6..e42b97be 100644
--- a/src/views/pay/wallet/rechargePackage/index.vue
+++ b/src/views/pay/wallet/rechargePackage/index.vue
@@ -40,7 +40,11 @@
         <template #default="{ row }"> {{ fenToYuan(row.payPrice) }}元</template>
       </el-table-column>
       <el-table-column label="获得宝石" align="center" prop="bonusPrice">
-        <template #default="{ row }"> {{ fenToYuan(row.bonusPrice) }}个</template>
+        <template #default="{ row }">
+          <div>
+            {{ fenToYuan(row.bonusPrice + row.payPrice) }}个
+          </div>
+        </template>
       </el-table-column>
       <el-table-column label="状态" align="center" prop="status">
         <template #default="scope">
diff --git a/src/views/system/tenantPackage/index.vue b/src/views/system/tenantPackage/index.vue
index 04b27824..10d39534 100644
--- a/src/views/system/tenantPackage/index.vue
+++ b/src/views/system/tenantPackage/index.vue
@@ -3,51 +3,29 @@
 
   <!-- 搜索 -->
   <ContentWrap>
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
       <el-form-item label="套餐名" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入套餐名"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+        <el-input v-model="queryParams.name" placeholder="请输入套餐名" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
       </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!w-240px">
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          type="daterange"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          class="!w-240px"
-        />
+        <el-date-picker v-model="queryParams.createTime" type="daterange" value-format="YYYY-MM-DD HH:mm:ss"
+          start-placeholder="开始日期" end-placeholder="结束日期" class="!w-240px" />
       </el-form-item>
       <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['system:tenant-package:create']"
-        >
+        <el-button @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+        <el-button type="primary" plain @click="openForm('create')" v-hasPermi="['system:tenant-package:create']">
           <Icon icon="ep:plus" class="mr-5px" />
           新增
         </el-button>
@@ -66,41 +44,23 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        width="180"
-        :formatter="dateFormatter"
-      />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180" :formatter="dateFormatter" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['system:tenant-package:update']"
-          >
+          <el-button link type="primary" @click="openForm('update', scope.row.id)"
+            v-hasPermi="['system:tenant-package:update']">
             修改
           </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['system:tenant-package:delete']"
-          >
+          <el-button link type="danger" @click="handleDelete(scope.row.id)"
+            v-hasPermi="['system:tenant-package:delete']">
             删除
           </el-button>
         </template>
       </el-table-column>
     </el-table>
     <!-- 分页 -->
-    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
@@ -170,7 +130,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()
-  } catch {}
+  } catch { }
 }
 
 /** 初始化 **/