Browse Source

4/6号更新

4/1日二期
donghaolin 1 month ago
parent
commit
a9458e7f53
  1. 12
      gold-system/src/views/audit/rechargeAudit.vue
  2. 8
      gold-system/src/views/audit/refundAudit.vue
  3. 4
      gold-system/src/views/consume/allConsume.vue
  4. 8
      gold-system/src/views/permissions/index.vue
  5. 24
      gold-system/src/views/recharge/adminRecharge.vue
  6. 4
      gold-system/src/views/recharge/allRecharge.vue
  7. 4
      gold-system/src/views/refund/allRefund.vue
  8. 57
      gold-system/src/views/usergold/index.vue
  9. 4
      gold-system/src/views/usergoldInfo/index.vue
  10. 8
      gold-system/src/views/workspace/index.vue

12
gold-system/src/views/audit/rechargeAudit.vue

@ -227,12 +227,12 @@ const search = function () {
};
//
const reset = function () {
rechargeVo.value.activityId = "";
rechargeVo.value.jwcode = "";
rechargeVo.value.payWay = "";
rechargeVo.value.area = "";
rechargeVo.value.startDate = "";
rechargeVo.value.endDate = "";
delete rechargeVo.value.activityId;
delete rechargeVo.value.jwcode;
delete rechargeVo.value.payWay;
delete rechargeVo.value.area;
delete rechargeVo.value.startDate;
delete rechargeVo.value.endDate;
getTime.value = {};
};
//

8
gold-system/src/views/audit/refundAudit.vue

