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

# Conflicts:
#	src/views/recharge/gold/addCoinRecharge.vue

src/views/consume/gold/addCoinConsume.vue

@@ -363,18 +363,43 @@ const ConsumeDialogVisibleCancel = () => {
   resetForm()
   user.value = {}
 };
-// 实际执行充值操作
-const proceedWithConsume = () => {
-  ElMessageBox.confirm('确认购买?')
-      .then(() => {
+
+// 第一次弹窗
+// 充值对话框显示状态
+const FirstConsumeDialogVisible = ref(false);
+
+// 关闭对话框
+const FirstConsumeDialogVisiblehandleClose = () => {
+  FirstConsumeDialogVisible.value = false;
+  // 重置表单数据
+  resetForm()
+  user.value = {}
+};
+
+// 确认使用cookie继续充值
+const FirstConsumeDialogVisibleContinue = () => {
+  FirstConsumeDialogVisible.value = false;
   add();
-        console.log('添加成功');
-      })
-      .catch(() => {
-        console.log('取消添加');
-      });
 };
 
+const FirstConsumeDialogVisibleCancel = () => {
+  FirstConsumeDialogVisible.value = false
+  resetForm()
+  user.value = {}
+};
+
+// 实际执行充值操作
+// const proceedWithConsume = () => {
+//   ElMessageBox.confirm('确认购买?')
+//       .then(() => {
+//         add();
+//         console.log('添加成功');
+//       })
+//       .catch(() => {
+//         console.log('取消添加');
+//       });
+// };
+
 // 添加前验证
 const addBefore = () => {
   Ref.value.validate(async (valid) => {
@@ -395,7 +420,7 @@ const addBefore = () => {
     if (cookie) {
       ConsumeDialogVisible.value = true;
     } else {
-      proceedWithConsume();
+      FirstConsumeDialogVisible.value = true;
     }
   });
 };
@@ -733,6 +758,64 @@ onMounted(async function () {
         </div>
       </template>
     </el-dialog>
+
+    <el-dialog
+        v-model="FirstConsumeDialogVisible"
+        title="操作确认"
+        :before-close="FirstConsumeDialogVisiblehandleClose"
+        :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>
+
+      <!-- 底部按钮（居中） -->
+      <template #footer>
+        <div class="dialog-footer-center">
+          <el-button @click="FirstConsumeDialogVisibleCancel">取 消</el-button>
+          <el-button type="primary" @click="FirstConsumeDialogVisibleContinue">确认购买</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
   </div>
 
   <!-- 金币消耗明细的布局------------------------------------------------------- -->