Merge branch 'master' of http://39.101.133.168:8807/donghaolin/gold-system

vue/gold-system/src/views/recharge/addRecharge.vue

@@ -37,9 +37,11 @@ getAdminData();
 const addRecharge = ref({
   rechargeVoucher: "",
   rechargeWay: "客服充值",
-  freeGold: 0,
+  freeGold: "0",
   rechargeGold: 0,
   paidGold: 0,
+  Rate: null,
+  rechargeRatio: "0",
 });
 // 这是添加充值信息的接口
 const add = async function () {
@@ -241,7 +243,7 @@ const getActivityById = async function (row) {
       { activity: { activityId: row } }
     );
     addRecharge.value.rechargeRatio = result.data[0].rechargeRatio;
-    console.log("看看有了吗", result.value);
+    console.log("看看有了吗", addRecharge.value.rechargeRatio);
   } catch (error) {
     console.log("请求失败", error);
   }
@@ -253,17 +255,26 @@ function handleActivityChange(value) {
   console.log("看看", addRecharge.value);
 }
 // 监听 paidGold 的变化
-watch(
-  () => addRecharge.value.paidGold,
-  (newValue) => {
-    // 当 paidGold 变化时，更新 freeGold 和 rechargeGold
-    addRecharge.value.freeGold = newValue % addRecharge.value.rechargeRatio;
-    console.log("剩余金币", addRecharge.value.freeGold);
-    addRecharge.value.rechargeGold = newValue * addRecharge.value.Rate;
-    console.log("充值金币", addRecharge.value.rechargeGold);
-  }
+const calculatedFree = computed(() => {
+  if (
+    Math.trunc(addRecharge.value.paidGold / addRecharge.value.rechargeRatio) < 1
+  ) {
+    return 0;
+  } else {
+    return Math.trunc(
+      addRecharge.value.paidGold / addRecharge.value.rechargeRatio
     );
-
+  }
+});
+watch(calculatedFree, (newVal) => {
+  addRecharge.value.freeGold = newVal;
+});
+const calculatedRecharge = computed(() => {
+  return addRecharge.value.paidGold * Rate.value;
+});
+watch(calculatedRecharge, (newVal) => {
+  addRecharge.value.rechargeGold = newVal;
+});
 //这是重置重置表单的方法
 const deleteRecharge = function () {
   addRecharge.value = {