Browse Source

0516先上一版

main
lihuilin 2 days ago
parent
commit
344fdf8989
  1. 2
      gold-system/.env.development
  2. 4
      gold-system/.env.test
  3. 60
      gold-system/src/views/recharge/addRecharge.vue
  4. 16
      gold-system/src/views/recharge/adminRecharge.vue
  5. 32
      gold-system/src/views/refund/addRefund.vue
  6. 2
      gold-system/stats.html

2
gold-system/.env.development

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

4
gold-system/.env.test

@ -1,6 +1,6 @@
# VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod'
#VITE_API_BASE='http://54.251.137.151:10704/'
# VITE_API_BASE='http://192.168.8.94:8080/'
VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev'
# VITE_API_BASE='http://192.168.8.232:8080/'
ITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev'
# VVITE_API_BASE='http://192.168.8.225:8080/'

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

@ -133,15 +133,6 @@ const addBefore = () => {
//
const Ref = ref(null)
// const checkFreeGoldRadio = function (rule, value, callback) {
// if (value == "0" || value == null || value == "") {
// callback(new Error(""));
// } else if (value < 0 || isNaN(value)) {
// callback(new Error(""));
// } else {
// callback();
// }
// };
const rules = reactive({
jwcode: [{ required: true, message: '请输入精网号', trigger: 'blur' }],
activityId: [{ required: true, message: '请选择活动名称', trigger: 'blur' }],
@ -185,16 +176,6 @@ const rules = reactive({
message: '请选择货币名称',
trigger: 'blur'
}
// {
// validator: (rule, value, callback) => {
// if (value != null && value!= '') {
// callback()
// } else {
// callback(new Error(''))
// }
// },
// trigger: 'blur'
// }
],
'addRecharge.rechargeGold': [
{
@ -202,17 +183,6 @@ const rules = reactive({
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' }],
rechargeTime: [{ required: true, message: '请选择交款时间', trigger: 'blur' }]
@ -300,7 +270,7 @@ const getCurrency = async function () {
const handleAvatarSuccess = (response, uploadFile) => {
imageUrl.value = URL.createObjectURL(uploadFile.raw)
console.log('图片上传成功', response, uploadFile)
addRecharge.value.rechargeVoucher = `http://54.251.137.151:10702/upload/${response.data}`
addRecharge.value.rechargeVoucher = `http://54.251.137.151:10704/upload/${response.data}`
console.log('图片名称', addRecharge.value.rechargeVoucher)
}
@ -346,24 +316,6 @@ function handleActivityChange(value) {
getActivityById(value)
console.log('看看', addRecharge.value)
}
// paidGold
// const calculatedFree = computed(() => {
// const result = addRecharge.value.paidGold / addRecharge.value.rechargeRatio
// if (isNaN(result) || result < 1 || addRecharge.value.rechargeRatio == 0) {
// return 0
// } else {
// return Math.trunc(result)
// }
// })
// watch(calculatedFree, (newVal) => {
// addRecharge.value.freeGold = newVal
// })
// const calculatedRecharge = computed(() => {
// return addRecharge.value.paidGold * Rate.value
// })
// watch(calculatedRecharge, (newVal) => {
// addRecharge.value.rechargeGold = newVal
// })
//
const deleteRecharge = function () {
addRecharge.value = {
@ -685,7 +637,7 @@ const changeVoucher = function (row) {
const handleBatchAvatarSuccess = (response, uploadFile) => {
imageUrl.value = URL.createObjectURL(uploadFile.raw)
console.log('图片上传成功', response, uploadFile)
rechargeVoucher.value = `http://54.251.137.151:10702/upload/${response.data}`
rechargeVoucher.value = `http://54.251.137.151:10704/upload/${response.data}`
console.log('图片名称', rechargeVoucher.value)
}
//
@ -817,7 +769,7 @@ const batchSettingInit = function () {
const batchSettingHandleAvatarSuccess = (response, uploadFile) => {
batchSettingObj.value.imageUrl = URL.createObjectURL(uploadFile.raw)
console.log('图片上传成功', response, uploadFile)
batchSettingObj.value.rechargeVoucher = `http://54.251.137.151:10702/upload/${response.data}`
batchSettingObj.value.rechargeVoucher = `http://54.251.137.151:10704/upload/${response.data}`
console.log('图片名称', batchSettingObj.value.rechargeVoucher)
}
//
@ -1007,7 +959,7 @@ onMounted(async function () {
style="margin-bottom: 5px"
>
<el-upload
action="http://54.251.137.151:10702/upload"
action="http://54.251.137.151:10704/upload"
class="avatar-uploader"
:show-file-list="false"
:on-success="handleAvatarSuccess"
@ -1339,7 +1291,7 @@ onMounted(async function () {
<el-table-column property="rechargeVoucher" label="充值凭证">
<template #default="scope">
<el-upload
action="http://54.251.137.151:10702/upload"
action="http://54.251.137.151:10704/upload"
class="avatar-uploader"
:show-file-list="false"
:on-success="handleBatchAvatarSuccess"
@ -1504,7 +1456,7 @@ onMounted(async function () {
</el-form-item>
<el-form-item prop="rechargeVoucher" label="交款凭证">
<el-upload
action="http://54.251.137.151:10702/upload"
action="http://54.251.137.151:10704/upload"
class="avatar-uploader"
:show-file-list="false"
:on-success="batchSettingHandleAvatarSuccess"

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

@ -416,17 +416,19 @@ const sortField = ref('')
const sortOrder = ref('')
//
const handleSortChange = (column) => {
get()
console.log('排序字段:', column.prop)
console.log('排序方式:', column.order)
if (column.prop === 'paidGold') {
sortField.value = 'recharge_gold'
sortField.value = 'paid_gold'
} else if (column.prop === 'freeGold') {
sortField.value = 'free_gold'
} else if (column.prop === 'rechargeTime') {
sortField.value = 'recharge_time'
} else if (column.prop === 'createTime') {
sortField.value = 'create_time'
} else if(column.prop === 'rechargeGold'){
sortField.value = 'recharge_gold'
}
sortOrder.value = column.order === 'ascending' ? 'ASC' : 'DESC'
console.log('传递给后端的排序字段:', sortField.value)
@ -591,7 +593,7 @@ const handleSortChange = (column) => {
width="120px"
/>
<el-table-column
prop="paidGold"
prop="rechargeGold"
label="永久金币"
sortable="custom"
width="110px"
@ -654,19 +656,19 @@ const handleSortChange = (column) => {
show-overflow-tooltip
/>
<el-table-column
prop="rechargeTime"
prop="createTime"
sortable
label="交款时间"
width="200px"
>
<template #default="scope">
<!-- <template #default="scope">
{{
moment(scope.row.rechargeTime).format('YYYY-MM-DD HH:mm:ss')
}}
</template>
</template> -->
</el-table-column>
<el-table-column
prop="createTime"
prop="rechargeTime"
sortable="custom"
label="提交时间"
width="200px"

32
gold-system/src/views/refund/addRefund.vue

@ -115,10 +115,36 @@ const rules = reactive({
jwcode: [{ required: true, message: '请输入精网号', trigger: 'blur' }],
refundType: [{ required: true, message: '请选择退款类型', trigger: 'blur' }],
orderCode: [{ required: true, message: '请选择退款商品', trigger: 'blur' }],
taskCoin: [{ required: true, message: '请输入任务金币', trigger: 'blur' }],
freeCoin: [{ required: true, message: '请输入免费金币', trigger: 'blur' }],
taskCoin: [{ required: true, message: '请输入任务金币', trigger: 'blur' },
{
validator: (rule, value) => {
if (value < 0) {
return Promise.reject(new Error('任务金币至少为0'))
}
return Promise.resolve()
},
}
],
freeCoin: [{ required: true, message: '请输入免费金币', trigger: 'blur' },
{
validator: (rule, value) => {
if (value < 0) {
return Promise.reject(new Error('免费金币至少为0'))
}
return Promise.resolve()
},
}
],
rechargeCoin: [
{ required: true, message: '请输入永久金币', trigger: 'blur' }
{ required: true, message: '请输入永久金币', trigger: 'blur' },
{
validator: (rule, value) => {
if (value < 0) {
return Promise.reject(new Error('永久金币至少为0'))
}
return Promise.resolve()
},
}
],
allCoin: [
{ required: true, message: '请选择付款方式', trigger: 'blur' },

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

Loading…
Cancel
Save