From 921b9e8a5f58aff8c2011d8a3af2d6ac3b3e313c Mon Sep 17 00:00:00 2001
From: lihuilin <analsak@163.com>
Date: Thu, 21 Aug 2025 15:51:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=86=E5=8F=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/consume/gold/addCoinConsume.vue | 180 +++++++++++++-----------------
 src/views/history/history.vue             |  46 ++++----
 2 files changed, 101 insertions(+), 125 deletions(-)

diff --git a/src/views/consume/gold/addCoinConsume.vue b/src/views/consume/gold/addCoinConsume.vue
index 85e9633..63c0e34 100644
--- a/src/views/consume/gold/addCoinConsume.vue
+++ b/src/views/consume/gold/addCoinConsume.vue
@@ -1,12 +1,12 @@
 <script setup>
-import {onMounted, reactive, ref, watch} from "vue";
-import {ElIcon, ElMessage, ElMessageBox} from "element-plus";
+import { onMounted, reactive, ref, watch } from "vue";
+import { ElIcon, ElMessage, ElMessageBox } from "element-plus";
 import moment from "moment";
 import request from "@/util/http.js"
 import Cookies from 'js-cookie';
-import {useAdminStore} from "@/store/index.js";
-import {storeToRefs} from "pinia";
-import {WarnTriangleFilled} from "@element-plus/icons-vue";
+import { useAdminStore } from "@/store/index.js";
+import { storeToRefs } from "pinia";
+import { WarnTriangleFilled } from "@element-plus/icons-vue";
 import dayjs from "dayjs";
 
 const adminStore = useAdminStore();
@@ -15,25 +15,19 @@ const { adminData, menuTree } = storeToRefs(adminStore);
 const trimJwCode = () => {
   if (addConsume.value.jwcode) {
     // 去除所有空格，并尝试转换为整数
-    const trimmed = addConsume.value.jwcode.toString().replace(/\s/g, '');
-    const numeric = Number(trimmed);
+    const trimmed = addConsume.value.jwcode.toString().replace(/\s/g, '')
+    const numeric = Number(trimmed)
 
     // 如果转换为数字成功，保存为数字，否则提示错误
     if (!isNaN(numeric)) {
-      addConsume.value.jwcode = numeric;
+      addConsume.value.jwcode = numeric
     } else {
-      ElMessage.error("精网号格式不正确，请输入数字");
+      ElMessage.error("精网号格式不正确，请输入数字")
     }
   }
 }
 //提交禁止重复点击
 const addDisabled = ref(false)
