diff --git a/README.md b/README.md index ce9db79..cfcd484 100644 --- a/README.md +++ b/README.md @@ -58,9 +58,9 @@ https://github.com/zccbbg/ruoyi-mall * 开发团队成立5年，我们前端开发、后端架构，有一颗热爱开源的心，致力于打造企业级的通用产品设计UI体系让项目 或者更直观，更高效、更简单，未来将持续关注UI交互，持续推出高质量的交互产品。 * 这五年我主要做isv对接淘宝、拼多多、抖音、美团等平台的订单处理应用，日处理订单300w条，因为要熟悉业务也开过淘宝和拼多多店铺运营了一个网易严选的品牌。我们的公众号会陆续更新一些我一边撸代码一边做客服的经历。也会更新一些我的读书笔记以及编程、创业、生活中踩坑的文章。另外还会开放一些米哈游、博世、企查查、同程、阿里、京东、拼多多等大厂、中厂或外企的内推岗位！ -## 技术支持 +## 加群/技术支持 | 公众号 | |:------------------------------------------:| | | -扫公众号二维码，关注后回复：“支持” +扫公众号二维码，关注后回复：“支持”或者“加群” diff --git a/src/api/aws/systemStatistics.js b/src/api/aws/systemStatistics.js new file mode 100644 index 0000000..8a5832b --- /dev/null +++ b/src/api/aws/systemStatistics.js @@ -0,0 +1,54 @@ +import request from '@/utils/request' + +// 查询系统数据统计列表 +export function listAwsSystemStatistics(query, pageReq) { + return request({ + url: '/aws/systemStatistics/list', + method: 'post', + data: query, + params: pageReq + }) +} + +// 查询系统数据统计详细 +export function getAwsSystemStatistics(id) { + return request({ + url: '/aws/systemStatistics/' + id, + method: 'get' + }) +} + +// 新增系统数据统计 +export function addAwsSystemStatistics(data) { + return request({ + url: '/aws/systemStatistics', + method: 'post', + data: data + }) +} + +// 修改系统数据统计 +export function updateAwsSystemStatistics(data) { + return request({ + url: '/aws/systemStatistics', + method: 'put', + data: data + }) +} + +// 删除系统数据统计 +export function delAwsSystemStatistics(id) { + return request({ + url: '/aws/systemStatistics/' + id, + method: 'delete' + }) +} + +// 导出系统数据统计 +export function exportAwsSystemStatistics(query) { + return request({ + url: '/aws/systemStatistics/export', + method: 'get', + params: query + }) +} diff --git a/src/api/ums/member.js b/src/api/ums/member.js index d26648a..28a4a32 100644 --- a/src/api/ums/member.js +++ b/src/api/ums/member.js @@ -35,6 +35,13 @@ export function updateUmsMember(data) { data: data }) } +export function updateUmsMemberMark(data) { + return request({ + url: '/ums/member/mark/update', + method: 'post', + data: data + }) +} // 删除会员信息 export function delUmsMember(id) { diff --git a/src/main.js b/src/main.js index 34530f4..2a866b5 100644 --- a/src/main.js +++ b/src/main.js @@ -19,7 +19,7 @@ import './assets/icons' // icon import './permission' // permission control import { getDicts } from "@/api/system/dict/data"; import { getConfigKey } from "@/api/system/config"; -import { parseTime, resetForm, addDateRange, addDateRange2, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi"; +import { parseTime, resetForm, addDateRange, addDateRange2, addDateRange3, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi"; import { getHiddenName, getHiddenDetailAddress } from '@/utils/DataHidden' // 分页组件 import Pagination from "@/components/Pagination"; @@ -56,6 +56,7 @@ Vue.prototype.selectDictLabels = selectDictLabels Vue.prototype.download = download Vue.prototype.handleTree = handleTree Vue.prototype.addDateRange2 = addDateRange2 +Vue.prototype.addDateRange3 = addDateRange3 Vue.prototype.getHiddenName = getHiddenName Vue.prototype.getHiddenDetailAddress = getHiddenDetailAddress diff --git a/src/utils/ruoyi.js b/src/utils/ruoyi.js index f5fbd75..0eba27e 100644 --- a/src/utils/ruoyi.js +++ b/src/utils/ruoyi.js @@ -81,6 +81,19 @@ export function addDateRange2(params, dateRange, addDay=true) { return search; } +export function addDateRange3(params, dateRange, addDay=true) { + let search = params; + dateRange = Array.isArray(dateRange) ? dateRange : []; + if (addDay) { + search['beginTime'] = dateRange[0] + ' 00:00:00'; + search['endTime'] = moment(dateRange[1]).add(1,"days").format('yyyy-MM-DD')+ ' 00:00:00'; + } else { + search['beginTime'] = dateRange[0]+ ' 00:00:00'; + search['endTime'] = dateRange[1]+ ' 00:00:00'; + } + return search; +} + // 回显数据字典 export function selectDictLabel(datas, value) { if (value === undefined) { diff --git a/src/views/aws/systemStatistics/index.vue b/src/views/aws/systemStatistics/index.vue new file mode 100644 index 0000000..404b988 --- /dev/null +++ b/src/views/aws/systemStatistics/index.vue @@ -0,0 +1,248 @@ + + + diff --git a/src/views/oms/aftersale/index.vue b/src/views/oms/aftersale/index.vue index b642751..8a9cb03 100644 --- a/src/views/oms/aftersale/index.vue +++ b/src/views/oms/aftersale/index.vue @@ -46,6 +46,7 @@ diff --git a/src/views/oms/order/index.vue b/src/views/oms/order/index.vue index e69b169..4dcf9ae 100644 --- a/src/views/oms/order/index.vue +++ b/src/views/oms/order/index.vue @@ -64,6 +64,12 @@ + + + - + - + - + + + +