Browse Source

merge lh,zry,milestone success

lihui/feature-20250623144029-金币前端lihui
zry 2 days ago
parent
commit
137c178636
  1. 2
      .env.development
  2. 4
      src/views/audit/rechargeAudit.vue
  3. 30
      src/views/audit/refundAudit.vue
  4. 4
      src/views/consume/addCoinConsume.vue
  5. 32
      src/views/consume/beanConsume.vue
  6. 81
      src/views/consume/coinConsumeDetail.vue
  7. 2
      src/views/home.vue
  8. 2
      src/views/index.vue
  9. 122
      src/views/managerecharge/rate.vue
  10. 1301
      src/views/recharge/addCoinRecharge.vue
  11. 38
      src/views/recharge/beanRecharge.vue
  12. 488
      src/views/recharge/coinRechargeDetail.vue
  13. 38
      src/views/refund/addCoinRefund.vue
  14. 32
      src/views/refund/beanRefund.vue
  15. 20
      src/views/refund/coinRefundDetail.vue
  16. 6
      src/views/usergold/clientCountBalance.vue
  17. 6
      src/views/usergold/clientCountDetail.vue
  18. 2
      src/views/workspace/index.vue

2
.env.development

@ -4,5 +4,5 @@
# 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.94:8080/'
VITE_API_BASE='http://192.168.8.247:8081/'
VITE_API_BASE='http://18.143.76.3:10704/'

4
src/views/audit/rechargeAudit.vue

@ -338,7 +338,7 @@ const getYesterday = function () {
yesterday.getMonth(),
yesterday.getDate() + 1
)
getTime.value = [startDate, endDate]
getTime.value = [startTime, endTime]
console.log('getTime', getTime.value)
get()
}
@ -355,7 +355,7 @@ const get7Days = function () {
today.getMonth(),
today.getDate() + 1
)
getTime.value = [startDate, endDate]
getTime.value = [startTime, endTime]
console.log('getTime', getTime.value)
get()
}

30
src/views/audit/refundAudit.vue

