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

src/views/consume/gold/addCoinConsume.vue

@@ -226,7 +226,7 @@ const add = async function () {
 
     //存一下 用户的jwcode
     // 拼接 jwcode:permanentGold:freeGold
-    WriteCookies.value = `coinConsume:${addConsume.value.jwcode}:${addConsume.value.goodsName}}`
+    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天
@@ -321,7 +321,7 @@ const ConsumeDialogVisiblehandleClose = () => {
   resetForm()
   user.value = {}
 };
-
+``
 // 确认使用cookie继续充值
 const ConsumeDialogVisibleContinue = () => {
   ConsumeDialogVisible.value = false;
@@ -346,7 +346,7 @@ const FirstConsumeDialogVisiblehandleClose = () => {
   user.value = {}
 };
 
-// 确认使用cookie继续充值
+// 第一次消耗
 const FirstConsumeDialogVisibleContinue = () => {
   FirstConsumeDialogVisible.value = false;
   add();
@@ -387,6 +387,7 @@ const addBefore = () => {
     console.log("time", WriteCookiesTime.value)
     // 格式化时间
     ReadCookiesTime.value = moment(cookie).format('YYYY-MM-DD HH:mm:ss')
+    console.log("cookie========", cookie)
     if (cookie) {
       ConsumeDialogVisible.value = true;
     } else {
@@ -655,8 +656,15 @@ 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="FirstConsumeDialogVisible"
+        title="操作确认"
+        :before-close="FirstConsumeDialogVisiblehandleClose"
+        :close-on-click-modal="false"
+        width="480px"
+    >
       <!-- 内容整体居中且收窄 -->
       <div class="confirm-body">
         <!-- 用户信息 -->
@@ -696,41 +704,20 @@ onMounted(async function () {
           </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>
+          <el-button @click="FirstConsumeDialogVisibleCancel">取 消</el-button>
+          <el-button type="primary" @click="FirstConsumeDialogVisibleContinue">确认购买</el-button>
         </div>
       </template>
     </el-dialog>
 
-    <el-dialog
-        v-model="FirstConsumeDialogVisible"
-        title="操作确认"
-        :before-close="FirstConsumeDialogVisiblehandleClose"
-        :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">
         <!-- 用户信息 -->
@@ -770,13 +757,30 @@ onMounted(async function () {
           </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="FirstConsumeDialogVisibleCancel">取 消</el-button>
-          <el-button type="primary" @click="FirstConsumeDialogVisibleContinue">确认购买</el-button>
+          <el-button @click="ConsumeDialogVisibleCancel">取 消</el-button>
+          <el-button type="primary" @click="ConsumeDialogVisibleContinue">确认购买</el-button>
         </div>
       </template>
     </el-dialog>

src/views/recharge/gold/addCoinRecharge.vue

@@ -133,10 +133,20 @@ const add = async function () {
   }
 }
 
-// 充值对话框显示状态
+// 二次校验充值对话框显示状态
 const RechargeDialogVisible = ref(false);
+// 第一次弹窗
+const FirstRechargeDialogVisible = ref(false);
 
-// 关闭对话框
+// 关闭第一次对话框
+const FirstRechargeDialogVisiblehandleClose = () => {
+  FirstRechargeDialogVisible.value = false;
+  // 重置表单数据
+  deleteRecharge()
+  user.value = {}
+};
+
+// 关闭第二次对话框
 const RechargeDialogVisiblehandleClose = () => {
   RechargeDialogVisible.value = false;
   // 重置表单数据
@@ -156,16 +166,21 @@ const RechargeDialogVisibleCancel = () => {
   user.value = {}
 };
 
-// 实际执行充值操作
-const proceedWithRecharge = () => {
-  ElMessageBox.confirm('确认充值？')
-    .then(() => {
-      add();
-      console.log('充值成功');
-    })
-    .catch(() => {
-      console.log('取消充值');
-    });
+// 第一次实际执行充值操作
+// const proceedWithRecharge = () => {
+//   FirstRechargeDialogVisible.value = false
+//   add()
+// };
+
+const FistRechargeDialogVisibleContinue = () => {
+  FirstRechargeDialogVisible.value = false
+  add()
+};
+// 第一次取消
+const FirstRechargeDialogVisibleCancel = () => {
+  FirstRechargeDialogVisible.value = false
+  deleteRecharge()
+  user.value = {}
 };
 
 // 添加充值信息前的按钮点击事件，进行表单验证和用户确认操作
@@ -241,7 +256,7 @@ const addBefore = () => {
     if (cookie) {
       RechargeDialogVisible.value = true;
     } else {
-      proceedWithRecharge();
+      FirstRechargeDialogVisible.value = true;
     }
   });
 };
@@ -792,6 +807,47 @@ onMounted(() => {
       </el-form>
     </el-card>
 
+    <el-dialog v-model="FirstRechargeDialogVisible" title="操作确认" :before-close="FirstRechargeDialogVisiblehandleClose"
+               :close-on-click-modal="false" width="400px">
+      <!-- 内容整体居中且收窄 -->
+      <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="recharge.activity" disabled/>
+        </div>
+        <!-- 金币信息（同一行左右排列） -->
+        <el-row :gutter="20" class="coins-row">
+          <el-col :span="12">
+            <div class="field">
+              <div class="field-label">永久金币</div>
+              <el-input v-model="recharge.permanentGold" disabled/>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="field">
+              <div class="field-label">免费金币</div>
+              <el-input v-model="recharge.freeGold" disabled/>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+
+      <!-- 底部按钮（居中） -->
+      <template #footer>
+        <div class="dialog-footer-center">
+          <el-button @click="FirstRechargeDialogVisibleCancel">取 消</el-button>
+          <el-button type="primary" @click="FistRechargeDialogVisibleContinue">确认充值</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+
     <el-dialog v-model="RechargeDialogVisible" title="操作确认" :before-close="RechargeDialogVisiblehandleClose"
       :close-on-click-modal="false" width="480px">
       <!-- 内容整体居中且收窄 -->
@@ -850,6 +906,7 @@ onMounted(() => {
       </template>
     </el-dialog>
 
+
   </div>
 </template>
 
@@ -918,4 +975,22 @@ p {
   margin-right: 300px;
   margin-top: 150px;
 }
+
+.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>