yanjiaqing
/
gold_vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

0514早，修几个bug

main
lihuilin 4 days ago
parent
1fcafa069e
commit
5aefc97970
6 changed files with 129 additions and 117 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. 2
      gold-system/.env.development
  2. 2
      gold-system/.env.production
  3. 141
      gold-system/src/views/managerecharge/rate.vue
  4. 78
      gold-system/src/views/recharge/addRecharge.vue
  5. 17
      gold-system/src/views/recharge/adminRecharge.vue
  6. 6
      gold-system/stats.html

2
gold-system/.env.development
View File

@ -2,4 +2,4 @@
# VITE_API_BASE='http://192.168.8.94:8080/' # VITE_API_BASE='http://192.168.8.94:8080/'
VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev' VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev'
# VITE_API_BASE='http://54.251.137.151:10704/' # VITE_API_BASE='http://54.251.137.151:10704/'
# VITE_API_BASE='http://192.168.8.220:8080/'
# VITE_API_BASE='http://192.168.8.232:8080/'

2
gold-system/.env.production
View File

@ -1,5 +1,5 @@
# VITE_API_BASE='http://54.251.137.151:10702/' # VITE_API_BASE='http://54.251.137.151:10702/'
VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod' VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod'
# VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev' # VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev'
# VITE_API_BASE='http://192.168.8.220:8080/'
# VITE_API_BASE='http://192.168.8.232:8080/'

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

