3 Commits

  1. 14
      src/views/consume/bean/addBeanConsume.vue
  2. 14
      src/views/recharge/addBeanRecharge.vue
  3. 34
      src/views/recharge/gold/addCoinRecharge.vue

14
src/views/consume/bean/addBeanConsume.vue

@ -71,9 +71,12 @@ const rules = reactive({
}, trigger: 'blur' }, trigger: 'blur'
}], }],
permanentBean: [ permanentBean: [
{ required: true, message: '请输入付费金豆数', trigger: 'blur' },
{ required: true, message: '请输入付费金豆数', trigger: 'change' },
{ {
validator: (rule, value, callback) => { validator: (rule, value, callback) => {
if(!value){
value = 0
}
// //
if (!/^\d+$/.test(value)) { if (!/^\d+$/.test(value)) {
callback(new Error('请输入非负整数')); callback(new Error('请输入非负整数'));
@ -92,9 +95,12 @@ const rules = reactive({
} }
], ],
freeBean: [ freeBean: [
{ required: true, message: '请输入免费金豆数', trigger: 'blur' },
{ required: true, message: '请输入免费金豆数', trigger: 'change' },
{ {
validator: (rule, value, callback) => { validator: (rule, value, callback) => {
if(!value){
value = 0
}
// //
if (!/^\d+$/.test(value)) { if (!/^\d+$/.test(value)) {
callback(new Error('请输入非负整数')); callback(new Error('请输入非负整数'));
@ -211,10 +217,10 @@ const throttledHandleConsumeFormt = _.throttle(handleConsumeForm, 5000, {
<el-button type="primary" @click="getUser(consumeForm.jwcode)" style="margin-left: 20px">查询</el-button> <el-button type="primary" @click="getUser(consumeForm.jwcode)" style="margin-left: 20px">查询</el-button>
</el-form-item> </el-form-item>
<el-form-item prop="permanentBean" label="付费金豆" label-position="left"> <el-form-item prop="permanentBean" label="付费金豆" label-position="left">
<el-input v-model="consumeForm.permanentBean" placeholder="不填默认为0" style="width: 100px" />
<el-input v-model="consumeForm.permanentBean" placeholder="0" style="width: 100px" />
</el-form-item> </el-form-item>
<el-form-item prop="freeBean" label="免费金豆" label-position="left"> <el-form-item prop="freeBean" label="免费金豆" label-position="left">
<el-input v-model="consumeForm.freeBean" placeholder="不填默认为0" style="width: 100px" />
<el-input v-model="consumeForm.freeBean" placeholder="0" style="width: 100px" />
</el-form-item> </el-form-item>
<el-form-item prop="remark" label="备注" label-position="left"> <el-form-item prop="remark" label="备注" label-position="left">
<el-input v-model="consumeForm.remark" style="width: 300px" :rows="5" maxlength="100" show-word-limit <el-input v-model="consumeForm.remark" style="width: 300px" :rows="5" maxlength="100" show-word-limit

14
src/views/recharge/addBeanRecharge.vue

@ -70,9 +70,12 @@ const rules = reactive({
}, trigger: 'blur' }, trigger: 'blur'
}], }],
permanentBean: [ permanentBean: [
{ required: true, message: '请输入付费金豆数', trigger: 'blur' },
{ required: true, message: '请输入付费金豆数', trigger: 'change' },
{ {
validator: (rule, value, callback) => { validator: (rule, value, callback) => {
if(!value){
value = 0
}
// //
if (!/^\d+$/.test(value)) { if (!/^\d+$/.test(value)) {
callback(new Error('请输入非负整数')); callback(new Error('请输入非负整数'));
@ -91,9 +94,12 @@ const rules = reactive({
} }
], ],
freeBean: [ freeBean: [
{ required: true, message: '请输入免费金豆数', trigger: 'blur' },
{ required: true, message: '请输入免费金豆数', trigger: 'change' },
{ {
validator: (rule, value, callback) => { validator: (rule, value, callback) => {
if(!value){
value = 0
}
// //
if (!/^\d+$/.test(value)) { if (!/^\d+$/.test(value)) {
callback(new Error('请输入非负整数')); callback(new Error('请输入非负整数'));
@ -197,10 +203,10 @@ const throttledHandleAddFormt = _.throttle(handleAddForm, 5000, {
<el-button type="primary" @click="getUser(addForm.jwcode)" style="margin-left: 20px">查询</el-button> <el-button type="primary" @click="getUser(addForm.jwcode)" style="margin-left: 20px">查询</el-button>
</el-form-item> </el-form-item>
<el-form-item prop="permanentBean" label="付费金豆" label-position="left"> <el-form-item prop="permanentBean" label="付费金豆" label-position="left">
<el-input v-model="addForm.permanentBean" placeholder="不填默认为0" style="width: 100px" />
<el-input v-model="addForm.permanentBean" placeholder="0" style="width: 100px" />
</el-form-item> </el-form-item>
<el-form-item prop="freeBean" label="免费金豆" label-position="left"> <el-form-item prop="freeBean" label="免费金豆" label-position="left">
<el-input v-model="addForm.freeBean" placeholder="不填默认为0" style="width: 100px" />
<el-input v-model="addForm.freeBean" placeholder="0" style="width: 100px" />
</el-form-item> </el-form-item>
<el-form-item prop="remark" label="备注" label-position="left"> <el-form-item prop="remark" label="备注" label-position="left">
<el-input v-model="addForm.remark" style="width: 300px" :rows="5" maxlength="100" show-word-limit <el-input v-model="addForm.remark" style="width: 300px" :rows="5" maxlength="100" show-word-limit

34
src/views/recharge/gold/addCoinRecharge.vue

@ -63,9 +63,9 @@ const recharge = ref({
activity: '', // activity activity: '', // activity
voucher: '', voucher: '',
rechargeWay: '客服充值', rechargeWay: '客服充值',
freeGold: "0",
freeGold: "",
money: null, money: null,
permanentGold: "0",
permanentGold: "",
rateName: null, rateName: null,
rateId: null, rateId: null,
payModel: '', // payModel payModel: '', // payModel
@ -83,6 +83,7 @@ const add = async function () {
if (formattedRecharge.permanentGold) { if (formattedRecharge.permanentGold) {
formattedRecharge.permanentGold = Number(formattedRecharge.permanentGold) * 100; formattedRecharge.permanentGold = Number(formattedRecharge.permanentGold) * 100;
} }
if (formattedRecharge.freeGold) { if (formattedRecharge.freeGold) {
formattedRecharge.freeGold = Number(formattedRecharge.freeGold) * 100; formattedRecharge.freeGold = Number(formattedRecharge.freeGold) * 100;
} }
@ -115,9 +116,9 @@ const add = async function () {
recharge.value.market = adminData.value.market recharge.value.market = adminData.value.market
recharge.value.voucher = '' recharge.value.voucher = ''
recharge.value.rechargeWay = '客服充值' recharge.value.rechargeWay = '客服充值'
recharge.value.freeGold = '0'
recharge.value.freeGold = ''
recharge.value.money = null recharge.value.money = null
recharge.value.permanentGold = '0'
recharge.value.permanentGold = ''
recharge.value.rateId = null recharge.value.rateId = null
imageUrl.value = '' imageUrl.value = ''
recharge.value.rateName = null recharge.value.rateName = null
@ -130,9 +131,14 @@ const add = async function () {
// //
const addBefore = () => { const addBefore = () => {
if(!recharge.value.permanentGold){
recharge.value.permanentGold ='0'
}
if(!recharge.value.freeGold){
recharge.value.freeGold ='0'
}
Ref.value.validate(async (valid) => { Ref.value.validate(async (valid) => {
if (valid) { if (valid) {
if (Number(recharge.value.permanentGold) === 0 && Number(recharge.value.freeGold) === 0) { if (Number(recharge.value.permanentGold) === 0 && Number(recharge.value.freeGold) === 0) {
ElMessage({ ElMessage({
type: 'error', type: 'error',
@ -197,9 +203,12 @@ const rules = reactive({
}], }],
activity: [{ required: true, message: '请选择活动名称', trigger: 'blur' }], activity: [{ required: true, message: '请选择活动名称', trigger: 'blur' }],
permanentGold: [ permanentGold: [
{ required: true, message: '请输入永久金币数', trigger: 'blur' },
{ required: true, message: '请输入永久金币数', trigger: 'change' },
{ {
validator: (rule, value, callback) => { validator: (rule, value, callback) => {
if(!value){
value = '0'
}
// //
if (/[^0-9.]/.test(value)) { if (/[^0-9.]/.test(value)) {
callback(new Error('不能包含特殊符号或负数')); callback(new Error('不能包含特殊符号或负数'));
@ -235,9 +244,12 @@ const rules = reactive({
} }
], ],
freeGold: [ freeGold: [
{ required: true, message: '请输入免费金币数', trigger: 'blur' },
{ required: true, message: '请输入免费金币数', trigger: 'change' },
{ {
validator: (rule, value, callback) => { validator: (rule, value, callback) => {
if(!value){
value = '0'
}
// //
if (/[^0-9.]/.test(value)) { if (/[^0-9.]/.test(value)) {
callback(new Error('不能包含特殊符号或负数')); callback(new Error('不能包含特殊符号或负数'));
@ -520,9 +532,9 @@ const deleteRecharge = function () {
market: adminData.value.market, market: adminData.value.market,
voucher: '', voucher: '',
rechargeWay: '客服充值', rechargeWay: '客服充值',
freeGold: Number(),
freeGold: '',
money: null, money: null,
permanentGold: Number(),
permanentGold: '',
rateId: null rateId: null
} }
imageUrl.value = '' imageUrl.value = ''
@ -568,13 +580,13 @@ onMounted(() => {
<el-input v-model="recharge.activity" placeholder="请输入活动名称" style="width: 300px" /> <el-input v-model="recharge.activity" placeholder="请输入活动名称" style="width: 300px" />
</el-form-item> </el-form-item>
<el-form-item prop="permanentGold" label="永久金币"> <el-form-item prop="permanentGold" label="永久金币">
<el-input v-model="recharge.permanentGold" style="width: 100px" />
<el-input v-model="recharge.permanentGold" placeholder="0" style="width: 100px" />
<p></p> <p></p>
</el-form-item> </el-form-item>
<el-form-item prop="freeGold" label="免费金币"> <el-form-item prop="freeGold" label="免费金币">
<el-input v-model="recharge.freeGold" style="width: 100px" />
<el-input v-model="recharge.freeGold" placeholder="0" style="width: 100px" />
<p></p> <p></p>
</el-form-item> </el-form-item>
<!-- <el-form-item label="充值金额"> <!-- <el-form-item label="充值金额">

Loading…
Cancel
Save