Browse Source

Merge remote-tracking branch 'origin/milestone-20250815-金币优化' into milestone-20250815-金币优化

youhua/chongzhi
lihui 2 months ago
parent
commit
d2e194e046
  1. 33
      src/views/consume/bean/addBeanConsume.vue
  2. 16
      src/views/recharge/bean/addBeanRecharge.vue
  3. 1
      src/views/recharge/gold/addCoinRecharge.vue

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

@ -78,7 +78,7 @@ const rules = reactive({
{ required: true, message: '请输入付费金豆数', trigger: 'change' },
{
validator: (rule, value, callback) => {
if(!value){
if (!value) {
value = 0
}
//
@ -102,7 +102,7 @@ const rules = reactive({
{ required: true, message: '请输入免费金豆数', trigger: 'change' },
{
validator: (rule, value, callback) => {
if(!value){
if (!value) {
value = 0
}
//
@ -128,21 +128,15 @@ const rules = reactive({
//
const deleteConsumeForm = function () {
consumeForm.value = {
jwcode: '',
permanentBean: '',
freeBean: '',
remark: '',
adminName: ''
}
formRef.value.resetFields();
}
const handleConsumeForm = async () => {
try {
if(!consumeForm.value.permanentBean ){
if (!consumeForm.value.permanentBean) {
consumeForm.value.permanentBean = 0
}
if(!consumeForm.value.freeBean ){
if (!consumeForm.value.freeBean) {
consumeForm.value.freeBean = 0
}
await new Promise((resolve, reject) => {
@ -196,15 +190,9 @@ const handleConsumeForm = async () => {
addDisabled.value = false
if (result.code == 200) {
ElMessage.success('新增成功')
consumeForm.value = {
jwcode: "",
permanentBean: '',
freeBean: '',
remark: '',
adminName: ''
}
deleteConsumeForm()
user.value = {}
}else{
} else {
ElMessage.error(result.msg)
}
} catch (error) {
@ -218,7 +206,8 @@ const throttledHandleConsumeFormt = _.throttle(handleConsumeForm, 5000, {
</script>
<template>
<div>
<el-form :model="consumeForm" :rules="rules" ref="formRef" label-width="auto" style="max-width: 600px" class="consume-form">
<el-form :model="consumeForm" :rules="rules" ref="formRef" label-width="auto" style="max-width: 600px"
class="consume-form">
<el-form-item prop="jwcode" label="精网号" label-position="left">
<el-input v-model="consumeForm.jwcode" style="width: 220px" />
<el-button type="primary" @click="getUser(consumeForm.jwcode)" style="margin-left: 20px">查询</el-button>
@ -264,7 +253,7 @@ const throttledHandleConsumeFormt = _.throttle(handleConsumeForm, 5000, {
</el-row>
<!-- 第二行精网号 + 免费金豆 -->
<el-row >
<el-row>
<el-col :span="9">
<el-form-item label="精网号">
<p style="color: #2fa1ff; margin-right: 5px">{{ user.jwcode }}</p>
@ -286,7 +275,7 @@ const throttledHandleConsumeFormt = _.throttle(handleConsumeForm, 5000, {
</el-col>
<el-col :span="9">
<el-form-item label="消耗金豆总数">
<p style="color: #2fa1ff; margin-right: 5px" v-if="user.consumeSum!=null">{{ user.consumeSum }}</p>
<p style="color: #2fa1ff; margin-right: 5px" v-if="user.consumeSum != null">{{ user.consumeSum }}</p>
<p style="color: #2fa1ff; margin-right: 5px" v-else>{{ 0 }}</p>
</el-form-item>
</el-col>

16
src/views/recharge/bean/addBeanRecharge.vue

@ -126,13 +126,7 @@ const rules = reactive({
//
const deleteAddForm = function () {
addForm.value = {
jwcode: '',
permanentBean: '',
freeBean: '',
remark: '',
adminName: ''
}
formRef.value.resetFields();
}
const handleAddForm = async () => {
@ -181,13 +175,7 @@ const handleAddForm = async () => {
addDisabled.value = false
if (result.code == 200) {
ElMessage.success('新增成功')
addForm.value = {
jwcode: '',
permanentBean: '',
freeBean: '',
remark: '',
adminName: ''
}
deleteAddForm()
user.value = {}
}else{
ElMessage.error(result.msg)

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

@ -614,6 +614,7 @@ function handleActivityChange(value) {
//
const deleteRecharge = function () {
Ref.value.resetFields();
recharge.value = {
adminId: adminData.value.id,
//adminId: fixedAdminId,

Loading…
Cancel
Save