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

.env.development

@@ -1,6 +1,6 @@
-# VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
+VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
 # 测试环境
- VITE_API_BASE='http://54.255.212.181:10704/'
+#  VITE_API_BASE='http://54.255.212.181:10704/'
 # 正式环境
 #  VITE_API_BASE='http://54.255.212.181:10705/'
 VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload

src/views/consume/bean/addBeanConsume.vue

@@ -15,8 +15,8 @@ import { useAdminStore } from "@/store/index.js";
 import { storeToRefs } from "pinia";
 const user = ref({})
 const getUser = async function (jwcode) {
-  if (addForm.value.jwcode) {
-    addForm.value.jwcode = addForm.value.jwcode.replace(/\s/g, '');
+  if (consumeForm.value.jwcode) {
+    consumeForm.value.jwcode = consumeForm.value.jwcode.replace(/\s/g, '');
   } else {
     ElMessage.error('请先输入精网号')
     return false
@@ -25,7 +25,7 @@ const getUser = async function (jwcode) {
     const result = await API({
       url: '/beanUser/userCard',
       data: {
-        jwcode: addForm.value.jwcode
+        jwcode: consumeForm.value.jwcode
       }
     })
     if (result.code === 0) {
@@ -42,7 +42,7 @@ const getUser = async function (jwcode) {
     ElMessage.error("精网号错误");
   }
 }
-const addForm = ref({
+const consumeForm = ref({
   jwcode: '',
   permanentBean: '',
   freeBean: '',
@@ -115,8 +115,8 @@ const rules = reactive({
 });
 
 //重置表单
-const deleteAddForm = function () {
-  addForm.value = {
+const deleteConsumeForm = function () {
+  consumeForm.value = {
     jwcode: '',
     permanentBean: '',
     freeBean: '',
@@ -125,12 +125,12 @@ const deleteAddForm = function () {
   }
 }
 
-const handleAddForm = async () => {
+const handleConsumeForm = async () => {
   try {
     await new Promise((resolve, reject) => {
       formRef.value.validate((valid) => {
         if (valid) {
-          if (Number(addForm.value.permanentBean) === 0 && Number(addForm.value.freeBean) === 0) {
+          if (Number(consumeForm.value.permanentBean) === 0 && Number(consumeForm.value.freeBean) === 0) {
             reject(new Error('永久金豆和付费金豆不能同时为0'));
           }
           resolve(); // 验证通过，继续执行后续代码
@@ -142,12 +142,13 @@ const handleAddForm = async () => {
     console.log('adminData', adminData.value);
 
     const result = await request({
-      url: '/bean/add',
+      url: '/beanConsume/reduce',
+
       data: {
-        jwcode: addForm.value.jwcode,
-        permanentBean: addForm.value.permanentBean,
-        freeBean: addForm.value.freeBean,
-        remark: addForm.value.remark,
+        jwcode: consumeForm.value.jwcode,
+        permanentBean: consumeForm.value.permanentBean,
+        freeBean: consumeForm.value.freeBean,
+        remark: consumeForm.value.remark,
         adminId: adminData.adminId
       }
     })
@@ -159,26 +160,26 @@ const handleAddForm = async () => {
 </script>
 <template>
   <div>
-    <el-form :model="addForm" :rules="rules" ref="formRef" label-width="auto" style="max-width: 600px" class="add-form">
+    <el-form :model="consumeForm" :rules="rules" ref="formRef" label-width="auto" style="max-width: 600px" class="consume-form">
       <el-form-item prop="jwcode" label="精网号" label-position="left">
-        <el-input v-model="addForm.jwcode" style="width: 220px" />
-        <el-button type="primary" @click="getUser(addForm.jwcode)" style="margin-left: 20px">查询</el-button>
+        <el-input v-model="consumeForm.jwcode" style="width: 220px" />
+        <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="addForm.permanentBean" style="width: 100px" />
+        <el-input v-model="consumeForm.permanentBean" 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="consumeForm.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
+        <el-input v-model="consumeForm.remark" style="width: 300px" :rows="5" maxlength="100" show-word-limit
           type="textarea" />
       </el-form-item>
       <!-- <el-form-item prop="adminId" label="提交人">
         <el-input style="width: 300px" :value="adminData.adminName" disabled placeholder="提交人姓名" />
       </el-form-item> -->
-      <el-button @click="deleteAddForm" style="margin-left: 280px" type="success">重置</el-button>
-      <el-button type="primary" @click="handleAddForm"> 提交 </el-button>
+      <el-button @click="deleteConsumeForm" style="margin-left: 280px" type="success">重置</el-button>
+      <el-button type="primary" @click="handleConsumeForm"> 提交 </el-button>
     </el-form>
 
     <!-- 客户信息栏 -->
@@ -239,7 +240,7 @@ const handleAddForm = async () => {
   </div>
 </template>
 <style scoped>
-.add-form {
+.consume-form {
   margin-top: 50px;
   max-width: 50%;
   float: left;

src/views/consume/bean/articleVideo.vue

@@ -547,13 +547,13 @@ const getTagText = (state) => {
         <!-- 设置表格容器的高度和滚动样式 -->
         <div style="height: 576px; overflow-y: auto">
           <el-table :data="tableData" style="width: 100%" height="576px" @sort-change="handleSortChange">
-            <!-- <el-table-column type="index" label="序号" width="80px" fixed="left">
+            <el-table-column type="index" label="序号" width="80px" fixed="left">
               <template #default="scope">
                 <span>{{
                   scope.$index + 1 + (getObj.value.pageNum - 1) * getObj.value.pageSize
                 }}</span>
               </template>
-            </el-table-column> -->
+            </el-table-column>
             <!-- 固定姓名列 -->
             <el-table-column prop="name" label="姓名" width="150px" fixed="left" />
             <!-- 固定精网号列 -->

src/views/consume/bean/dieHardFan.vue

@@ -535,13 +535,13 @@ const getTagText = (state) => {
         <!-- 设置表格容器的高度和滚动样式 -->
         <div style="height: 576px; overflow-y: auto">
           <el-table :data="tableData" style="width: 100%" height="576px" @sort-change="handleSortChange">
-            <!-- <el-table-column type="index" label="序号" width="80px" fixed="left">
+            <el-table-column type="index" label="序号" width="80px" fixed="left">
               <template #default="scope">
                 <span>{{
-                  scope.$index + 1 + (getObj.value.pageNum - 1) * getObj.value.pageSize
+                  scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize
                 }}</span>
               </template>
-            </el-table-column> -->
+            </el-table-column>
             <!-- 固定姓名列 -->
             <el-table-column prop="name" label="姓名" width="150px" fixed="left" />
             <!-- 固定精网号列 -->

src/views/consume/bean/liveStream.vue

@@ -588,13 +588,13 @@ const getTagText = (state) => {
         <!-- 设置表格容器的高度和滚动样式 -->
         <div style="height: 576px; overflow-y: auto">
           <el-table :data="tableData" style="width: 100%" height="576px" @sort-change="handleSortChange">
-            <!-- <el-table-column type="index" label="序号" width="80px" fixed="left">
+            <el-table-column type="index" label="序号" width="80px" fixed="left">
               <template #default="scope">
                 <span>{{
                   scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize
                 }}</span>
               </template>
-            </el-table-column> -->
+            </el-table-column>
             <!-- 固定姓名列 -->
             <el-table-column prop="name" label="姓名" width="150px" fixed="left" />
             <!-- 固定精网号列 -->