Merge branch 'zhangrenyuan/feature-20250728113353-金币前端三期' into milestone-20250728-金币前端三期

src/views/consume/addBeanConsume.vue

@@ -44,8 +44,8 @@ const getUser = async function (jwcode) {
 }
 const addForm = ref({
   jwcode: '',
-  gode: '',
-  freeGode: '',
+  permanentBean: '',
+  freeBean: '',
   remark: '',
   adminId: ''
 })
@@ -68,7 +68,7 @@ const rules = reactive({
         callback();
       }, trigger: 'blur'
     }],
-  gode: [
+  permanentBean: [
     { required: true, message: '请输入永久金豆数', trigger: 'blur' },
     {
       validator: (rule, value, callback) => {
@@ -89,7 +89,7 @@ const rules = reactive({
       trigger: 'blur'
     }
   ],
-  freeGode: [
+  freeBean: [
     { required: true, message: '请输入免费金豆数', trigger: 'blur' },
     {
       validator: (rule, value, callback) => {
@@ -118,8 +118,8 @@ const rules = reactive({
 const deleteAddForm = function () {
   addForm.value = {
     jwcode: '',
-    gode: '',
-    freeGode: '',
+    permanentBean: '',
+    freeBean: '',
     remark: '',
     adminId: ''
   }
@@ -130,7 +130,7 @@ const handleAddForm = async () => {
     await new Promise((resolve, reject) => {
       formRef.value.validate((valid) => {
         if (valid) {
-          if (Number(addForm.value.gode) === 0 && Number(addForm.value.freeGode) === 0) {
+          if (Number(addForm.value.permanentBean) === 0 && Number(addForm.value.freeBean) === 0) {
             reject(new Error('永久金豆和付费金豆不能同时为0'));
           }
           resolve(); // 验证通过，继续执行后续代码
@@ -145,8 +145,8 @@ const handleAddForm = async () => {
       url: '/bean/add',
       data: {
         jwcode: addForm.value.jwcode,
-        gode: addForm.value.gode,
-        freeGode: addForm.value.freeGode,
+        permanentBean: addForm.value.permanentBean,
+        freeBean: addForm.value.freeBean,
         remark: addForm.value.remark,
         adminId: adminData.adminId
       }
@@ -164,11 +164,11 @@ const handleAddForm = async () => {
         <el-input v-model="addForm.jwcode" style="width: 220px" />
         <el-button type="primary" @click="getUser(addForm.jwcode)" style="margin-left: 20px">查询</el-button>
       </el-form-item>
-      <el-form-item prop="gode" label="付费金豆" label-position="left">
-        <el-input v-model="addForm.gode" style="width: 100px" />
+      <el-form-item prop="permanentBean" label="付费金豆" label-position="left">
+        <el-input v-model="addForm.permanentBean" style="width: 100px" />
       </el-form-item>
-      <el-form-item prop="freeGode" label="免费金豆" label-position="left">
-        <el-input v-model="addForm.freeGode" style="width: 100px" />
+      <el-form-item prop="freeBean" label="免费金豆" label-position="left">
+        <el-input v-model="addForm.freeBean" 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

src/views/consume/dieHardFan.vue

@@ -273,7 +273,7 @@ const getToday = function () {
   console.log('getTime', getTime.value)
   activeTimeRange.value = 'today' // 标记当前激活状态
 
-  ConsumeSelectBy
+  ConsumeSelectBy()
 }
 // 昨天
 const getYesterday = function () {
@@ -292,8 +292,8 @@ const getYesterday = function () {
   getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
   activeTimeRange.value = 'yesterday' // 标记当前激活状态
-
-  ConsumeSelectBy //todo
+  console.log('昨', getTime.value)
+  ConsumeSelectBy() 
 }
 // 近7天
 const get7Days = function () {
@@ -312,7 +312,7 @@ const get7Days = function () {
   console.log('getTime', getTime.value)
   activeTimeRange.value = '7days' // 标记当前激活状态
 
-  ConsumeSelectBy 
+  ConsumeSelectBy() 
 }