Merge branch 'zhangyong/feature-20250716164232-金币前端' into milestone-20250728-金币前端三期

src/views/consume/bean/addBeanConsume.vue

@@ -46,8 +46,8 @@ const getUser = async function (jwcode) {
 }
 const consumeForm = ref({
   jwcode: '',
-  permanentBean: '0',
-  freeBean: '0',
+  permanentBean: '',
+  freeBean: '',
   remark: '',
   adminName: ''
 })
@@ -120,8 +120,8 @@ const rules = reactive({
 const deleteConsumeForm = function () {
   consumeForm.value = {
     jwcode: '',
-    permanentBean: '0',
-    freeBean: '0',
+    permanentBean: '',
+    freeBean: '',
     remark: '',
     adminName: ''
   }
@@ -129,6 +129,12 @@ const deleteConsumeForm = function () {
 
 const handleConsumeForm = async () => {
   try {
+    if(!consumeForm.value.permanentBean ){
+      consumeForm.value.permanentBean = 0
+    }
+    if(!consumeForm.value.freeBean ){
+      consumeForm.value.freeBean = 0
+    }
     await new Promise((resolve, reject) => {
       formRef.value.validate((valid) => {
         if (valid) {
@@ -180,8 +186,8 @@ const handleConsumeForm = async () => {
       ElMessage.success('新增成功')
       consumeForm.value = {
         jwcode: "",
-        permanentBean: '0',
-        freeBean: '0',
+        permanentBean: '',
+        freeBean: '',
         remark: '',
         adminName: ''
       }
@@ -205,10 +211,10 @@ const throttledHandleConsumeFormt = _.throttle(handleConsumeForm, 5000, {
         <el-button type="primary" @click="getUser(consumeForm.jwcode)" style="margin-left: 20px">查询</el-button>
       </el-form-item>
       <el-form-item prop="permanentBean" label="付费金豆" label-position="left">
-        <el-input v-model="consumeForm.permanentBean" style="width: 100px" />
+        <el-input v-model="consumeForm.permanentBean" placeholder="不填默认为0" style="width: 100px" />
       </el-form-item>
       <el-form-item prop="freeBean" label="免费金豆" label-position="left">
-        <el-input v-model="consumeForm.freeBean" style="width: 100px" />
+        <el-input v-model="consumeForm.freeBean" placeholder="不填默认为0" style="width: 100px" />
       </el-form-item>
       <el-form-item prop="remark" label="备注" label-position="left">
         <el-input v-model="consumeForm.remark" style="width: 300px" :rows="5" maxlength="100" show-word-limit

src/views/recharge/addBeanRecharge.vue

@@ -45,8 +45,8 @@ const getUser = async function (jwcode) {
 }
 const addForm = ref({
   jwcode: '',
-  permanentBean: 0,
-  freeBean: 0,
+  permanentBean: '',
+  freeBean: '',
   remark: '',
   adminName: ''
 })
@@ -70,7 +70,7 @@ const rules = reactive({
       }, trigger: 'blur'
     }],
   permanentBean: [
-    { required: true, message: '请输入永久金豆数', trigger: 'blur' },
+    { required: true, message: '请输入付费金豆数', trigger: 'blur' },
     {
       validator: (rule, value, callback) => {
         // 检查是否为非负整数
@@ -119,8 +119,8 @@ const rules = reactive({
 const deleteAddForm = function () {
   addForm.value = {
     jwcode: '',
-    permanentBean: '0',
-    freeBean: '0',
+    permanentBean: '',
+    freeBean: '',
     remark: '',
     adminName: ''
   }
@@ -128,6 +128,12 @@ const deleteAddForm = function () {
 
 const handleAddForm = async () => {
   try {
+    if(!addForm.value.permanentBean ){
+      addForm.value.permanentBean = 0
+    }
+    if(!addForm.value.freeBean ){
+      addForm.value.freeBean = 0
+    }
     await new Promise((resolve, reject) => {
       formRef.value.validate((valid) => {
         if (valid) {
@@ -191,10 +197,10 @@ const throttledHandleAddFormt = _.throttle(handleAddForm, 5000, {
         <el-button type="primary" @click="getUser(addForm.jwcode)" style="margin-left: 20px">查询</el-button>
       </el-form-item>
       <el-form-item prop="permanentBean" label="付费金豆" label-position="left">
-        <el-input v-model="addForm.permanentBean" style="width: 100px" />
+        <el-input v-model="addForm.permanentBean"  placeholder="不填默认为0"  style="width: 100px" />
       </el-form-item>
       <el-form-item prop="freeBean" label="免费金豆" label-position="left">
-        <el-input v-model="addForm.freeBean" style="width: 100px" />
+        <el-input v-model="addForm.freeBean" placeholder="不填默认为0" style="width: 100px" />
       </el-form-item>
       <el-form-item prop="remark" label="备注" label-position="left">
         <el-input v-model="addForm.remark" style="width: 300px" :rows="5" maxlength="100" show-word-limit