Browse Source

这是修改活动的

Hongxilin
donghaolin 5 months ago
parent
commit
9c079388b3
  1. 27
      vue/gold-system/src/views/managerecharge/rate.vue
  2. 15
      vue/gold-system/src/views/recharge/addRecharge.vue

27
vue/gold-system/src/views/managerecharge/rate.vue

@ -236,6 +236,14 @@ function formatDate(value) {
const seconds = date.getSeconds().toString().padStart(2, "0"); const seconds = date.getSeconds().toString().padStart(2, "0");
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
} }
function formatDateTwe(value) {
if (!value) return "";
const date = new Date(value);
const year = date.getFullYear();
const month = (date.getMonth() + 1).toString().padStart(2, "0");
const day = date.getDate().toString().padStart(2, "0");
return `${year}-${month}-${day}`;
}
// //
const tableHeight = computed(function () { const tableHeight = computed(function () {
@ -378,25 +386,32 @@ const checkNumber = function () {
:height="tableHeight" :height="tableHeight"
style="width: 100%" style="width: 100%"
> >
<el-table-column prop="currency" label="货币名称" :span="3" />
<el-table-column prop="exchangeRate" label="汇率" :span="3">
<el-table-column prop="currency" label="货币名称" :span="2" />
<el-table-column prop="exchangeRate" label="汇率" :span="2">
<template #default="scope"> <template #default="scope">
<p>{{ scope.row.exchangeRate }} 1新币</p> <p>{{ scope.row.exchangeRate }} 1新币</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="createTime" label="添加时间" :span="5">
<el-table-column prop="createTime" label="添加时间" :span="3">
<template #default="scope"> <template #default="scope">
<span>{{ formatDate(scope.row.createTime) }}</span> <span>{{ formatDate(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="updateTime" label="更新时间" :span="5">
<!-- <el-table-column prop="updateTime" label="更新时间" :span="3">
<template #default="scope"> <template #default="scope">
<span>{{ formatDate(scope.row.updateTime) }}</span> <span>{{ formatDate(scope.row.updateTime) }}</span>
</template> </template>
</el-table-column> -->
<el-table-column prop="adminName" label="提交人" :span="1" />
<el-table-column prop="startTime" label="持续时间" :span="10">
<template #default="scope">
<span>{{ formatDateTwe(scope.row.startTime) }}</span>
<span>---</span>
<span>{{ formatDateTwe(scope.row.endTime) }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="adminName" label="更新人" :span="4" />
<el-table-column label="操作" :span="4">
<el-table-column label="操作" :span="3">
<template #default="scope"> <template #default="scope">
<el-button <el-button
type="text" type="text"

15
vue/gold-system/src/views/recharge/addRecharge.vue

@ -401,13 +401,17 @@ const getActivityById = async function (row) {
console.log("请求失败", error); console.log("请求失败", error);
} }
}; };
const handleSelectionChange = (row) => {
getActivityById(row);
};
function handleActivityChange(value) {
//
console.log("选中的值:", value);
getActivityById(value);
console.log("看看", addRecharge.value);
}
const calculatedFreeGold = computed(() => { const calculatedFreeGold = computed(() => {
if (!addRecharge.value.activityId == 0) { if (!addRecharge.value.activityId == 0) {
const paidGold = Number(addRecharge.value.paidGold) || 0; const paidGold = Number(addRecharge.value.paidGold) || 0;
const activityId = Number(addRecharge.value.rechargeRatio) || 1; // 0 const activityId = Number(addRecharge.value.rechargeRatio) || 1; // 0
console.log("看看有没拿到", addRecharge.value);
return Math.ceil(paidGold / activityId); return Math.ceil(paidGold / activityId);
} }
}); });
@ -479,6 +483,7 @@ const addLine = function () {
const handleSelectionChangebatch = function (val) { const handleSelectionChangebatch = function (val) {
console.log("val===", val); console.log("val===", val);
batchDelObj.value = val; batchDelObj.value = val;
console.log("大傻春");
}; };
// //
const batchDel = function () { const batchDel = function () {
@ -665,6 +670,7 @@ const batchAdd = function () {
v-model="addRecharge.activityId" v-model="addRecharge.activityId"
placeholder="请选择" placeholder="请选择"
style="width: 300px" style="width: 300px"
@change="handleActivityChange"
> >
<el-option <el-option
v-for="item in activity" v-for="item in activity"
@ -909,7 +915,8 @@ const batchAdd = function () {
clearable clearable
v-model="scope.row.activityId" v-model="scope.row.activityId"
placeholder="请选择活动名称" placeholder="请选择活动名称"
@change="calculatedRowFreeGold(scope.row)"
@change="handleSelectionChange"
>
> >
<el-option <el-option
v-for="item in activity" v-for="item in activity"

Loading…
Cancel
Save