@ -63,8 +63,8 @@ const activeName = ref("all");
// 退
const refundType = [
{
value: "退款金币",
label: "退款金币",
value: "退款商品",
label: "退款商品",
},
];
@ -603,11 +603,11 @@ const handleSortChange = (column) => {
<el-tab-pane label="待审核" name="wait"></el-tab-pane>
<el-tab-pane label="已通过" name="pass"></el-tab-pane>
<el-tab-pane label="已驳回" name="reject"></el-tab-pane>
<!-- <div>
<div>
退款记录条数{{ Math.abs(trueCount) }},退款金币总数{{
Math.abs(trueGold)
}}
</div> -->
</div>
</el-tabs>
<!-- 设置表格容器的高度和滚动样式 -->
<div style="height: 540px; overflow-y: auto">

4
gold-system/src/views/consume/allConsume.vue

@ -413,13 +413,13 @@ const handleSortChange = (column) => {
<el-row>
<el-col>
<el-card>
<!-- <div>
<div>
消费金币总数{{ Math.abs(totalCoin) }}永久金币{{
Math.abs(rechargeCoin)
}}免费金币{{ Math.abs(freeCoin) }}任务金币{{
Math.abs(taskCoin)
}}
</div> -->
</div>
<!-- 设置表格容器的高度和滚动样式 -->
<div style="height: 576px; overflow-y: auto">
<el-table

8
gold-system/src/views/permissions/index.vue

@ -435,10 +435,10 @@ onMounted(async function () {
</div>
<div class="head-card-element" style="margin-left: 50px">
<el-text class="mx-1" size="large">所属部门</el-text>
<el-text class="mx-1" size="large">职位名称</el-text>
<el-select
v-model="admin.store"
placeholder="请选择部门"
placeholder="请选择职位名称"
style="width: 240px"
clearable
>
@ -489,7 +489,7 @@ onMounted(async function () {
<el-table-column prop="jwcode" label="精网号" />
<el-table-column prop="name" label="姓名" />
<el-table-column prop="area" label="所属地区" />
<el-table-column prop="store" label="所属部门" />
<el-table-column prop="store" label="职位" />
<el-table-column prop="permission" label="部门权限">
<template #default="scope">
<span v-if="scope.row.permission === '1'"> 总部管理员 </span>
@ -660,7 +660,7 @@ onMounted(async function () {
></el-option>
</el-select>
</el-form-item>
<el-form-item prop="store" label="所属部门:">
<el-form-item prop="store" label="职位:">
<el-input
v-model="addAdmin.store"
placeholder="请输入职称"

24
gold-system/src/views/recharge/adminRecharge.vue

@ -153,9 +153,9 @@ const get = async function (val) {
for (let i = 0; i < result2.data.length; i++) {
if (result2.data[i].flag == "已通过") {
totalData.value = result2.data[i];
totalmoney.value = totalData.value.sumRaudit1;
totalRcoin.value = totalData.value.sumRaudit1;
totalFcoin.value = totalData.value.sumRaudit2;
totalmoney.value = totalData.value.sumRaudit1 || 0;
totalRcoin.value = totalData.value.sumRaudit1 || 0;
totalFcoin.value = totalData.value.sumRaudit2 || 0;
break;
}
}
@ -180,13 +180,13 @@ const search = function () {
};
//
const reset = function () {
rechargeVo.value.activityId = "";
rechargeVo.value.payWay = "";
rechargeVo.value.area = "";
rechargeVo.value.startDate = "";
rechargeVo.value.endDate = "";
sortField.value = "";
sortOrder.value = "";
delete rechargeVo.value.activityId;
delete rechargeVo.value.payWay;
delete rechargeVo.value.area;
delete rechargeVo.value.startDate;
delete rechargeVo.value.endDate;
delete sortField.value;
delete sortOrder.value;
getTime.value = {};
};
//
@ -505,11 +505,11 @@ const handleSortChange = (column) => {
<el-tab-pane label="待审核" name="wait"></el-tab-pane>
<el-tab-pane label="已通过" name="pass"></el-tab-pane>
<el-tab-pane label="已驳回" name="reject"></el-tab-pane>
<!-- <div>
<div>
充值金额{{ totalmoney }}新币永久金币{{
totalRcoin
}}金币免费金币{{ totalFcoin }}金币
</div> -->
</div>
</el-tabs>
<!-- 设置表格容器的高度和滚动样式 -->
<div style="height: 520px; overflow-y: auto">

4
gold-system/src/views/recharge/allRecharge.vue

@ -472,11 +472,11 @@ const handleSortChange = (column) => {
<el-tab-pane label="待审核" name="wait"></el-tab-pane>
<el-tab-pane label="已通过" name="pass"></el-tab-pane>
<el-tab-pane label="已驳回" name="reject"></el-tab-pane>
<!-- <div>
<div>
充值金额{{ totalmoney / 100 }}新币永久金币{{
totalRcoin / 100
}}金币免费金币{{ totalFcoin / 100 }}金币
</div> -->
</div>
</el-tabs>
<!-- 设置表格容器的高度和滚动样式 -->
<div style="height: 520px; overflow-y: auto">

4
gold-system/src/views/refund/allRefund.vue

@ -533,13 +533,13 @@ const handleSortChange = (column) => {
<el-tab-pane label="已驳回" name="reject"></el-tab-pane>
</el-tabs>
<!-- <div>
<div>
退款金币总数{{ Math.abs(trueGold) }}永久金币{{
Math.abs(trueRgold)
}}免费金币{{ Math.abs(trueFgold) }}任务金币{{
Math.abs(trueTgold)
}}
</div> -->
</div>
<!-- 设置表格容器的高度和滚动样式 -->
<div style="height: 520px; overflow-y: auto">
<el-table

57
gold-system/src/views/usergold/index.vue

@ -26,7 +26,7 @@ const getAdminData = async function () {
//
const tableData = ref([]);
//
const tableAllData = ref([]);
// const tableAllData = ref([]);
//
const rechargeCoin = ref(0);
const freeCoin = ref(0);
@ -99,37 +99,37 @@ const get = async function (val) {
...getObj.value,
detailY: { ...detailY.value },
});
const result2 = await API.post("http://54.251.137.151:10702/detailY", {
...getAllObj.value,
detailY: { ...detailY.value },
});
// const result2 = await API.post("http://54.251.137.151:10702/detailY", {
// ...getAllObj.value,
// detailY: { ...detailY.value },
// });
//
console.log("请求成功", result);
console.log("请求成功2", result2);
// console.log("2", result2);
//
tableData.value = result.data.list;
console.log("tableData", tableData.value);
tableAllData.value = result2.data;
console.log("tableAllData", tableAllData.value);
// tableAllData.value = result2.data;
// console.log("tableAllData", tableAllData.value);
//
total.value = result.data.total;
console.log("total", total.value);
// 100
// 100
rechargeCoin.value = parseFloat((tableAllData.value.sumR / 100).toFixed(2));
freeCoin.value = parseFloat((tableAllData.value.sumF / 100).toFixed(2));
taskCoin.value = parseFloat((tableAllData.value.sumT / 100).toFixed(2));
// rechargeCoin.value = parseFloat((tableAllData.value.sumR / 100).toFixed(2));
// freeCoin.value = parseFloat((tableAllData.value.sumF / 100).toFixed(2));
// taskCoin.value = parseFloat((tableAllData.value.sumT / 100).toFixed(2));
// for (let i = 0; i < tableAllData.value.length; i++) {
// rechargeCoin.value += tableAllData.value[i].rechargeCoin;
// freeCoin.value += tableAllData.value[i].freeCoin;
// taskCoin.value += tableAllData.value[i].taskCoin;
// }
console.log(
"各金币总数",
rechargeCoin.value,
freeCoin.value,
taskCoin.value
);
// console.log(
// "",
// rechargeCoin.value,
// freeCoin.value,
// taskCoin.value
// );
} catch (error) {
console.log("请求失败", error);
//
@ -142,16 +142,21 @@ const search = function () {
};
//
const reset = function () {
detailY.value.jwcode = "";
detailY.value.num = "";
detailY.value.startDate = "";
detailY.value.endDate = "";
detailY.value.area = "";
sortField.value = "";
sortOrder.value = "";
//
delete detailY.value.jwcode;
//
delete detailY.value.num;
//
delete detailY.value.startDate;
//
delete detailY.value.endDate;
//
delete detailY.value.area;
delete sortField.value;
delete sortOrder.value;
getTime.value = {};
//
detailY.value.consumePlatform = "";
//
delete detailY.value.consumePlatform;
};
//
const getToday = function () {

4
gold-system/src/views/usergoldInfo/index.vue

@ -275,11 +275,11 @@ onMounted(async function () {
<el-row>
<el-col>
<el-card>
<!-- <div>
<div>
现有金币永久金币{{ Math.abs(rechargeCoin) }}免费金币{{
Math.abs(freeCoin)
}}任务金币{{ Math.abs(taskCoin) }}
</div> -->
</div>
<!-- 设置表格容器的高度和滚动样式 -->
<div style="height: 626px; overflow-y: auto">
<el-table

8
gold-system/src/views/workspace/index.vue

@ -1261,9 +1261,11 @@ onMounted(async function () {
>昨日新增消耗{{
formatNum(
Math.abs(
threeData.yesterdayCoin !== undefined &&
threeData.yesterdayCoin !== null
? threeData.yesterdayCoin / 100
threeData.yesterdayGold + threeData.yesterdayrefund !==
undefined &&
threeData.yesterdayGold + threeData.yesterdayrefund !== null
? (threeData.yesterdayGold + threeData.yesterdayrefund) /
100
: 0
)
)

Loading…
Cancel
Save