diff --git a/gold-system/.env.development b/gold-system/.env.development index 389772c..b87c5db 100644 --- a/gold-system/.env.development +++ b/gold-system/.env.development @@ -1,5 +1,5 @@ # 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='https://hwjb.homilychart.com/gold_htms_dev' # VITE_API_BASE='http://54.251.137.151:10704/' -# VITE_API_BASE='http://192.168.8.225:8080/' +VITE_API_BASE='http://192.168.8.225:8080/' diff --git a/gold-system/.env.test b/gold-system/.env.test index 96cd783..6d17b02 100644 --- a/gold-system/.env.test +++ b/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/' -ITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev' -# VVITE_API_BASE='http://192.168.8.225:8080/' +# VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev' +VITE_API_BASE='http://192.168.8.225:8080/' diff --git a/gold-system/src/views/audit/rechargeAudit.vue b/gold-system/src/views/audit/rechargeAudit.vue index 9e6f30b..69cc24e 100644 --- a/gold-system/src/views/audit/rechargeAudit.vue +++ b/gold-system/src/views/audit/rechargeAudit.vue @@ -25,12 +25,13 @@ const columnOptions = ref([ { prop: 'status', label: '审核状态', width: 125 }, { prop: 'reson', label: '驳回理由', width: 200 }, { prop: 'rechargeTime', label: '交款时间', width: 200, sortable: true }, - { prop: 'createTime', label: '提交时间', width: 200, sortable: true } + { prop: 'createTime', label: '提交时间', width: 200, sortable: true }, + { prop: 'auditTime', label:'审核时间', width:200, sortable:true} ]) // 默认显示 const defaultColumns = ['username', 'jwcode', 'area', 'activityName', 'rechargeGold', 'rechargeWay', 'paidGold', 'freeGold', - 'remark', 'payWay', 'rechargeVoucher', 'name', 'status', 'reson', 'rechargeTime', 'createTime' ] + 'remark', 'payWay', 'rechargeVoucher', 'name', 'status', 'reson', 'rechargeTime', 'createTime', 'auditTime'] const selectedColumns = ref([...defaultColumns]) //这是获取用户信息的接口 const adminData = ref({}) @@ -568,6 +569,8 @@ const handleSortChange = (column) => { sortField.value = 'create_time' } else if (column.prop === 'paidGold') { sortField.value = 'paid_gold' + }else if (column.prop === 'auditTime') { + sortField.value = 'audit_time' } sortOrder.value = column.order === 'ascending' ? 'ASC' : 'DESC' get() @@ -691,6 +694,12 @@ const trimJwCode = () => { + + diff --git a/gold-system/src/views/recharge/allRecharge.vue b/gold-system/src/views/recharge/allRecharge.vue index b3916ff..8a74204 100644 --- a/gold-system/src/views/recharge/allRecharge.vue +++ b/gold-system/src/views/recharge/allRecharge.vue @@ -403,15 +403,15 @@ const handleSortChange = (column) => { 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 === 'paidMoney') { - sortField.value = 'paid_gold' + } else if (column.prop === 'rechargeGold') { + sortField.value = 'recharge_gold' } sortOrder.value = column.order === 'ascending' ? 'ASC' : 'DESC' get()