diff --git a/.env.development b/.env.development index 85805ee..ed224d3 100644 --- a/.env.development +++ b/.env.development @@ -1,11 +1,6 @@ -# VITE_API_BASE='http://54.251.137.151:10704/' +VITE_API_BASE='http://192.168.8.94:8081/' # VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev' # VITE_API_BASE='http://54.251.137.151:10704/' -<<<<<<< HEAD -# VITE_API_BASE='http://192.168.8.225:8080/' -# VITE_API_BASE='http://192.168.8.94:8080/' -VITE_API_BASE='http://18.143.76.3:10704/' -======= -VITE_API_BASE='http://192.168.8.94:8081/' ->>>>>>> lihuilin/feature-20250623164044-金币前端 +# VITE_API_BASE='http://192.168.9.28:8081/' +# VITE_API_BASE='18.143.76.3:10703/' diff --git a/src/views/audit/rechargeAudit.vue b/src/views/audit/rechargeAudit.vue index 663093c..5f45012 100644 --- a/src/views/audit/rechargeAudit.vue +++ b/src/views/audit/rechargeAudit.vue @@ -1,54 +1,202 @@ + + + - - + \ No newline at end of file diff --git a/src/views/audit/refundAudit.vue b/src/views/audit/refundAudit.vue index 354ee57..02a74b5 100644 --- a/src/views/audit/refundAudit.vue +++ b/src/views/audit/refundAudit.vue @@ -6,19 +6,19 @@ 精网号: - + 商品名: - + - + 退款方式: - - + + @@ -32,10 +32,9 @@
- 充值时间: - + 提交时间: + 近7天 @@ -60,32 +59,50 @@
- 总条数:{{ stats.totalItems }}条     - 退款总金币数:{{ stats.totalCoins }}金币     - 永久金币:{{ stats.permanentCoins }}金币     - 免费金币:{{ stats.freeCoins }}金币     - 任务金币:{{ stats.taskCoins }}金币 + 总条数:{{ stats.totalNum }}条     + 退款总金币数:{{ stats.permanentGolds + stats.freeGolds + stats.taskGolds }}金币     + 永久金币:{{ stats.permanentGolds }}金币     + 免费金币:{{ stats.freeGolds }}金币     + 任务金币:{{ stats.taskGolds }}金币
- + - - + + + + + + + + + + + + + + - - - - + - - - @@ -569,18 +517,6 @@ onMounted(async () => { display: flex; } -.green-dot { - background-color: #67C23A; -} - -.grey-dot { - background-color: #909399; -} - -.red-dot { - background-color: #F56C6C; -} - .time-controls { display: flex; align-items: center; @@ -591,46 +527,4 @@ onMounted(async () => { align-items: center; gap: 10px; } - -.quick-buttons { - display: flex; - align-items: center; -} - -.status { - display: flex; - align-items: center; - /* 确保子元素垂直居中对齐 */ - gap: 6px; - /* 设置圆点和文字之间的间距 */ -} - -.green-dot, -.grey-dot, -.red-dot { - display: inline-block; - width: 8px; - height: 8px; - border-radius: 50%; - flex-shrink: 0; - /* 防止圆点在空间不足时缩小 */ - margin: 0; - /* 移除原有的 margin-right */ -} - -/* 备注列样式 */ -.remark-cell { - display: block; - width: 100%; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} - -/* 设置单元格内容溢出隐藏 */ -.el-table .el-table__cell { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} \ No newline at end of file diff --git a/src/views/consume/addCoinConsume.vue b/src/views/consume/addCoinConsume.vue index f28ec08..718fcb1 100644 --- a/src/views/consume/addCoinConsume.vue +++ b/src/views/consume/addCoinConsume.vue @@ -178,7 +178,7 @@ const add = async function () { // 发送POST请求 const result = await request({ // url: "/consume/add", - url: "http://18.143.76.3:10704/consume/add", + url: "/consume/add", data: { ...addConsume.value, jwcode: addConsume.value.jwcode, @@ -289,7 +289,7 @@ const getUser = async function (jwcode) { // 发送POST请求 const result = await request({ // url: "user/selectUser", - url: "http://18.143.76.3:10704/user/selectUser", // todo 服务器改回无ip的 + url: "/user/selectUser", // todo 服务器改回无ip的 data: { // 只需要传精网号 jwcode: addConsume.value.jwcode, diff --git a/src/views/consume/coinConsumeDetail.vue b/src/views/consume/coinConsumeDetail.vue index 1efe06b..e6a0e44 100644 --- a/src/views/consume/coinConsumeDetail.vue +++ b/src/views/consume/coinConsumeDetail.vue @@ -109,7 +109,7 @@ const totalGoldSearch = ref({ const getAdminData = async function () { try { const result = await request({ - url: 'http://18.143.76.3:10704/admin/userinfo', + url: '/admin/userinfo', data: {} }) adminData.value = result @@ -150,7 +150,7 @@ const ConsumeSelectBy = async function (val) { // 发送POST请求 const result = await request({ - url: 'http://18.143.76.3:10704/consume/selectBy', + url: '/consume/selectBy', data: { pageNum: getObj.value.pageNum, pageSize: getObj.value.pageSize, @@ -179,8 +179,8 @@ const ConsumeSelectBy = async function (val) { totalGoldSearch.value.goodsName = consumeUser.value.goodsName // const resultTotalGold = await request({ - // url: 'http://18.143.76.3:10704/consume/statsGold', - url: 'http://18.143.76.3:10704/consume/statsGold', + // url: '/consume/statsGold', + url: '/consume/statsGold', data: totalGoldSearch.value }) @@ -321,7 +321,7 @@ const getGoods = async function () { try { // 发送POST请求 const result = await request({ - url: 'http://18.143.76.3:10704/general/goods', + url: '/general/goods', data: {} }) // 将响应结果存储到响应式数据中 @@ -341,7 +341,7 @@ const getMarket = async function () { // 发送请求获取地区列表 const result = await request({ // url: '/general/market', - url: 'http://18.143.76.3:10704/general/market', // todo 换成实际接口地址 + url: '/general/market', // todo 换成实际接口地址 data: {} }) console.log('请求地区列表成功', result) @@ -594,7 +594,7 @@ onMounted(async function () { fixed="left" /> - + { prop="activityName" label="活动名称" width="150px" + show-overflow-tooltip /> { isLoadingPlatform.value = true; try { const result = await API({ - url: 'http://18.143.76.3:10704/general/platform', + url: '/general/platform', method: 'post', data: {}// 这里添加参数 }) @@ -181,7 +181,7 @@ const get = async function (val) { console.log('搜索参数', getObj.value) // 发送POST请求 const result = await API({ - url: 'http://18.143.76.3:10704/recharge/selectBy', + url: '/recharge/selectBy', data: { ...getObj.value, rechargeUser: { ...rechargeUser.value } @@ -198,7 +198,7 @@ const get = async function (val) { payPlatform: rechargeUser.value.payPlatform }) const resultTotalGold = await API({ - url: 'http://18.143.76.3:10704/recharge/statsGold', + url: '/recharge/statsGold', data: { ...detailWithoutSort.value } diff --git a/src/views/refund/addCoinRefund.vue b/src/views/refund/addCoinRefund.vue index de16f3f..58711a4 100644 --- a/src/views/refund/addCoinRefund.vue +++ b/src/views/refund/addCoinRefund.vue @@ -86,7 +86,7 @@ const add = async function () { } // 发送POST请求 - const result = await API({ url: 'http://18.143.76.3:10704/refund/add', + const result = await API({ url: '/refund/add', data: processedRefund }) if (result.code === 0) { @@ -162,7 +162,7 @@ const getUser = async function (jwcode) { try { // 发送POST请求 const result = await API({ - url: 'http://18.143.76.3:10704/user/selectUser', + url: '/user/selectUser', data: { jwcode: addRefund.value.jwcode } @@ -206,7 +206,7 @@ const getRefundTypes = async function () { try { // 发送请求获取退款类型 const result = await API({ - url: 'http://18.143.76.3:10704/refund/refundType', //这里应该写上一个退款类型的接口 + url: '/refund/refundType', //这里应该写上一个退款类型的接口 data: {} }) console.log('退款类型请求成功', result) // 检查返回的数据是否为数组 @@ -236,7 +236,7 @@ const getGoods = async function (jwcode) { // 发送POST请求 const result = await API({ // url: 'http://39.101.133.168:8828/live_mall/api/product/all', //需要接口 - url: 'http://18.143.76.3:10704/refund/selectGoods', + url: '/refund/selectGoods', data: { jwcode: addRefund.value.jwcode } diff --git a/src/views/refund/coinRefundDetail.vue b/src/views/refund/coinRefundDetail.vue index 45bb277..79310f9 100644 --- a/src/views/refund/coinRefundDetail.vue +++ b/src/views/refund/coinRefundDetail.vue @@ -76,7 +76,7 @@ const getRefundTypes = async function () { try { // 发送请求获取退款类型 const result = await API({ - url: 'http://18.143.76.3:10704/refund/refundType', //这里应该写上一个退款类型的接口 + url: '/refund/refundType', //这里应该写上一个退款类型的接口 data: {} }) console.log('退款类型请求成功', result) // 检查返回的数据是否为数组 @@ -121,7 +121,7 @@ const getSelectBy = async function (val) { console.log('搜索参数', getObj.value) // 发送POST请求 const result = await API({ - url: 'http://18.143.76.3:10704/refund/selectBy', + url: '/refund/selectBy', data: { ...getObj.value, refundUser: { ...refundUser.value } @@ -133,7 +133,7 @@ const getSelectBy = async function (val) { delete detailWithoutSort.sortOrder const resultTotalGold = await API({ - url: 'http://18.143.76.3:10704/refund/statsGold', + url: '/refund/statsGold', data: { ...detailWithoutSort } @@ -255,7 +255,7 @@ const handleClick = function (tab, event) { const getMarket = async function () { try { // 发送POST请求 - const result = await API({ url: 'http://18.143.76.3:10704/general/market', data: {} }) + const result = await API({ url: '/general/market', data: {} }) // 将响应结果存储到响应式数据中 console.log('请求成功', result) // 存储地区信息 @@ -297,7 +297,7 @@ const getGoods = async function () { try { // 发送POST请求 const result = await request({ - url: 'http://18.143.76.3:10704/general/goods', + url: '/general/goods', data: {} }) // 将响应结果存储到响应式数据中 diff --git a/src/views/usergold/clientCountBalance.vue b/src/views/usergold/clientCountBalance.vue index bab5144..dfe3bb8 100644 --- a/src/views/usergold/clientCountBalance.vue +++ b/src/views/usergold/clientCountBalance.vue @@ -30,7 +30,7 @@ const getmarket = async () => { isLoadingmarket.value = true; try { const result = await API({ - url: 'http://18.143.76.3:10704/general/market' + url: '/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://18.143.76.3:10704/goldDetail/getGold', + url: '/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://18.143.76.3:10704/goldDetail/goldTotal', + url: '/goldDetail/goldTotal', data: { ...getAllObj.value, user: { ...user.value } diff --git a/src/views/usergold/clientCountDetail.vue b/src/views/usergold/clientCountDetail.vue index f94a2b2..eb8b0f0 100644 --- a/src/views/usergold/clientCountDetail.vue +++ b/src/views/usergold/clientCountDetail.vue @@ -42,7 +42,7 @@ const getPlatform = async () => { isLoadingPlatform.value = true; try { const result = await API({ - url: 'http://18.143.76.3:10704/general/platform', + url: '/general/platform', method: 'post', data: {}// 这里添加参数 }) @@ -85,7 +85,7 @@ const getArea = async () => { isLoadingArea.value = true; try { const result = await API({ - url: 'http://18.143.76.3:10704/general/market' + url: '/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://18.143.76.3:10704/goldDetail/getGoldDetail', + url: '/goldDetail/getGoldDetail', method: 'post', data: { ...getObj.value, goldDetail: { ...goldDetail.value } } })