diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index f021dc9..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index 79ee123..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/git_toolbox_blame.xml b/.idea/git_toolbox_blame.xml
deleted file mode 100644
index 7dc1249..0000000
--- a/.idea/git_toolbox_blame.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 737be84..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1dd..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 08d9f9f..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {
- "associatedIndex": 2
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1723220985918
-
-
- 1723220985918
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/views/business/mer_list/index.vue b/src/views/business/mer_list/index.vue
index 339a9ac..41ebbf6 100644
--- a/src/views/business/mer_list/index.vue
+++ b/src/views/business/mer_list/index.vue
@@ -290,7 +290,7 @@ const columns = ref([
},
},
{
- title: '积分',
+ title: '余额',
align: 'center',
key: 'integral',
},
diff --git a/src/views/commodity/hot_list/index.vue b/src/views/commodity/hot_list/index.vue
index 426bcbc..6468a5e 100644
--- a/src/views/commodity/hot_list/index.vue
+++ b/src/views/commodity/hot_list/index.vue
@@ -173,11 +173,11 @@
:min="0"
/>
-
+
@@ -337,7 +337,7 @@ const rules = {
discount: {
required: true,
type: 'number',
- message: '请输入折扣比例',
+ message: '请输入抵扣比例',
trigger: 'blur',
},
}
@@ -444,32 +444,19 @@ const columns = ref([
align: 'center',
},
{
- title: '积分抵扣',
- slot: 'exchange',
+ title: '抵扣后价格(元)',
+ key: 'discount_price',
align: 'center',
- render: (row) => {
- return h(
- 'span',
- {},
- {
- default: () => (row.exchange ? `${(row.exchange / 100).toFixed(2)}元` : '无'),
- }
- )
- },
},
{
- title: '折扣比例(%)',
- slot: 'discount',
+ title: '积分抵扣（元）',
+ key: 'exchange',
+ align: 'center',
+ },
+ {
+ title: '抵扣比例（%）',
+ key: 'discount',
align: 'center',
- render: (row) => {
- return h(
- 'span',
- {},
- {
- default: () => `${row.discount}%`,
- }
- )
- },
},
{
title: '商品库存',
@@ -667,28 +654,33 @@ const clear = () => {
}
const veeify = async () => {
- let data = {}
- if (nowKey.value === 1 || nowKey.value === 2) {
- data = {
- gid: [nowRow.value.gid],
- status: nowKey.value,
- notes: notesVal.value,
- }
- await api.getHotStatus(data)
- await getList()
- clear()
- } else {
- formRef.value?.validate(async (errors) => {
- if (!errors) {
- data = {
- ...nowRow.value,
- gid: [nowRow.value.gid],
- }
- await api.getHotStatus(data)
- await getList()
- clear()
+ try {
+ let data = {}
+ if (nowKey.value === 1 || nowKey.value === 2) {
+ data = {
+ gid: [nowRow.value.gid],
+ status: nowKey.value,
+ notes: notesVal.value,
}
- })
+ await api.getHotStatus(data)
+ await getList()
+ // clear()
+ } else {
+ formRef.value?.validate(async (errors) => {
+ if (!errors) {
+ data = {
+ ...nowRow.value,
+ gid: [nowRow.value.gid],
+ }
+ await api.getHotStatus(data)
+ await getList()
+ // clear()
+ }
+ })
+ }
+ } finally {
+ isNoteModel.value = false
+ isDzModel.value = false
}
}
diff --git a/src/views/finance/api.js b/src/views/finance/api.js
index 0ef29ae..9dd7e59 100644
--- a/src/views/finance/api.js
+++ b/src/views/finance/api.js
@@ -9,4 +9,6 @@ export default {
ydataEdit: (data) => request.post('/store/amount/withdraw/edit', data),
// 溯源统计
suyuanData: (data) => request.post('/pulse/count', data),
+ // 获取游戏大厅
+ getGameData: (data) => request.post('/game/list', data),
}
diff --git a/src/views/finance/index.vue b/src/views/finance/index.vue
index 6de0ee0..e799815 100644
--- a/src/views/finance/index.vue
+++ b/src/views/finance/index.vue
@@ -8,7 +8,7 @@
@@ -28,18 +28,14 @@
-
+
diff --git a/src/views/finance/suyuan.vue b/src/views/finance/suyuan.vue
index ec87813..bbb339f 100644
--- a/src/views/finance/suyuan.vue
+++ b/src/views/finance/suyuan.vue
@@ -1,5 +1,87 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 豆子状态：
+
+
+
+
+
+
+
+ 活动赠送：
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
import api from './api'
+import dayjs from 'dayjs'
-// const queryData = ref({})
+const queryParams = ref({})
+
+const cardData = ref({})
+
+const selectOptions = [
+ {
+ label: '商家电话',
+ value: 0,
+ },
+ {
+ label: '用户电话',
+ value: 1,
+ },
+]
+
+const songs = ref([
+ {
+ value: 1,
+ label: '未使用',
+ },
+ {
+ value: 3,
+ label: '用户赢',
+ },
+ {
+ value: 4,
+ label: '用户输',
+ },
+ {
+ value: 5,
+ label: '已过期',
+ },
+])
+
+const gamelist = ref([])
+
+const songs1 = ref([
+ {
+ value: 5,
+ label: '注册赠送',
+ },
+ {
+ value: 6,
+ label: '签到赠送',
+ },
+ {
+ value: 7,
+ label: '平台赠送',
+ },
+])
const loading = ref(false)
-const columns = ref([])
+const columns = ref([
+ {
+ title: '游戏名称',
+ align: 'center',
+ slot: 'game_name',
+ render: (row) => {
+ const res = gamelist.value.find((item) => item.value === Number(row.hall_id))
+ return h('span', null, {
+ default: () => res?.label || '',
+ })
+ },
+ },
+ {
+ title: '订单ID',
+ align: 'center',
+ key: 'order_id',
+ },
+ {
+ title: '期数',
+ align: 'center',
+ key: 'periods',
+ },
+ {
+ title: '投注豆子',
+ align: 'center',
+ key: 'number',
+ },
+ {
+ title: '赢积分',
+ align: 'center',
+ key: 'integral',
+ },
+ {
+ title: '用户电话',
+ align: 'center',
+ key: 'user_phone',
+ },
+ {
+ title: '商户电话',
+ align: 'center',
+ key: 'merchant_phone',
+ },
+ {
+ title: '投注时间',
+ align: 'center',
+ key: 'add_time',
+ },
+ {
+ title: '过期时间',
+ align: 'center',
+ slot: 'expire',
+ render: (row) => {
+ return h('span', null, {
+ default: () => dayjs(row.expire).format('YYYY-MM-DD HH:mm:ss'),
+ })
+ },
+ },
+])
const data = ref([])
@@ -35,30 +224,56 @@ const pagination = ref({
onMounted(() => {
getList()
+ getGameList()
})
+const getGameList = async () => {
+ const res = await api.getGameData({ pageSize: 9999999, pageNum: 1 })
+ gamelist.value = res.data.data.map((item) => ({ value: item.ID, label: item.name }))
+}
+
const getList = async () => {
loading.value = true
- // const query_data = {
- // Status: queryData.value.status || '',
- // Phone: queryData.value.word || '',
- // StartTime: queryData.value.time === null ? '' : queryData.value.time[0] || '',
- // EndTime: queryData.value.time === null ? '' : queryData.value.time[1] || '',
- // }
+ const query_data = {
+ ...queryParams.value,
+ StartTime: queryParams.value.time?.[0] || '',
+ EndTime: queryParams.value.time?.[1] || '',
+ }
+
+ switch (queryParams.value.selectKey) {
+ case 0:
+ query_data['merchant_phone'] = queryParams.value.word
+ break
+ case 1:
+ query_data['user_phone'] = queryParams.value.word
+ break
+ }
+
+ delete query_data.time
+ delete query_data.word
const res = await api.suyuanData({
pageNum: pagination.value.page,
pageSize: pagination.value.pageSize,
- // ...query_data,
+ ...query_data,
})
-
- data.value = res.data.data || []
- pagination.value.itemCount = res.data.total
- // cardData.value.total = res.data.all
- // cardData.value.service = res.data.audit_number
- // cardData.value.commission = res.data.audit_commission
- // cardData.value.count = res.data.success_amount
+ data.value = res.data.result || []
+ pagination.value.itemCount = res.data.count
+ cardData.value.win = res.data.win
+ cardData.value.pulse = res.data.pulse
loading.value = false
}
+
+const clear = () => {
+ queryParams.value = {
+ word: '',
+ selectKey: null,
+ Status: '',
+ time: null,
+ Type: '',
+ hall_id: '',
+ }
+ getList()
+}
diff --git a/src/views/order/index/index.vue b/src/views/order/index/index.vue
index 71f23f7..fe253a5 100644
--- a/src/views/order/index/index.vue
+++ b/src/views/order/index/index.vue
@@ -251,10 +251,14 @@ const columns = ref([
render: (row) => h('span', `${row.price}元`),
},
{
- title: '积分抵扣',
+ title: '抵扣后价格(元)',
+ key: 'discount_price',
+ align: 'center',
+ },
+ {
+ title: '积分抵扣',
+ key: 'exchange',
align: 'center',
- slot: 'discount_price',
- render: (row) => h('span', `${row.discount_price}`),
},
{
title: '支付方式',
diff --git a/src/views/system/msgMag/index.vue b/src/views/system/msgMag/index.vue
new file mode 100644
index 0000000..35a41e0
--- /dev/null
+++ b/src/views/system/msgMag/index.vue
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/src/views/user/index/index.vue b/src/views/user/index/index.vue
index d9d21eb..5216a7a 100644
--- a/src/views/user/index/index.vue
+++ b/src/views/user/index/index.vue
@@ -3,21 +3,21 @@
-
+
+
-
+
-
+
+
-
+
筛选条件:
-
+
+
时间筛选：