diff --git a/src/api/rights/configService.js b/src/api/rights/configService.js index b0060e3..1210762 100644 --- a/src/api/rights/configService.js +++ b/src/api/rights/configService.js @@ -5,8 +5,17 @@ const prefix = '/configService'; // 查询对应的配置内容 export function listConfigService(configName) { return request({ - url: `${serviceTitle}${prefix}/list?configName=`+ configName, - method: 'post' + url: `${serviceTitle}${prefix}/list?configName=`, + method: 'post', + data: configName + }) +} + +// 查询核减配置详情 +export function detailsConfigService(id) { + return request({ + url: `${serviceTitle}${prefix}/details/${id}`, + method: 'get' }) } diff --git a/src/main.js b/src/main.js index 13c6cf2..8d1ab2c 100644 --- a/src/main.js +++ b/src/main.js @@ -18,7 +18,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, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi"; +import { parseTime, resetForm, addDateRange,addRightsDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi"; // 分页组件 import Pagination from "@/components/Pagination"; // 自定义表格工具组件 @@ -44,6 +44,7 @@ Vue.prototype.getConfigKey = getConfigKey Vue.prototype.parseTime = parseTime Vue.prototype.resetForm = resetForm Vue.prototype.addDateRange = addDateRange +Vue.prototype.addRightsDateRange = addRightsDateRange Vue.prototype.selectDictLabel = selectDictLabel Vue.prototype.selectDictLabels = selectDictLabels Vue.prototype.download = download diff --git a/src/utils/ruoyi.js b/src/utils/ruoyi.js index e001def..e916744 100644 --- a/src/utils/ruoyi.js +++ b/src/utils/ruoyi.js @@ -68,6 +68,21 @@ export function addDateRange(params, dateRange, propName) { return search; } +// 会员权益专属添加日期范围 +export function addRightsDateRange(params, dateRange, dateNextRange) { + let search = params; + search = typeof (search) === 'object' && search !== null && !Array.isArray(search) ? search : {}; + dateRange = Array.isArray(dateRange) ? dateRange : []; + if(typeof (dateRange) != 'undefined'){ + search['beginTime'] = dateRange[0]; + search['endTime'] = dateRange[1]; + }if(typeof (dateNextRange) != 'undefined'){ + search['beginSearchNextPayTime'] = dateNextRange[0]; + search['endSearchNextPayTime'] = dateNextRange[1]; + } + return search; +} + // 回显数据字典 export function selectDictLabel(datas, value) { if (value === undefined) { diff --git a/src/views/rights/aliPayOrder/index.vue b/src/views/rights/aliPayOrder/index.vue index 0bb0599..b78fd87 100644 --- a/src/views/rights/aliPayOrder/index.vue +++ b/src/views/rights/aliPayOrder/index.vue @@ -113,6 +113,7 @@