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 () { {{ adminData.area }} - - {{ adminData.store }} - {{ adminData.createTime }} 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); +});