Browse Source

合并main到feat/lhl

lhl
zry 3 weeks ago
parent
commit
4ee96e5ee2
  1. 7
      gold-system/.env.development
  2. 11
      gold-system/.env.production
  3. 17
      gold-system/.env.test
  4. 70
      gold-system/src/views/goldBeen/goldenBeenConsum.vue
  5. 72
      gold-system/src/views/goldBeen/goldenBeenDetail.vue
  6. 69
      gold-system/src/views/goldBeen/onLineDetail.vue
  7. 1
      gold-system/src/views/index.vue
  8. 16
      gold-system/src/views/login.vue
  9. 59
      gold-system/src/views/managerecharge/activity.vue
  10. 110
      gold-system/src/views/managerecharge/rate.vue
  11. 57
      gold-system/src/views/usergold/index.vue
  12. 34
      gold-system/stats.html

7
gold-system/.env.development

@ -1,5 +1,12 @@
<<<<<<< HEAD
# VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod'
#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/'
# 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/'
>>>>>>> 229c13b945d0e56e10792208bccfdeed0488bca0
# VITE_API_BASE='http://192.168.8.220:8080/'

11
gold-system/.env.production

@ -1,12 +1,3 @@
# VITE_API_BASE='http://54.251.137.151:10702/'
<<<<<<< HEAD
<<<<<<< HEAD
VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod'
=======
VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod'
# VITE_API_BASE='http://192.168.8.220:8080/'
>>>>>>> zry
=======
VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod'
# VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev'
>>>>>>> a117177bbbe1dd3064874e0b27bedb0c3b15c3e3

17
gold-system/.env.test

@ -1,21 +1,6 @@
<<<<<<< HEAD
<<<<<<< HEAD
#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_prod'
# VITE_API_BASE='http://54.251.137.151:10704/'
# VITE_API_BASE='http://192.168.8.232:8080/'
=======
# 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_prod'
# VITE_API_BASE='http://54.251.137.151:10704/'
# VITE_API_BASE='http://192.168.8.220:8080/'
>>>>>>> zry
=======
# VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod'
#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://192.168.8.232:8080/'
>>>>>>> a117177bbbe1dd3064874e0b27bedb0c3b15c3e3

70
gold-system/src/views/goldBeen/goldenBeenConsum.vue

