diff --git a/vue/gold-system/src/views/managerecharge/rate.vue b/vue/gold-system/src/views/managerecharge/rate.vue
index 809817b..99c3603 100644
--- a/vue/gold-system/src/views/managerecharge/rate.vue
+++ b/vue/gold-system/src/views/managerecharge/rate.vue
@@ -17,8 +17,8 @@ const getAdminData = async function () {
{}
);
adminData.value = result;
- addRate.value.adminId = adminData.value.adminId;
- editRate.value.adminId = adminData.value.adminId;
+ rateAdd.value.adminId = adminData.value.adminId;
+ rateEdit.value.adminId = adminData.value.adminId;
console.log("请求成功", result);
console.log("用户信息", user.value);
} catch (error) {
@@ -266,7 +266,6 @@ const checkEndTime = function (rule, value, callback) {
const rules = reactive({
currency: [{ required: true, message: "请选择货币名称", trigger: "blur" }],
exchangeRate: [{ required: true, message: "请输入汇率", trigger: "blur" }],
- updateName: [{ required: true, message: "请输入添加人", trigger: "blur" }],
startTime: [
{ required: true, message: "请选择开始时间", trigger: "blur" },
{ validator: checkStartTime, trigger: "blur" },
@@ -385,7 +384,7 @@ const checkNumber = function () {
{{ formatDate(scope.row.updateTime) }}
-
+
:1
(提示:当前规则每 5 元人民币可兑换 1 新币)
-
+
diff --git a/vue/gold-system/src/views/recharge/addRecharge.vue b/vue/gold-system/src/views/recharge/addRecharge.vue
index facc2e0..477e5eb 100644
--- a/vue/gold-system/src/views/recharge/addRecharge.vue
+++ b/vue/gold-system/src/views/recharge/addRecharge.vue
@@ -31,7 +31,7 @@ const addRecharge = ref({
rechargeWay: "客服充值",
freeGold: 0,
rechargeGold: 0,
- paidGold: 0,
+ paidGold: "",
});
// 这是添加充值信息的接口
const add = async function () {
@@ -51,14 +51,23 @@ const add = async function () {
// 显示成功消息
ElMessage.success("添加成功");
// 重置表单
- addRecharge.value = {};
- addRecharge.value.adminId = adminData.value.adminId;
- addRecharge.value.area = adminData.value.area;
- addRecharge.value.rechargeVoucher = "";
- addRecharge.value.rechargeWay = "客服充值";
- addRecharge.value.freeGold = 0;
- addRecharge.value.rechargeGold = 0;
- addRecharge.value.paidGold = 0;
+ addRecharge.value = {
+ adminId: adminData.value.adminId,
+ area: adminData.value.area,
+ rechargeVoucher: "",
+ rechargeWay: "客服充值",
+ freeGold: Number(0),
+ rechargeGold: 1,
+ paidGold: "",
+ };
+
+ // addRecharge.value.adminId = adminData.value.adminId;
+ // addRecharge.value.area = adminData.value.area;
+ // addRecharge.value.rechargeVoucher = "";
+ // addRecharge.value.rechargeWay = "客服充值";
+ // addRecharge.value.freeGold = 0;
+ // addRecharge.value.rechargeGold = 0;
+ // addRecharge.value.paidGold = "";
} catch (error) {
console.log("请求失败", error);
// 在这里可以处理错误逻辑,比如显示错误提示等
@@ -89,7 +98,7 @@ const addBefore = () => {
// 开始时间改变时,重新验证结束时间
const Ref = ref(null);
const checkEndTime = function (rule, value, callback) {
- if (value <= new Date()) {
+ if (value <= new Date() - 1000 * 60 * 60 * 24 * 1) {
callback(new Error("付款时间不能小于当前时间"));
} else {
callback();
@@ -216,17 +225,42 @@ const options = [
];
const calculatedFreeGold = computed(() => {
- return Math.ceil(addRecharge.value.paidGold / addRecharge.value.activityId);
+ if (!addRecharge.value.activityId == 0) {
+ const paidGold = Number(addRecharge.value.paidGold) || 0;
+ const activityId = Number(addRecharge.value.activityId) || 1; // 避免除以0
+ return Math.ceil(paidGold / activityId);
+ }
});
+
const calculatedRechargeGold = computed(() => {
- return addRecharge.value.paidGold * addRecharge.value.rateId;
+ if (!addRecharge.value.rateId == 0) {
+ const paidGold = Number(addRecharge.value.paidGold) || 0;
+ const rateId = Number(addRecharge.value.rateId) || 1; // 避免乘以0
+ return Math.ceil(paidGold * rateId);
+ }
});
+
watch(calculatedFreeGold, (newVal) => {
- addRecharge.value.freeGold = newVal;
+ addRecharge.value.freeGold = Number(newVal);
});
+
watch(calculatedRechargeGold, (newVal) => {
- addRecharge.value.rechargeGold = newVal;
+ addRecharge.value.rechargeGold = Number(newVal);
});
+
+//这是重置重置表单的方法
+const deleteRecharge = function () {
+ addRecharge.value = {
+ adminId: adminData.value.adminId,
+ area: adminData.value.area,
+
+ rechargeVoucher: "",
+ rechargeWay: "客服充值",
+ freeGold: Number(0),
+ rechargeGold: 0,
+ paidGold: "",
+ };
+};
@@ -270,7 +304,7 @@ watch(calculatedRechargeGold, (newVal) => {
个
-
+
{
placeholder="提交人姓名"
/>
- 取消重置
提交