diff --git a/src/lang/messages/pages/en.js b/src/lang/messages/pages/en.js index 2cc07fe..21333ed 100644 --- a/src/lang/messages/pages/en.js +++ b/src/lang/messages/pages/en.js @@ -2037,6 +2037,7 @@ export default { type: 'Type', quantity: 'Quantity', balance: 'Balance', + amount: 'USDT', origin: 'Source', remark: 'Remark', createdAt: 'Created At' @@ -2473,6 +2474,7 @@ export default { form: { gold: 'Gold', amount: 'Amount', + deductUsdt: 'USDT', rechargeType: 'Recharge Type', remark: 'Remark', contactInfo: 'Contact Info', @@ -2482,6 +2484,7 @@ export default { shipGoldQuantity: 'Please enter shipped gold quantity', deductGoldQuantity: 'Please enter deducted gold quantity', amount: 'Please enter amount', + deductUsdt: 'Please enter deducted USDT amount', rechargeType: 'Please select recharge type', remark: 'Please enter remark', contactInfo: 'Please enter contact info', @@ -2499,6 +2502,7 @@ export default { validation: { required: 'Required field', requiredNotEmpty: 'Required field cannot be empty', + requiredAndNonNegative: 'Required field and cannot be less than 0', requiredAndGreaterThanZero: 'Required field and must be greater than 0' }, formEdit: { diff --git a/src/lang/messages/pages/zh.js b/src/lang/messages/pages/zh.js index daf6e4d..0d7fcdb 100644 --- a/src/lang/messages/pages/zh.js +++ b/src/lang/messages/pages/zh.js @@ -2036,6 +2036,7 @@ export default { type: '类型', quantity: '数量', balance: '余额', + amount: 'USDT', origin: '来源', remark: '备注', createdAt: '创建时间' @@ -2472,6 +2473,7 @@ export default { form: { gold: '金币', amount: '金额', + deductUsdt: 'USDT', rechargeType: '充值类型', remark: '备注', contactInfo: '联系方式', @@ -2481,6 +2483,7 @@ export default { shipGoldQuantity: '请输入发货金币数量', deductGoldQuantity: '请输入扣款金币数量', amount: '请输入金额', + deductUsdt: '请输入扣除的USDT金额', rechargeType: '请选择充值类型', remark: '请输入备注', contactInfo: '请输入联系方式', @@ -2498,6 +2501,7 @@ export default { validation: { required: '必填字段', requiredNotEmpty: '必填字段不可为空', + requiredAndNonNegative: '必填字段,且不能小于0', requiredAndGreaterThanZero: '必填字段,且必须大于0' }, formEdit: { diff --git a/src/views/user/freight-info-list/index.vue b/src/views/user/freight-info-list/index.vue index ebd130e..b63eea5 100644 --- a/src/views/user/freight-info-list/index.vue +++ b/src/views/user/freight-info-list/index.vue @@ -138,6 +138,12 @@ align="center" min-width="100" /> + - - + + value === undefined || value === null || String(value).trim() === ""; + const validateEarnPoints = (rule, value, callback) => { + if (blank(value)) { + callback(new Error(this.$t("pages.userFreight.validation.requiredNotEmpty"))); + return; + } + const quantity = Number(value); + if (!Number.isFinite(quantity) || quantity < 0 || (this.type && quantity <= 0)) { + callback(new Error(this.type ? this.$t("pages.userFreight.validation.requiredAndGreaterThanZero") : this.$t("pages.userFreight.validation.requiredAndNonNegative"))); + return; + } + callback(); + }; + const validateAmount = (rule, value, callback) => { + if (blank(value)) { + callback(new Error(this.$t("pages.userFreight.validation.requiredNotEmpty"))); + return; + } + const amount = Number(value); + if (!Number.isFinite(amount) || amount <= 0) { + callback(new Error(this.$t("pages.userFreight.validation.requiredAndGreaterThanZero"))); + return; + } + callback(); + }; const commonRules = [ { required: true, message: this.$t("pages.userFreight.validation.required"), trigger: "blur" } ]; @@ -439,12 +467,8 @@ export default { updateLoading: false, //更新提交加载中 formRules: { userId: commonRules, - earnPoints: { - required: true, - message: this.$t("pages.userFreight.validation.requiredNotEmpty"), - trigger: "blur" - }, - amount: commonRules, + earnPoints: [{ validator: validateEarnPoints, trigger: "blur" }], + amount: [{ validator: validateAmount, trigger: "blur" }], rechargeType: commonRules, sysOrigin: commonRules, supportedCountries: commonRules, @@ -552,6 +576,8 @@ export default { userId: row.userId, earnPoints: "", sysOrigin: row.sysOrigin, + amount: "", + rechargeType: "", remark: "" }; that.goldInputBoxVisible = true; @@ -598,7 +624,7 @@ export default { }) .catch(er => { that.listLoading = false; - that.$opsMessage.success(); + that.$opsMessage.fail(); console.error(er); }); return; @@ -613,7 +639,7 @@ export default { }) .catch(er => { that.listLoading = false; - that.$opsMessage.success(); + that.$opsMessage.fail(); console.error(er); }); }); diff --git a/src/views/user/freight/running-water.vue b/src/views/user/freight/running-water.vue index 5fc3276..779c09d 100644 --- a/src/views/user/freight/running-water.vue +++ b/src/views/user/freight/running-water.vue @@ -46,6 +46,7 @@ +