From 4b46fa0510e55fc9080259b3269b2de152e04107 Mon Sep 17 00:00:00 2001
From: donghaolin <17667510818@163.com>
Date: Mon, 16 Dec 2024 20:18:51 +0800
Subject: [PATCH 1/2] 123456

---
 vue/gold-system/src/views/consume/allConsume.vue     | 7 +------
 vue/gold-system/src/views/recharge/addRecharge.vue   | 1 -
 vue/gold-system/src/views/recharge/adminRecharge.vue | 6 +-----
 vue/gold-system/src/views/recharge/allRecharge.vue   | 6 +-----
 4 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/vue/gold-system/src/views/consume/allConsume.vue b/vue/gold-system/src/views/consume/allConsume.vue
index b8a8da6..a460ea0 100644
--- a/vue/gold-system/src/views/consume/allConsume.vue
+++ b/vue/gold-system/src/views/consume/allConsume.vue
@@ -369,12 +369,7 @@ getGoods();
               show-overflow-tooltip
             />
             <el-table-column prop="adminName" label="提交人" width="120px" />
-            <el-table-column
-              prop="createTime"
-              label="消费时间"
-              width="180px"
-              sortable
-            />
+            <el-table-column prop="createTime" label="消费时间" width="180px" />
           </el-table>
         </div>
 
