+
![支付凭证]()
- --
@@ -173,6 +181,8 @@ import {ElMessage} from 'element-plus'
import request from '@/util/http'
import moment from 'moment'
import API from '@/util/http'
+import {useAdminStore} from "@/store/index.js";
+import {storeToRefs} from "pinia";
// 精网号去空格
const trimJwCode = () => {
if (rechargeAudit.value.jwcode) {
@@ -200,7 +210,7 @@ const rechargeAudit = ref({
startTime: "", // 充值时间开始
endTime: "", // 充值时间结束
market: "", // 地区
- auditStatus : "0",
+ auditStatus: "0",
})
// 搜索对象
@@ -501,23 +511,33 @@ const handlePagination = (type, val) => {
getStats()
}
+const adminStore = useAdminStore();
+const {menuTree} = storeToRefs(adminStore);
+import {permissionMapping, findMenuById} from "@/utils/menuTreePermission.js"
+
+
// 处理通过操作
const handleApprove = async (row) => {
- try {
- const params = {
- orderCode: row.orderCode,
- auditId: adminData.value.id,
- action: 1,
- rejectReason: ''
+ if (findMenuById(menuTree.value, permissionMapping.Recharge_Approval)) {
+ try {
+ const params = {
+ orderCode: row.orderCode,
+ auditId: adminData.value.id,
+ action: 1,
+ rejectReason: ''
+ }
+ await request({url: '/audit/audit', data: params})
+ ElMessage.success('审核通过成功')
+ await getRecharge()
+ await getStats()
+ } catch (error) {
+ console.error('审核通过失败', error)
+ ElMessage.error('操作失败')
}
- await request({url: '/audit/audit', data: params})
- ElMessage.success('审核通过成功')
- await getRecharge()
- await getStats()
- } catch (error) {
- console.error('审核通过失败', error)
- ElMessage.error('操作失败')
+ }else {
+ ElMessage.error('无权限')
}
+
}
// 显示驳回对话框
diff --git a/src/views/consume/addBeanConsume.vue b/src/views/consume/addBeanConsume.vue
new file mode 100644
index 0000000..399ab7f
--- /dev/null
+++ b/src/views/consume/addBeanConsume.vue
@@ -0,0 +1,11 @@
+
+
+
+ addBeanConsume
+
+
+
\ No newline at end of file
diff --git a/src/views/consume/articleVideo.vue b/src/views/consume/articleVideo.vue
new file mode 100644
index 0000000..2d36320
--- /dev/null
+++ b/src/views/consume/articleVideo.vue
@@ -0,0 +1,11 @@
+
+
+
+ article videos
+
+
+
\ No newline at end of file
diff --git a/src/views/consume/beanConsume.vue b/src/views/consume/beanConsume.vue
index 96c0baf..6a028e7 100644
--- a/src/views/consume/beanConsume.vue
+++ b/src/views/consume/beanConsume.vue
@@ -1,11 +1,137 @@
-
+
+
+
\ No newline at end of file
diff --git a/src/views/consume/dieHardFan.vue b/src/views/consume/dieHardFan.vue
new file mode 100644
index 0000000..78d9704
--- /dev/null
+++ b/src/views/consume/dieHardFan.vue
@@ -0,0 +1,11 @@
+
+
+
+ die-hard fans
+
+
+
\ No newline at end of file
diff --git a/src/views/consume/liveStream.vue b/src/views/consume/liveStream.vue
new file mode 100644
index 0000000..48e128f
--- /dev/null
+++ b/src/views/consume/liveStream.vue
@@ -0,0 +1,11 @@
+
+
+
+ live stream
+
+
+
\ No newline at end of file
diff --git a/src/views/recharge/coinRechargeDetail.vue b/src/views/recharge/coinRechargeDetail.vue
index 2dce85f..b4da800 100644
--- a/src/views/recharge/coinRechargeDetail.vue
+++ b/src/views/recharge/coinRechargeDetail.vue
@@ -34,6 +34,25 @@ const handleDatePickerChange = () => {
const rechargeUser = ref({
adminId: adminData.value.id
})
+
+// 存储地区选择变化
+const selectedMarketPath = ref([])
+//处理地区选择变化
+const handleMarketChange = (value) => {
+ if(value && value.length > 0){
+ const lastValue = value[value.length - 1];
+ if (lastValue.endsWith('_all')) {
+ // 选中“全部”，取父节点名称
+ rechargeUser.value.market = lastValue.replace('_all', '');
+ } else {
+ // 取路径的最后一项作为选中的地区
+ rechargeUser.value.market = lastValue;
+ }
+ } else {
+ rechargeUser.value.market = ''
+ }
+}
+
// 搜索对象
const getObj = ref({
pageNum: 1,
@@ -116,25 +135,46 @@ const getActivity = async function () {
// 在这里可以处理错误逻辑，比如显示错误提示等
}
}
-// 获取地区
-// 获取地区
+
+// 获取地区，修改为级联下拉框
const getArea = async function () {
console.log('获取地区adminid', adminData.value)
try {
// 发送POST请求
const result = await API({
- url: '/general/adminMarkets',
+ url: '/market/selectMarket',
data: {account: adminData.value.account}
});
// 将响应结果存储到响应式数据中
console.log('请求成功', result)
+
+ // 递归转换树形结构为级联选择器需要的格式
+ const transformTree = (nodes) => {
+ return nodes.map(node => {
+ const children = node.children && node.children.length
+ ? transformTree(node.children)
+ : null;
+ // 如果有子节点，添加“全部”选项
+ if (children) {
+ children.unshift({
+ value: `${node.name}_all`, // 唯一标识
+ label: '全部',
+ children: null
+ });
+ }
+ return {
+ value: node.name, //使用地区名称作为值
+ label: node.name, //显示名称
+ children
+ };
+ });
+ }
// 存储地区信息
- market.value = result.data
- console.log('地区', market.value)
+ market.value = transformTree(result.data)
+ console.log('转换后的地区树', market.value)
} catch (error) {
console.log('请求失败', error)
- // 在这里可以处理错误逻辑，比如显示错误提示等
}
}
@@ -257,6 +297,7 @@ const reset = function () {
delete rechargeUser.value.activity
delete rechargeUser.value.payPlatform
delete rechargeUser.value.market
+ selectedMarketPath .value = [] // 重置地区选择路径
delete rechargeUser.value.startTime
delete rechargeUser.value.endTime
delete sortField.value
@@ -487,13 +528,26 @@ const getTagText = (state) => {
+ 所属地区：
+