Browse Source

feat(general): 更新地区数据获取接口

zhangrenyuan/feature-20250714163943-金币前端二期
lihui 2 weeks ago
parent
commit
2ba78a88e2
  1. 6
      src/views/audit/rechargeAudit.vue
  2. 4
      src/views/audit/refundAudit.vue
  3. 4
      src/views/consume/coinConsumeDetail.vue
  4. 4
      src/views/home.vue
  5. 23
      src/views/recharge/coinRechargeDetail.vue
  6. 4
      src/views/refund/coinRefundDetail.vue
  7. 3
      src/views/usergold/clientCountBalance.vue
  8. 46
      src/views/usergold/clientCountDetail.vue
  9. 8
      src/views/workspace/index.vue

6
src/views/audit/rechargeAudit.vue

@ -479,8 +479,10 @@ const getActivity = async function () {
const getMarket = async function () {
try {
const result = await request({
url: '/general/market',
data: {}
url: '/general/roleMarkets',
data: {
account: adminData.value.account
}
})
market.value = result.data
console.log('地区', market.value)

4
src/views/audit/refundAudit.vue

@ -268,7 +268,9 @@ const showRejectDialog = (row) => {
//
const getmarkets = async () => {
try {
const result = await API({ url: 'general/market' })
const result = await API({ url: '/general/roleMarkets', data: {
account: adminInfo.value.account,
} })
marketOptions.value = result.data || []
} catch (error) {
console.error('获取地区列表失败', error)

4
src/views/consume/coinConsumeDetail.vue

@ -362,8 +362,8 @@ const getMarket = async function () {
//
const result = await request({
// url: '/general/market',
url: '/general/market', // todo
data: {}
url: '/general/roleMarkets', // todo
data: {account:adminData.value.account}
})
console.log('请求地区列表成功', result)
//

4
src/views/home.vue

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

23
src/views/recharge/coinRechargeDetail.vue

@ -119,9 +119,14 @@ const getActivity = async function () {
//
//
const getArea = async function () {
console.log('获取地区adminid', adminData.value)
try {
// POST
const result = await API({ url: '/general/market', data: {} })
const result = await API({
url: '/general/roleMarkets',
data: {account: adminData.value.account}
});
//
console.log('请求成功', result)
//
@ -333,6 +338,7 @@ const get7Days = function () {
onMounted(async function () {
await get()
await getActivity()
await getAdminData()
await getArea()
await getPlatform()
})
@ -505,9 +511,15 @@ const getTagText = (state) => {
<el-text class="mx-1" size="large">充值时间</el-text>
<el-date-picker v-model="getTime" type="datetimerange" range-separator="" start-placeholder="起始时间"
end-placeholder="结束时间" style="width: 400px" @change="handleDatePickerChange"/>
<el-button @click="getToday()" style="margin-left: 10px" :type="activeTimeRange === 'today' ? 'primary' : ''"> </el-button>
<el-button @click="getYesterday()" style="margin-left: 10px" :type="activeTimeRange === 'yesterday' ? 'primary' : ''"> </el-button>
<el-button @click="get7Days()" style="margin-left: 10px" :type="activeTimeRange === '7days' ? 'primary' : ''"> 近7天</el-button>
<el-button @click="getToday()" style="margin-left: 10px"
:type="activeTimeRange === 'today' ? 'primary' : ''">
</el-button>
<el-button @click="getYesterday()" style="margin-left: 10px"
:type="activeTimeRange === 'yesterday' ? 'primary' : ''">
</el-button>
<el-button @click="get7Days()" style="margin-left: 10px"
:type="activeTimeRange === '7days' ? 'primary' : ''"> 近7天
</el-button>
<el-button type="success" @click="reset()">重置</el-button>
<el-button type="primary" @click="search()">查询</el-button>
<el-button type="primary" @click="exportExcel()">导出Excel</el-button>
@ -559,7 +571,8 @@ const getTagText = (state) => {
<!-- 分页 -->
<div class="pagination" style="margin-top: 20px">
<el-pagination background :page-size="getObj.pageSize" :page-sizes="[5, 10, 20, 50, 100]"
layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handlePageSizeChange"
layout="total, sizes, prev, pager, next, jumper" :total="total"
@size-change="handlePageSizeChange"
@current-change="handleCurrentChange"></el-pagination>
</div>
</el-card>

4
src/views/refund/coinRefundDetail.vue

@ -270,7 +270,9 @@ const handleClick = function (tab, event) {
const getMarket = async function () {
try {
// POST
const result = await API({ url: '/general/market', data: {} })
const result = await API({ url: '/general/roleMarkets', data: {
account:adminData.value.account,
} })
//
console.log('请求成功', result)
//

3
src/views/usergold/clientCountBalance.vue

@ -30,7 +30,8 @@ const getmarket = async () => {
isLoadingmarket.value = true;
try {
const result = await API({
url: '/general/market'
url: '/general/roleMarkets',
data: {account: adminData.value.account}
});
console.log('获取地区数据成功', result)
// { value, label }

46
src/views/usergold/clientCountDetail.vue

@ -25,16 +25,12 @@ const totalGoldTotal = ref(0)
const adminData = ref({})
const getAdminData = async function () {
try {
const result = await API({
url: '/admin/userinfo',
method: 'post',
data: {}
})
const result = await API({ url: '/admin/userinfo', data: {} })
adminData.value = result
// console.log('', result)
console.log('请求成功', result)
console.log('管理员用户信息', adminData.value)
} catch (error) {
console.log('管理员用户信息请求失败', error)
console.log('请求失败', error)
}
}
@ -91,14 +87,19 @@ const type = [
]
//
const isLoadingArea = ref(false);
//
const isLoadingmarket = ref(false);
const market = ref([])
const getArea = async () => {
isLoadingArea.value = true;
const getmarket = async () => {
isLoadingmarket.value = true;
try {
const result = await API({
url: '/general/market'
url: '/general/roleMarkets',
data: {account: adminData.value.account}
});
console.log('获取地区数据成功', result)
// { value, label }
if (Array.isArray(result.data) && typeof result.data[0] === 'string') {
market.value = result.data
@ -113,10 +114,9 @@ const getArea = async () => {
//
market.value = [];
} finally {
isLoadingArea.value = false;
isLoadingmarket.value = false;
}
};
/*// 地区下拉框
const getMarket = async function () {
try {
@ -365,9 +365,10 @@ const handleCurrentChange = function (val) {
//
onMounted(async function () {
await get()
await getArea()
await getAdminData()
await get()
await getmarket()
await getPlatform() //
})
@ -496,7 +497,8 @@ const handleMarketChange = (val) => {
<el-col :span="6">
<div class="head-card-element">
<el-text class="mx-1" size="large">所属地区</el-text>
<el-select v-model="goldDetail.markets" placeholder="请选择所属地区" style="width: 180px" clearable multiple
<el-select v-model="goldDetail.markets" placeholder="请选择所属地区" style="width: 180px" clearable
multiple
:loading="isLoadingArea" @change="handleMarketChange">
<el-option v-for="item in market"
:key="item.value || item"
@ -514,11 +516,14 @@ const handleMarketChange = (val) => {
<el-date-picker v-model="getTime" type="datetimerange" range-separator="" start-placeholder="起始时间"
end-placeholder="结束时间" style="width: 400px" @change="handleDatePickerChange"/>
<el-button @click="getToday()" style="margin-left: 10px"
:type="activeTimeRange === 'today' ? 'primary' : ''"> </el-button>
:type="activeTimeRange === 'today' ? 'primary' : ''">
</el-button>
<el-button @click="getYesterday()" style="margin-left: 10px"
:type="activeTimeRange === 'yesterday' ? 'primary' : ''"> </el-button>
:type="activeTimeRange === 'yesterday' ? 'primary' : ''">
</el-button>
<el-button @click="get7Days()" style="margin-left: 10px"
:type="activeTimeRange === '7days' ? 'primary' : ''"> 近7天</el-button>
:type="activeTimeRange === '7days' ? 'primary' : ''"> 近7天
</el-button>
<el-button type="success" @click="reset()">重置</el-button>
<el-button type="primary" @click="search()">查询</el-button>
@ -605,7 +610,8 @@ const handleMarketChange = (val) => {
<!-- 此处分页 -->
<div class="pagination" style="margin-top: 20px">
<el-pagination background :page-size="getObj.pageSize" :page-sizes="[5, 10, 20, 50, 100]"
layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handlePageSizeChange"
layout="total, sizes, prev, pager, next, jumper" :total="total"
@size-change="handlePageSizeChange"
@current-change="handleCurrentChange"></el-pagination>
</div>
</el-card>

8
src/views/workspace/index.vue

@ -420,8 +420,14 @@ const processData = (data) => {
//
const getMarkets = async () => {
console.log("adminData",adminData.value.account)
try {
const response = await API({ url: '/general/market', data: {} })
const response = await API({
url: '/general/roleMarkets',
data: {
account: adminData.value.account
}
})
if (Array.isArray(response.data)) {
markets.value = response.data
console.log('市场列表获取成功:', markets.value)

Loading…
Cancel
Save