diff --git a/vue/gold-system/src/views/recharge/addRecharge.vue b/vue/gold-system/src/views/recharge/addRecharge.vue
index b93fdee..3623361 100644
--- a/vue/gold-system/src/views/recharge/addRecharge.vue
+++ b/vue/gold-system/src/views/recharge/addRecharge.vue
@@ -788,7 +788,6 @@ const batchAdd = function () {
       label-width="auto"
       style="max-width: 1200px"
       label-position="left"
-      width="1000px"
     >
       <el-text size="large" style="margin-left: 20px">客户信息</el-text>
       <el-row style="margin-top: 20px">
diff --git a/vue/gold-system/src/views/recharge/adminRecharge.vue b/vue/gold-system/src/views/recharge/adminRecharge.vue
index fbb0c58..c0a99fc 100644
--- a/vue/gold-system/src/views/recharge/adminRecharge.vue
+++ b/vue/gold-system/src/views/recharge/adminRecharge.vue
@@ -430,11 +430,7 @@ onMounted(async function () {
               label="活动名称"
               width="150px"
             />
-            <el-table-column
-              prop="paidGold"
-              label="充值金额(新币)"
-              width="120px"
-            />
+            <el-table-column prop="paidGold" label="充值金额" width="120px" />
             <el-table-column prop="paidGold" label="充值金币" width="100px" />
             <el-table-column prop="freeGold" label="免费金币" width="100px" />
             <el-table-column
diff --git a/vue/gold-system/src/views/recharge/allRecharge.vue b/vue/gold-system/src/views/recharge/allRecharge.vue
index d80c782..d8bcc86 100644
--- a/vue/gold-system/src/views/recharge/allRecharge.vue
+++ b/vue/gold-system/src/views/recharge/allRecharge.vue
@@ -397,11 +397,7 @@ onMounted(async function () {
               label="活动名称"
               width="150px"
             />
-            <el-table-column
-              prop="paidGold"
-              label="充值金额(新币)"
-              width="120px"
-            />
+            <el-table-column prop="paidGold" label="充值金额" width="120px" />
             <el-table-column
               prop="rechargeWay"
               label="充值方式"

From 9c079388b3cb63a6638c6bea34fcd02d848ffbc0 Mon Sep 17 00:00:00 2001
From: donghaolin <17667510818@163.com>
Date: Tue, 17 Dec 2024 13:22:11 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=BF=99=E6=98=AF=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/gold-system/src/views/managerecharge/rate.vue  | 27 +++++++++++++++++-----
 vue/gold-system/src/views/recharge/addRecharge.vue | 15 ++++++++----
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/vue/gold-system/src/views/managerecharge/rate.vue b/vue/gold-system/src/views/managerecharge/rate.vue
index 35367f8..bc34a75 100644
--- a/vue/gold-system/src/views/managerecharge/rate.vue
+++ b/vue/gold-system/src/views/managerecharge/rate.vue
@@ -236,6 +236,14 @@ function formatDate(value) {
   const seconds = date.getSeconds().toString().padStart(2, "0");
   return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
 }
+function formatDateTwe(value) {
+  if (!value) return "";
+  const date = new Date(value);
+  const year = date.getFullYear();
+  const month = (date.getMonth() + 1).toString().padStart(2, "0");
+  const day = date.getDate().toString().padStart(2, "0");
+  return `${year}-${month}-${day}`;
+}
 
 //表格高度
 const tableHeight = computed(function () {
@@ -378,25 +386,32 @@ const checkNumber = function () {
             :height="tableHeight"
             style="width: 100%"
           >
-            <el-table-column prop="currency" label="货币名称" :span="3" />
-            <el-table-column prop="exchangeRate" label="汇率" :span="3">
+            <el-table-column prop="currency" label="货币名称" :span="2" />
+            <el-table-column prop="exchangeRate" label="汇率" :span="2">
               <template #default="scope">
                 <p>{{ scope.row.exchangeRate }} ：1新币</p>
               </template>
             </el-table-column>
 
-            <el-table-column prop="createTime" label="添加时间" :span="5">
+            <el-table-column prop="createTime" label="添加时间" :span="3">
               <template #default="scope">
                 <span>{{ formatDate(scope.row.createTime) }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="updateTime" label="更新时间" :span="5">
+            <!-- <el-table-column prop="updateTime" label="更新时间" :span="3">
               <template #default="scope">
                 <span>{{ formatDate(scope.row.updateTime) }}</span>
               </template>
+            </el-table-column> -->
+            <el-table-column prop="adminName" label="提交人" :span="1" />
+            <el-table-column prop="startTime" label="持续时间" :span="10">
+              <template #default="scope">
+                <span>{{ formatDateTwe(scope.row.startTime) }}</span>
+                <span>---</span>
+                <span>{{ formatDateTwe(scope.row.endTime) }}</span>
+              </template>
             </el-table-column>
-            <el-table-column prop="adminName" label="更新人" :span="4" />
-            <el-table-column label="操作" :span="4">
+            <el-table-column label="操作" :span="3">
               <template #default="scope">
                 <el-button
                   type="text"
diff --git a/vue/gold-system/src/views/recharge/addRecharge.vue b/vue/gold-system/src/views/recharge/addRecharge.vue
index 3623361..6b5ceaf 100644
--- a/vue/gold-system/src/views/recharge/addRecharge.vue
+++ b/vue/gold-system/src/views/recharge/addRecharge.vue
@@ -401,13 +401,17 @@ const getActivityById = async function (row) {
     console.log("请求失败", error);
   }
 };
-const handleSelectionChange = (row) => {
-  getActivityById(row);
-};
+function handleActivityChange(value) {
+  // 在这里执行你的逻辑，例如获取选中的值
+  console.log("选中的值：", value);
+  getActivityById(value);
+  console.log("看看", addRecharge.value);
+}
 const calculatedFreeGold = computed(() => {
   if (!addRecharge.value.activityId == 0) {
     const paidGold = Number(addRecharge.value.paidGold) || 0;
     const activityId = Number(addRecharge.value.rechargeRatio) || 1; // 避免除以0
+    console.log("看看有没拿到", addRecharge.value);
     return Math.ceil(paidGold / activityId);
   }
 });
@@ -479,6 +483,7 @@ const addLine = function () {
 const handleSelectionChangebatch = function (val) {
   console.log("val===", val);
   batchDelObj.value = val;
+  console.log("大傻春");
 };
 //
 const batchDel = function () {
@@ -665,6 +670,7 @@ const batchAdd = function () {
         v-model="addRecharge.activityId"
         placeholder="请选择"
         style="width: 300px"
+        @change="handleActivityChange"
       >
         <el-option
           v-for="item in activity"
@@ -909,8 +915,9 @@ const batchAdd = function () {
               clearable
               v-model="scope.row.activityId"
               placeholder="请选择活动名称"
-              @change="calculatedRowFreeGold(scope.row)"
+              @change="handleSelectionChange"
             >
+              >
               <el-option
                 v-for="item in activity"
                 :key="item.value"