donghaolin
/
gold-system
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://39.101.133.168:8807/donghaolin/gold-system

Hongxilin
hongxilin 5 months ago
parent
fa006f030c 3004f2e47c
commit
221b5ba465
10 changed files with 923 additions and 567 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      vue/gold-system/src/views/consume/addConsume.vue
  2. 1
      vue/gold-system/src/views/consume/allConsume.vue
  3. 2
      vue/gold-system/src/views/managerecharge/activity.vue
  4. 1
      vue/gold-system/src/views/managerecharge/rate.vue
  5. 404
      vue/gold-system/src/views/recharge/addRecharge.vue
  6. 946
      vue/gold-system/src/views/recharge/adminRecharge.vue
  7. 10
      vue/gold-system/src/views/recharge/allRecharge.vue
  8. 17
      vue/gold-system/src/views/refund/addRefund.vue
  9. 54
      vue/gold-system/src/views/refund/allRefund.vue
  10. 38
      vue/gold-system/src/views/usergold/index.vue

17
vue/gold-system/src/views/consume/addConsume.vue
View File

@ -334,12 +334,15 @@ function calculateCoins() {
</el-form> </el-form>
<!-- 客户信息栏 --> <!-- 客户信息栏 -->
<el-card style="float: right" class="customer-info">
<el-form :model="user" label-width="auto" label-position="left">
<el-text size="large" style="margin-left: 20px; font-weight: bold"
>客户信息</el-text
>
<el-row style="margin-top: 20px; display: flex">
<el-card style="width: 850px; float: right" class="customer-info">
<el-form
:model="user"
label-width="auto"
style="max-width: 1000px"
label-position="left"
>
<el-text size="large" style="margin-left: 20px">客户信息</el-text>
<el-row style="margin-top: 20px">
<el-col :span="10"> <el-col :span="10">
<el-form-item label="姓名:"> <el-form-item label="姓名:">
<p>{{ user.name }}</p> <p>{{ user.name }}</p>
@ -356,7 +359,7 @@ function calculateCoins() {
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="14"> <el-col :span="14">
<el-form-item label="当前金币总数">
<el-form-item label="当前金币总数" style="width: 500px">
<span style="color: #2fa1ff; margin-right: 5px" v-if="user.buyJb">{{ <span style="color: #2fa1ff; margin-right: 5px" v-if="user.buyJb">{{
user.buyJb + user.free6 + user.free12 + user.coreJb user.buyJb + user.free6 + user.free12 + user.coreJb
}}</span> }}</span>

1
vue/gold-system/src/views/consume/allConsume.vue
View File

@ -445,6 +445,5 @@ getGoods();
.pagination { .pagination {
display: flex; display: flex;
margin-top: 20px; margin-top: 20px;
margin-left: 33%;
} }
</style> </style>

2
vue/gold-system/src/views/managerecharge/activity.vue
View File

@ -394,7 +394,7 @@ onMounted(async function () {
</div> </div>
<!-- 分页 --> <!-- 分页 -->
<div class="pagination">
<div class="pagination" style="margin-top: 20px">
<el-pagination <el-pagination
background background
:page-size="getObj.pageSize" :page-size="getObj.pageSize"

1
vue/gold-system/src/views/managerecharge/rate.vue
View File

@ -600,7 +600,6 @@ p {
.pagination { .pagination {
margin-top: 20px; margin-top: 20px;
margin-left: 33%;
} }
.box-card { .box-card {

404
vue/gold-system/src/views/recharge/addRecharge.vue
View File

@ -466,60 +466,59 @@ const closeBatchRechargeVisible = function () {
// 批量充值初始化 // 批量充值初始化
const batchInit = function () { const batchInit = function () {
openBatchRechargeVisible(); openBatchRechargeVisible();
}
//
};
//
const addLine = function () { const addLine = function () {
batchData.value.unshift({ batchData.value.unshift({
line: ++i.value, line: ++i.value,
showInput: true, showInput: true,
}); });
}
//
};
//
const handleSelectionChangebatch = function (val) { const handleSelectionChangebatch = function (val) {
console.log("val===", val); console.log("val===", val);
batchDelObj.value = val; batchDelObj.value = val;
}
//
};
//
const batchDel = function () { const batchDel = function () {
ElMessageBox.confirm(
'确认批量删除吗？',
'批量删除',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}
)
ElMessageBox.confirm("确认批量删除吗？", "批量删除", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => { .then(() => {
console.log("batchDel===", batchDelObj.value); console.log("batchDel===", batchDelObj.value);
batchData.value = batchData.value.filter(itemA => { return !batchDelObj.value.some(itemB => itemB.line == itemA.line) })
batchData.value = batchData.value.filter((itemA) => {
return !batchDelObj.value.some((itemB) => itemB.line == itemA.line);
});
console.log("batchData===", batchData.value); console.log("batchData===", batchData.value);
ElMessage({ ElMessage({
type: 'success',
message: '操作成功',
})
type: "success",
message: "操作成功",
});
}) })
.catch(() => { .catch(() => {
ElMessage({ ElMessage({
type: 'info',
message: '操作撤销',
})
})
}
//
type: "info",
message: "操作撤销",
});
});
};
//
const del = function (row) { const del = function (row) {
console.log("row===", row); console.log("row===", row);
delObj.value.line = row.line; delObj.value.line = row.line;
}
};
const delConfirm = function () { const delConfirm = function () {
batchData.value = batchData.value.filter(item => item.line != delObj.value.line)
batchData.value = batchData.value.filter(
(item) => item.line != delObj.value.line
);
console.log("batchData===", batchData.value); console.log("batchData===", batchData.value);
}
//
};
//
const reset = function (row) { const reset = function (row) {
resetObj.value.line = row.line; resetObj.value.line = row.line;
}
};
const resetConfirm = function () { const resetConfirm = function () {
for (let i = 0; i < batchData.value.length; i++) { for (let i = 0; i < batchData.value.length; i++) {
if (batchData.value[i].line == resetObj.value.line) { if (batchData.value[i].line == resetObj.value.line) {
@ -529,36 +528,30 @@ const resetConfirm = function () {
break; break;
} }
} }
}
//
};
//
const cancelBatch = function () { const cancelBatch = function () {
ElMessageBox.confirm(
'确认取消吗？此操作将不会保存任何数据。',
'确认取消',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}
)
ElMessageBox.confirm("确认取消吗？此操作将不会保存任何数据。", "确认取消", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => { .then(() => {
batchData.value = [
{ line: 1, showInput: true }
];
batchData.value = [{ line: 1, showInput: true }];
closeBatchRechargeVisible(); closeBatchRechargeVisible();
ElMessage({ ElMessage({
type: 'success',
message: '操作成功',
})
type: "success",
message: "操作成功",
});
}) })
.catch(() => { .catch(() => {
ElMessage({ ElMessage({
type: 'info',
message: '操作撤销',
})
})
}
//
type: "info",
message: "操作撤销",
});
});
};
//
const calculatedRowFreeGold = function (row) { const calculatedRowFreeGold = function (row) {
console.log("row===", row); console.log("row===", row);
let ratio = 0; let ratio = 0;
@ -578,9 +571,9 @@ const calculatedRowFreeGold = function (row) {
batchData.value[i].freeGold = Math.ceil(paidGold / ratio); batchData.value[i].freeGold = Math.ceil(paidGold / ratio);
} }
break; break;
};
}
} }
}
};
const calculatedRowRechargeGold = computed(() => { const calculatedRowRechargeGold = computed(() => {
if (!addRecharge.value.rateId == 0) { if (!addRecharge.value.rateId == 0) {
@ -597,13 +590,13 @@ const calculatedRowRechargeGold = computed(() => {
watch(calculatedRowRechargeGold, (newVal) => { watch(calculatedRowRechargeGold, (newVal) => {
addRecharge.value.rechargeGold = Number(newVal); addRecharge.value.rechargeGold = Number(newVal);
}); });
//
//
const batchAdd = function () { const batchAdd = function () {
console.log("batchData===", batchData.value); console.log("batchData===", batchData.value);
if (batchData.value.length == 0) { if (batchData.value.length == 0) {
ElMessage({ ElMessage({
type: 'error',
message: '至少需要输入一条数据！',
type: "error",
message: "至少需要输入一条数据！",
}); });
return; return;
} }
@ -611,15 +604,23 @@ const batchAdd = function () {
batchData.value[i].adminId = adminData.value.adminId; batchData.value[i].adminId = adminData.value.adminId;
batchData.value[i].area = adminData.value.area; batchData.value[i].area = adminData.value.area;
batchData.value[i].rechargeWay = "客服充值"; batchData.value[i].rechargeWay = "客服充值";
if (batchData.value[i].jwcode == "" || batchData.value[i].jwcode == null
|| batchData.value[i].activityId == "" || batchData.value[i].activityId == null
|| batchData.value[i].paidGold == "" || batchData.value[i].paidGold == null
|| batchData.value[i].rechargeGold == "" || batchData.value[i].rechargeGold == null
|| batchData.value[i].payWay == "" || batchData.value[i].payWay == null
|| batchData.value[i].rechargeTime == "" || batchData.value[i].rechargeTime == null) {
if (
batchData.value[i].jwcode == "" ||
batchData.value[i].jwcode == null ||
batchData.value[i].activityId == "" ||
batchData.value[i].activityId == null ||
batchData.value[i].paidGold == "" ||
batchData.value[i].paidGold == null ||
batchData.value[i].rechargeGold == "" ||
batchData.value[i].rechargeGold == null ||
batchData.value[i].payWay == "" ||
batchData.value[i].payWay == null ||
batchData.value[i].rechargeTime == "" ||
batchData.value[i].rechargeTime == null
) {
ElMessage({ ElMessage({
type: 'error',
message: '信息不能为空！请检查输入内容！',
type: "error",
message: "信息不能为空！请检查输入内容！",
}); });
return; return;
} }
@ -627,29 +628,49 @@ const batchAdd = function () {
console.log("batchData===", batchData.value); console.log("batchData===", batchData.value);
ElMessage({ ElMessage({
type: 'success',
message: '添加成功！',
})
type: "success",
message: "添加成功！",
});
closeBatchRechargeVisible(); closeBatchRechargeVisible();
}
};
</script> </script>
<template> <template>
<div style="display: flex;">
<div style="margin-right: 20px;">新增充值</div>
<div style="display: flex">
<div style="margin-right: 20px">新增充值</div>
<el-button type="primary" plain @click="batchInit()">批量充值</el-button> <el-button type="primary" plain @click="batchInit()">批量充值</el-button>
</div> </div>
<el-form :model="addRecharge" ref="Ref" :rules="rules" label-width="auto" style="max-width: 600px" class="add-form">
<el-form
:model="addRecharge"
ref="Ref"
:rules="rules"
label-width="auto"
style="max-width: 600px"
class="add-form"
>
<el-form-item prop="jwcode" label="精网号"> <el-form-item prop="jwcode" label="精网号">
<el-input v-model="addRecharge.jwcode" style="width: 220px" /> <el-input v-model="addRecharge.jwcode" style="width: 220px" />
<el-button type="primary" @click="getUser(addRecharge.jwcode)" style="margin-left: 20px">查询</el-button>
<el-button
type="primary"
@click="getUser(addRecharge.jwcode)"
style="margin-left: 20px"
>查询</el-button
>
</el-form-item> </el-form-item>
<el-form-item prop="activityId" label="活动名称"> <el-form-item prop="activityId" label="活动名称">
<el-select v-model="addRecharge.activityId" placeholder="请选择" style="width: 300px">
<el-option v-for="item in activity" :key="item.value" :label="item.activityName" :value="item.activityId" />
<el-select
v-model="addRecharge.activityId"
placeholder="请选择"
style="width: 300px"
>
<el-option
v-for="item in activity"
:key="item.value"
:label="item.activityName"
:value="item.activityId"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="paidGold" label="充值金币"> <el-form-item prop="paidGold" label="充值金币">
@ -660,25 +681,64 @@ const batchAdd = function () {
<p>个</p> <p>个</p>
</el-form-item> </el-form-item>
<el-form-item prop="rechargeGold" label="充值金额"> <el-form-item prop="rechargeGold" label="充值金额">
<el-select prop="rechargeGold" v-model="addRecharge.rateId" placeholder="货币名称"
style="width: 95px; margin-right: 5px">
<el-option v-for="item in currency" :key="item.value" :label="item.currency" :value="item.exchangeRate" />
<el-select
prop="rechargeGold"
v-model="addRecharge.rateId"
placeholder="货币名称"
style="width: 95px; margin-right: 5px"
>
<el-option
v-for="item in currency"
:key="item.value"
:label="item.currency"
:value="item.exchangeRate"
/>
</el-select> </el-select>
<el-input disabled v-model="addRecharge.rechargeGold" style="width: 200px" />
<el-input
disabled
v-model="addRecharge.rechargeGold"
style="width: 200px"
/>
</el-form-item> </el-form-item>
<el-form-item prop="payWay" label="收款方式"> <el-form-item prop="payWay" label="收款方式">
<el-select v-model="addRecharge.payWay" placeholder="请选择" style="width: 300px">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
<el-select
v-model="addRecharge.payWay"
placeholder="请选择"
style="width: 300px"
>
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="rechargeTime" label="交款时间"> <el-form-item prop="rechargeTime" label="交款时间">
<el-date-picker v-model="addRecharge.rechargeTime" type="date" style="width: 300px" />
<el-date-picker
v-model="addRecharge.rechargeTime"
type="date"
style="width: 300px"
/>
</el-form-item> </el-form-item>
<el-form-item prop="rechargeVoucher" label="交款凭证" style="margin-bottom: 5px">
<el-upload class="avatar-uploader" :show-file-list="false" :on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload">
<el-form-item
prop="rechargeVoucher"
label="交款凭证"
style="margin-bottom: 5px"
>
<el-upload
class="avatar-uploader"
:show-file-list="false"
:on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload"
style="width: 100px; height: 115px"
>
<img v-if="imageUrl" :src="imageUrl" class="avatar" /> <img v-if="imageUrl" :src="imageUrl" class="avatar" />
<el-icon v-else class="avatar-uploader-icon">
<el-icon
v-else
class="avatar-uploader-icon"
style="width: 100px; height: 100px"
>
<Plus /> <Plus />
</el-icon> </el-icon>
</el-upload> </el-upload>
@ -687,22 +747,40 @@ const batchAdd = function () {
</p> </p>
</el-form-item> </el-form-item>
<el-form-item prop="remark" label="备注"> <el-form-item prop="remark" label="备注">
<el-input v-model="addRecharge.remark" style="width: 300px" :rows="2" maxlength="100" show-word-limit
type="textarea" />
<el-input
v-model="addRecharge.remark"
style="width: 300px"
:rows="2"
maxlength="100"
show-word-limit
type="textarea"
/>
</el-form-item> </el-form-item>
<el-form-item prop="submitter" label="提交人"> <el-form-item prop="submitter" label="提交人">
<el-input style="width: 300px" :value="adminData.name" disabled placeholder="提交人姓名" />
<el-input
style="width: 300px"
:value="adminData.name"
disabled
placeholder="提交人姓名"
/>
</el-form-item> </el-form-item>
<el-button @click="deleteRecharge" style="margin-left: 280px">重置</el-button>
<el-button @click="deleteRecharge" style="margin-left: 280px"
>重置</el-button
>
<el-button type="primary" @click="addBefore"> 提交 </el-button> <el-button type="primary" @click="addBefore"> 提交 </el-button>
</el-form> </el-form>
<!-- 客户信息栏 --> <!-- 客户信息栏 -->
<el-card style="width: 700px; float: right" class="customer-info">
<el-form :model="user" label-width="auto" style="max-width: 600px" label-position="left">
<el-card style="width: 1200px; float: right" class="customer-info">
<el-form
:model="user"
label-width="auto"
style="max-width: 1000px"
label-position="left"
>
<el-text size="large" style="margin-left: 20px">客户信息</el-text> <el-text size="large" style="margin-left: 20px">客户信息</el-text>
<el-row style="margin-top: 20px"> <el-row style="margin-top: 20px">
<el-col :span="12">
<el-col :span="10">
<el-form-item label="姓名:"> <el-form-item label="姓名:">
<p>{{ user.name }}</p> <p>{{ user.name }}</p>
</el-form-item> </el-form-item>
@ -718,7 +796,7 @@ const batchAdd = function () {
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="14"> <el-col :span="14">
<el-form-item label="当前金币总数">
<el-form-item label="当前金币总数" style="width: 500px">
<span style="color: #2fa1ff; margin-right: 5px" v-if="user.buyJb">{{ <span style="color: #2fa1ff; margin-right: 5px" v-if="user.buyJb">{{
user.buyJb + user.free6 + user.free12 + user.coreJb user.buyJb + user.free6 + user.free12 + user.coreJb
}}</span> }}</span>
@ -769,14 +847,32 @@ const batchAdd = function () {
</el-form> </el-form>
</el-card> </el-card>
<el-dialog v-model="batchRechargeVisible" title="批量充值" width="1800px" style="height: 700px;">
<el-dialog
v-model="batchRechargeVisible"
title="批量充值"
width="1800px"
style="height: 700px"
>
<el-row style="margin-bottom: 10px"> <el-row style="margin-bottom: 10px">
<el-button type="primary" @click="addLine()" style="margin-right: auto">新增一行</el-button>
<el-button type="danger" plain @click="batchDel()" style="margin-right: 10px; width: 130px;">批量删除</el-button>
<el-button type="primary" @click="addLine()" style="margin-right: auto"
>新增一行</el-button
>
<el-button
type="danger"
plain
@click="batchDel()"
style="margin-right: 10px; width: 130px"
>批量删除</el-button
>
</el-row> </el-row>
<el-row> <el-row>
<el-table :data="batchData" border max-height="540px" style="height: 540px;"
@selection-change="handleSelectionChangebatch">
<el-table
:data="batchData"
border
max-height="540px"
style="height: 540px"
@selection-change="handleSelectionChangebatch"
>
<el-table-column type="selection" width="50px" /> <el-table-column type="selection" width="50px" />
<el-table-column property="index" label="序号" width="55px"> <el-table-column property="index" label="序号" width="55px">
<template #default="scope"> <template #default="scope">
@ -785,15 +881,31 @@ const batchAdd = function () {
</el-table-column> </el-table-column>
<el-table-column property="jwcode" label="精网号" width="150px"> <el-table-column property="jwcode" label="精网号" width="150px">
<template #default="scope"> <template #default="scope">
<input type="number" v-if="scope.row.showInput" v-model="scope.row.jwcode" style="width: 110px;" />
<input
type="number"
v-if="scope.row.showInput"
v-model="scope.row.jwcode"
style="width: 110px"
/>
<span v-else>{{ scope.row.jwcode }}</span> <span v-else>{{ scope.row.jwcode }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column property="activityName" label="活动名称" width="150px"> <el-table-column property="activityName" label="活动名称" width="150px">
<template #default="scope"> <template #default="scope">
<el-select v-if="scope.row.showInput" filterable clearable v-model="scope.row.activityId"
placeholder="请选择活动名称" @change="calculatedRowFreeGold(scope.row)">
<el-option v-for="item in activity" :key="item.value" :label="item.activityName" :value="item.activityId">
<el-select
v-if="scope.row.showInput"
filterable
clearable
v-model="scope.row.activityId"
placeholder="请选择活动名称"
@change="calculatedRowFreeGold(scope.row)"
>
<el-option
v-for="item in activity"
:key="item.value"
:label="item.activityName"
:value="item.activityId"
>
</el-option> </el-option>
</el-select> </el-select>
<span v-else>{{ scope.row.activityName }}</span> <span v-else>{{ scope.row.activityName }}</span>
@ -801,7 +913,11 @@ const batchAdd = function () {
</el-table-column> </el-table-column>
<el-table-column property="paidGold" label="充值金币" width="110px"> <el-table-column property="paidGold" label="充值金币" width="110px">
<template #default="scope"> <template #default="scope">
<input v-if="scope.row.showInput" v-model="scope.row.paidGold" style="width: 70px;" />
<input
v-if="scope.row.showInput"
v-model="scope.row.paidGold"
style="width: 70px"
/>
<span v-else>{{ scope.row.paidGold }}</span> <span v-else>{{ scope.row.paidGold }}</span>
</template> </template>
</el-table-column> </el-table-column>
@ -812,8 +928,19 @@ const batchAdd = function () {
</el-table-column> </el-table-column>
<el-table-column property="rechargeGold" label="充值金额"> <el-table-column property="rechargeGold" label="充值金额">
<template #default="scope"> <template #default="scope">
<el-select v-if="scope.row.showInput" filterable clearable v-model="scope.row.rateId" placeholder="请选择币种">
<el-option v-for="item in currency" :key="item.value" :label="item.currency" :value="item.exchangeRate">
<el-select
v-if="scope.row.showInput"
filterable
clearable
v-model="scope.row.rateId"
placeholder="请选择币种"
>
<el-option
v-for="item in currency"
:key="item.value"
:label="item.currency"
:value="item.exchangeRate"
>
</el-option> </el-option>
</el-select> </el-select>
<span v-else>{{ scope.row.rateId }}</span> <span v-else>{{ scope.row.rateId }}</span>
@ -826,8 +953,19 @@ const batchAdd = function () {
</el-table-column> </el-table-column>
<el-table-column property="payWay" label="收款方式" width="130px"> <el-table-column property="payWay" label="收款方式" width="130px">
<template #default="scope"> <template #default="scope">
<el-select v-if="scope.row.showInput" filterable clearable v-model="scope.row.payWay" placeholder="请选择收款方式">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
<el-select
v-if="scope.row.showInput"
filterable
clearable
v-model="scope.row.payWay"
placeholder="请选择收款方式"
>
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option> </el-option>
</el-select> </el-select>
<span v-else>{{ scope.row.payWay }}</span> <span v-else>{{ scope.row.payWay }}</span>
@ -835,10 +973,17 @@ const batchAdd = function () {
</el-table-column> </el-table-column>
<el-table-column property="rechargeTime" label="交款时间" width="150px"> <el-table-column property="rechargeTime" label="交款时间" width="150px">
<template #default="scope"> <template #default="scope">
<el-date-picker v-if="scope.row.showInput" type="date" v-model="scope.row.rechargeTime"
style="width: 120px;" placeholder="请选择交款时间">
<el-date-picker
v-if="scope.row.showInput"
type="date"
v-model="scope.row.rechargeTime"
style="width: 120px"
placeholder="请选择交款时间"
>
</el-date-picker> </el-date-picker>
<span v-else>{{ moment(scope.row.rechargeTime).format("YYYY-MM-DD HH:mm:ss") }}</span>
<span v-else>{{
moment(scope.row.rechargeTime).format("YYYY-MM-DD HH:mm:ss")
}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column property="rechargeVoucher" label="充值凭证"> <el-table-column property="rechargeVoucher" label="充值凭证">
@ -854,18 +999,31 @@ const batchAdd = function () {
</el-table-column> </el-table-column>
<el-table-column property="remark" label="备注" width="130px"> <el-table-column property="remark" label="备注" width="130px">
<template #default="scope"> <template #default="scope">
<textarea v-if="scope.row.showInput" v-model="scope.row.remark" style="max-width: 90px;" rows="1"
cols="12"></textarea>
<textarea
v-if="scope.row.showInput"
v-model="scope.row.remark"
style="max-width: 90px"
rows="1"
cols="12"
></textarea>
<span v-else>{{ scope.row.remark }}</span> <span v-else>{{ scope.row.remark }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column property="submitter" label="提交人"> <el-table-column property="submitter" label="提交人">
<el-input :value="adminData.name" disabled /> <el-input :value="adminData.name" disabled />
</el-table-column> </el-table-column>
<el-table-column fixed="right" prop="operation" label="操作" width="150px">
<el-table-column
fixed="right"
prop="operation"
label="操作"
width="150px"
>
<template #default="scope"> <template #default="scope">
<div style="display: flex;">
<el-popconfirm title="确定将此条信息删除吗？" @confirm="delConfirm">
<div style="display: flex">
<el-popconfirm
title="确定将此条信息删除吗？"
@confirm="delConfirm"
>
<template #reference> <template #reference>
<el-button type="danger" text @click="del(scope.row)"> <el-button type="danger" text @click="del(scope.row)">
删除 删除
@ -878,7 +1036,10 @@ const batchAdd = function () {
</el-button> </el-button>
</template> </template>
</el-popconfirm> </el-popconfirm>
<el-popconfirm title="确定将此条信息重置吗？" @confirm="resetConfirm">
<el-popconfirm
title="确定将此条信息重置吗？"
@confirm="resetConfirm"
>
<template #reference> <template #reference>
<el-button type="primary" text @click="reset(scope.row)"> <el-button type="primary" text @click="reset(scope.row)">
重置 重置
@ -891,10 +1052,8 @@ const batchAdd = function () {
</el-button> </el-button>
</template> </template>
</el-popconfirm> </el-popconfirm>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-row> </el-row>
@ -905,7 +1064,6 @@ const batchAdd = function () {
</div> </div>
</el-row> </el-row>
</el-dialog> </el-dialog>
</template> </template>
<style scoped> <style scoped>

946
vue/gold-system/src/views/recharge/adminRecharge.vue
File diff suppressed because it is too large
View File

10
vue/gold-system/src/views/recharge/allRecharge.vue
View File

@ -389,7 +389,7 @@ onMounted(async function () {
<div> <div>
<el-table :data="tableData" :height="tableHeight" style="width: 100%"> <el-table :data="tableData" :height="tableHeight" style="width: 100%">
<el-table-column prop="username" label="姓名" width="100px" /> <el-table-column prop="username" label="姓名" width="100px" />
<el-table-column prop="jwcode" label="精网号" width="150px" />
<el-table-column prop="jwcode" label="精网号" width="130px" />
<el-table-column prop="area" label="所属地区" width="100px" /> <el-table-column prop="area" label="所属地区" width="100px" />
<el-table-column <el-table-column
prop="activityName" prop="activityName"
@ -397,9 +397,9 @@ onMounted(async function () {
width="150px" width="150px"
/> />
<el-table-column <el-table-column
prop="rechargeGold"
label="充值金额"
width="100px"
prop="paidGold"
label="充值金额(新币)"
width="120px"
/> />
<el-table-column <el-table-column
prop="rechargeWay" prop="rechargeWay"
@ -471,7 +471,7 @@ onMounted(async function () {
</div> </div>
<!-- 分页 --> <!-- 分页 -->
<div class="pagination">
<div class="pagination" style="margin-top: 20px">
<el-pagination <el-pagination
background background
:page-size="getObj.pageSize" :page-size="getObj.pageSize"

17
vue/gold-system/src/views/refund/addRefund.vue
View File

@ -379,12 +379,15 @@ const handleSelectionChange = (value) => {
</el-form> </el-form>
<!-- 客户信息栏 --> <!-- 客户信息栏 -->
<el-card style="float: right" class="customer-info">
<el-form :model="user" label-width="auto" label-position="left">
<el-text size="large" style="margin-left: 20px; font-weight: bold"
>客户信息</el-text
>
<el-row style="margin-top: 20px; display: flex">
<el-card style="width: 850px; float: right" class="customer-info">
<el-form
:model="user"
label-width="auto"
style="max-width: 1000px"
label-position="left"
>
<el-text size="large" style="margin-left: 20px">客户信息</el-text>
<el-row style="margin-top: 20px">
<el-col :span="10"> <el-col :span="10">
<el-form-item label="姓名:"> <el-form-item label="姓名:">
<p>{{ user.name }}</p> <p>{{ user.name }}</p>
@ -401,7 +404,7 @@ const handleSelectionChange = (value) => {
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="14"> <el-col :span="14">
<el-form-item label="当前金币总数">
<el-form-item label="当前金币总数" style="width: 500px">
<span style="color: #2fa1ff; margin-right: 5px" v-if="user.buyJb">{{ <span style="color: #2fa1ff; margin-right: 5px" v-if="user.buyJb">{{
user.buyJb + user.free6 + user.free12 + user.coreJb user.buyJb + user.free6 + user.free12 + user.coreJb
}}</span> }}</span>

54
vue/gold-system/src/views/refund/allRefund.vue
View File

@ -14,7 +14,7 @@ const detail = ref({});
// 搜索对象 // 搜索对象
const getObj = ref({ const getObj = ref({
pageNum: 1, pageNum: 1,
pageSize: 10,
pageSize: 5,
}); });
//分页总条目 //分页总条目
const total = ref(100); const total = ref(100);
@ -487,14 +487,46 @@ getGoods();
</div> </div>
<!-- 分页 --> <!-- 分页 -->
<el-pagination
background
layout="prev, pager, next"
:total="total"
:page-size="getObj.pageSize"
:current-page="getObj.pageNum"
@current-change="get"
/>
<div class="pagination">
<el-pagination
background
:page-size="getObj.pageSize"
layout="slot"
:total="total"
>
<div>共{{ total }}条,每页</div>
<el-select
v-model="getObj.pageSize"
class="page-size"
@change="get()"
style="width: 80px"
>
<el-option
v-for="item in [5, 6, 7, 8, 9, 10]"
:key="item"
:label="item"
:value="item"
></el-option>
</el-select>
<div>条</div>
</el-pagination>
<el-pagination
background
layout="prev, pager, next, slot"
:page-size="getObj.pageSize"
:total="total"
:current-page="getObj.pageNum"
@current-change="get"
>
<div>跳至</div>
<el-input
v-model="getObj.pageNum"
style="width: 40px"
@change="checkNumber"
/>
<div>页</div>
</el-pagination>
</div>
</el-card> </el-card>
</el-col> </el-col>
</el-row> </el-row>
@ -516,4 +548,8 @@ getGoods();
.head-card-btn { .head-card-btn {
margin-left: auto; margin-left: auto;
} }
.pagination {
display: flex;
margin-top: 20px;
}
</style> </style>

38
vue/gold-system/src/views/usergold/index.vue
View File

@ -2,6 +2,7 @@
import { ref, onMounted, reactive, computed } from "vue"; import { ref, onMounted, reactive, computed } from "vue";
import ElementPlus from "element-plus"; import ElementPlus from "element-plus";
import axios from "axios"; import axios from "axios";
import moment from "moment";
import { ta } from "element-plus/es/locales.mjs"; import { ta } from "element-plus/es/locales.mjs";
import API from "../../api/index.js"; import API from "../../api/index.js";
@ -46,7 +47,7 @@ const updateType = [
//表格高度 //表格高度
const tableHeight = computed(function () { const tableHeight = computed(function () {
return getObj.value.pageSize * 50 + "px";
return (getObj.value.pageSize + 2) * 38 + "px";
}); });
// 方法 // 方法
@ -93,7 +94,7 @@ const get = async function (val) {
rechargeCoin.value = 0; rechargeCoin.value = 0;
freeCoin.value = 0; freeCoin.value = 0;
taskCoin.value = 0; taskCoin.value = 0;
for(let i=0;i<tableAllData.value.length;i++){
for (let i = 0; i < tableAllData.value.length; i++) {
rechargeCoin.value += tableAllData.value[i].rechargeCoin; rechargeCoin.value += tableAllData.value[i].rechargeCoin;
freeCoin.value += tableAllData.value[i].freeCoin; freeCoin.value += tableAllData.value[i].freeCoin;
taskCoin.value += tableAllData.value[i].taskCoin; taskCoin.value += tableAllData.value[i].taskCoin;
@ -264,10 +265,10 @@ onMounted(async function () {
</div> </div>
<div> <div>
<el-table :data="tableData" :height="tableHeight" style="width: 100%"> <el-table :data="tableData" :height="tableHeight" style="width: 100%">
<el-table-column prop="uname" label="姓名" />
<el-table-column prop="jwcode" label="精网号" />
<el-table-column prop="area" label="所属地区" />
<el-table-column prop="gold" label="更新数量">
<el-table-column prop="uname" label="姓名" width="130" />
<el-table-column prop="jwcode" label="精网号" width="170" />
<el-table-column prop="area" label="所属地区" width="170" />
<el-table-column prop="gold" label="更新数量" width="160">
<template #default="scope"> <template #default="scope">
<span>{{ <span>{{
scope.row.rechargeCoin + scope.row.rechargeCoin +
@ -276,18 +277,29 @@ onMounted(async function () {
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="updateType" label="更新类型" />
<el-table-column prop="freeCoin" label="免费金币" />
<el-table-column prop="rechargeCoin" label="充值金币" />
<el-table-column prop="taskCoin" label="任务金币" />
<el-table-column prop="name" label="提交人" />
<el-table-column prop="createTime" label="更新时间" />
<el-table-column prop="updateType" label="更新类型" width="150" />
<el-table-column prop="freeCoin" label="免费金币" width="130" />
<el-table-column prop="rechargeCoin" label="充值金币" width="150" />
<el-table-column prop="taskCoin" label="任务金币" width="130" />
<el-table-column prop="name" label="提交人" width="150" />
<el-table-column
prop="createTime"
label="更新时间"
width="210"
show-overflow-tooltip
>
<template #default="scope">
<span>{{
moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss")
}}</span>
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
<!-- 分页 --> <!-- 分页 -->
<!-- 分页 --> <!-- 分页 -->
<div class="pagination">
<div class="pagination" style="margin-top: 20px">
<el-pagination <el-pagination
background background
:page-size="getObj.pageSize" :page-size="getObj.pageSize"

Write Preview
Loading…
Cancel
Save