From fc3cb174376c1cf550a519cce7cb27506c1fa4d7 Mon Sep 17 00:00:00 2001
From: donghaolin <17667510818@163.com>
Date: Fri, 6 Dec 2024 11:17:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9A=84=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=85=85=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/gold-system/src/views/managerecharge/rate.vue  |  9 ++-
 vue/gold-system/src/views/recharge/addRecharge.vue | 68 ++++++++++++++++------
 2 files changed, 55 insertions(+), 22 deletions(-)

diff --git a/vue/gold-system/src/views/managerecharge/rate.vue b/vue/gold-system/src/views/managerecharge/rate.vue
index 809817b..99c3603 100644
--- a/vue/gold-system/src/views/managerecharge/rate.vue
+++ b/vue/gold-system/src/views/managerecharge/rate.vue
@@ -17,8 +17,8 @@ const getAdminData = async function () {
       {}
     );
     adminData.value = result;
-    addRate.value.adminId = adminData.value.adminId;
-    editRate.value.adminId = adminData.value.adminId;
+    rateAdd.value.adminId = adminData.value.adminId;
+    rateEdit.value.adminId = adminData.value.adminId;
     console.log("请求成功", result);
     console.log("用户信息", user.value);
   } catch (error) {
@@ -266,7 +266,6 @@ const checkEndTime = function (rule, value, callback) {
 const rules = reactive({
   currency: [{ required: true, message: "请选择货币名称", trigger: "blur" }],
   exchangeRate: [{ required: true, message: "请输入汇率", trigger: "blur" }],
-  updateName: [{ required: true, message: "请输入添加人", trigger: "blur" }],
   startTime: [
     { required: true, message: "请选择开始时间", trigger: "blur" },
     { validator: checkStartTime, trigger: "blur" },
@@ -385,7 +384,7 @@ const checkNumber = function () {
                 <span>{{ formatDate(scope.row.updateTime) }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="updateName" label="更新人" :span="4" />
+            <el-table-column prop="adminId" label="更新人" :span="4" />
             <el-table-column label="操作" :span="4">
               <template #default="scope">
                 <el-button
@@ -480,7 +479,7 @@ const checkNumber = function () {
           <p class="unit">:1</p>
           <p>(提示：当前规则每 5 元人民币可兑换 1 新币)</p>
         </el-form-item>
-        <el-form-item prop="updateName" label="提交人:">
+        <el-form-item prop="adminId" label="提交人:">
           <el-input :value="adminData.name" disabled style="width: 240px" />
         </el-form-item>
         <el-form-item prop="startTime" label="开始时间:">
diff --git a/vue/gold-system/src/views/recharge/addRecharge.vue b/vue/gold-system/src/views/recharge/addRecharge.vue
index facc2e0..477e5eb 100644
--- a/vue/gold-system/src/views/recharge/addRecharge.vue
+++ b/vue/gold-system/src/views/recharge/addRecharge.vue
@@ -31,7 +31,7 @@ const addRecharge = ref({
   rechargeWay: "客服充值",
   freeGold: 0,
   rechargeGold: 0,
-  paidGold: 0,
+  paidGold: "",
 });
 // 这是添加充值信息的接口
 const add = async function () {
@@ -51,14 +51,23 @@ const add = async function () {
     // 显示成功消息
     ElMessage.success("添加成功");
     // 重置表单
-    addRecharge.value = {};
-    addRecharge.value.adminId = adminData.value.adminId;
-    addRecharge.value.area = adminData.value.area;
-    addRecharge.value.rechargeVoucher = "";
-    addRecharge.value.rechargeWay = "客服充值";
-    addRecharge.value.freeGold = 0;
-    addRecharge.value.rechargeGold = 0;
-    addRecharge.value.paidGold = 0;
+    addRecharge.value = {
+      adminId: adminData.value.adminId,
+      area: adminData.value.area,
+      rechargeVoucher: "",
+      rechargeWay: "客服充值",
+      freeGold: Number(0),
+      rechargeGold: 1,
+      paidGold: "",
+    };
+
+    // addRecharge.value.adminId = adminData.value.adminId;
+    // addRecharge.value.area = adminData.value.area;
+    // addRecharge.value.rechargeVoucher = "";
+    // addRecharge.value.rechargeWay = "客服充值";
+    // addRecharge.value.freeGold = 0;
+    // addRecharge.value.rechargeGold = 0;
+    // addRecharge.value.paidGold = "";
   } catch (error) {
     console.log("请求失败", error);
     // 在这里可以处理错误逻辑，比如显示错误提示等
@@ -89,7 +98,7 @@ const addBefore = () => {
 // 开始时间改变时，重新验证结束时间
 const Ref = ref(null);
 const checkEndTime = function (rule, value, callback) {
-  if (value <= new Date()) {
+  if (value <= new Date() - 1000 * 60 * 60 * 24 * 1) {
     callback(new Error("付款时间不能小于当前时间"));
   } else {
     callback();
@@ -216,17 +225,42 @@ const options = [
 ];
 
 const calculatedFreeGold = computed(() => {
-  return Math.ceil(addRecharge.value.paidGold / addRecharge.value.activityId);
+  if (!addRecharge.value.activityId == 0) {
+    const paidGold = Number(addRecharge.value.paidGold) || 0;
+    const activityId = Number(addRecharge.value.activityId) || 1; // 避免除以0
+    return Math.ceil(paidGold / activityId);
+  }
 });
+
 const calculatedRechargeGold = computed(() => {
-  return addRecharge.value.paidGold * addRecharge.value.rateId;
+  if (!addRecharge.value.rateId == 0) {
+    const paidGold = Number(addRecharge.value.paidGold) || 0;
+    const rateId = Number(addRecharge.value.rateId) || 1; // 避免乘以0
+    return Math.ceil(paidGold * rateId);
+  }
 });
+
 watch(calculatedFreeGold, (newVal) => {
-  addRecharge.value.freeGold = newVal;
+  addRecharge.value.freeGold = Number(newVal);
 });
+
 watch(calculatedRechargeGold, (newVal) => {
-  addRecharge.value.rechargeGold = newVal;
+  addRecharge.value.rechargeGold = Number(newVal);
 });
+
+//这是重置重置表单的方法
+const deleteRecharge = function () {
+  addRecharge.value = {
+    adminId: adminData.value.adminId,
+    area: adminData.value.area,
+
+    rechargeVoucher: "",
+    rechargeWay: "客服充值",
+    freeGold: Number(0),
+    rechargeGold: 0,
+    paidGold: "",
+  };
+};
 </script>
 
 <template>
@@ -270,7 +304,7 @@ watch(calculatedRechargeGold, (newVal) => {
       <el-input v-model="addRecharge.freeGold" disabled style="width: 100px" />
       <p>个</p>
     </el-form-item>
-    <el-form-item label="充值金额">
+    <el-form-item prop="rechargeGold" label="充值金额">
       <el-select
         prop="rechargeGold"
         v-model="addRecharge.rateId"
@@ -348,8 +382,8 @@ watch(calculatedRechargeGold, (newVal) => {
         placeholder="提交人姓名"
       />
     </el-form-item>
-    <el-button @click="closeAddActivityVisible" style="margin-left: 280px"
-      >取消</el-button
+    <el-button @click="deleteRecharge" style="margin-left: 280px"
+      >重置</el-button
     >
     <el-button type="primary" @click="addBefore"> 提交 </el-button>
   </el-form>