From 2db67042f31ef3ae3b0ecc568fd53ce3554ec1a9 Mon Sep 17 00:00:00 2001
From: donghaolin <17667510818@163.com>
Date: Sat, 28 Dec 2024 10:56:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=99=E6=98=AF=E6=96=B0=E5=A2=9E=E5=85=85?=
 =?UTF-8?q?=E5=80=BC=E7=9A=84=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/gold-system/src/views/index.vue                |  3 -
 vue/gold-system/src/views/recharge/addRecharge.vue | 81 +++++++++-------------
 2 files changed, 33 insertions(+), 51 deletions(-)

diff --git a/vue/gold-system/src/views/index.vue b/vue/gold-system/src/views/index.vue
index b15ef29..6e2b4a9 100644
--- a/vue/gold-system/src/views/index.vue
+++ b/vue/gold-system/src/views/index.vue
@@ -198,9 +198,6 @@ onMounted(async function () {
       <el-form-item label="地区" label-width="100px" label-position="left">
         <span class="message-font">{{ adminData.area }}</span>
       </el-form-item>
-      <el-form-item label="所属门店" label-width="100px" label-position="left">
-        <span class="message-font">{{ adminData.store }}</span>
-      </el-form-item>
       <el-form-item label="注册时间" label-width="100px" label-position="left">
         <span class="message-font">{{ adminData.createTime }}</span>
       </el-form-item>
diff --git a/vue/gold-system/src/views/recharge/addRecharge.vue b/vue/gold-system/src/views/recharge/addRecharge.vue
index 69cf864..e23e531 100644
--- a/vue/gold-system/src/views/recharge/addRecharge.vue
+++ b/vue/gold-system/src/views/recharge/addRecharge.vue
@@ -248,38 +248,6 @@ function handleActivityChange(value) {
   getActivityById(value);
   console.log("看看", addRecharge.value);
 }
-const calculatedFreeGold = computed(() => {
-  if (!addRecharge.value.rechargeRatio == 0) {
-    const paidGold = Number(addRecharge.value.paidGold) || 0;
-    const activityId = Number(addRecharge.value.rechargeRatio) || 1; // 避免除以0
-    const number = Number(paidGold / activityId); //计算总数
-    console.log("看看", number);
-    if (number < 1) {
-      return 0;
-    } else {
-      return Number(Math.ceil(number));
-    }
-  }
-  if (addRecharge.value.rechargeRatio == 0) {
-    const paidGold = Number(addRecharge.value.paidGold) || 0;
-    return 0;
-  }
-});
-const calculatedRechargeGold = computed(() => {
-  if (!Rate.value == 0) {
-    const paidGold = Number(addRecharge.value.paidGold) || 0;
-    const rate = Number(Rate.value) || 0; // 避免乘以0
-    return Number(Math.ceil(paidGold * rate));
-  }
-});
-
-watch(calculatedFreeGold, (newVal) => {
-  addRecharge.value.freeGold = Number(newVal);
-});
-
-watch(calculatedRechargeGold, (newVal) => {
-  addRecharge.value.rechargeGold = Number(newVal);
-});
 
 //这是重置重置表单的方法
 const deleteRecharge = function () {
@@ -473,22 +441,6 @@ const calculatedRowFreeGold = function (row) {
   }
 };
 
-const calculatedRowRechargeGold = computed(() => {
-  if (Rate.value != 0) {
-    const paidGold = Number(addRecharge.value.paidGold) || 0;
-    const rate = Number(Rate.value) || 1; // 避免乘以0
-    return Number(Math.ceil(paidGold * rate));
-  }
-});
-
-// watch(calculatedRowFreeGold, (newVal) => {
-//   addRecharge.value.freeGold = Number(newVal);
-// });
-
-watch(calculatedRowRechargeGold, (newVal) => {
-  addRecharge.value.rechargeGold = Number(newVal);
-});
-//
 const batchAdd = function () {
   console.log("batchData===", batchData.value);
   if (batchData.value.length == 0) {
@@ -532,6 +484,39 @@ const batchAdd = function () {
 
   closeBatchRechargeVisible();
 };
+
+const calculatedFreeGold = computed(() => {
+  if (!addRecharge.value.rechargeRatio == 0) {
+    const paidGold = Number(addRecharge.value.paidGold) || 0;
+    const activityId = Number(addRecharge.value.rechargeRatio) || 1; // 避免除以0
+    const number = Number(paidGold / activityId); //计算总数
+    console.log("看看", number);
+    if (number < 1) {
+      return 0;
+    } else {
+      return Number(Math.ceil(number));
+    }
+  }
+  if (addRecharge.value.rechargeRatio == 0) {
+    const paidGold = Number(addRecharge.value.paidGold) || 0;
+    return 0;
+  }
+});
+const calculatedRechargeGold = computed(() => {
+  if (!Rate.value == 0) {
+    const paidGold = Number(addRecharge.value.paidGold) || 0;
+    const rate = Number(Rate.value) || 0; // 避免乘以0
+    return Number(Math.ceil(paidGold * rate));
+  }
+});
+
+watch(calculatedFreeGold, (newVal) => {
+  addRecharge.value.freeGold = Number(newVal);
+});
+
+watch(calculatedRechargeGold, (newVal) => {
+  addRecharge.value.rechargeGold = Number(newVal);
+});
 </script>
 
 <template>