-/*
-====================数据=================================
-*/
-//这是获取当前登录的用户信息
-// const adminData = ref({});
-
 // 通过精网号查询用户（客户）信息 表单
 const user = ref({
   jwcode: null,
@@ -65,14 +59,12 @@ const addConsume = ref({
   taskGold: null, // 任务金币
   remark: "",//备注
   adminId: null,// 当前管理员id
-});
-// 表单验证
-const Ref = ref(null);
-// 表单验证规则
+  adminName: null,// 当前管理员姓名
+})
+const Ref = ref(null)
 const rules = reactive({
   jwcode: [
     { required: true, message: "请输入精网号", trigger: "blur" },
-    // { type: 'number', message: "精网号必须为数字", trigger: "blur" }
   ],
   goodsName: [{ required: true, message: "请选择商品", trigger: "blur" }],
   sumGold: [
@@ -83,7 +75,7 @@ const rules = reactive({
         const isValid = /^(0\.\d{1,2})|([1-9]\d*(\.\d{1,2})?)$/.test(value);
 
         if (!isValid) {
-          callback(new Error("请输入大于0的正数（可包含最多两位小数）"));
+          callback(new Error("请输入大于0的正数(可包含最多两位小数)"));
         } else {
           callback();
         }
@@ -93,30 +85,7 @@ const rules = reactive({
   ]
 });
 // 查询商品的表单
-const goods = ref([]);
-
-/*
-====================方法=================================
-*/
-const getAdminData = async function () {
-  try {//await 暂停函数执行，直到请求完成
-    const result = await request({
-      url: "/admin/userinfo",
-      data: {},
-    });
-    adminData.value = result;
-    addConsume.value.adminId = adminData.value.id;
-
-    addConsume.value.name = adminData.value.adminName;
-
-    console.log("请求成功", result);
-    console.log("用户信息", adminData.value);
-  } catch (error) {
-    console.log("请求失败", error);
-  }
-};
-
-
+const goods = ref([])
 // 输入验证函数
 function validateInput() {
   const sumGold = parseFloat(addConsume.value.sumGold);
@@ -261,16 +230,16 @@ const add = async function () {
     //value 为当前消耗时间
     WriteCookiesTime.value = dayjs().format("YYYY-MM-DD HH:mm:ss");
     // 设置cookies,用户jwcode为key，value也是jwcode，过期时间为1天
-    Cookies.set(WriteCookies.value, WriteCookiesTime.value, {expires:
-          1, path: '/'});
+    Cookies.set(WriteCookies.value, WriteCookiesTime.value, {
+      expires:
+        1, path: '/'
+    });
 
     addDisabled.value = true
     // 发送POST请求
     const result = await request({
-      // url: "/consume/add",
       url: "/consume/add",
       data: {
-        ...addConsume.value,
         jwcode: addConsume.value.jwcode,
         adminId: addConsume.value.adminId,
         sumGold: addConsume.value.sumGold * 100,
@@ -278,9 +247,10 @@ const add = async function () {
         taskGold: addConsume.value.taskGold * 100,
         permanentGold: addConsume.value.permanentGold * 100,
         goodsName: addConsume.value.goodsName,
-        remark: addConsume.value.remark
+        remark: addConsume.value.remark,
+        adminName: adminData.value.adminName
       }
-    });
+    })
     addDisabled.value = false
     console.log("add请求", result);
     // 处理响应
@@ -318,7 +288,7 @@ function resetForm() {
     remark: "",
     adminId: adminData.value.id,
     adminName: adminData.value.adminName,
-  };
+  }
 
   console.log("重置表单")
 
@@ -366,13 +336,13 @@ const ConsumeDialogVisibleCancel = () => {
 // 实际执行充值操作
 const proceedWithConsume = () => {
   ElMessageBox.confirm('确认购买?')
-      .then(() => {
-        add();
-        console.log('添加成功');
-      })
-      .catch(() => {
-        console.log('取消添加');
-      });
+    .then(() => {
+      add();
+      console.log('添加成功');
+    })
+    .catch(() => {
+      console.log('取消添加');
+    });
 };
 
 // 添加前验证
@@ -400,7 +370,6 @@ const addBefore = () => {
   });
 };
 
-
 // 查询客户信息（通过精网号）
 const getUser = async function (jwcode) {
   try {
@@ -520,9 +489,10 @@ watch(
 */
 // 挂载
 onMounted(async function () {
-  await getAdminData();
-  await getGoods();
-});
+  await getGoods()
+  console.log('adminData', adminData.value)
+
+})
 
 </script>
 
@@ -535,41 +505,41 @@ onMounted(async function () {
         </el-button>
       </el-form-item>
 
-        <el-form-item prop="goodsName" label="商品名称" style="flex: 1; margin-right: 0px">
-          <el-select v-model="addConsume.goodsName" placeholder="请选择商品"  style="width: 10vw;margin-left:30px">
-            <el-option v-for="item in goods" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>
-        </el-form-item>
+      <el-form-item prop="goodsName" label="商品名称" style="flex: 1; margin-right: 0px">
+        <el-select v-model="addConsume.goodsName" placeholder="请选择商品" style="width: 10vw;margin-left:30px">
+          <el-option v-for="item in goods" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
+      </el-form-item>
 
-        <el-form-item prop="sumGold" label="消耗金币总数">
-          <el-input v-model="addConsume.sumGold" style="width: 10vw;margin-left:2px" @input="validateInput()"
-            @change="calculateCoins(addConsume.sumGold)" />
-        </el-form-item>
+      <el-form-item prop="sumGold" label="消耗金币总数">
+        <el-input v-model="addConsume.sumGold" style="width: 10vw;margin-left:2px" @input="validateInput()"
+          @change="calculateCoins(addConsume.sumGold)" />
+      </el-form-item>
 
 
       <!-- 三类金币自动计算（禁用状态，不可编辑） -->
 
-        <el-form-item prop="permanentGold" label="永久金币">
-          <el-input v-model="addConsume.permanentGold" disabled  style="width: 10vw;margin-left:40px">
-            <template #default="scope">{{ scope.row.permanentGold }}</template>
-          </el-input>
-          <p style="margin-right: 0px">&nbsp;&nbsp;个</p>
-        </el-form-item>
+      <el-form-item prop="permanentGold" label="永久金币">
+        <el-input v-model="addConsume.permanentGold" disabled style="width: 10vw;margin-left:40px">
+          <template #default="scope">{{ scope.row.permanentGold }}</template>
+        </el-input>
+        <p style="margin-right: 0px">&nbsp;&nbsp;个</p>
+      </el-form-item>
 
-        <el-form-item prop="freeCoin" label="免费金币">
-          <el-input disabled v-model="addConsume.freeGold" style="width: 10vw;margin-left:40px" />
-          <p style="margin-right: 0px">&nbsp;&nbsp;个</p>
-        </el-form-item>
+      <el-form-item prop="freeCoin" label="免费金币">
+        <el-input disabled v-model="addConsume.freeGold" style="width: 10vw;margin-left:40px" />
+        <p style="margin-right: 0px">&nbsp;&nbsp;个</p>
+      </el-form-item>
 
-        <el-form-item prop="taskGold" label="任务金币">
-          <el-input disabled v-model="addConsume.taskGold" style="width: 10vw;margin-left:40px" />
-          <p style="margin-right: 20px">&nbsp;&nbsp;个</p>
-        </el-form-item>
+      <el-form-item prop="taskGold" label="任务金币">
+        <el-input disabled v-model="addConsume.taskGold" style="width: 10vw;margin-left:40px" />
+        <p style="margin-right: 20px">&nbsp;&nbsp;个</p>
+      </el-form-item>
 
-        <el-form-item prop="remark" label="备注">
-          <el-input v-model="addConsume.remark" style="width: 13.5vw;margin-left:70px" :rows="4" maxlength="100" show-word-limit
-            type="textarea" />
-        </el-form-item>
+      <el-form-item prop="remark" label="备注">
+        <el-input v-model="addConsume.remark" style="width: 13.5vw;margin-left:70px" :rows="4" maxlength="100"
+          show-word-limit type="textarea" />
+      </el-form-item>
 
       <el-button type="success" @click="resetForm()" style="margin-left: 200px;margin-top:10px">重置</el-button>
       <el-button type="primary" :disabled="addDisabled" @click="addBefore" style="margin-top:10px"> 提交</el-button>
@@ -660,48 +630,43 @@ onMounted(async function () {
         </el-row>
       </el-form>
     </el-card>
-    <el-dialog
-        v-model="ConsumeDialogVisible"
-        title="操作确认"
-        :before-close="ConsumeDialogVisiblehandleClose"
-        :close-on-click-modal="false"
-        width="480px"
-    >
+    <el-dialog v-model="ConsumeDialogVisible" title="操作确认" :before-close="ConsumeDialogVisiblehandleClose"
+      :close-on-click-modal="false" width="480px">
       <!-- 内容整体居中且收窄 -->
       <div class="confirm-body">
         <!-- 用户信息 -->
         <div>
           <div class="field-label">用户信息</div>
-          <el-input :model-value="user.jwcode + (user.name ? '【' + user.name + '】' : '')" disabled/>
+          <el-input :model-value="user.jwcode + (user.name ? '【' + user.name + '】' : '')" disabled />
         </div>
         <!-- 活动名称 -->
         <div class="field">
           <div class="field-label">商品名称</div>
-          <el-input v-model="addConsume.goodsName" disabled/>
+          <el-input v-model="addConsume.goodsName" disabled />
         </div>
         <!--金币总数   -->
         <div class="field">
           <div class="field-label">金币总数</div>
-          <el-input v-model="addConsume.sumGold" disabled/>
+          <el-input v-model="addConsume.sumGold" disabled />
         </div>
         <!-- 金币详细信息（同一行左右排列） -->
         <el-row :gutter="20" class="coins-row">
           <el-col :span="8">
             <div class="field">
               <div class="field-label">永久金币</div>
-              <el-input v-model="addConsume.permanentGold" disabled/>
+              <el-input v-model="addConsume.permanentGold" disabled />
             </div>
           </el-col>
           <el-col :span="8">
             <div class="field">
               <div class="field-label">免费金币</div>
-              <el-input v-model="addConsume.freeGold" disabled/>
+              <el-input v-model="addConsume.freeGold" disabled />
             </div>
           </el-col>
           <el-col :span="8">
             <div class="field">
               <div class="field-label">任务金币</div>
-              <el-input v-model="addConsume.taskGold" disabled/>
+              <el-input v-model="addConsume.taskGold" disabled />
             </div>
           </el-col>
 
@@ -709,13 +674,13 @@ onMounted(async function () {
         <!-- 风险提示 -->
         <div style="display: flex; align-items: center; margin-top: 20px;">
           <el-icon :size="24" color="#FFD700">
-            <WarnTriangleFilled/>
+            <WarnTriangleFilled />
           </el-icon>
           <p>重复购买风险提示</p>
         </div>
         <!-- 记录 + 虚线分隔 -->
         <div>
-          <el-divider border-style="dashed"/>
+          <el-divider border-style="dashed" />
           <p>检测到该用户近期有相似消费记录：</p>
           · {{ ReadCookiesTime }} 购买 【{{ addConsume.goodsName }}】(操作人: {{ adminData.adminName }})
         </div>
@@ -759,22 +724,27 @@ p {
   height: 50px;
   display: block;
 }
+
 .add-form {
   max-width: 50%;
   float: left;
 }
+
 /* 标题居中 */
 .el-dialog__header {
   text-align: center;
 }
+
 .confirm-body {
   width: 420px;
   margin: 0 auto;
 }
+
 /* 字段块与标签样式 */
 .field {
   margin-bottom: 14px;
 }
+
 .customer-info {
   width: 700px;
   float: right;
diff --git a/src/views/history/history.vue b/src/views/history/history.vue
index bbcaaee..6153065 100644
--- a/src/views/history/history.vue
+++ b/src/views/history/history.vue
@@ -23,21 +23,21 @@
 
     <el-card style="margin-top:10px" v-show="tableData.length > 0">
         <el-table :data="tableData" style="width: 100%" height="600">
-            <el-table-column type="index" label="序号" width="55" header-align="center" align="center">
+            <el-table-column type="index" label="序号" width="100" header-align="center" align="center">
                 <template #default="scope">
                     {{ scope.$index + 1 + (pagination.pageNum - 1) * pagination.pageSize }}
                 </template>
             </el-table-column>
-            <el-table-column prop="name" label="客户姓名" width="120" show-overflow-tooltip />
-            <el-table-column prop="jwcode" label="精网号" width="120" header-align="center" align="center" />
-            <el-table-column prop="num" label="数量" width="120" header-align="center" align="center" />
-            <el-table-column prop="updateType" show-overflow-tooltip label="更新类型" width="120" align="center" />
-            <el-table-column v-if="activeName === 'new'" prop="freeGold" label="免费金币" width="120" align="center" />
-            <el-table-column v-if="activeName === 'new'" prop="permanentGold" label="永久金币" width="120" align="center" />
-            <el-table-column v-if="activeName === 'new'" prop="taskGold" label="任务金币" width="120" align="center" />
-            <el-table-column prop="operator" label="操作人" width="120" />
+            <el-table-column prop="name" label="客户姓名" width="180" show-overflow-tooltip />
+            <el-table-column prop="jwcode" label="精网号" width="180" header-align="center" align="center" />
+            <el-table-column prop="num" label="数量" width="180" header-align="center" align="center" />
+            <el-table-column prop="updateType" show-overflow-tooltip label="更新类型" width="180" align="center" />
+            <el-table-column v-if="activeName === 'new'" prop="freeGold" label="免费金币" width="180" align="center" />
+            <el-table-column v-if="activeName === 'new'" prop="permanentGold" label="永久金币" width="180" align="center" />
+            <el-table-column v-if="activeName === 'new'" prop="taskGold" label="任务金币" width="180" align="center" />
+            <el-table-column prop="operator" label="操作人" width="180" />
             <el-table-column prop="createTime" label="更新时间" width="200" header-align="center" align="center" />
-            <el-table-column prop="remark" label="备注" show-overflow-tooltip width="180" align="center" />
+            <el-table-column prop="remark" label="备注" show-overflow-tooltip width="200" align="center" />
         </el-table>
         <el-pagination background style="margin-top:20px" v-model:current-page="pagination.pageNum"
             v-model:page-size="pagination.pageSize" layout="total, sizes, prev, pager, next, jumper"
@@ -92,8 +92,8 @@ const getOld = async function () {
     if (findMenuById(menuTree.value, permissionMapping.History_Query)) {
         try {
             if ((searchObj.value.name || searchObj.value.jwcode) && activeName.value == 'old') {
-                const startTime = dateRange.value[0] ? moment(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : ""
-                const endTime = dateRange.value[1] ? moment(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : ""
+                const startTime = dateRange.value && dateRange.value[0] ? moment(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : ""
+                const endTime = dateRange.value && dateRange.value[1] ? moment(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : ""
                 const res = await API({
                     url: '/history/getOldHistoryRecord',
                     data: {
@@ -104,10 +104,12 @@ const getOld = async function () {
                         pageSize: pagination.value.pageSize,
                     }
                 })
-                tableData.value = res.data.list
-                console.log('tableData.value', res.data.list);
-                pagination.value.total = res.data.total
-
+                if (res.code == 200) {
+                    ElMessage.success('查询成功')
+                    tableData.value = res.data.list
+                    console.log('tableData.value', res.data.list);
+                    pagination.value.total = res.data.total
+                }
             } else {
                 ElMessage.error('请输入姓名或精网号')
                 return
@@ -122,8 +124,8 @@ const get = async function () {
     if (findMenuById(menuTree.value, permissionMapping.History_Query)) {
         try {
             if ((searchObj.value.name || searchObj.value.jwcode) && activeName.value == 'new') {
-                const startTime = dateRange.value[0] ? moment(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : ""
-                const endTime = dateRange.value[1] ? moment(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : ""
+                const startTime = dateRange.value && dateRange.value[0] ? moment(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : ""
+                const endTime = dateRange.value && dateRange.value[1] ? moment(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : ""
                 const res = await API({
                     url: '/history/getNewHistoryRecord',
                     data: {
@@ -134,8 +136,12 @@ const get = async function () {
                         pageSize: pagination.value.pageSize,
                     }
                 })
-                tableData.value = res.data.list
-                pagination.value.total = res.data.total
+                if (res.code == 200) {
+                    ElMessage.success('查询成功')
+                    tableData.value = res.data.list
+                    console.log('tableData.value', res.data.list)
+                    pagination.value.total = res.data.total
+                }
             } else {
                 ElMessage.error('请输入姓名或精网号')
                 return