@ -42,35 +42,63 @@ const getObj = ref({
const total = ref(0) const total = ref(0)
//分页总条目 //分页总条目
// 时间选择器
// const value1 = ref([]) // 时间数组
// function handleDateChange(value) {
// if (value && value.length === 2) {
// value1.value.startTime = value[0] // 开始日期
// value1.value.endTime = value[1] // 结束日期
// }
// console.log(value1)
// }
const time = ref({})
// 替换原来的time，用数组
const timeRange = ref([])
// 格式化日期为YYYY-MM-DD HH:mm:ss，否则格式不对无法填充日期时间选择器
const formatDateTime = (date) => {
return moment(date).format('YYYY-MM-DD HH:mm:ss')
}
// 今天
const getToday = () => {
const today = new Date()
const start = new Date(today.getFullYear(), today.getMonth(), today.getDate(), 0, 0, 0)
const end = new Date(today.getFullYear(), today.getMonth(), today.getDate() + 1, 0, 0, 0)
timeRange.value = [formatDateTime(start), formatDateTime(end)]
search()
}
// 昨天
const getYesterday = () => {
const yesterday = new Date()
yesterday.setDate(yesterday.getDate() - 1)
const start = new Date(yesterday.getFullYear(), yesterday.getMonth(), yesterday.getDate(), 0, 0, 0)
const end = new Date(yesterday.getFullYear(), yesterday.getMonth(), yesterday.getDate() + 1, 0, 0, 0)
timeRange.value = [formatDateTime(start), formatDateTime(end)]
search()
}
// 近 7 天
const get7Days = () => {
const today = new Date()
const start = new Date(today.getFullYear(), today.getMonth(), today.getDate() - 6, 0, 0, 0)
const end = new Date(today.getFullYear(), today.getMonth(), today.getDate() + 1, 0, 0, 0)
timeRange.value = [formatDateTime(start), formatDateTime(end)]
search()
}
const get = async function (val) { const get = async function (val) {
// 搜索参数时间赋值
// if (value1.value && value1.value.length === 2) {
// time.value.startTime = value1.value[0];
// time.value.endTime = value1.value[1];
// } else {
// time.value.startTime = '';
// time.value.endTime = '';
// }
try { try {
// 搜索参数页码赋值 // 搜索参数页码赋值
if (typeof val === 'number') { if (typeof val === 'number') {
getObj.value.pageNum = val; getObj.value.pageNum = val;
} }
// 时间赋值
const time = {}
if (timeRange.value.length === 2) {
time.startTime = moment(timeRange.value[0]).format('YYYY-MM-DD HH:mm:ss')
time.endTime = moment(timeRange.value[1]).format('YYYY-MM-DD HH:mm:ss')
} else {
time.startTime = ''
time.endTime = ''
}
console.log('搜索参数', { console.log('搜索参数', {
...getObj.value, ...getObj.value,
rate: { ...time.value }
rate: { ...time }
}); });
// 发送POST请求 // 发送POST请求
const result = await request({ const result = await request({
@ -78,7 +106,7 @@ const get = async function (val) {
method: 'POST', method: 'POST',
data: { data: {
...getObj.value, ...getObj.value,
rate: { ...time.value }
rate: { ...time }
} }
}); });
@ -96,41 +124,6 @@ const get = async function (val) {
} }
} }
// 今天
const getToday = () => {
const today = new Date()
// 格式化开始时间
const startDate = moment(today).startOf('day').format('YYYY-MM-DD HH:mm:ss')
// 格式化结束时间，将结束时间设为当天 00:00:00
const endDate = moment(today).add(1, 'days').startOf('day').format('YYYY-MM-DD HH:mm:ss')
time.value.startTime = startDate
time.value.endTime = endDate
search()
}
// 昨天
const getYesterday = () => {
const yesterday = moment().subtract(1, 'days')
// 格式化开始时间
const startDate = yesterday.startOf('day').format('YYYY-MM-DD HH:mm:ss')
// 格式化结束时间，将结束时间设为当天 00:00:00
const endDate = yesterday.add(1, 'days').startOf('day').format('YYYY-MM-DD HH:mm:ss')
time.value.startTime = startDate
time.value.endTime = endDate
search()
}
// 近7天
const get7Days = () => {
// 格式化开始时间
const startDate = moment().subtract(6, 'days').startOf('day').format('YYYY-MM-DD HH:mm:ss')
// 格式化结束时间，将结束时间设为当天 00:00:00
const endDate = moment().add(1, 'days').startOf('day').format('YYYY-MM-DD HH:mm:ss')
time.value.startTime = startDate
time.value.endTime = endDate
search()
}
// 搜索 // 搜索
const search = function () { const search = function () {
getObj.value.pageNum = 1 getObj.value.pageNum = 1
@ -414,8 +407,7 @@ const rules = reactive({
// 重置的按钮 // 重置的按钮
const handledelete = function () { const handledelete = function () {
time.value.startTime = ''
time.value.endTime = ''
timeRange.value={}
getObj.value.pageNum = 1 getObj.value.pageNum = 1
} }
// 验证跳转输入框的数字是否合法 // 验证跳转输入框的数字是否合法
@ -494,27 +486,16 @@ function handleInput(value) {
<!-- 这是时间 --> <!-- 这是时间 -->
<div class="demo-range"> <div class="demo-range">
<el-row> <el-row>
<el-col :span="6">
<el-form-item prop="startTime">
<el-text class="mx-1" size="large">开始时间：</el-text>
<el-date-picker
v-model="time.startTime"
type="date"
placeholder="开始日期"
style="width: 210px"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item prop="endTime">
<el-text class="mx-1" size="large">结束时间：</el-text>
<el-col :span="9">
<el-form-item>
<el-text class="mx-1" size="large">时间范围：</el-text>
<el-date-picker <el-date-picker
v-model="time.endTime"
type="date"
placeholder="结束日期"
style="width: 210px"
v-model="timeRange"
type="datetimerange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
style="width: 300px"
format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
/> />
@ -716,7 +697,7 @@ function handleInput(value) {
</el-form-item> </el-form-item>
<el-form-item prop="startTime" label="开始时间:"> <el-form-item prop="startTime" label="开始时间:">
<el-date-picker <el-date-picker
v-model="rateAdd.startTime"
v-model="time.startTime"
type="date" type="date"
placeholder="请选择时间" placeholder="请选择时间"
:default-value="new Date()" :default-value="new Date()"
@ -726,7 +707,7 @@ function handleInput(value) {
</el-form-item> </el-form-item>
<el-form-item prop="endTime" label="结束时间:"> <el-form-item prop="endTime" label="结束时间:">
<el-date-picker <el-date-picker
v-model="rateAdd.endTime"
v-model="time.endTime"
type="date" type="date"
placeholder="请选择时间" placeholder="请选择时间"
:default-value="new Date()" :default-value="new Date()"

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

@ -54,11 +54,11 @@ const getAdminData = async function () {
const addRecharge = ref({ const addRecharge = ref({
rechargeVoucher: '', rechargeVoucher: '',
rechargeWay: '客服充值', rechargeWay: '客服充值',
freeGold: '0',
rechargeGold: 0,
paidGold: 0,
freeGold: '',
rechargeGold: null,
paidGold: '',
Rate: null, Rate: null,
rechargeRatio: '0'
rechargeRatio: ''
}) })
// 这是添加充值信息的接口 // 这是添加充值信息的接口
const add = async function () { const add = async function () {
@ -97,6 +97,20 @@ const add = async function () {
const addBefore = () => { const addBefore = () => {
Ref.value.validate(async (valid) => { Ref.value.validate(async (valid) => {
if (valid) { if (valid) {
if (Rate.value == null || Rate.value == '' || Rate.value == undefined) {
ElMessage({
type: 'error',
message: '请选择币种'
})
return
}
if(addRecharge.value.rechargeGold == null || addRecharge.value.rechargeGold == '' || addRecharge.value.rechargeGold == undefined){
ElMessage({
type: 'error',
message: '请输入充值金额'
})
return
}
ElMessageBox.confirm('确认添加？') ElMessageBox.confirm('确认添加？')
.then(() => { .then(() => {
add() add()
@ -165,19 +179,40 @@ const rules = reactive({
trigger: 'blur' trigger: 'blur'
} }
], ],
// 必须进行选择
rechargeGold: [ rechargeGold: [
{ {
required: true,message: '请选择充值方式',trigger: 'blur'
},{
validator: (rule, value, callback) => {
if (value >= 0) {
callback()
} else {
callback(new Error('输入金额至少为0'))
}
}
required: true,
message: '请选择货币名称',
trigger: 'blur'
}
// {
// validator: (rule, value, callback) => {
// if (value != null && value!= '') {
// callback()
// } else {
// callback(new Error('请选择货币名称'))
// }
// },
// trigger: 'blur'
// }
],
'addRecharge.rechargeGold': [
{
required: true,
message: '请输入充值金额',
trigger: 'blur'
} }
// {
// validator: (rule, value, callback) => {
// if (typeof value === 'number' && value >= 0) {
// callback()
// } else {
// callback(new Error('输入金额至少为 0'))
// }
// },
// trigger: 'blur'
// }
// 以上两个字段的校验在提交时触发
], ],
payWay: [{ required: true, message: '请选择付款方式', trigger: 'blur' }], payWay: [{ required: true, message: '请选择付款方式', trigger: 'blur' }],
rechargeTime: [{ required: true, message: '请选择交款时间', trigger: 'blur' }] rechargeTime: [{ required: true, message: '请选择交款时间', trigger: 'blur' }]
@ -336,9 +371,9 @@ const deleteRecharge = function () {
area: adminData.value.area, area: adminData.value.area,
rechargeVoucher: '', rechargeVoucher: '',
rechargeWay: '客服充值', rechargeWay: '客服充值',
freeGold: Number(0),
rechargeGold: 0,
paidGold: Number(0)
freeGold: Number(),
rechargeGold: null,
paidGold: Number()
} }
imageUrl.value = '' imageUrl.value = ''
Rate.value = '' Rate.value = ''
@ -927,12 +962,13 @@ onMounted(async function () {
<el-input v-model="addRecharge.freeGold" style="width: 100px" /> <el-input v-model="addRecharge.freeGold" style="width: 100px" />
<p>个</p> <p>个</p>
</el-form-item> </el-form-item>
<el-form-item prop="rechargeGold" label="充值金额">
<el-form-item label="充值金额">
<el-select <el-select
prop="rechargeGold" prop="rechargeGold"
v-model="Rate" v-model="Rate"
placeholder="货币名称" placeholder="货币名称"
style="width: 95px; margin-right: 5px" style="width: 95px; margin-right: 5px"
aria-required="true"
> >
<el-option <el-option
v-for="item in currency" v-for="item in currency"
@ -941,7 +977,7 @@ onMounted(async function () {
:value="item.exchangeRate" :value="item.exchangeRate"
/> />
</el-select> </el-select>
<el-input v-model="addRecharge.rechargeGold" style="width: 200px" />
<el-input prop="addRecharge.rechargeGold" v-model="addRecharge.rechargeGold" style="width: 200px" aria-required="true"/>
</el-form-item> </el-form-item>
<el-form-item prop="payWay" label="收款方式"> <el-form-item prop="payWay" label="收款方式">
<el-select <el-select
@ -1260,9 +1296,9 @@ onMounted(async function () {
<span v-else>{{ scope.row.rate }}</span> <span v-else>{{ scope.row.rate }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column property="rechargeGold" label="充值金额" width="110px">
<el-table-column label="充值金额" width="110px">
<template #default="scope"> <template #default="scope">
<el-input v-model="scope.row.rechargeGold"></el-input>
<el-input property="rechargeGold" v-model="scope.row.rechargeGold"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column property="payWay" label="收款方式" width="130px"> <el-table-column property="payWay" label="收款方式" width="130px">

17
gold-system/src/views/recharge/adminRecharge.vue
View File

@ -416,6 +416,7 @@ const sortField = ref('')
const sortOrder = ref('') const sortOrder = ref('')
// 处理排序事件 // 处理排序事件
const handleSortChange = (column) => { const handleSortChange = (column) => {
get()
console.log('排序字段：', column.prop) console.log('排序字段：', column.prop)
console.log('排序方式：', column.order) console.log('排序方式：', column.order)
if (column.prop === 'paidGold') { if (column.prop === 'paidGold') {
@ -426,11 +427,9 @@ const handleSortChange = (column) => {
sortField.value = 'recharge_time' sortField.value = 'recharge_time'
} else if (column.prop === 'createTime') { } else if (column.prop === 'createTime') {
sortField.value = 'create_time' sortField.value = 'create_time'
} else if (column.prop === 'paidMoney') {
sortField.value = 'paid_gold'
}
}
sortOrder.value = column.order === 'ascending' ? 'ASC' : 'DESC' sortOrder.value = column.order === 'ascending' ? 'ASC' : 'DESC'
get()
} }
</script> </script>
@ -582,23 +581,23 @@ const handleSortChange = (column) => {
label="活动名称" label="活动名称"
width="150px" width="150px"
/> />
<el-table-column prop="" label="货币名称" width="120px" />
<!-- <el-table-column prop="" label="货币名称" width="120px" /> -->
<el-table-column <el-table-column
prop="paidGold" prop="paidGold"
sortable="“custom”"
sortable="custom"
label="充值金额" label="充值金额"
width="120px" width="120px"
/> />
<el-table-column <el-table-column
prop="paidGold" prop="paidGold"
label="永久金币" label="永久金币"
sortable="“custom”"
sortable="custom"
width="110px" width="110px"
/> />
<el-table-column <el-table-column
prop="freeGold" prop="freeGold"
label="免费金币" label="免费金币"
sortable="“custom”"
sortable="custom"
width="110px" width="110px"
/> />
<el-table-column <el-table-column
@ -654,7 +653,7 @@ const handleSortChange = (column) => {
/> />
<el-table-column <el-table-column
prop="rechargeTime" prop="rechargeTime"
sortable="“custom”"
sortable
label="交款时间" label="交款时间"
width="200px" width="200px"
> >

6
gold-system/stats.html
File diff suppressed because it is too large
View File

Write Preview
Loading…
Cancel
Save