Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner-admin into dev

src/views/pay/currency/balance/index.vue

@@ -61,16 +61,16 @@
         </template>
       </el-table-column>
       <el-table-column label="余额" align="center" prop="balance">
-        <!-- <template #default="{ row }"> {{ dealPrice(row.balance) }} 元</template> -->
+        <template #default="{ row }"> {{ fenToYuan(row.balance) }} 元</template>
       </el-table-column>
       <el-table-column label="累计支出" align="center" prop="totalExpense">
-        <!-- <template #default="{ row }"> {{ dealPrice(row.totalExpense) }} 元</template> -->
+        <template #default="{ row }"> {{ fenToYuan(row.totalExpense) }} 元</template>
       </el-table-column>
       <el-table-column label="累计充值" align="center" prop="totalRecharge">
-        <!-- <template #default="{ row }"> {{ dealPrice(row.totalRecharge) }} 元</template> -->
+        <template #default="{ row }"> {{ fenToYuan(row.totalRecharge) }} 元</template>
       </el-table-column>
       <el-table-column label="冻结金额" align="center" prop="freezePrice">
-        <!-- <template #default="{ row }"> {{ dealPrice(row.freezePrice) }} 元</template> -->
+        <template #default="{ row }"> {{ fenToYuan(row.freezePrice) }} 元</template>
       </el-table-column>
       <el-table-column
         label="创建时间"
@@ -101,7 +101,7 @@
 <script setup lang="ts">
 import { dateFormatter } from '@/utils/formatTime'
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
-// import { fenToYuan } from '@/utils'
+import { fenToYuan } from '@/utils'
 import * as CurrencyApi from '@/api/pay/currency/balance'
 import CurrencyForm from './CurrencyForm.vue'
 

src/views/pay/currency/recharge/index.vue

@@ -62,9 +62,9 @@
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <el-table-column label="编号" align="center" prop="id" />
-      <el-table-column label="用户实际到余额" align="center" prop="totalPrice">
+      <el-table-column label="用户实际到账M豆" align="center" prop="totalPrice">
         <template #default="scope">
-          {{ fenToYuan(scope.row.totalPrice) }}
+          {{ parseInt(fenToYuan(scope.row.totalPrice)) }}
         </template>
       </el-table-column>
       <el-table-column label="实际支付金额" align="center" prop="payPrice">
@@ -72,9 +72,14 @@
           {{ fenToYuan(scope.row.payPrice) }}
         </template>
       </el-table-column>
-      <el-table-column label="钱包赠送金额" align="center" prop="bonusPrice">
+      <el-table-column label="到账M豆" align="center" prop="receiptPrice">
         <template #default="scope">
-          {{ fenToYuan(scope.row.bonusPrice) }}
+          {{ parseInt(fenToYuan(scope.row.receiptPrice)) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="赠送M豆" align="center" prop="bonusPrice">
+        <template #default="scope">
+          {{ parseInt(fenToYuan(scope.row.bonusPrice)) }}
         </template>
       </el-table-column>
       <el-table-column label="是否已支付" align="center" prop="payStatus">

src/views/pay/currency/rechargePackage/CurrencyRechargePackageForm.vue

@@ -11,10 +11,13 @@
         <el-input v-model="formData.name" placeholder="请输入套餐名" />
       </el-form-item>
       <el-form-item label="支付金额(元)" prop="payPrice">
-        <el-input-number v-model="formData.payPrice" :min="1" :step="10" />
+        <el-input-number v-model="formData.payPrice" :min="0" :step="1" />
       </el-form-item>
-      <el-form-item label="赠送金额(元)" prop="bonusPrice">
-        <el-input-number v-model="formData.bonusPrice" :min="0" :step="10" />
+      <el-form-item label="到账M豆" prop="receiptPrice">
+        <el-input-number v-model="formData.receiptPrice" :min="1" :step="1" step-strictly />
+      </el-form-item>
+      <el-form-item label="赠送M豆" prop="bonusPrice">
+        <el-input-number v-model="formData.bonusPrice" :min="0" :step="1" step-strictly />
       </el-form-item>
       <el-form-item label="开启状态" prop="status">
         <el-radio-group v-model="formData.status">
@@ -49,13 +52,15 @@ const formData = ref({
   id: undefined,
   name: undefined,
   payPrice: undefined,
+  receiptPrice: undefined,
   bonusPrice: undefined,
   status: undefined
 })
 const formRules = reactive({
   name: [{ required: true, message: '套餐名不能为空', trigger: 'blur' }],
   payPrice: [{ required: true, message: '支付金额不能为空', trigger: 'blur' }],
-  bonusPrice: [{ required: true, message: '赠送金额不能为空', trigger: 'blur' }],
+  receiptPrice: [{ required: true, message: '到账M豆不能为空', trigger: 'blur' }],
+  bonusPrice: [{ required: true, message: '赠送M豆不能为空', trigger: 'blur' }],
   status: [{ required: true, message: '状态不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
@@ -72,6 +77,7 @@ const open = async (type: string, id?: number) => {
     try {
       formData.value = await CurrencyRechargePackageApi.getCurrencyRechargePackage(id)
       formData.value.payPrice = fenToYuan(formData.value.payPrice)
+      formData.value.receiptPrice = fenToYuan(formData.value.receiptPrice)
       formData.value.bonusPrice = fenToYuan(formData.value.bonusPrice)
     } finally {
       formLoading.value = false
@@ -92,6 +98,7 @@ const submitForm = async () => {
   try {
     const data = { ...formData.value }
     data.payPrice = yuanToFen(data.payPrice)
+    data.receiptPrice = yuanToFen(data.receiptPrice)
     data.bonusPrice = yuanToFen(data.bonusPrice)
     if (formType.value === 'create') {
       await CurrencyRechargePackageApi.createCurrencyRechargePackage(data)
@@ -114,6 +121,7 @@ const resetForm = () => {
     id: undefined,
     name: undefined,
     payPrice: undefined,
+    receiptPrice: undefined,
     bonusPrice: undefined,
     status: undefined
   }

src/views/pay/currency/rechargePackage/index.vue

@@ -61,8 +61,11 @@
       <el-table-column label="支付金额" align="center" prop="payPrice">
         <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>
+      <el-table-column label="到账M豆" align="center" prop="receiptPrice">
+        <template #default="{ row }"> {{ parseInt(fenToYuan(row.receiptPrice)) }}</template>
+      </el-table-column>
+      <el-table-column label="赠送M豆" align="center" prop="bonusPrice">
+        <template #default="{ row }"> {{ parseInt(fenToYuan(row.bonusPrice)) }}</template>
       </el-table-column>
       <el-table-column label="状态" align="center" prop="status">
         <template #default="scope">