From 5463fa88f00c688fa07c22dbbf45f888764e137a Mon Sep 17 00:00:00 2001
From: donghaolin <17667510818@163.com>
Date: Tue, 17 Dec 2024 17:54:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=8A=E6=AC=A1=E5=84=BF=E8=BF=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/gold-system/src/views/consume/addConsume.vue   |  4 +-
 vue/gold-system/src/views/managerecharge/rate.vue  | 49 +++++++++++++---------
 vue/gold-system/src/views/recharge/addRecharge.vue |  2 +-
 vue/gold-system/src/views/refund/addRefund.vue     |  8 +---
 4 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/vue/gold-system/src/views/consume/addConsume.vue b/vue/gold-system/src/views/consume/addConsume.vue
index 94fbe67..95afa62 100644
--- a/vue/gold-system/src/views/consume/addConsume.vue
+++ b/vue/gold-system/src/views/consume/addConsume.vue
@@ -298,7 +298,7 @@ function calculateCoins() {
       <el-form-item prop="rechargeCoin" label="充值金币" style="float: left">
         <el-input
           disabled
-          v-model="addConsume.taskCoin"
+          v-model="addConsume.rechargeCoin"
           style="width: 100px; margin-left: -5px"
         />
         <p style="margin-right: 0px">个</p>
@@ -318,7 +318,7 @@ function calculateCoins() {
       <el-form-item prop="taskCoin" label="任务金币" style="margin-left: -20px">
         <el-input
           disabled
-          v-model="addConsume.rechargeCoin"
+          v-model="addConsume.taskCoin"
           style="width: 100px; margin-left: -5px"
         />
         <p style="margin-right: 20px">个</p>
diff --git a/vue/gold-system/src/views/managerecharge/rate.vue b/vue/gold-system/src/views/managerecharge/rate.vue
index 77bf067..440632e 100644
--- a/vue/gold-system/src/views/managerecharge/rate.vue
+++ b/vue/gold-system/src/views/managerecharge/rate.vue
@@ -39,7 +39,32 @@ const getObj = ref({
 });
 const total = ref(0);
 //分页总条目
+
+//时间选择器
+const value1 = ref({
+  startTime: "",
+  endTime: "",
+}); // 时间数组
+function handleDateChange(value) {
+  if (value && value.length === 2) {
+    value1.value.startTime = value[0]; // 开始日期
+    value1.value.endTime = value[1]; // 结束日期
+  }
+  console.log(value1);
+}
+
+const time = ref({});
 const get = async function (val) {
+  // 搜索参数时间赋值
+  if (value1.value != null) {
+    if (value1.value.startDate != "" && value1.value.endDate != "") {
+      time.value.startTime = value1.value[0];
+      time.value.endTime = value1.value[1];
+    }
+  } else {
+    time.value.startTime = "";
+    time.value.endTime = "";
+  }
   try {
     // 搜索参数页码赋值
     if (typeof val === "number") {
@@ -50,7 +75,7 @@ const get = async function (val) {
     // 发送POST请求
     const result = await API.post("http://192.168.8.93:10010/rates/search", {
       ...getObj.value,
-      rate: { ...value1.value },
+      rate: { ...time.value },
     });
 
     // 将响应结果存储到响应式数据中
@@ -128,17 +153,15 @@ const getEditData = async function (row) {
     console.log("搜索参数", getObj.value);
     // 发送POST请求
     const result = await API.post(
-      "http://192.168.8.93:10010/rates/searchById",
-      {
-        rate: { rateId: row.rateId },
-      }
+      "http://192.168.8.93:10010/rates/searchById?rateId=" + row.rateId,
+      {}
     );
 
     // 将响应结果存储到响应式数据中
     console.log("请求成功", result);
     // 存储表格数据
 
-    rateEdit.value = result.data[0];
+    rateEdit.value = result.data;
     console.log("这是编辑的数值", rateEdit.value);
   } catch (error) {
     console.log("请求失败", error);
@@ -221,19 +244,6 @@ const options = [
   },
 ];
 
-//时间选择器
-const value1 = ref({
-  startTime: "",
-  endTime: "",
-}); // 时间数组
-function handleDateChange(value) {
-  if (value && value.length === 2) {
-    value1.value.startTime = value[0]; // 开始日期
-    value1.value.endTime = value[1]; // 结束日期
-  }
-  console.log(value1);
-}
-
 function formatDate(value) {
   if (!value) return "";
   const date = new Date(value);
@@ -353,7 +363,6 @@ const checkNumber = function () {
             range-separator="至"
             start-placeholder="开始时间"
             end-placeholder="结束时间"
-            @change="handleDateChange"
             :size="size"
             value-format="YYYY-MM-DD"
           />
diff --git a/vue/gold-system/src/views/recharge/addRecharge.vue b/vue/gold-system/src/views/recharge/addRecharge.vue
index 70f4279..22f16dd 100644
--- a/vue/gold-system/src/views/recharge/addRecharge.vue
+++ b/vue/gold-system/src/views/recharge/addRecharge.vue
@@ -114,7 +114,7 @@ const checkFreeGoldRadio = function (rule, value, callback) {
 };
 const rules = reactive({
   jwcode: [{ required: true, message: "请输入精网号", trigger: "blur" }],
-  activityId: [{ required: true, message: "请选择活动名称", trigger: "blur" }],
+  // activityId: [{ required: true, message: "请选择活动名称", trigger: "blur" }],
   paidGold: [{ validator: checkFreeGoldRadio, trigger: "blur" }],
   rechargeGold: [
     { required: true, message: "请输入充值金额", trigger: "blur" },
diff --git a/vue/gold-system/src/views/refund/addRefund.vue b/vue/gold-system/src/views/refund/addRefund.vue
index f83c580..2d8da97 100644
--- a/vue/gold-system/src/views/refund/addRefund.vue
+++ b/vue/gold-system/src/views/refund/addRefund.vue
@@ -323,7 +323,7 @@ const handleSelectionChange = (value) => {
       </el-select>
     </el-form-item>
     <div style="display: flex; align-items: center">
-      <el-form-item prop="taskCoin" label="充值金币" style="float: left">
+      <el-form-item prop="rechargeCoin" label="充值金币" style="float: left">
         <el-input
           v-model="addRefund.rechargeCoin"
           style="width: 100px"
@@ -343,11 +343,7 @@ const handleSelectionChange = (value) => {
         />
         <p>个</p>
       </el-form-item>
-      <el-form-item
-        prop="rechargeCoin"
-        label="任务金币"
-        style="margin-left: -20px"
-      >
+      <el-form-item prop="taskCoin" label="任务金币" style="margin-left: -20px">
         <el-input
           v-model="addRefund.taskCoin"
           style="float: left; width: 100px"