Browse Source

Merge branch 'zhangyong/feature-20250716164232-金币前端' into milestone-20250728-金币前端三期

zhangrenyuan/feature-20250728113353-金币前端三期
ZhangYong 1 week ago
parent
commit
877fbac479
  1. 4
      src/views/consume/bean/addBeanConsume.vue
  2. 2
      src/views/recharge/addBeanRecharge.vue
  3. 4
      src/views/recharge/beanSystemRecharge.vue

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

@ -71,7 +71,7 @@ const rules = reactive({
}, trigger: 'blur'
}],
permanentBean: [
{ required: true, message: '请输入永久金豆数', trigger: 'blur' },
{ required: true, message: '请输入付费金豆数', trigger: 'blur' },
{
validator: (rule, value, callback) => {
//
@ -139,7 +139,7 @@ const handleConsumeForm = async () => {
formRef.value.validate((valid) => {
if (valid) {
if (Number(consumeForm.value.permanentBean) === 0 && Number(consumeForm.value.freeBean) === 0) {
reject(new Error('永久金豆和付费金豆不能同时为0'));
reject(new Error('付费金豆和免费金豆不能同时为0'));
}
resolve(); //
} else {

2
src/views/recharge/addBeanRecharge.vue

@ -138,7 +138,7 @@ const handleAddForm = async () => {
formRef.value.validate((valid) => {
if (valid) {
if (Number(addForm.value.permanentBean) === 0 && Number(addForm.value.freeBean) === 0) {
reject(new Error('永久金豆和付费金豆不能同时为0'));
reject(new Error('付费金豆和免费金豆不能同时为0'));
}
resolve(); //
} else {

4
src/views/recharge/beanSystemRecharge.vue

@ -377,7 +377,7 @@ onMounted(async function () {
<div class="bean-info">
<!-- 汉字用 <strong> 加粗动态数据用 <span> 包一层单独改色 -->
金豆总数{{ beanNum }}
, 充值金豆数{{ permanentBeans }}
, 付费金豆数{{ permanentBeans }}
, 免费金豆数{{ freeBean }}
</div>
<!-- 设置表格容器的高度和滚动样式 -->
@ -393,7 +393,7 @@ onMounted(async function () {
<el-table-column fixed="left" prop="name" label="姓名" min-width="100" />
<el-table-column fixed="left" prop="jwcode" label="精网号" min-width="110px" />
<el-table-column prop="market" label="所属地区" min-width="100px" />
<el-table-column prop="permanentBean" label="永久金豆" sortable="custom" min-width="110px" />
<el-table-column prop="permanentBean" label="付费金豆" sortable="custom" min-width="110px" />
<el-table-column prop="freeBean" label="免费金豆" sortable="custom" min-width="110px" />
<el-table-column prop="remark" label="备注" min-width="150px" show-overflow-tooltip />
<el-table-column prop="rechargeTime" label="充值时间" min-width="200px">

Loading…
Cancel
Save