Merge branch 'refs/heads/lihui/feature-20250815155204-金币优化' into milestone-20250815-金币优化

src/views/consume/gold/addCoinConsume.vue

@@ -1,8 +1,12 @@
 <script setup>
 import {onMounted, reactive, ref, watch} from "vue";
-import { ElMessage, ElMessageBox } from "element-plus";
+import {ElIcon, ElMessage, ElMessageBox} from "element-plus";
+import {Plus, WarnTriangleFilled} from '@element-plus/icons-vue'
+
 import moment from "moment";
 import request from "@/util/http.js"
+import Cookies from 'js-cookie';
+import dayjs from "dayjs";
 // 精网号去空格
 const trimJwCode = () => {
   if (addConsume.value.jwcode) {
@@ -177,7 +181,6 @@ function validateInput() {
   }
 
 
-
   // 验证金币总和
   const totalAvailableGold = (user.value.nowSumGold)
   if (user.value.jwcode && sumGold > totalAvailableGold) {
@@ -227,6 +230,15 @@ function calculateCoins(sumGold) {
   return {free: freeUsed, permanent: permanentUsed, task: taskUsed};
 }
 
+// 用来写的 cookie 的 key
+const WriteCookies = ref(null)
+// 用来写的 cookie 的 value
+const WriteCookiesTime = ref(null)
+// 用来读的 cookie 的 key
+const ReadCookies = ref(null)
+// 用来读的 cookie 的 value
+const ReadCookiesTime = ref(null)
+
 // 这是添加消费信息的接口
 const add = async function () {
   try {
@@ -238,6 +250,14 @@ const add = async function () {
     calculateCoins(addConsume.value.sumGold);
 
     console.log("addConsume.value", addConsume.value)
+    //存一下 用户的jwcode
+    // 拼接 jwcode:permanentGold:freeGold
+    WriteCookies.value = `coinConsume:${addConsume.value.jwcode}:${addConsume.value.goodsName}}`
+    //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: '/'});
+
     // 发送POST请求
     addDisabled.value = true
     const result = await request({
@@ -316,29 +336,65 @@ function resetForm() {
   }
 }
 
-// 添加前验证
-const addBefore = () => {
-  Ref.value.validate(async (valid) => {
-    if (valid) {
-      ElMessageBox.confirm("确认添加？")
+// 充值对话框显示状态
+const ConsumeDialogVisible = ref(false);
+
+// 关闭对话框
+const ConsumeDialogVisiblehandleClose = () => {
+  ConsumeDialogVisible.value = false;
+  // 重置表单数据
+  resetForm()
+  user.value = {}
+};
+
+// 确认使用cookie继续充值
+const ConsumeDialogVisibleContinue = () => {
+  ConsumeDialogVisible.value = false;
+  add();
+};
+
+const ConsumeDialogVisibleCancel = () => {
+  ConsumeDialogVisible.value = false
+    resetForm()
+    user.value = {}
+};
+// 实际执行充值操作
+const proceedWithConsume = () => {
+  ElMessageBox.confirm('确认充值？')
       .then(() => {
-          console.log("这里是jwcode", addConsume.value.jwcode)
         add();
-          console.log("添加成功",);
-          addConsume.value = {};
+        console.log('添加成功');
       })
       .catch(() => {
-          console.log("取消添加");
+        console.log('取消添加');
       });
-    } else {
-      //提示
+};
+
+// 添加前验证
+const addBefore = () => {
+  Ref.value.validate(async (valid) => {
+    // 验证cookie
+    if (!valid) {
       ElMessage({
-        type: "error",
-        message: "请检查输入内容",
+        type: 'error',
+        message: '请检查输入内容'
       });
+      return;
+    }
+    ReadCookies.value = `coinConsume:${addConsume.value.jwcode}:${addConsume.value.goodsName}}`
+  // 获取cookie
+    const cookie = Cookies.get(ReadCookies.value)
+    console.log("time", WriteCookiesTime.value)
+    // 格式化时间
+    ReadCookiesTime.value = moment(cookie).format('YYYY-MM-DD HH:mm:ss')
+    if (cookie) {
+      ConsumeDialogVisible.value = true;
+    } else {
+      proceedWithConsume();
     }
   });
 };
+
 // 查询客户信息（通过精网号）
 const getUser = async function (jwcode) {
   try {
@@ -466,7 +522,8 @@ onMounted(async function () {
 
 <template>
   <div>
-    <el-form :model="addConsume" ref="Ref" :rules="rules" label-width="auto" style="max-width: 600px;" label-position="right" class="add-form">
+    <el-form :model="addConsume" ref="Ref" :rules="rules" label-width="auto" style="max-width: 600px;"
+             label-position="right" class="add-form">
       <el-form-item prop="jwcode" label="精网号">
         <el-input v-model="addConsume.jwcode" style="width: 200px"/>
         <el-button type="primary" @click="getUser(addConsume.jwcode)" style="margin-left: 10px">查询
@@ -545,13 +602,15 @@ onMounted(async function () {
           </el-col>
           <el-col :span="14">
             <el-form-item label="当前金币总数" style="width: 500px">
-              <span style="color: #2fa1ff; margin-right: 5px" v-if="user.nowSumGold !== undefined">{{ user.nowSumGold
+              <span style="color: #2fa1ff; margin-right: 5px" v-if="user.nowSumGold !== undefined">{{
+                  user.nowSumGold
                 }}</span>
             </el-form-item>
             <!-- 金币详情独立显示 -->
             <el-form-item style="margin-top: -23px"> <!-- 负边距减少间距 -->
               <span style="color: #b1b1b1; margin-left: 0px" v-if="user.nowPermanentGold !== undefined">(永久金币:{{
-                user.nowPermanentGold }};
+                  user.nowPermanentGold
+                }};
                 免费金币:{{ user.nowFreeGold }};
                 任务金币:{{ user.nowTaskGold }})</span>
             </el-form-item>
@@ -590,6 +649,80 @@ onMounted(async function () {
       </el-form>
     </el-card>
 
+    <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/>
+        </div>
+        <!-- 活动名称 -->
+        <div class="field">
+          <div class="field-label">商品名称</div>
+          <el-input v-model="addConsume.goodsName" disabled/>
+        </div>
+        <!--金币总数   -->
+        <div class="field">
+          <div class="field-label">金币总数</div>
+          <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/>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <div class="field">
+              <div class="field-label">免费金币</div>
+              <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/>
+            </div>
+          </el-col>
+
+        </el-row>
+        <!-- 风险提示 -->
+        <div style="display: flex; align-items: center; margin-top: 20px;">
+          <el-icon :size="24" color="#FFD700">
+            <WarnTriangleFilled/>
+          </el-icon>
+          <p>重复购买风险提示</p>
+        </div>
+        <!-- 记录 + 虚线分隔 -->
+        <div>
+          <el-divider border-style="dashed"/>
+          <p>检测到该用户近期有相似消费记录：</p>
+          · {{ ReadCookiesTime }} 购买 【{{ addConsume.goodsName }}】(操作人: {{ adminData.adminName }})
+        </div>
+        <div style="margin-top: 10px">
+          <p>是否继续操作？</p>
+
+        </div>
+      </div>
+
+      <!-- 底部按钮（居中） -->
+      <template #footer>
+        <div class="dialog-footer-center">
+          <el-button @click="ConsumeDialogVisibleCancel">取 消</el-button>
+          <el-button type="primary" @click="ConsumeDialogVisibleContinue">确认充值</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
   </div>
 
   <!-- 金币消耗明细的布局------------------------------------------------------- -->
@@ -605,11 +738,13 @@ onMounted(async function () {
 p {
   margin: 0px;
 }
+
 .add-form {
   margin-top: 50px;
   max-width: 50%;
   float: left;
 }
+
 .el-form-item {
   margin-left: 50px;
 }
@@ -620,10 +755,41 @@ p {
   height: 50px;
   display: block;
 }
+
 .customer-info {
   max-width: 60%;
 }
 </style>
 
 <style>
+/* 标题居中 */
+.el-dialog__header {
+  text-align: center;
+}
+.confirm-body {
+  width: 420px;
+  margin: 0 auto;
+}
+/* 字段块与标签样式 */
+.field {
+  margin-bottom: 14px;
+}
+
+.field-label {
+  font-size: 14px;
+  color: #606266;
+  margin-bottom: 6px;
+}
+
+/* 金币行紧凑 */
+.coins-row .field {
+  margin-bottom: 0;
+}
+
+/* 底部按钮居中 */
+.dialog-footer-center {
+  display: flex;
+  justify-content: center;
+  gap: 12px;
+}
 </style>

src/views/recharge/gold/addCoinRecharge.vue

@@ -6,7 +6,6 @@ import axios from 'axios'
 import API from '@/util/http.js'
 import moment from 'moment'
 import Cookies from 'js-cookie';
-import dayjs from "dayjs";
 // 定义 fixedAdminId
 // const fixedAdminId = 1;
 
@@ -105,7 +104,7 @@ const add = async function () {
     console.log('开始添加充值信息', recharge.value)
     //存一下 用户的jwcode
     // 拼接 jwcode:permanentGold:freeGold
-    WriteCookies.value = `${recharge.value.jwcode}:${recharge.value.permanentGold}:${recharge.value.freeGold}`
+    WriteCookies.value = `coinRecharge:${recharge.value.jwcode}:${recharge.value.permanentGold}:${recharge.value.freeGold}`
     //value 为充值时间
     WriteCookiesTime.value = recharge.value.payTime
     // 设置cookies,用户jwcode为key，value也是jwcode，过期时间为1天
@@ -153,9 +152,8 @@ const RechargeDialogVisibleContinue = () => {
 
 const RechargeDialogVisibleCancel = () => {
   RechargeDialogVisible.value = false
-  //todo
-  /*  deleteRecharge()
-    user.value = {}*/
+    deleteRecharge()
+    user.value = {}
 };
 
 // 实际执行充值操作
@@ -231,7 +229,7 @@ const addBefore = () => {
 
     // 检查cookie
     // 拼接 jwcode:permanentGold:freeGold
-    ReadCookies.value = `${recharge.value.jwcode}:${recharge.value.permanentGold}:${recharge.value.freeGold}`
+    ReadCookies.value = `coinRecharge:${recharge.value.jwcode}:${recharge.value.permanentGold}:${recharge.value.freeGold}`
 
     // 获取cookie
     const cookie = Cookies.get(ReadCookies.value)
@@ -809,14 +807,14 @@ onMounted(() => {
         title="操作确认"
         :before-close="RechargeDialogVisiblehandleClose"
         :close-on-click-modal="false"
-        width="600px"
+        width="480px"
     >
       <!-- 内容整体居中且收窄 -->
       <div class="confirm-body">
         <!-- 用户信息 -->
         <div>
+          <div class="field-label">用户信息</div>
           <el-input :model-value="user.jwcode + (user.name ? '【' + user.name + '】' : '')" disabled/>
-
         </div>
         <!-- 活动名称 -->
         <div class="field">
@@ -940,13 +938,13 @@ p {
 
 
 .confirm-body {
-  width: 500px;
+  width: 420px;
   margin: 0 auto;
 }
 
 /* 字段块与标签样式 */
 .field {
-  margin-bottom: 14px;
+  margin-top: 10px;
 }
 
 .field-label {