diff --git a/.env.development b/.env.development index 667ca36..85805ee 100644 --- a/.env.development +++ b/.env.development @@ -1,8 +1,11 @@ # 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='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-金币前端 diff --git a/src/router/index.js b/src/router/index.js index f1ac976..2767e29 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -10,7 +10,6 @@ const router = createRouter({ meta: { requireAuth: true }, path: '/', component: () => import("../views/home.vue"), children: [ - // 工作台 { path: '/workspace/:area?', name: "workspace", component: () => import("../views/workspace/index.vue") }, // 充值审核 diff --git a/src/views/audit/rechargeAudit.vue b/src/views/audit/rechargeAudit.vue index 19b507c..663093c 100644 --- a/src/views/audit/rechargeAudit.vue +++ b/src/views/audit/rechargeAudit.vue @@ -52,7 +52,6 @@ const getObj = ref({ const total = ref(50) // 搜索对象时间 const getTime = ref([]) -// 搜索活动列表 const activity = ref([]) // 搜索地区列表 const market = ref([]) @@ -82,22 +81,8 @@ const payModel = [ { value: '微信', label: '微信' - }, - { - value: '支付宝', - label: '支付宝' - }, - { - value: '银联', - label: '银联' - }, - { - value: '信用卡', - label: '信用卡' - }, - { - value: '借记卡', - label: '借记卡' + },{ + value:'.....................................'// 待补充 } ] // 表单验证ref @@ -451,11 +436,11 @@ const passConfirm = async function () { } // 打开驳回弹出框 -const openRejectVisible = function () { +const openRej = function () { rejectVisible.value = true } // 关闭驳回弹出框 -const closeRejectVisible = function () { +const closeRej = function () { rejectVisible.value = false } // 驳回按钮 @@ -509,18 +494,8 @@ const rejectConfirm = async function () { const handleSortChange = (column) => { console.log('排序字段：', column.prop) console.log('排序方式：', column.order) - if (column.prop === 'rechargeGold') { - sortField.value = 'recharge_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 === 'paidGold') { - sortField.value = 'paid_gold' - } else if (column.prop === 'auditTime') { - sortField.value = 'audit_time' + if (column.prop === '待补充') { + sortField.value = '' } sortOrder.value = column.order === 'ascending' ? 'ASC' : 'DESC' getRecharge() @@ -629,7 +604,7 @@ onMounted(async function () { 重置 - 查询 + 查询 @@ -745,7 +720,7 @@ onMounted(async function () { - + diff --git a/src/views/audit/refundAudit.vue b/src/views/audit/refundAudit.vue index 3ba6d57..354ee57 100644 --- a/src/views/audit/refundAudit.vue +++ b/src/views/audit/refundAudit.vue @@ -9,23 +9,22 @@ - 活动名称： - - - + 商品名： + + + - 退款商品： - - + 退款方式： + + + 所属地区： - - + + @@ -68,89 +67,59 @@ 任务金币：{{ stats.taskCoins }}金币 -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + 查看个人信息 - 退出登录 + 退出登录 diff --git a/src/views/managerecharge/rate.vue b/src/views/managerecharge/rate.vue index 6938fb2..354550c 100644 --- a/src/views/managerecharge/rate.vue +++ b/src/views/managerecharge/rate.vue @@ -431,20 +431,9 @@ onMounted(async function () { \ No newline at end of file + diff --git a/src/views/permissions/index.vue b/src/views/permissions/index.vue deleted file mode 100644 index 6153e5c..0000000 --- a/src/views/permissions/index.vue +++ /dev/null @@ -1,909 +0,0 @@ - - - - - diff --git a/src/views/permissions/permission.vue b/src/views/permissions/permission.vue index 175ab05..4bdb383 100644 --- a/src/views/permissions/permission.vue +++ b/src/views/permissions/permission.vue @@ -4,18 +4,21 @@ import ElementPlus from 'element-plus' import { ElMessage, ElMessageBox } from 'element-plus' import axios from 'axios' import moment from 'moment' -import { ta } from 'element-plus/es/locales.mjs' import { UserFilled } from '@element-plus/icons-vue' import _ from 'lodash' import request from '@/util/http' -// 客户明细表格 +// 客户明细表格 什么表格？？？？？？？ const tableData = ref([]) // 搜索=========================================== //分页总条目 const total = ref(100) // 搜索admin -const admin = ref({}) +const admin = ref({ + account: '', + market: '', + postiton: '' +}) // 搜索对象 const getObj = ref({ pageNum: 1, @@ -32,17 +35,17 @@ const postiton = ref([]) // 新增用户权限对象 const permissionAddObj = ref({}) // 新增用户权限对象，机器码要实现存储多个，addMachineIdInput方法实现 -const addAdmin = ref({ - account: '', - name: '', - market: '', - permission: '', - postiton: '', - machineId: '', // 初始机器码输入框 - machineIds: [], // 动态添加的机器码输入框 - remark: '' +const addAdmin = ref({ + account: '', + name: '', + market: '', + permission: [], + postiton: '', + machineId: '', // 初始机器码输入框 + machineIds: [], // 动态添加的机器码输入框 + remark: '' }) -const addMachineIdInput = function () { +const addMachineIdInput = function () { // 为啥>=1？？？？？？？？？？？？？？ if (addAdmin.value.machineIds.length >= 1) { ElMessage.warning('设备数量已达上限') return @@ -62,13 +65,15 @@ const get = async function (val) { if (typeof val === 'number') { getObj.value.pageNum = val } - console.log('搜索参数', getObj.value) + console.log('搜索参数', getObj.value,admin.value) // 发送POST请求 const result = await request({ - url: '/admin/search', + url: '/permission/getPermission', data: { ...getObj.value, - admin: { ...admin.value } + permission: { + ...admin.value + } } }) tableData.value = result.data.list @@ -81,9 +86,9 @@ const get = async function (val) { // 精网号去空格 const trimJwCode = () => { if (admin.value.account) { - admin.value.account = admin.value.account.replace(/\s/g, ''); + admin.value.account = admin.value.account.replace(/\s/g, ''); } -} +} // 搜索 const search = function () { trimJwCode(); @@ -93,14 +98,14 @@ const search = function () { // 重置 const reset = function () { admin.value = {} -// addAdmin.value = {}//用在新增表单的重置方法，但现在采用Ref.value.resetFields()方法，不需要reset + // addAdmin.value = {}//用在新增表单的重置方法，但现在采用Ref.value.resetFields()方法，不需要reset } // 获取地区 const getArea = async function () { try { const result = await request({ - url: '/admin/market', + url: '/permission/getmarket', data: {} }) market.value = result.data @@ -113,7 +118,7 @@ const getArea = async function () { const getStore = async function () { try { const result = await request({ - url: '/admin/postiton', + url: '/permission/getposition', data: {} }) postiton.value = result.data @@ -123,32 +128,6 @@ const getStore = async function () { } } -// 验证跳转输入框的数字是否合法 -const checkNumber = function () { - if (typeof parseInt(getObj.value.pageNum) === 'number') { - console.log('总共有多少页' + Math.ceil(total.value / getObj.value.pageSize)) - if ( - getObj.value.pageNum > 0 && - getObj.value.pageNum <= Math.ceil(total.value / getObj.value.pageSize) - ) { - getObj.value.pageNum = parseInt(getObj.value.pageNum) - console.log('输入的数字合法') - get() - } else { - //提示 - ElMessage({ - type: 'error', - message: '请检查输入内容' - }) - } - } else { - //提示 - ElMessage({ - type: 'error', - message: '请检查输入内容' - }) - } -} // 打开新增用户权限弹窗 const openPermissionAddVisible = function () { @@ -156,90 +135,29 @@ const openPermissionAddVisible = function () { } // 关闭新增用户权限弹窗，并刷新表单 const closePermissionAddVisible = function () { - // reset() ，下面这个方法还可以重置表单验证（请输入...），reset只能重置输入，修改reset方法 - // 重置表单数据，当我们在新增表单点击添加后会弹出一个文本框，再点击取消，弹出的文本框应该是不显示出来的 - addAdmin.value = { + // reset() ，下面这个方法还可以重置表单验证（请输入...），reset只能重置输入，修改reset方法 + // 重置表单数据，当我们在新增表单点击添加后会弹出一个文本框，再点击取消，弹出的文本框应该是不显示出来的 + addAdmin.value = { account: '', name: '', market: '', permission: '', postiton: '', - machineId: '', - machineIds: [], + machineId: '', + machineIds: [], remark: '' }; permissionAddVisible.value = false; // 清除表单验证状态 - Ref.value.resetFields(); - + Ref.value.resetFields(); + } // 新增用户权限初始化 const permissionAddInit = function () { permissionAddObj.value = {} openPermissionAddVisible() } -// 通过精网号查询没有权限的用户 -const getAdminByJwcodeWithoutPermission = async function () { - try { - const result = await request({ - url: '/admin/selectNo', - data: permissionAddObj.value - }) - if (result.code == 200) { - permissionAddObj.value = result.data[0] - ElMessage.success('精网号查询成功') - } else { - ElMessage.error(result.msg) - } - console.log('精网号查询没有权限的用户', permissionAddObj.value) - } catch (error) { - console.log('请求失败', error) - // 在这里可以处理错误逻辑，比如显示错误提示等 - } -} -// 新增用户权限提交 -// const permissionAdd = async function () { -// try { -// if ( -// permissionAddObj.value.account == "" || -// permissionAddObj.value.account == null || -// permissionAddObj.value.name == "" || -// permissionAddObj.value.name == null -// ) { -// ElMessage.error("请选择要添加权限的用户"); -// return; -// } -// if ( -// permissionAddObj.value.permisson == "" || -// permissionAddObj.value.permission == null -// ) { -// ElMessage.error("请选择权限"); -// return; -// } -// console.log("新增用户权限提交", permissionAddObj.value); - -// const result = await request( -// { -// url: "/admin/update", -// data: permissionAddObj.value} -// ); - -// // 将响应结果存储到响应式数据中 -// console.log("请求成功", result); - -// ElMessage.success("添加成功"); - -// get(); - -// closePermissionAddVisible(); -// } catch (error) { -// console.log("新增用户权限失败", error); -// // 在这里可以处理错误逻辑，比如显示错误提示等 - -// ElMessage.error("新增用户权限失败"); -// closePermissionAddVisible(); -// } -// }; + const permissionAdd = async function () { Ref.value.validate(async (valid) => { console.log('valid', valid) @@ -248,7 +166,7 @@ const permissionAdd = async function () { addAdmin.value.adminFlag = 1 addAdmin.value.status1 = 1 const result = await request({ - url: '/admin/add', + url: '/permission/addPermission', data: addAdmin.value }) @@ -278,16 +196,6 @@ const permissionAdd = async function () { } }) } -// 表格添加的条件 -const rules = reactive({ - account: [{ required: true, message: '请输入OA号', trigger: 'blur' }], - name: [{ required: true, message: '请输入用户名', trigger: 'blur' }], - postiton: [{ required: true, message: '请输入职称', trigger: 'blur' }], - machineId: [{ required: true, message: '请输入机器码', trigger: 'blur' }], - market: [{ required: true, message: '请选择所属地区', trigger: 'blur' }], - permission: [{ required: true, message: '请选择权限', trigger: 'blur' }] -}) -// 验证表单 // 表单验证ref const Ref = ref(null) // 使用 _.throttle 并设置 trailing 为 false 实现严格节流，只执行一次 @@ -297,44 +205,31 @@ const throttledPermissionAdd = _.throttle(permissionAdd, 5000, { // 权限类别 const permissionList = [ { - label: '总部', + label: '管理员', value: '1' }, { - label: '地区经理', - value: '5' + label: '总部财务', + value: '2' }, { - label: '财务', + label: '总部客服', value: '3' }, { - label: '客服', - value: '2' + label: '地区负责人', + value: '4' + }, + { + label: '地区财务', + value: '5' + }, + { + label: '客服专员', + value: '6' } ] -// 获取地区 -// 获取地区 -const areaList = ref([]) -const getAreas = async function () { - try { - // 发送POST请求 - const result = await request({ - url: '/recharge/user/search', - data: {} - }) - // 将响应结果存储到响应式数据中 - console.log('请求成功', result) - // 存储地区信息 - areaList.value = result.data - console.log('地区', market.value) - } catch (error) { - console.log('请求失败', error) - // 在这里可以处理错误逻辑，比如显示错误提示等 - } -} -getAreas() // 打开编辑用户权限弹窗 const openPermissionEditVisible = function () { permissionEditVisible.value = true @@ -346,11 +241,13 @@ const closePermissionEditVisible = function () { // 编辑用户权限初始化 const permissionEditInit = function (row) { permissionEditObj.value = {} + permissionEditObj.value.id = row.id permissionEditObj.value.account = row.account permissionEditObj.value.name = row.name permissionEditObj.value.market = row.market permissionEditObj.value.postiton = row.postiton permissionEditObj.value.permission = row.permission + permissionEditObj.value.roleId = row.roleId console.log('编辑用户权限', permissionEditObj.value) openPermissionEditVisible() } @@ -358,23 +255,18 @@ const permissionEditInit = function (row) { const permissionEdit = async function () { try { const result = await request({ - url: '/admin/update', + url: '/permission/updateAdminRole', data: permissionEditObj.value }) - // 将响应结果存储到响应式数据中 - console.log('请求成功', result) - + console.log('请求成功3', result) ElMessage.success('编辑用户权限成功') - get() - closePermissionEditVisible() } catch (error) { console.log('编辑用户权限失败', error) // 在这里可以处理错误逻辑，比如显示错误提示等 ElMessage.error('编辑用户权限失败') - closePermissionEditVisible() } } @@ -386,20 +278,17 @@ const del = function (row) { delObj.value = {} console.log(row, '删除初始化') delObj.value.account = row.account + delObj.value.id = row.id } // 删除权限 const delConfirm = async function () { try { - delObj.value.permission = '4' - console.log(delObj.value) - const result = await request({ - url: '/admin/update', + url: '/permission/deleteAdmin', data: delObj.value }) - - // 将响应结果存储到响应式数据中 - console.log('请求成功', result) + console.log('看看删除对象', delObj.value) + console.log('请求成功1', result) ElMessage.success('删除权限成功') delObj.value = {} @@ -416,21 +305,21 @@ const editStatus = async function (row) { console.log(row) permissionEditObj.value = {} + permissionEditObj.value.id = row.id permissionEditObj.value.account = row.account - permissionEditObj.value.status1 = row.status1 - + permissionEditObj.value.adminStatus = row.adminStatus console.log('修改用户权限状态', permissionEditObj.value) const result = await request({ - url: '/admin/update', + url: '/permission/upadatePermission', data: permissionEditObj.value }) // 将响应结果存储到响应式数据中 - console.log('请求成功', result) + console.log('请求成功2', result) ElMessage.success( - permissionEditObj.value.status1 == 1 ? '启用成功' : '禁用成功' + permissionEditObj.value.adminStatus == 1 ? '启用成功' : '禁用成功' ) permissionEditObj.value = {} get() @@ -463,44 +352,18 @@ const handleCurrentChange = function (val) {
OA号： - +
所属地区： - - + +
-
职位名称： - - + +
@@ -512,26 +375,18 @@ const handleCurrentChange = function (val) { + - +
- 新增用户 + 新增用户
- +