@ -186,12 +186,21 @@ const STATUS = {
//
const searchForm = ref({
<<<<<<< HEAD
jwcode: null, //
activity: "", //
refundGoods: "", // 退
market: "", //
startTime: "", //
endTime: "" //
=======
jwcode: '',
refundType: '',
refundGoods: '',
area: '',
startTime: '',
endTime: ''
>>>>>>> zhangrenyuan/feature-20250623164058-金币前端
})
//
@ -377,9 +386,13 @@ const getProducts = async () => {
//
const getMarket = async () => {
try {
<<<<<<< HEAD
const result = await request({
url: 'http://192.168.8.247:8081/general/market' // todo
})
=======
const result = await request({ url: 'http://18.143.76.3:10704/general/market' })
>>>>>>> zhangrenyuan/feature-20250623164058-金币前端
areaOptions.value = result.data || []
} catch (error) {
console.error('获取地区列表失败', error)
@ -416,6 +429,14 @@ const get = async function (val) {
status: getCurrentStatus()
}
}
<<<<<<< HEAD
=======
//
if (dateRange.value?.length === 2) {
params.detail.startTime = moment(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss')
params.detail.endTime = moment(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss')
}
>>>>>>> zhangrenyuan/feature-20250623164058-金币前端
const result = await request({
url: '/audit/audit/refund', // todo
@ -482,12 +503,21 @@ const handleSearch = function () {
//
const resetSearch = function () {
searchForm.value = {
<<<<<<< HEAD
jwcode: null,
activity: "",
refundGoods: "",
market: "",
startTime: "",
endTime: ""
=======
jwcode: '',
refundType: '',
refundGoods: '',
area: adminInfo.value.area === '总部' ? '' : adminInfo.value.area,
startTime: '',
endTime: ''
>>>>>>> zhangrenyuan/feature-20250623164058-金币前端
}
dateRange.value = []
handleSearch()

4
src/views/consume/addCoinConsume.vue

@ -175,7 +175,7 @@ const add = async function () {
// POST
const result = await request({
// url: "/consume/add",
url: "http://192.168.8.247:8081/consume/add",
url: "http://18.143.76.3:10704/consume/add",
data: addConsume.value,
});
@ -269,7 +269,7 @@ const getUser = async function (jwcode) {
// POST
const result = await request({
// url: "user/selectUser",
url: "http://192.168.8.247:8081/user/selectUser", // todo ip
url: "http://18.143.76.3:10704/user/selectUser", // todo ip
data: {
//
jwcode: addConsume.value.jwcode,

32
src/views/consume/beanConsume.vue

@ -91,13 +91,13 @@ const get = async function (val) {
}
//
if (getTime.value != null) {
if (getTime.value.startDate != '' && getTime.value.endDate != '') {
detailVo.value.startDate = getTime.value[0]
detailVo.value.endDate = getTime.value[1]
if (getTime.value.startTime != '' && getTime.value.endTime != '') {
detailVo.value.startTime = getTime.value[0]
detailVo.value.endTime = getTime.value[1]
}
} else {
detailVo.value.startDate = ''
detailVo.value.endDate = ''
detailVo.value.startTime = ''
detailVo.value.endTime = ''
}
detailVo.value.sortField = sortField.value
detailVo.value.sortOrder = sortOrder.value
@ -172,8 +172,8 @@ const reset = function () {
detailVo.value.productName = ''
detailVo.value.consumePlatform = ''
detailVo.value.consumeType = ''
detailVo.value.startDate = ''
detailVo.value.endDate = ''
detailVo.value.startTime = ''
detailVo.value.endTime = ''
sortField.value = ''
sortOrder.value = ''
getTime.value = {}
@ -181,17 +181,17 @@ const reset = function () {
//
const getToday = function () {
const today = new Date()
const startDate = new Date(
const startTime = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate()
)
const endDate = new Date(
const endTime = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() + 1
)
getTime.value = [startDate, endDate]
getTime.value = [startTime, endTime]
console.log('getTime', getTime.value)
get()
}
@ -199,34 +199,34 @@ const getToday = function () {
const getYesterday = function () {
const yesterday = new Date()
yesterday.setDate(yesterday.getDate() - 1)
const startDate = new Date(
const startTime = new Date(
yesterday.getFullYear(),
yesterday.getMonth(),
yesterday.getDate()
)
const endDate = new Date(
const endTime = new Date(
yesterday.getFullYear(),
yesterday.getMonth(),
yesterday.getDate() + 1
)
getTime.value = [startDate, endDate]
getTime.value = [startTime, endTime]
console.log('getTime', getTime.value)
get()
}
// 7
const get7Days = function () {
const today = new Date()
const startDate = new Date(
const startTime = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() - 6
)
const endDate = new Date(
const endTime = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() + 1
)
getTime.value = [startDate, endDate]
getTime.value = [startTime, endTime]
console.log('getTime', getTime.value)
get()
}

81
src/views/consume/coinConsumeDetail.vue

@ -150,6 +150,7 @@ const ConsumeSelectBy = async function (val) {
// POST
const result = await request({
<<<<<<< HEAD
url: 'http://192.168.8.247:8081/consume/selectBy',
data: {
pageNum: getObj.value.pageNum,
@ -160,6 +161,19 @@ const ConsumeSelectBy = async function (val) {
sortOrder: sortOrder.value
}
}
=======
// url: 'consumeUser/selectBy',
url: 'http://18.143.76.3:10704/consume/selectBy',
data: {
pageNum: getObj.value.pageNum,
pageSize: getObj.value.pageSize,
consumeUser: {
...consumeUser.value,
sortField: sortField.value,
sortOrder: sortOrder.value
}
}
>>>>>>> zhangrenyuan/feature-20250623164058-金币前端
})
console.log('请求成功2', sortField)
@ -179,9 +193,19 @@ const ConsumeSelectBy = async function (val) {
totalGoldSearch.value.goodsName = consumeUser.value.goodsName
//
const resultTotalGold = await request({
<<<<<<< HEAD
// url: 'http://192.168.8.247:8081/consume/statsGold',
url: 'http://192.168.8.247:8081/consume/statsGold',
data: totalGoldSearch.value
=======
// url: 'http://18.143.76.3:10704/consume/statsGold',
url: 'http://18.143.76.3:10704/consume/statsGold',
// data: {
// pageNum: getObj.value.pageNum,
// pageSize: getObj.value.pageSize,
// consumeUser: consumeUser.value
// }
>>>>>>> zhangrenyuan/feature-20250623164058-金币前端
})
@ -321,7 +345,7 @@ const getGoods = async function () {
try {
// POST
const result = await request({
url: 'http://192.168.8.247:8081/general/goods',
url: 'http://18.143.76.3:10704/general/goods',
data: {}
})
//
@ -341,7 +365,7 @@ const getMarket = async function () {
//
const result = await request({
// url: '/general/market',
url: 'http://192.168.8.247:8081/general/market', // todo
url: 'http://18.143.76.3:10704/general/market', // todo
data: {}
})
console.log('请求地区列表成功', result)
@ -364,13 +388,18 @@ const handleSortChange = (column) => {
if (column.prop === 'permanentGold') {
sortField.value = 'permanentGold'
} else if (column.prop === 'taskGold') {
<<<<<<< HEAD
sortField.value = 'taskGold'
=======
sortField.value = 'taskGold' //
>>>>>>> zhangrenyuan/feature-20250623164058-金币前端
} else if (column.prop === 'freeGold') {
sortField.value = 'freeGold'
} else if (column.prop === 'createTime') {
sortField.value = 'createTime'
}
sortOrder.value = column.order === 'ascending' ? 'DESC' : 'ASC'
//
sortOrder.value = column.order === 'ascending' ? 'ASC' : 'DESC'
ConsumeSelectBy()
}
@ -402,11 +431,7 @@ const checkNumber = function () {
})
}
} else {
//
ElMessage({
type: 'error',
message: '请检查输入内容'
})
console.log('输入的数字不合法')
}
}
@ -500,25 +525,7 @@ onMounted(async function () {
</el-select>
</div>
</el-col>
<!-- <el-col :span="8">
<div class="head-card-element">
<el-text class="mx-1" size="large">消费类型</el-text>
<el-select
v-model="consumeUser.consumeType"
placeholder="请选择消费类型"
size="large"
style="width: 240px"
clearable
>
<el-option
v-for="item in consumeType"
:key="item"
:label="item.label"
:value="item.value"
/>
</el-select>
</div>
</el-col> -->
</el-row>
<el-row>
<el-col :span="21">
@ -537,10 +544,7 @@ onMounted(async function () {
>
<el-button @click="getYesterday()"></el-button>
<el-button @click="get7Days()">近7天</el-button>
<!-- </div>
</el-col>
<el-col :span="3">
<div class="head-card-btn"> -->
<el-button type="success" @click="reset()">重置</el-button>
<el-button type="primary" @click="search()">查询</el-button>
@ -603,15 +607,10 @@ onMounted(async function () {
<template #default="scope">
<!-- 使用非严格相等比较 -->
{{ scope.row.payPlatform }}
<!-- <span scope.row.consumePlatform == 1">Homily Chart</span>-->
</template>
</el-table-column>
<!-- <el-table-column
prop="consumeType"
label="消费类型"
width="120px"
/> -->
<el-table-column
prop="sumGold"
label="消费金币总数"
@ -629,7 +628,7 @@ onMounted(async function () {
<el-table-column
prop="permanentGold"
label="永久金币"
sortable="custom"
sortable="custom"
width="110px"
>
<template #default="scope">
@ -649,7 +648,7 @@ onMounted(async function () {
<el-table-column
prop="taskGold"
label="任务金币"
sortable="custom"
sortable="custom"
width="110px"
>
<template #default="scope">
@ -667,7 +666,7 @@ onMounted(async function () {
<el-table-column
prop="createTime"
label="消费时间"
sortable="custom"
sortable="custom"
width="180px"
/>
</el-table>

2
src/views/home.vue

@ -36,7 +36,7 @@ const currentArea = ref('全部')
const getAreas = async function () {
try {
const result = await API({ url: 'http://192.168.8.247:8081/general/market', data: {} })
const result = await API({ url: 'http://18.143.76.3:10704/general/market', data: {} })
areas.value = result.data
console.log('请求成功', result)
} catch (error) {

2
src/views/index.vue

@ -36,7 +36,7 @@ const currentArea = ref('全部')
const getAreas = async function () {
try {
const result = await API({ url: '/recharge/user/search', data: {} })
const result = await API({ url: 'http://18.143.76.3:10704/general/market', data: {} })
areas.value = result.data
console.log('请求成功', result)
} catch (error) {

122
src/views/managerecharge/rate.vue

@ -35,6 +35,48 @@ const getObj = ref({
const total = ref(0)
const getAllRate = async function (val) {
try {
//
if (typeof val === 'number') {
getObj.value.pageNum = val;
}
// POST
const result = await request({
url: 'http://18.143.76.3:10704/rate/selectAll',
method: 'POST',
data: {
pageNum: getObj.value.pageNum,
pageSize: getObj.value.pageSize,
}
});
//
console.log('这是汇率列表 请求成功', result);
//
tableData.value = result.data.list;
//
total.value = result.data.total;
} catch (error) {
console.log('请求失败', error);
ElMessage.error('请求失败');
}
}
const handlePageSizeChange = function (val) {
getObj.value.pageSize = val
getAllRate()
}
const handleCurrentChange = function (val) {
getObj.value.pageNum = val
getAllRate()
}
//
const rateEdit = ref({
id: null,
@ -43,8 +85,82 @@ const rateEdit = ref({
adminId: null,
updateTime: Date.now(),
})
//
const getEditData = async function (row) {
try {
console.log('搜索参数', getObj.value)
// POST
const result = await request({
url: 'http://18.143.76.3:10704/rate/selectById',
data: {id: row.id}
})
//
console.log('根据id查 请求成功', result)
//
// rateEdit.value = result.data
//
rateEdit.value.id = row.id
rateEdit.value.rateName = row.rateName
rateEdit.value.num = row.num
console.log('根据id获取的数据', rateEdit.value)
rateEdit.value.adminId = adminData.value.adminId
} catch (error) {
console.log('请求失败', error)
}
}
const editRate = async function () {
try {
console.log('搜索参数', rateEdit.value)
// POST
const result = await request({
url: 'http://18.143.76.3:10704/rate/update',
data: rateEdit.value
})
//
console.log('请求成功', result)
await getAllRate()
} catch (error) {
console.log('请求失败', error)
}
}
const edit = () => {
ElMessageBox.confirm('确认修改?')
.then(() => {
editRate()
regeEdit.value = false
})
.catch(() => {
regeEdit.value = false
})
}
//
const cancelEdit = () => {
regeEdit.value = false
}
const handleEditDialogClose = () => {
if (editFormRef.value) {
getAllRate()
}
}
//
onMounted(async function () {
await getAllRate()
await getAdminData()
})
//
const rateNames = [
const rateName = [
{
value: 'USD',
label: 'USD'
@ -394,7 +510,11 @@ onMounted(async function () {
style="width: 240px"
>
<el-option
<<<<<<< HEAD
v-for="item in rateNames"
=======
v-for="item in rateName"
>>>>>>> zhangrenyuan/feature-20250623164058-金币前端
:key="item.value"
:label="item.label"
:value="item.value"

1301
src/views/recharge/addCoinRecharge.vue
File diff suppressed because it is too large
View File

38
src/views/recharge/beanRecharge.vue

@ -118,13 +118,13 @@ const get = async function (val) {
}
//
if (getTime.value != null) {
if (getTime.value.startDate != '' && getTime.value.endDate != '') {
rechargeVo.value.startDate = getTime.value[0]
rechargeVo.value.endDate = getTime.value[1]
if (getTime.value.startTime != '' && getTime.value.endTime != '') {
rechargeVo.value.startTime = getTime.value[0]
rechargeVo.value.endTime = getTime.value[1]
}
} else {
rechargeVo.value.startDate = ''
rechargeVo.value.endDate = ''
rechargeVo.value.startTime = ''
rechargeVo.value.endTime = ''
}
//
rechargeVo.value.sortField = sortField.value
@ -139,8 +139,8 @@ const get = async function (val) {
const detailWithoutSort = ref({
area: rechargeVo.value.area,
adminId: rechargeVo.value.adminId,
startDate: rechargeVo.value.startDate,
endDate: rechargeVo.value.endDate
startTime: rechargeVo.value.startTime,
endTime: rechargeVo.value.endTime
})
const result2 = await API({
url: '/recharge/recharge/RechargeA',
@ -206,8 +206,8 @@ const reset = function () {
delete rechargeVo.value.activityId
delete rechargeVo.value.payWay
delete rechargeVo.value.area
delete rechargeVo.value.startDate
delete rechargeVo.value.endDate
delete rechargeVo.value.startTime
delete rechargeVo.value.endTime
delete sortField.value
delete sortOrder.value
getTime.value = {}
@ -215,17 +215,17 @@ const reset = function () {
//
const getToday = function () {
const today = new Date()
const startDate = new Date(
const startTime = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate()
)
const endDate = new Date(
const endTime = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() + 1
)
getTime.value = [startDate, endDate]
getTime.value = [startTime, endTime]
console.log('getTime', getTime.value)
get()
}
@ -241,34 +241,34 @@ const handleCurrentChange = function (val) {
const getYesterday = function () {
const yesterday = new Date()
yesterday.setDate(yesterday.getDate() - 1)
const startDate = new Date(
const startTime = new Date(
yesterday.getFullYear(),
yesterday.getMonth(),
yesterday.getDate()
)
const endDate = new Date(
const endTime = new Date(
yesterday.getFullYear(),
yesterday.getMonth(),
yesterday.getDate() + 1
)
getTime.value = [startDate, endDate]
getTime.value = [startTime, endTime]
console.log('getTime', getTime.value)
get()
}
// 7
const get7Days = function () {
const today = new Date()
const startDate = new Date(
const startTime = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() - 6
)
const endDate = new Date(
const endTime = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() + 1
)
getTime.value = [startDate, endDate]
getTime.value = [startTime, endTime]
console.log('getTime', getTime.value)
get()
}
@ -343,7 +343,7 @@ const getActivity = async function () {
const getArea = async function () {
try {
// POST
const result = await API({ url: 'recharge/user/search', data: {} })
const result = await API({ url: 'http://18.143.76.3:10704/general/market', data: {} })
//
console.log('请求成功', result)
//

488
src/views/recharge/coinRechargeDetail.vue

@ -12,7 +12,7 @@ const getAdminData = async function () {
try {
const result = await API({ url: '/admin/userinfo', data: {} })
adminData.value = result
rechargeVo.value.adminId = adminData.value.adminId
rechargeUser.value.adminId = adminData.value.adminId
console.log('请求成功', result)
console.log('用户信息', adminData.value)
} catch (error) {
@ -24,7 +24,7 @@ const getAdminData = async function () {
const tableData = ref([])
// ===========================================
// recharge
const rechargeVo = ref({
const rechargeUser = ref({
adminId: adminData.value.adminId
})
//
@ -41,11 +41,24 @@ const activity = ref([])
//
const allData = ref([])
//
const area = ref([])
//
const activeName = ref('all')
const market = ref([])
//
const formatTime = (val) => val ? moment(val).format('YYYY-MM-DD HH:mm:ss') : ''
// money permanentGold freeGold
const money = ref(0)
const permanentGold = ref(0)
const freeGold = ref(0)
//
const permanentGolds = ref(0)
const freeGolds = ref(0)
//
const payWay = [
const payModel = [
{
value: '微信',
label: '微信'
@ -75,114 +88,123 @@ const payWay = [
//
const delObj = ref({})
// //
// const tableHeight = computed(function () {
// return (getObj.value.pageSize + 2) * 60 + "px";
// });
//
const getActivity = async function () {
try {
// POST
const result = await API({ url: '/recharge/activity/select', data: {} })
//
console.log('请求成功', result)
//
activity.value = result.data
console.log('activity', activity.value)
} catch (error) {
console.log('请求失败', error)
//
}
}
//
//
const getArea = async function () {
try {
// POST
const result = await API({ url: 'http://18.143.76.3:10704/general/market', data: {} })
//
console.log('请求成功', result)
//
market.value = result.data
console.log('地区', market.value)
} catch (error) {
console.log('请求失败', error)
//
}
}
//
const isLoadingPlatform = ref(false)
//
const platform = ref([])
//
const getPlatform = async () => {
isLoadingPlatform.value = true;
try {
const result = await API({
url: 'http://18.143.76.3:10704/general/platform',
method: 'post',
data: {}//
})
// { value, label }
if(Array.isArray(result.data)) {
platform.value = result.data.map(item => ({ value: item, label: item }));
} else {
console.error('充值类型格式错误',result)
ElMessage.error('充值类型格式错误,请联系管理员')
}
} catch (error) {
console.error('获取充值类型失败:', error);
ElMessage.error('获取充值类型失败,请稍后重试');
} finally {
isLoadingPlatform.value = false
}
}
//
//
const trueGold = ref(0)
const trueRGold = ref(0)
const trueFGold = ref(0)
//
const totalmoney = ref(0)
const totalRcoin = ref(0)
const totalFcoin = ref(0)
//
const pendingGold = ref(0)
const pendingRGold = ref(0)
const pendingFGold = ref(0)
//
const approvedGold = ref(0)
const approvedRGold = ref(0)
const approvedFGold = ref(0)
//
const rejectedGold = ref(0)
const rejectedRGold = ref(0)
const rejectedFGold = ref(0)
// ===========================================================================
//
const get = async function (val) {
try {
//
if (adminData.value.area === '泰国') {
rechargeVo.value.areas = ['泰国', '越南']
} else if (adminData.value.area !== '总部') {
rechargeVo.value.area = adminData.value.area
}
//
if (typeof val === 'number') {
getObj.value.pageNum = val
}
//
if (getTime.value != null) {
if (getTime.value.startDate != '' && getTime.value.endDate != '') {
rechargeVo.value.startDate = getTime.value[0]
rechargeVo.value.endDate = getTime.value[1]
if (getTime.value.startTime != '' && getTime.value.endTime != '') {
rechargeUser.value.startTime = formatTime(getTime.value[0])
rechargeUser.value.endTime = formatTime(getTime.value[1])
}
} else {
rechargeVo.value.startDate = ''
rechargeVo.value.endDate = ''
rechargeUser.value.startTime = ''
rechargeUser.value.endTime = ''
}
//
rechargeVo.value.sortField = sortField.value
rechargeVo.value.sortOrder = sortOrder.value
rechargeUser.value.sortField = sortField.value
rechargeUser.value.sortOrder = sortOrder.value
console.log('搜索参数', getObj.value)
// POST
const result = await API({
url: '/recharge/recharge',
data: { ...getObj.value, rechargeVo: { ...rechargeVo.value } }
url: 'http://18.143.76.3:10704/recharge/selectBy',
data: {
...getObj.value,
rechargeUser: { ...rechargeUser.value }
}
})
// rechargeVo.value
// rechargeUser.value
const detailWithoutSort = ref({
area: rechargeVo.value.area,
adminId: rechargeVo.value.adminId,
startDate: rechargeVo.value.startDate,
endDate: rechargeVo.value.endDate
market: rechargeUser.value.market,
adminId: rechargeUser.value.adminId,
startTime: rechargeUser.value.startTime,
endTime: rechargeUser.value.endTime,
jwcode: rechargeUser.value.jwcode,
goodsName: rechargeUser.value.goodsName,
payPlatform: rechargeUser.value.payPlatform
})
const result2 = await API({
url: '/recharge/recharge/RechargeA',
const resultTotalGold = await API({
url: 'http://18.143.76.3:10704/recharge/statsGold',
data: {
...detailWithoutSort.value
}
})
// result2
if (!result2 || !result2.data || result2.data.length === 0) {
totalmoney.value = 0
totalRcoin.value = 0
totalFcoin.value = 0
}
if (result2.data) {
result2.data.forEach((item) => {
switch (item.auditStatus) {
case '待审核':
// item.raudit 0
// item.sumRaudit 0
pendingGold.value = item.sumRaudit || 0
pendingRGold.value = item.sumRaudit1 || 0
pendingFGold.value = item.sumRaudit2 || 0
break
case '已通过':
approvedGold.value = item.sumRaudit || 0
approvedRGold.value = item.sumRaudit1 || 0
approvedFGold.value = item.sumRaudit2 || 0
break
case '已驳回':
rejectedGold.value = item.sumRaudit || 0
rejectedRGold.value = item.sumRaudit1 || 0
rejectedFGold.value = item.sumRaudit2 || 0
break
}
})
}
trueGold.value = pendingGold.value + approvedGold.value + rejectedGold.value
trueRGold.value =
pendingRGold.value + approvedRGold.value + rejectedRGold.value
trueFGold.value =
pendingFGold.value + approvedFGold.value + rejectedFGold.value
if (resultTotalGold.code === 200 && resultTotalGold.data) {
const data = resultTotalGold.data
console.log('获取到的金币数据:', data)
permanentGolds.value = Number(data.permanentGolds) || 0
freeGolds.value = Number(data.freeGolds) || 0
}
//
console.log('请求成功', result)
//
@ -203,29 +225,31 @@ const search = function () {
}
//
const reset = function () {
delete rechargeVo.value.activityId
delete rechargeVo.value.payWay
delete rechargeVo.value.area
delete rechargeVo.value.startDate
delete rechargeVo.value.endDate
delete rechargeUser.value.jwcode
delete rechargeUser.value.activity
delete rechargeUser.value.payPlatform
delete rechargeUser.value.market
delete rechargeUser.value.startTime
delete rechargeUser.value.endTime
delete sortField.value
delete sortOrder.value
getTime.value = {}
get()
}
//
const getToday = function () {
const today = new Date()
const startDate = new Date(
const startTime = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate()
)
const endDate = new Date(
const endTime = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() + 1
)
getTime.value = [startDate, endDate]
getTime.value = [startTime, endTime]
console.log('getTime', getTime.value)
get()
}
@ -241,119 +265,38 @@ const handleCurrentChange = function (val) {
const getYesterday = function () {
const yesterday = new Date()
yesterday.setDate(yesterday.getDate() - 1)
const startDate = new Date(
const startTime = new Date(
yesterday.getFullYear(),
yesterday.getMonth(),
yesterday.getDate()
)
const endDate = new Date(
const endTime = new Date(
yesterday.getFullYear(),
yesterday.getMonth(),
yesterday.getDate() + 1
)
getTime.value = [startDate, endDate]
getTime.value = [startTime, endTime]
console.log('getTime', getTime.value)
get()
}
// 7
const get7Days = function () {
const today = new Date()
const startDate = new Date(
const startTime = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() - 6
)
const endDate = new Date(
const endTime = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() + 1
)
getTime.value = [startDate, endDate]
getTime.value = [startTime, endTime]
console.log('getTime', getTime.value)
get()
}
//
const adminAll = function () {
console.log('adminAll')
rechargeVo.value.status = ''
getObj.value.pageNum = 1
get()
}
//
const adminWait = async function () {
rechargeVo.value.status = 0
getObj.value.pageNum = 1
await get()
console.log('adminWait')
trueGold.value = pendingGold.value
trueRGold.value = pendingRGold.value
trueFGold.value = pendingFGold.value
}
//
const adminPass = async function () {
rechargeVo.value.status = 1
getObj.value.pageNum = 1
await get()
trueGold.value = approvedGold.value
trueRGold.value = approvedRGold.value
trueFGold.value = approvedFGold.value
console.log('adminPass')
}
//
const adminReject = async function () {
rechargeVo.value.status = 2
getObj.value.pageNum = 1
await get()
console.log('adminReject')
trueGold.value = rejectedGold.value
trueRGold.value = rejectedRGold.value
trueFGold.value = rejectedFGold.value
}
//
const handleClick = function (tab, event) {
if (tab.props.name === 'all') {
adminAll()
} else if (tab.props.name === 'wait') {
adminWait()
} else if (tab.props.name === 'pass') {
adminPass()
} else if (tab.props.name === 'reject') {
adminReject()
}
}
//
const getActivity = async function () {
try {
// POST
const result = await API({ url: '/recharge/activity/select', data: {} })
//
console.log('请求成功', result)
//
activity.value = result.data
console.log('activity', activity.value)
} catch (error) {
console.log('请求失败', error)
//
}
}
//
//
const getArea = async function () {
try {
// POST
const result = await API({ url: 'http://192.168.8.247:8081/general/market', data: {} })
//
console.log('请求成功', result)
//
area.value = result.data
console.log('地区', area.value)
} catch (error) {
console.log('请求失败', error)
//
}
}
// =================================
//
const del = function (row) {
@ -399,7 +342,7 @@ const checkNumber = function () {
//
ElMessage({
type: 'error',
message: '请检查输入内容'
message: '数字输入有误'
})
}
}
@ -410,6 +353,7 @@ onMounted(async function () {
await get()
await getActivity()
await getArea()
await getPlatform()
})
//
const sortField = ref('')
@ -419,7 +363,7 @@ const handleSortChange = (column) => {
console.log('排序字段:', column.prop)
console.log('排序方式:', column.order)
if (column.prop === 'paidGold') {
if (column.prop === 'money') {
sortField.value = 'paid_gold'
} else if (column.prop === 'freeGold') {
sortField.value = 'free_gold'
@ -432,6 +376,7 @@ const handleSortChange = (column) => {
}
sortOrder.value = column.order === 'ascending' ? 'ASC' : 'DESC'
console.log('传递给后端的排序字段:', sortField.value)
console.log('传递给后端的排序方式:', sortOrder.value)
get()
}
@ -445,25 +390,25 @@ const handleSortChange = (column) => {
<el-col :span="5">
<div class="head-card-element">
<el-text class="mx-1" size="large">精网号</el-text>
<el-input v-model="rechargeVo.jwcode" placeholder="请输入精网号" style="width: 150px" clearable />
<el-input v-model="rechargeUser.jwcode" placeholder="请输入精网号" style="width: 150px" clearable />
</div>
</el-col>
<el-col :span="6">
<div class="head-card-element">
<el-text class="mx-1" size="large">活动名称</el-text>
<el-select v-model="rechargeVo.activityId" placeholder="请选择活动名称" style="width: 180px"
<el-select v-model="rechargeUser.activity" placeholder="请选择活动名称" style="width: 180px"
clearable>
<el-option v-for="item in activity" :key="item.activityId" :label="item.activityName"
:value="item.activityId" />
<el-option v-for="item in activity" :key="item.activity" :label="item.activity"
:value="item.activity" />
</el-select>
</div>
</el-col>
<el-col :span="6">
<div class="head-card-element" v-if="adminData.area == '总部'">
<div class="head-card-element" >
<el-text class="mx-1" size="large">所属地区</el-text>
<el-select v-model="rechargeVo.area" placeholder="请选择所属地区" style="width: 180px" clearable>
<el-option v-for="item in area" :key="item" :label="item" :value="item" />
<el-select v-model="rechargeUser.market" placeholder="请选择所属地区" style="width: 180px" clearable>
<el-option v-for="item in market" :key="item" :label="item" :value="item" />
</el-select>
</div>
</el-col>
@ -471,8 +416,8 @@ const handleSortChange = (column) => {
<el-col :span="6">
<div class="head-card-element">
<el-text class="mx-1" size="large">充值类型</el-text>
<el-select v-model="rechargeVo.rechargeWay" placeholder="请选择支付方式" style="width: 180px" clearable>
<el-option v-for="item in rechargeWay" :key="item.value" :label="item.label" :value="item.value" />
<el-select v-model="rechargeUser.payPlatform" placeholder="请选择充值方式" style="width: 180px" clearable>
<el-option v-for="item in platform" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</div>
</el-col>
@ -511,9 +456,9 @@ const handleSortChange = (column) => {
<el-col>
<el-card>
<div>
充值金额{{ trueRGold.toFixed(2) }}新币永久金币{{
trueRGold.toFixed(2)
}}金币免费金币{{ trueFGold }}金币
充值金额{{ permanentGolds.toFixed(2) }}新币永久金币{{
permanentGolds.toFixed(2)
}}金币免费金币{{ freeGolds }}金币
</div>
<!-- 设置表格容器的高度和滚动样式 -->
<div style="height: 520px; overflow-y: auto;margin-top: 10px;">
@ -537,7 +482,7 @@ const handleSortChange = (column) => {
</el-table-column>
<el-table-column
fixed="left"
prop="username"
prop="name"
label="姓名"
width="80px"
/>
@ -547,21 +492,21 @@ const handleSortChange = (column) => {
label="精网号"
width="80px"
/>
<el-table-column prop="area" label="所属地区" width="100px" />
<el-table-column prop="market" label="所属地区" width="100px" />
<el-table-column
prop="activityName"
prop="activity"
label="活动名称"
width="100px"
/>
<el-table-column prop="" label="货币名称" width="110px" />
<el-table-column prop="rateName" label="货币名称" width="110px" />
<el-table-column
prop="paidGold"
prop="money"
sortable="custom"
label="充值金额"
width="110px"
/>
<el-table-column
prop="paidGold"
prop="permanentGold"
label="永久金币"
sortable="custom"
width="110px"
@ -573,11 +518,11 @@ const handleSortChange = (column) => {
width="110px"
/>
<el-table-column
prop="rechargeWay"
prop="payPlatform"
label="充值方式"
width="100px"
/>
<el-table-column prop="payWay" label="支付方式" width="100px" />
<el-table-column prop="payModel" label="支付方式" width="100px" />
<el-table-column
prop="remark"
label="备注"
@ -585,50 +530,9 @@ const handleSortChange = (column) => {
show-overflow-tooltip
/>
<!-- <el-table-column
prop="rechargeVoucher"
label="支付凭证"
width="150px"
>
<template #default="scope">
<el-image
:preview-src-list="[scope.row.rechargeVoucher]"
preview-teleported="true"
:src="scope.row.rechargeVoucher"
alt="凭证"
style="width: 50px; height: 50px"
/>
</template>
</el-table-column> -->
<el-table-column prop="name" label="提交人" width="100px" />
<!-- <el-table-column prop="status" label="状态" width="100px">
<template #default="scope">
<span v-if="scope.row.status === 1">
<div class="status">
<span class="green-dot"></span>
<span>已通过</span>
</div>
</span>
<span v-if="scope.row.status === 0">
<div class="status">
<span class="grey-dot"></span>
<span>待审核</span>
</div>
</span>
<span v-if="scope.row.status === 2">
<div class="status">
<span class="red-dot"></span>
<span>已驳回</span>
</div>
</span>
</template>
</el-table-column>
<el-table-column
prop="reson"
label="驳回理由"
width="200px"
show-overflow-tooltip
/> -->
<el-table-column prop="adminName" label="提交人" width="100px" />
<el-table-column
prop="rechargeTime"
sortable
@ -641,37 +545,7 @@ const handleSortChange = (column) => {
}}
</template>
</el-table-column>
<!-- <el-table-column
prop="createTime"
sortable="custom"
label="提交时间"
width="200px"
/>
<el-table-column
fixed="right"
prop="operation"
label="操作"
width="150px"
>
<template #default="scope">
<el-popconfirm
title="确定将此条活动删除吗?"
@confirm="delConfirm"
>
<template #reference>
<el-button type="primary" text @click="del(scope.row)">
删除
</el-button>
</template>
<template #actions="{ confirm, cancel }">
<el-button size="small" @click="cancel">取消</el-button>
<el-button type="primary" size="small" @click="confirm">
确定
</el-button>
</template>
</el-popconfirm>
</template>
</el-table-column> -->
</el-table>
</div>
@ -691,60 +565,8 @@ const handleSortChange = (column) => {
</el-col>
</el-row>
<!-- 编辑弹窗 -->
<el-dialog
v-model="editRechargeVisible"
title="新增活动"
width="500"
:before-close="closeEditRechargeVisible"
>
<template #footer>
<el-form :model="editObj" label-width="auto" style="max-width: 600px">
<el-form-item label="活动名称:">
<el-input
v-model="addObj.activityName"
placeholder="请输入活动名称"
style="width: 220px"
/>
</el-form-item>
<el-form-item label="免费金币:">
<el-radio-group v-model="addObj.freeGold">
<el-radio value="0">无赠送</el-radio>
<el-radio value="1">有赠送</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="免费金币兑换比:">
<el-input
v-model="addObj.rechargeRatio"
placeholder="请输入"
style="width: 80px"
/>1
<div style="color: grey">(提示当前规则每10新币可兑换1免费金币)</div>
</el-form-item>
<el-form-item label="开始时间:">
<el-time-picker v-model="addObj.startTime" />
</el-form-item>
<el-form-item label="结束时间:">
<el-time-picker v-model="addObj.endTime" />
</el-form-item>
<el-form-item label="添加人:">
<el-input v-model="addObj.adminName" disabled style="width: 220px" />
</el-form-item>
</el-form>
<div class="dialog-footer">
<el-button @click="closeAddActivityVisible">取消</el-button>
<el-button type="primary" @click="closeAddActivityVisible">
提交
</el-button>
</div>
</template>
</el-dialog>
</template>
<style scoped>

38
src/views/refund/addCoinRefund.vue

@ -143,7 +143,7 @@ const getUser = async function (jwcode) {
try {
// POST
const result = await API({
url: 'http://192.168.8.247:8081/user/selectUser',
url: 'http://18.143.76.3:10704/user/selectUser',
data: {
jwcode: addRefund.value.jwcode
}
@ -166,23 +166,23 @@ const getUser = async function (jwcode) {
//
}
}
const calculatedAllGold = computed(() => {
const sum =
Number(addRefund.value.freeCoin) +
Number(addRefund.value.rechargeCoin) +
Number(addRefund.value.taskCoin)
return !isNaN(sum) ? sum : 0
})
// const calculatedAllGold = computed(() => {
// const sum =
// Number(addRefund.value.freeCoin) +
// Number(addRefund.value.rechargeCoin) +
// Number(addRefund.value.taskCoin)
// return !isNaN(sum) ? sum : 0
// })
watch(calculatedAllGold, (newVal) => {
addRefund.value.allCoin = newVal
})
// watch(calculatedAllGold, (newVal) => {
// addRefund.value.allCoin = newVal
// })
const AAA = computed(() => {
return addRefund.value.jwcode
})
// const AAA = computed(() => {
// return addRefund.value.jwcode
// })
watch(AAA, (newVal) => {})
// watch(AAA, (newVal) => {})
// 退
// const refundType = [
@ -200,7 +200,7 @@ const getRefundTypes = async function () {
try {
// 退
const result = await API({
// url: 'http://192.168.8.247:8081/', //退
// url: 'http://18.143.76.3:10704/', //退
data: {} })
console.log('退款类型请求成功', result)
// refundType
@ -221,7 +221,7 @@ const getGoods = async function (jwcode) {
try {
// POST
const result = await API({
url: 'http://39.101.133.168:8828/live_mall/api/product/all',
// url: 'http://39.101.133.168:8828/live_mall/api/product/all', //
data: {
jwcode: addRefund.value.jwcode,
market: adminData.value.market
@ -239,7 +239,7 @@ const getGoods = async function (jwcode) {
}
} catch (error) {
console.log('请求失败', error)
ElMessage.error('查询失败,请检查精网号是否正确')
ElMessage.error('查询商品失败,请检查精网号是否正确')
//
}
}
@ -287,7 +287,7 @@ const getProductByOrderCode = async function (item) {
}
} catch (error) {
console.log('请求失败', error)
ElMessage.error('查询失败,请检查精网号是否正确')
ElMessage.error('查询订单失败,请检查精网号是否正确')
//
}
}

32
src/views/refund/beanRefund.vue

@ -96,13 +96,13 @@ const get = async function (val) {
}
//
if (getTime.value != null) {
if (getTime.value.startDate != '' && getTime.value.endDate != '') {
detail.value.startDate = getTime.value[0]
detail.value.endDate = getTime.value[1]
if (getTime.value.startTime != '' && getTime.value.endTime != '') {
detail.value.startTime = getTime.value[0]
detail.value.endTime = getTime.value[1]
}
} else {
detail.value.startDate = ''
detail.value.endDate = ''
detail.value.startTime = ''
detail.value.endTime = ''
}
//
detail.value.sortField = sortField.value
@ -187,8 +187,8 @@ const reset = function () {
detail.value.refundGoods = ''
detail.value.refundType = ''
detail.value.area = ''
detail.value.startDate = ''
detail.value.endDate = ''
detail.value.startTime = ''
detail.value.endTime = ''
sortField.value = ''
sortOrder.value = ''
getTime.value = {}
@ -196,17 +196,17 @@ const reset = function () {
//
const getToday = function () {
const today = new Date()
const startDate = new Date(
const startTime = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate()
)
const endDate = new Date(
const endTime = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() + 1
)
getTime.value = [startDate, endDate]
getTime.value = [startTime, endTime]
console.log('getTime', getTime.value)
get()
}
@ -214,34 +214,34 @@ const getToday = function () {
const getYesterday = function () {
const yesterday = new Date()
yesterday.setDate(yesterday.getDate() - 1)
const startDate = new Date(
const startTime = new Date(
yesterday.getFullYear(),
yesterday.getMonth(),
yesterday.getDate()
)
const endDate = new Date(
const endTime = new Date(
yesterday.getFullYear(),
yesterday.getMonth(),
yesterday.getDate() + 1
)
getTime.value = [startDate, endDate]
getTime.value = [startTime, endTime]
console.log('getTime', getTime.value)
get()
}
// 7
const get7Days = function () {
const today = new Date()
const startDate = new Date(
const startTime = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() - 6
)
const endDate = new Date(
const endTime = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() + 1
)
getTime.value = [startDate, endDate]
getTime.value = [startTime, endTime]
console.log('getTime', getTime.value)
get()
}

20
src/views/refund/coinRefundDetail.vue

@ -76,7 +76,7 @@ const getRefundTypes = async function () {
try {
// 退
const result = await API({
// url: 'http://192.168.8.247:8081/', //退
// url: 'http://18.143.76.3:10704/', //退
data: {} })
console.log('退款类型请求成功', result)
// refundType
@ -118,7 +118,7 @@ const getSelectBy = async function (val) {
console.log('搜索参数', getObj.value)
// POST
const result = await API({
url: 'http://192.168.8.247:8081/refund/selectBy',
url: 'http://18.143.76.3:10704/refund/selectBy',
data: {
...getObj.value,
refundUser: { ...refundUser.value }
@ -130,7 +130,7 @@ const getSelectBy = async function (val) {
delete detailWithoutSort.sortOrder
const resultTotalGold = await API({
url: 'http://192.168.8.247:8081/refund/statsGold',
url: 'http://18.143.76.3:10704/refund/statsGold',
data: {
...detailWithoutSort
}
@ -244,7 +244,7 @@ const handleClick = function (tab, event) {
const getMarket = async function () {
try {
// POST
const result = await API({ url: 'http://192.168.8.247:8081/general/market', data: {} })
const result = await API({ url: 'http://18.143.76.3:10704/general/market', data: {} })
//
console.log('请求成功', result)
//
@ -286,7 +286,7 @@ const getGoods = async function () {
try {
// POST
const result = await request({
url: 'http://192.168.8.247:8081/general/goods',
url: 'http://18.143.76.3:10704/general/goods',
data: {}
})
//
@ -332,7 +332,7 @@ const checkNumber = function () {
onMounted(async function () {
await getAdminData()
await getSelectBy()
await getArea()
await getMarket()
await getRefundTypes()
})
//
@ -534,17 +534,17 @@ const handleCurrentChange = function (val) {
prop="permanentGold"
label="永久金币"
width="110px"
sortable="custom"
sortable="custom"
/>
<el-table-column
prop="freeGold"
sortable="custom"
sortable="custom"
label="免费金币"
width="110px"
/>
<el-table-column
prop="taskGold"
sortable="custom"
sortable="custom"
label="任务金币"
width="110px"
/>
@ -559,7 +559,7 @@ const handleCurrentChange = function (val) {
<el-table-column
prop="createTime"
sortable="custom"
sortable="custom"
label="提交时间"
width="180px"
>

6
src/views/usergold/clientCountBalance.vue

@ -30,7 +30,7 @@ const getmarket = async () => {
isLoadingmarket.value = true;
try {
const result = await API({
url: 'http://192.168.8.220:8081/general/market'
url: 'http://18.143.76.3:10704/general/market'
});
console.log('获取地区数据成功',result)
// { value, label }
@ -118,7 +118,7 @@ const get = async function (val) {
//console.log('', requestData);
const result = await API({
url: 'http://192.168.8.220:8081/goldDetail/getGold',
url: 'http://18.143.76.3:10704/goldDetail/getGold',
method: 'post',
data: { ...getObj.value, user: { ...user.value } }
})
@ -129,7 +129,7 @@ const get = async function (val) {
//
const resultGoldTotal = await API({
url: 'http://192.168.8.220:8081/goldDetail/goldTotal',
url: 'http://18.143.76.3:10704/goldDetail/goldTotal',
data: {
...getAllObj.value,
user: { ...user.value }

6
src/views/usergold/clientCountDetail.vue

@ -42,7 +42,7 @@ const getPlatform = async () => {
isLoadingPlatform.value = true;
try {
const result = await API({
url: 'http://192.168.8.220:8081/general/platform',
url: 'http://18.143.76.3:10704/general/platform',
method: 'post',
data: {}//
})
@ -85,7 +85,7 @@ const getArea = async () => {
isLoadingArea.value = true;
try {
const result = await API({
url: 'http://192.168.8.220:8081/general/market'
url: 'http://18.143.76.3:10704/general/market'
});
// { value, label }
if (Array.isArray(result.data) && typeof result.data[0] === 'string') {
@ -168,7 +168,7 @@ const get = async function (val) {
//console.log('', requestData);
const result = await API({
url: 'http://192.168.8.220:8081/goldDetail/getGoldDetail',
url: 'http://18.143.76.3:10704/goldDetail/getGoldDetail',
method: 'post',
data: { ...getObj.value, goldDetail: { ...goldDetail.value } }
})

2
src/views/workspace/index.vue

@ -223,7 +223,7 @@ const handleDateRangeChange = () => {
const getAreas = async () => {
try {
const result = await API({
url: 'http://192.168.8.247:8081/general/market',
url: 'http://18.143.76.3:10704/general/market',
data: {}
})
middleCategory.value = result.data.map(item => item.name)

Loading…
Cancel
Save