@ -66,17 +66,30 @@
style="width: 220px"
/>
</el-form-item>
<el-form-item prop="createTime">
<el-text class="mx-1" size="large">消费时间</el-text>
<el-form-item prop="startTime">
<el-text class="mx-1" size="large">开始时间</el-text>
<el-date-picker
v-model="detailY.createTime"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="YYYY-MM-DD HH:mm:ss"
v-model="detailY.startTime"
type="date"
placeholder="开始日期"
style="width: 240px"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
/>
</el-form-item>
<el-form-item prop="endTime">
<el-text class="mx-1" size="large">结束时间</el-text>
<el-date-picker
v-model="detailY.endTime"
type="date"
placeholder="结束日期"
style="width: 240px"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
/>
<el-button style="margin-left: 10px" @click="getToday()"></el-button>
<el-button @click="getYesterday()"></el-button>
<el-button @click="get7Days()">近7天</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="search">查询</el-button>
@ -185,7 +198,8 @@ const ruleFormRef = ref<FormInstance>()
const detailY = ref({
jwcode: '',
ipAddress: '',
createTime: '',
startTime:'',
endTime:'',
// channel: '', //
sourceName: '', //
sourceType: '' //
@ -194,11 +208,45 @@ const getObj = ref({
pageNum: 1,
pageSize: 50
})
//
const getToday = function () {
const today = new Date()
//
const startDate = moment(today).startOf('day').format('YYYY-MM-DD HH:mm:ss')
//
const endDate = moment(today).endOf('day').format('YYYY-MM-DD HH:mm:ss')
detailY.value.startTime = startDate
detailY.value.endTime = endDate
search()
}
//
const getYesterday = function () {
const yesterday = moment().subtract(1, 'days')
//
const startDate = yesterday.startOf('day').format('YYYY-MM-DD HH:mm:ss')
//
const endDate = yesterday.endOf('day').format('YYYY-MM-DD HH:mm:ss')
detailY.value.startTime = startDate
detailY.value.endTime = endDate
search()
}
// 7
const get7Days = function () {
//
const startDate = moment().subtract(6, 'days').startOf('day').format('YYYY-MM-DD HH:mm:ss')
//
const endDate = moment().endOf('day').format('YYYY-MM-DD HH:mm:ss')
detailY.value.startTime = startDate
detailY.value.endTime = endDate
search()
}
//
const getInit = async function () {
try {
console.log('搜索参数', getObj.value)
const [startTime, endTime] = detailY.value.createTime
const startTime = detailY.value.startTime
const endTime = detailY.value.endTime
// POST
const result = await API({
url: '/dou/getSpend',
@ -263,8 +311,8 @@ const getCount = async () => {
ipAddress: detailY.value.ipAddress,
sourceName: detailY.value.sourceName,
sourceType: detailY.value.sourceType,
startTime: detailY.value.createTime[0],
endTime: detailY.value.createTime[1]
startTime: detailY.value.startTime,
endTime: detailY.value.endTime
}
})
if (result.code == 200) {

72
gold-system/src/views/goldBeen/goldenBeenDetail.vue

@ -57,19 +57,31 @@
/>
</el-select>
</el-form-item> -->
<el-form-item prop="createTime">
<el-text class="mx-1" size="large">充值时间</el-text>
<el-form-item prop="startTime">
<el-text class="mx-1" size="large">开始时间</el-text>
<el-date-picker
v-model="detailY.createTime"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
v-model="detailY.startTime"
type="date"
placeholder="开始日期"
style="width: 240px"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
:unlinkPanels="true"
/>
</el-form-item>
<el-form-item prop="endTime">
<el-text class="mx-1" size="large">结束时间</el-text>
<el-date-picker
v-model="detailY.endTime"
type="date"
placeholder="结束日期"
style="width: 240px"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
/>
</el-form-item>
<el-button style="margin-left: 10px" @click="getToday()"></el-button>
<el-button @click="getYesterday()"></el-button>
<el-button @click="get7Days()">近7天</el-button>
<el-form-item>
<el-button type="primary" @click="search">查询</el-button>
<el-button type="success" @click="reset(ruleFormRef)">重置</el-button>
@ -229,7 +241,38 @@ const rules = ref({
jwcode: [{ required: true, message: '请输入精网号', trigger: 'blur' }],
area: [{ required: true, message: '请选择所属地区', trigger: 'change' }]
})
//
//
const getToday = function () {
const today = new Date()
//
const startDate = moment(today).startOf('day').format('YYYY-MM-DD HH:mm:ss')
//
const endDate = moment(today).endOf('day').format('YYYY-MM-DD HH:mm:ss')
detailY.value.startTime = startDate
detailY.value.endTime = endDate
search()
}
//
const getYesterday = function () {
const yesterday = moment().subtract(1, 'days')
//
const startDate = yesterday.startOf('day').format('YYYY-MM-DD HH:mm:ss')
//
const endDate = yesterday.endOf('day').format('YYYY-MM-DD HH:mm:ss')
detailY.value.startTime = startDate
detailY.value.endTime = endDate
search()
}
// 7
const get7Days = function () {
//
const startDate = moment().subtract(6, 'days').startOf('day').format('YYYY-MM-DD HH:mm:ss')
//
const endDate = moment().endOf('day').format('YYYY-MM-DD HH:mm:ss')
detailY.value.startTime = startDate
detailY.value.endTime = endDate
search()
}
const getArea = async () => {
try {
const result = await API({
@ -271,7 +314,8 @@ const detailY = ref({
orderNo: '',
payStyle: '',
type: '',
createTime: ''
startTime: '',
endTime: ''
})
const getObj = ref({
pageNum: 1,
@ -363,8 +407,6 @@ const getInit = async function (
) {
try {
console.log('搜索参数', getObj.value)
const [startTime, endTime] = detailY.value.createTime
console.log(startTime, endTime)
// POST
const result = await API({
url: '/dou/getPay',
@ -372,8 +414,8 @@ const getInit = async function (
pay: {
jwcode: isExport.value ? excelData.jwcode : detailY.value.jwcode,
deptName: isExport.value ? excelData.area : detailY.value.deptName,
startTime: isExport.value ? excelData.startTime : startTime || '',
endTime: isExport.value ? excelData.endTime : endTime || '',
startTime: isExport.value ? excelData.startTime : detailY.value.startTime || '',
endTime: isExport.value ? excelData.endTime : detailY.value.endTime || '',
payStyle: isExport.value ? '' : detailY.value.payStyle,
type: isExport.value ? '' : detailY.value.type,
orderNo: isExport.value ? '' : detailY.value.orderNo,
@ -448,8 +490,8 @@ const getCount = async () => {
data: {
jwcode: detailY.value.jwcode,
deptName: detailY.value.deptName,
startTime: detailY.value.createTime[0],
endTime: detailY.value.createTime[1],
startTime: detailY.value.startTime,
endTime: detailY.value.endTime,
orderNo: detailY.value.orderNo,
type: detailY.value.type
// payStyle: detailY.value.payStyle

69
gold-system/src/views/goldBeen/onLineDetail.vue

@ -60,19 +60,31 @@
/>
</el-select>
</el-form-item>
<el-form-item prop="createTime">
<el-text class="mx-1" size="large">充值时间</el-text>
<el-form-item prop="startTime">
<el-text class="mx-1" size="large">开始时间</el-text>
<el-date-picker
v-model="detailY.createTime"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
v-model="detailY.startTime"
type="date"
placeholder="开始日期"
style="width: 240px"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
:unlinkPanels="true"
/>
</el-form-item>
<el-form-item prop="endTime">
<el-text class="mx-1" size="large">结束时间</el-text>
<el-date-picker
v-model="detailY.endTime"
type="date"
placeholder="结束日期"
style="width: 240px"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
/>
<el-button style="margin-left: 10px" @click="getToday()"></el-button>
<el-button @click="getYesterday()"></el-button>
<el-button @click="get7Days()">近7天</el-button>
</el-form-item>
<el-col :span="10">
<el-form-item>
<el-button type="primary" @click="search">查询</el-button>
@ -230,6 +242,38 @@ const rules = ref({
jwcode: [{ required: true, message: '请输入精网号', trigger: 'blur' }],
area: [{ required: true, message: '请选择所属地区', trigger: 'change' }]
})
//
const getToday = function () {
const today = new Date()
//
const startDate = moment(today).startOf('day').format('YYYY-MM-DD HH:mm:ss')
//
const endDate = moment(today).endOf('day').format('YYYY-MM-DD HH:mm:ss')
detailY.value.startTime = startDate
detailY.value.endTime = endDate
search()
}
//
const getYesterday = function () {
const yesterday = moment().subtract(1, 'days')
//
const startDate = yesterday.startOf('day').format('YYYY-MM-DD HH:mm:ss')
//
const endDate = yesterday.endOf('day').format('YYYY-MM-DD HH:mm:ss')
detailY.value.startTime = startDate
detailY.value.endTime = endDate
search()
}
// 7
const get7Days = function () {
//
const startDate = moment().subtract(6, 'days').startOf('day').format('YYYY-MM-DD HH:mm:ss')
//
const endDate = moment().endOf('day').format('YYYY-MM-DD HH:mm:ss')
detailY.value.startTime = startDate
detailY.value.endTime = endDate
search()
}
const handlePageSizeChange = (val) => {
getObj.value.pageSize = val
getObj.value.pageNum = 1
@ -263,7 +307,8 @@ const detailY = ref({
orderNo: '',
payStyle: '',
type: '',
createTime: ''
startTime: '',
endTime: ''
})
const getObj = ref({
pageNum: 1,
@ -355,7 +400,9 @@ const getInit = async function (
) {
try {
console.log('搜索参数', getObj.value)
const [startTime, endTime] = detailY.value.createTime
const startTime = detailY.value.startTime
const endTime = detailY.value.endTime
console.log(startTime, endTime)
// POST
const result = await API({
@ -458,8 +505,8 @@ const getCount = async () => {
data: {
jwcode: detailY.value.jwcode,
deptName: detailY.value.deptName,
startTime: detailY.value.createTime[0],
endTime: detailY.value.createTime[1],
startTime: detailY.value.startTime,
endTime: detailY.value.endTime,
orderNo: detailY.value.orderNo,
payStyle: detailY.value.payStyle
}

1
gold-system/src/views/index.vue

@ -22,6 +22,7 @@ const { currentArea, updateArea } = storeToRefs(areaStore)
const adminData = ref({
name: ''
})
const getAdminData = async function () {
try {
const result = await API({ url: '/admin/userinfo', data: {} })

16
gold-system/src/views/login.vue

@ -225,3 +225,19 @@ More comprehensive version at shenanigans.shoghisimon.ca/collection/css
background-size: 100% 2px, 100% 100%, 100% 100%;
}
</style>
<!-- 这是补救
const run = () => {
const width = window.innerWidth;
const height = window.innerHeight;
const chartNode = document.querySelector("main");
drawChart.default(chartNode,data,width,height);
};
window.addEventListener("resize", run);
document.addEventListener("DOMContentLoaded", run);
</script>
</body>
</html>
-->

59
gold-system/src/views/managerecharge/activity.vue

@ -95,7 +95,58 @@ const get = async function (val) {
ElMessage.error('请求失败')
}
}
//
const getToday = function () {
const today = new Date()
const startDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate()
)
const endDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() + 1
)
getTime.value = [startDate, endDate]
console.log('getTime', getTime.value)
get()
}
//
const getYesterday = function () {
const yesterday = new Date()
yesterday.setDate(yesterday.getDate() - 1)
const startDate = new Date(
yesterday.getFullYear(),
yesterday.getMonth(),
yesterday.getDate()
)
const endDate = new Date(
yesterday.getFullYear(),
yesterday.getMonth(),
yesterday.getDate() + 1
)
getTime.value = [startDate, endDate]
console.log('getTime', getTime.value)
get()
}
// 7
const get7Days = function () {
const today = new Date()
const startDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() - 6
)
const endDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() + 1
)
getTime.value = [startDate, endDate]
console.log('getTime', getTime.value)
get()
}
//
const trim = () => {
if (activity.value.activityName) {
@ -223,6 +274,11 @@ const del = (row) => {
start-placeholder="起始时间"
end-placeholder="结束时间"
/>
<el-button style="margin-left: 10px" @click="getToday()"
></el-button
>
<el-button @click="getYesterday()"></el-button>
<el-button @click="get7Days()">近7天</el-button>
</div>
<div class="head-card-btn">
<el-button type="success" @click="reset()">重置</el-button>
@ -268,6 +324,7 @@ const del = (row) => {
{{ moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') }}
</template>
</el-table-column>
<el-table-column prop="rechargeRatio" label="免费兑换比">
<template #default="scope">
<span>{{ scope.row.rechargeRatio }}:1</span>

110
gold-system/src/views/managerecharge/rate.vue

@ -22,7 +22,7 @@ const getAdminData = async function () {
rateAdd.value.adminId = adminData.value.adminId
rateEdit.value.adminId = adminData.value.adminId
console.log('请求成功', result)
console.log('用户信息', user.value)
// console.log('', user.value)
} catch (error) {
console.log('请求失败', error)
}
@ -31,7 +31,6 @@ getAdminData()
const regeAdd = ref(false)
const regeEdit = ref(false)
//
const tableData = ref([])
//
@ -39,10 +38,11 @@ const getObj = ref({
pageNum: 1,
pageSize: 10
})
const total = ref(0)
//
//
//
const value1 = ref({
startTime: '',
endTime: ''
@ -58,45 +58,102 @@ function handleDateChange(value) {
const time = ref({})
const get = async function (val) {
//
if (value1.value != null) {
if (value1.value.startDate != '' && value1.value.endDate != '') {
time.value.startTime = value1.value[0]
time.value.endTime = value1.value[1]
}
if (value1.value && value1.value.length === 2) {
time.value.startTime = value1.value[0];
time.value.endTime = value1.value[1];
} else {
time.value.startTime = ''
time.value.endTime = ''
time.value.startTime = '';
time.value.endTime = '';
}
try {
//
if (typeof val === 'number') {
getObj.value.pageNum = val
getObj.value.pageNum = val;
}
console.log('搜索参数', getObj.value)
console.log('搜索参数', {
...getObj.value,
rate: { ...time.value }
});
// POST
const result = await request({
url: '/rates/search',
method: 'POST',
data: {
...getObj.value,
rate: { ...time.value }
}
})
});
//
console.log('请求成功', result)
console.log('请求成功', result);
//
tableData.value = result.data.list
console.log('tableData', tableData.value)
// UI
tableData.value = result.data.list;
console.log('tableData', tableData.value);
//
total.value = result.data.total
console.log('total', total.value)
total.value = result.data.total;
console.log('total', total.value);
} catch (error) {
console.log('请求失败', error)
//
console.log('请求失败', error);
ElMessage.error('请求失败');
}
}
//
const getToday = function () {
const today = new Date();
const startDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate()
);
const endDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() + 1
);
// value1!!value1!!lhl
value1.value = [startDate, endDate];
console.log('value1', value1.value);
get();
}
//
const getYesterday = function () {
const yesterday = new Date();
yesterday.setDate(yesterday.getDate() - 1);
const startDate = new Date(
yesterday.getFullYear(),
yesterday.getMonth(),
yesterday.getDate()
);
const endDate = new Date(
yesterday.getFullYear(),
yesterday.getMonth(),
yesterday.getDate() + 1
);
// value1
value1.value = [startDate, endDate];
console.log('value1', value1.value);
get();
}
// 7
const get7Days = function () {
const today = new Date();
const startDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() - 6
);
const endDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() + 1
);
// value1
value1.value = [startDate, endDate];
console.log('value1', value1.value);
get();
}
//
const search = function () {
getObj.value.pageNum = 1
@ -464,21 +521,22 @@ function handleInput(value) {
:size="size"
value-format="YYYY-MM-DD"
/>
<el-button style="margin-left: 10px" @click="getToday"></el-button>
<el-button @click="getYesterday"></el-button>
<el-button @click="get7Days">近7天</el-button>
<!-- 按钮 -->
<el-button
class="button-item"
type="primary"
style="float: right"
@click="search()"
>查询</el-button
>
@click="search"
>查询</el-button>
<el-button
class="button-item"
type="success"
style="float: right"
@click="handledelete"
>重置</el-button
>
>重置</el-button>
</div>
</el-card>
</el-col>

57
gold-system/src/views/usergold/index.vue

@ -148,6 +148,58 @@ const reset = function () {
getTime.value = []
delete detailY.value.consumePlatform
}
//
const getToday = function () {
const today = moment()
const startDate = today.startOf('day').toDate()
const endDate = today.endOf('day').toDate()
getTime.value = [startDate, endDate]
search()
}
//
const getYesterday = function () {
const yesterday = moment().subtract(1, 'day')
const startDate = yesterday.startOf('day').toDate()
const endDate = yesterday.endOf('day').toDate()
getTime.value = [startDate, endDate]
search()
}
// 7
const get7Days = function () {
const startDate = moment().subtract(6, 'day').startOf('day').toDate()
const endDate = moment().endOf('day').toDate()
getTime.value = [startDate, endDate]
search()
}
//
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: '请检查输入内容'
})
}
}
//
onMounted(async function () {
@ -554,8 +606,11 @@ const handleCurrentChange = function (val) {
range-separator="至"
start-placeholder="起始时间"
end-placeholder="结束时间"
style="margin-right: 700px"
style="margin-right: 10px"
/>
<el-button type="success" @click="getToday()"></el-button>
<el-button type="success" @click="getYesterday()"></el-button>
<el-button type="success" @click="get7Days()">近7天</el-button>
<el-button type="success" @click="exportExcel">导出Excel表格</el-button>
<el-button type="success" @click="reset()">重置</el-button>
<el-button type="primary" @click="search()">查询</el-button>

34
gold-system/stats.html
File diff suppressed because it is too large
View File

Loading…
Cancel
Save