diff --git a/.env.development b/.env.development
index b17f756..cec78c3 100644
--- a/.env.development
+++ b/.env.development
@@ -4,3 +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:8080/'
+
diff --git a/src/router/index.js b/src/router/index.js
index 222fbd7..94c51e8 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -19,7 +19,7 @@ const router = createRouter({
{ path: '/refundAudit', name: "refundAudit", component: () => import("../views/audit/refundAudit.vue") },
// 金币消耗
{ path: '/coinConsume', name: "coinConsume", component: () => import("../views/consume/coinConsume.vue"),
- redirect: '/coinConsume/add',// 重定向到新增页面
+ redirect: '/coinConsume/add',// 重定向到新增消耗页面
children: [
// 金币新增消耗
{ path: 'add', name: "addCoinConsume", component: () => import("../views/consume/addCoinConsume.vue") },
@@ -32,11 +32,27 @@ const router = createRouter({
// 汇率管理
{ path: '/rate', name: "rate", component: () => import("../views/managerecharge/rate.vue") },
// 金币充值
- { path: '/coinRecharge', name: "coinRecharge", component: () => import("../views/recharge/coinRecharge.vue") },
+ { path: '/coinRecharge', name: "coinRecharge", component: () => import("../views/recharge/coinRecharge.vue"),
+ redirect: '/coinRecharge/add',// 重定向到新增充值页面
+ children: [
+ // 金币新增充值
+ { path: 'add', name: "addCoinRecharge", component: () => import("../views/recharge/addCoinRecharge.vue") },
+ // 金币充值明细详情
+ { path: 'detail', name: "coinRechargeDetail", component: () => import("../views/recharge/coinRechargeDetail.vue") }
+ ]
+ },
// 金豆充值
{ path: '/beanRecharge', name: "beanRecharge", component: () => import("../views/recharge/beanRecharge.vue") },
// 金币退款
- { path: '/coinRefund', name: "coinRefund", component: () => import("../views/refund/coinRefund.vue") },
+ { path: '/coinRefund', name: "coinRefund", component: () => import("../views/refund/coinRefund.vue"),
+ redirect: '/coinRefund/add',// 重定向到新增退款页面
+ children: [
+ // 金币新增消耗
+ { path: 'add', name: "addCoinRefund", component: () => import("../views/refund/addCoinRefund.vue") },
+ // 金币消耗明细详情
+ { path: 'detail', name: "coinRefundDetail", component: () => import("../views/refund/coinRefundDetail.vue") }
+ ]
+ },
// 金豆退款
{ path: '/beanRefund', name: "beanRefund", component: () => import("../views/refund/beanRefund.vue") },
// 客户账户明细
@@ -50,7 +66,7 @@ const router = createRouter({
]
},
// 权限管理
- { path: '/permissions', name: "permissions", component: () => import("../views/permissions/index.vue") },
+ { path: '/permissions', name: "permissions", component: () => import("../views/permissions/permission.vue") },
// 没有权限
{ path: '/noPermission', name: "noPermission", component: () => import("../views/noPermissionPage.vue") }
]
diff --git a/src/views/permissions/index.vue b/src/views/permissions/index.vue
index fa5ed0a..6153e5c 100644
--- a/src/views/permissions/index.vue
+++ b/src/views/permissions/index.vue
@@ -9,12 +9,12 @@ import { UserFilled } from '@element-plus/icons-vue'
import _ from 'lodash'
import request from '@/util/http'
-// 充值明细表格
+// 客户明细表格
const tableData = ref([])
// 搜索===========================================
//分页总条目
const total = ref(100)
-// 搜索detailY
+// 搜索admin
const admin = ref({})
// 搜索对象
const getObj = ref({
diff --git a/src/views/permissions/permission.vue b/src/views/permissions/permission.vue
new file mode 100644
index 0000000..32ca8ae
--- /dev/null
+++ b/src/views/permissions/permission.vue
@@ -0,0 +1,954 @@
+
+
+
+
+
+
+
+
+ OA号:
+
+
+
+ 所属地区:
+
+
+
+
+
+
+ 职位名称:
+
+
+
+
+
+
+ 重置
+ 查询
+
+
+
+
+
+
+
+
+
+
+ 新增用户
+
+
+
+
+
+
+ {{
+ scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize
+ }}
+
+
+
+
+
+
+
+
+
+ 总部管理员
+ 分部财务
+ 分部客服
+ 分部经理
+
+
+
+
+
+
+ 修改权限
+
+
+
+
+ 删除
+
+
+
+ 取消
+
+ 确定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Ref.value.validateField('market')"
+ >
+
+
+
+
+ Ref.value.validateField('permission')"
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+
+ 提交
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 员工精网号
+
+
+ {{ permissionEditObj.account }}
+
+
+
+
+
+
+
+ 员工姓名
+
+
+ {{ permissionEditObj.name }}
+
+
+
+
+
+
+
+ 所属地区
+
+
+ {{ permissionEditObj.market }}
+
+
+
+
+
+
+
+ 部门
+
+
+ {{ permissionEditObj.postiton }}
+
+
+
+
+
+
+
+ 权限设置:
+
+ 总部管理员
+ 分部经理
+ 分部财务
+ 分部客服
+
+
+
+
+ 取消
+
+ 提交
+
+
+
+
+
+
+
diff --git a/src/views/recharge/addCoinRecharge.vue b/src/views/recharge/addCoinRecharge.vue
new file mode 100644
index 0000000..0fcd04b
--- /dev/null
+++ b/src/views/recharge/addCoinRecharge.vue
@@ -0,0 +1,1604 @@
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+ 个
+ 免费金币
+
+ 个
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 仅支持.jpg .png格式,文件≤1MB
+
+
+
+
+
+
+
+
+ 重置
+ 提交
+
+
+
+
+
+ 客户信息
+
+
+
+ {{ user.name }}
+
+
+
+
+
+
+ {{ Number(user.totalRechargeGold / 100) }}
+
+
+
+
+
+
+
+ {{ user.jwcode }}
+
+
+
+
+ {{
+ (user.buyJb + user.free6 + user.free12 + user.coreJb) / 100
+ }}
+ (永久金币:{{ user.buyJb / 100 }};免费金币:{{
+ (user.free6 + user.free12) / 100
+ }};任务金币:{{ user.coreJb / 100 }})
+
+
+
+
+
+ {{ moment(user.firstRechargeDate).format('YYYY-MM-DD HH:mm:ss') }}
+
+
+
+
+
+ {{ user.rechargeTimes }}
+
+
+
+
+
+ {{ user.spendTimes }}
+
+
+
+
+ {{ adminData.area }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加
+
+ 行
+ 添加
+
+ 批量设置
+
+ 批量删除
+
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
+
+
+ {{ scope.row.inputErrorMessage }}
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.activityName }}
+
+
+
+
+
+ {{ scope.row.paidGold }}
+
+
+
+
+
+ {{ scope.row.freeGold }}
+
+
+
+
+
+
+
+
+ {{ scope.row.rate }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.payWay }}
+
+
+
+
+
+
+ {{
+ moment(scope.row.rechargeTime).format('YYYY-MM-DD HH:mm:ss')
+ }}
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.rechargeVoucher }}
+
+
+
+
+
+ {{ scope.row.remark }}
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+ 取消
+
+ 确定
+
+
+
+
+
+
+ 重置
+
+
+
+ 取消
+
+ 确定
+
+
+
+
+
+
+
+
+
+
+ 取消
+
+ 提交
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 确认
+
+
+
+
+
+
+
diff --git a/src/views/recharge/coinRecharge.vue b/src/views/recharge/coinRecharge.vue
index 358f45c..6033aca 100644
--- a/src/views/recharge/coinRecharge.vue
+++ b/src/views/recharge/coinRecharge.vue
@@ -1,2213 +1,61 @@
-
-
-
-
-
-
+
+
+
新增充值
-
金币充值明细
-
-
-
-
-
-
-
-
-
-
- 查询
-
-
-
-
-
-
-
-
-
- 个
-
-
-
- 个
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 仅支持.jpg .png格式,文件≤2MB
-
-
-
-
-
-
-
-
- 重置
- 提交
-
-
-
-
-
- 客户信息
-
-
-
- {{ user.name }}
-
-
-
-
-
-
- {{ Number(user.totalRechargeGold / 100) }}
-
-
-
-
-
-
-
- {{ user.jwcode }}
-
-
-
-
- {{
- (user.buyJb + user.free6 + user.free12 + user.coreJb) / 100
- }}
- (永久金币:{{ user.buyJb / 100 }};免费金币:{{
- (user.free6 + user.free12) / 100
- }};任务金币:{{ user.coreJb / 100 }})
-
-
-
-
-
- {{ moment(user.firstRechargeDate).format('YYYY-MM-DD HH:mm:ss') }}
-
-
-
-
-
- {{ user.rechargeTimes }}
-
-
-
-
-
- {{ user.spendTimes }}
-
-
-
-
- {{ adminData.area }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- 添加
-
- 行
- 添加
-
- 批量设置
-
- 批量删除
-
-
-
-
-
-
- {{ scope.$index + 1 }}
-
-
-
-
-
-
- {{ scope.row.inputErrorMessage }}
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.activityName }}
-
-
-
-
-
- {{ scope.row.paidGold }}
-
-
-
-
-
- {{ scope.row.freeGold }}
-
-
-
-
-
-
-
-
- {{ scope.row.rate }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.payWay }}
-
-
-
-
-
-
- {{
- moment(scope.row.rechargeTime).format('YYYY-MM-DD HH:mm:ss')
- }}
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.rechargeVoucher }}
-
-
-
-
-
- {{ scope.row.remark }}
-
-
-
-
-
-
-
-
-
-
-
- 删除
-
-
-
- 取消
-
- 确定
-
-
-
-
-
-
- 重置
-
-
-
- 取消
-
- 确定
-
-
-
-
-
-
-
-
-
-
- 取消
-
- 提交
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 取消
- 确认
-
-
-
-
-
-
-
-
-
-
- 精网号:
-
-
-
-
-
- 活动名称:
-
-
-
-
-
-
-
-
- 所属地区:
-
-
-
-
-
-
-
-
- 充值类型:
-
-
-
-
-
-
-
-
-
-
- 充值时间:
-
- 今
- 昨
- 近7天
-
- 重置
- 查询
- 导出Excel
-
-
-
-
-
-
-
-
-
-
- 充值金额:{{ trueRGold.toFixed(2) }}新币,永久金币:{{
- trueRGold.toFixed(2)
- }}金币,免费金币:{{ trueFGold }}金币
-
-
-
-
-
-
- {{
- scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize
- }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{
- moment(scope.row.rechargeTime).format('YYYY-MM-DD HH:mm:ss')
- }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 无赠送
- 有赠送
-
-
-
-
- :1
- (提示:当前规则每10新币可兑换1免费金币)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
+
diff --git a/src/views/recharge/coinRechargeDetail.vue b/src/views/recharge/coinRechargeDetail.vue
new file mode 100644
index 0000000..3979a98
--- /dev/null
+++ b/src/views/recharge/coinRechargeDetail.vue
@@ -0,0 +1,770 @@
+
+
+
+
+
+
+
+
+
+ 精网号:
+
+
+
+
+
+ 活动名称:
+
+
+
+
+
+
+
+
+ 所属地区:
+
+
+
+
+
+
+
+
+ 充值类型:
+
+
+
+
+
+
+
+
+
+
+ 充值时间:
+
+ 今
+ 昨
+ 近7天
+
+ 重置
+ 查询
+ 导出Excel
+
+
+
+
+
+
+
+
+
+
+ 充值金额:{{ trueRGold.toFixed(2) }}新币,永久金币:{{
+ trueRGold.toFixed(2)
+ }}金币,免费金币:{{ trueFGold }}金币
+
+
+
+
+
+
+ {{
+ scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ moment(scope.row.rechargeTime).format('YYYY-MM-DD HH:mm:ss')
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无赠送
+ 有赠送
+
+
+
+
+ :1
+ (提示:当前规则每10新币可兑换1免费金币)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/refund/addCoinRefund.vue b/src/views/refund/addCoinRefund.vue
new file mode 100644
index 0000000..e67ae21
--- /dev/null
+++ b/src/views/refund/addCoinRefund.vue
@@ -0,0 +1,546 @@
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 全部退款
+ 部分退款
+
+
+
+
+
+
+
+ 个
+
+
+
+ 个
+
+
+
+ 个
+
+
+
+
+
+
+
+
+
+
+
+
+ 重置
+ 提交
+
+
+
+
+
+ 客户信息
+
+
+
+ {{ user.name }}
+
+
+
+
+
+
+ {{ Number(user.totalRechargeGold / 100) }}
+
+
+
+
+
+
+
+ {{ user.jwcode }}
+
+
+
+
+ {{
+ (user.buyJb + user.free6 + user.free12 + user.coreJb) / 100
+ }}
+ (永久金币:{{ user.buyJb / 100 }};免费金币:{{
+ (user.free6 + user.free12) / 100
+ }};任务金币:{{ user.coreJb / 100 }})
+
+
+
+
+
+ {{ moment(user.firstRechargeDate).format('YYYY-MM-DD HH:mm:ss') }}
+
+
+
+
+
+ {{ user.rechargeTimes }}
+
+
+
+
+
+ {{ user.spendTimes }}
+
+
+
+
+ {{ adminData.area }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/refund/coinRefund.vue b/src/views/refund/coinRefund.vue
index e29bd2a..482e909 100644
--- a/src/views/refund/coinRefund.vue
+++ b/src/views/refund/coinRefund.vue
@@ -1,1310 +1,61 @@
-
-
-
-
-
-
+
+
+
新增退款
-
金币退款明细
-
-
-
-
-
-
-
-
-
- 查询
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 全部退款
- 部分退款
-
-
-
-
-
-
-
- 个
-
-
-
- 个
-
-
-
- 个
-
-
-
-
-
-
-
-
-
-
-
-
- 重置
- 提交
-
-
-
-
-
- 客户信息
-
-
-
- {{ user.name }}
-
-
-
-
-
-
- {{ Number(user.totalRechargeGold / 100) }}
-
-
-
-
-
-
-
- {{ user.jwcode }}
-
-
-
-
- {{
- (user.buyJb + user.free6 + user.free12 + user.coreJb) / 100
- }}
- (永久金币:{{ user.buyJb / 100 }};免费金币:{{
- (user.free6 + user.free12) / 100
- }};任务金币:{{ user.coreJb / 100 }})
-
-
-
-
-
- {{ moment(user.firstRechargeDate).format('YYYY-MM-DD HH:mm:ss') }}
-
-
-
-
-
- {{ user.rechargeTimes }}
-
-
-
-
-
- {{ user.spendTimes }}
-
-
-
-
- {{ adminData.area }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 精网号:
-
-
-
-
-
-
- 退款类型:
-
-
-
-
-
-
-
- 退款商品:
-
-
-
-
-
-
-
- 所属地区:
-
-
-
-
-
-
-
-
-
- 退款时间:
-
- 今
- 昨
- 近7天
-
- 重置
- 查询
- 导出Excel
-
-
-
-
-
-
-
-
-
-
-
-
- 退款金币总数:{{ Math.abs(trueGold) }},永久金币:{{
- Math.abs(truePgold)
- }},免费金币:{{ Math.abs(trueFgold) }},任务金币:{{
- Math.abs(trueTgold)
- }}
-
-
-
-
-
-
- {{
- scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize
- }}
-
-
-
-
-
-
-
-
-
-
- {{
- scope.row.rechargeCoin +
- scope.row.freeCoin +
- scope.row.taskCoin
- }}
-
-
-
-
-
-
-
-
-
-
-
-
- {{ moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') }}
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
+
diff --git a/src/views/refund/coinRefundDetail.vue b/src/views/refund/coinRefundDetail.vue
new file mode 100644
index 0000000..c9eea7c
--- /dev/null
+++ b/src/views/refund/coinRefundDetail.vue
@@ -0,0 +1,735 @@
+
+
+
+
+
+
+
+
+
+ 精网号:
+
+
+
+
+
+
+ 退款类型:
+
+
+
+
+
+
+
+ 退款商品:
+
+
+
+
+
+
+
+ 所属地区:
+
+
+
+
+
+
+
+
+
+ 退款时间:
+
+ 今
+ 昨
+ 近7天
+
+ 重置
+ 查询
+ 导出Excel
+
+
+
+
+
+
+
+
+
+
+
+
+ 退款金币总数:{{ Math.abs(trueGold) }},永久金币:{{
+ Math.abs(truePgold)
+ }},免费金币:{{ Math.abs(trueFgold) }},任务金币:{{
+ Math.abs(trueTgold)
+ }}
+
+
+
+
+
+
+ {{
+ scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize
+ }}
+
+
+
+
+
+
+
+
+
+
+ {{
+ scope.row.rechargeCoin +
+ scope.row.freeCoin +
+ scope.row.taskCoin
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/usergold/clientCountBalance.vue b/src/views/usergold/clientCountBalance.vue
index ea656c5..2c48295 100644
--- a/src/views/usergold/clientCountBalance.vue
+++ b/src/views/usergold/clientCountBalance.vue
@@ -93,36 +93,18 @@ const sortOrder = ref('')
-// //表格高度
-// const tableHeight = computed(function () {
-// return (getObj.value.pageSize + 2) * 38 + "px";
-// });
+
// 方法
// 搜索===========================================================================
// 搜索方法
const get = async function (val) {
try {
- // 地区赋值
- // if (adminData.value.market === '泰国') {
- // user.value.markets = ['泰国', '越南']
- // } else if (adminData.value.market !== '总部') {
- // user.value.market = adminData.value.market
- // }
// 搜索参数页码赋值
if (typeof val === 'number') {
getObj.value.pageNum = val
}
- // // 搜索参数时间赋值
- // if (getTime.value != null) {
- // if (getTime.value[0] != '' && getTime.value[1] != '') {
- // user.value.startDate = getTime.value[0]
- // user.value.endDate = getTime.value[1]
- // }
- // } else {
- // user.value.startDate = ''
- // user.value.endDate = ''
- // }
+
// 添加排序字段和排序方式到请求参数
user.value.sortField = sortField.value
user.value.sortOrder = sortOrder.value
@@ -269,33 +251,6 @@ const handleSortChange = (column) => {
get()
}
-// //选地区
-// const market = [
-// {
-// value: '马来西亚',
-// label: '马来西亚'
-// },
-// {
-// value: '新加坡',
-// label: '新加坡'
-// },
-// {
-// value: '香港',
-// label: '香港'
-// },
-// {
-// value: '泰国',
-// label: '泰国'
-// },
-// {
-// value: '加拿大',
-// label: '加拿大'
-// },
-// {
-// value: '越南HCM',
-// label: '越南HCM'
-// }
-// ]
// 挂载
onMounted(async function () {
@@ -345,9 +300,6 @@ const handleCurrentChange = function (val) {
/>
-
-
-
查询
导出Excel
@@ -463,7 +415,6 @@ const handleCurrentChange = function (val) {
-