Browse Source

添加会员权益界面

master
Penny 2 years ago
parent
commit
a92e455de9
  1. 13
      src/api/rights/configService.js
  2. 3
      src/main.js
  3. 15
      src/utils/ruoyi.js
  4. 3
      src/views/rights/aliPayOrder/index.vue
  5. 13
      src/views/rights/aliPaySigningOrder/index.vue
  6. 66
      src/views/rights/configService/index.vue
  7. 39
      src/views/rights/link/index.vue
  8. 3
      src/views/rights/rightsOrder/index.vue

13
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'
})
}

3
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

15
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) {

3
src/views/rights/aliPayOrder/index.vue

@ -113,6 +113,7 @@
<script>
import { listAliPayOrder } from "@/api/rights/aliPayOrder";
import { addRightsDateRange } from "@/utils/ruoyi";
export default {
name: "aliPayOrder",
@ -180,7 +181,7 @@ export default {
/** 查询aliQPayOrder列表 */
getList() {
this.loading = true;
listAliPayOrder(this.addDateRange(this.queryParams,this.dateTimeRange)).then(response => {
listAliPayOrder(this.addRightsDateRange(this.queryParams,this.dateTimeRange)).then(response => {
this.aliPayOrderList = response.records;
this.total = response.total;
this.loading = false;

13
src/views/rights/aliPaySigningOrder/index.vue

@ -52,7 +52,7 @@
<el-form-item label="订单时间">
<el-date-picker
v-model="dateTimeRange"
v-model="dateTimeRangeOrder"
style="width: 240px"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
@ -64,7 +64,7 @@
<el-form-item label="下次支付时间" label-width="100px">
<el-date-picker
v-model="dateTimeRange"
v-model="dateTimeRangeNext"
style="width: 240px"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
@ -130,6 +130,7 @@
<script>
import { listAliPaySigningOrder } from "@/api/rights/aliPaySigningOrder";
import { addRightsDateRange } from "@/utils/ruoyi";
export default {
name: "aliPaySigningOrder",
@ -152,7 +153,8 @@ export default {
//
open: false,
//
dateTimeRange: [],
dateTimeRangeOrder: [],
dateTimeRangeNext: [],
//
status: [
{ value:'0',label:'失败'},
@ -200,7 +202,7 @@ export default {
/** 查询aliQPayOrder列表 */
getList() {
this.loading = true;
listAliPaySigningOrder(this.addDateRange(this.queryParams,this.dateTimeRange)).then(response => {
listAliPaySigningOrder(this.addRightsDateRange(this.queryParams,this.dateTimeRangeOrder,this.dateTimeRangeNext)).then(response => {
this.aliPaySigningOrderList = response.records;
this.total = response.total;
this.loading = false;
@ -214,7 +216,8 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.dateTimeRange = [];
this.dateTimeRangeOrder = [];
this.dateTimeRangeNext = [];
this.resetForm("queryForm");
this.handleQuery();
},

66
src/views/rights/configService/index.vue

@ -20,27 +20,6 @@
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['rights:link:add']"
>新增</el-button>
</el-col> -->
<!-- <el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['img:banner:delete']"
>删除</el-button>
</el-col> -->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>
@ -68,13 +47,6 @@
</el-table-column>
</el-table>
<!-- <pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/> -->
</el-col>
</el-row>
@ -83,23 +55,16 @@
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
<el-col :span="12">
<el-form-item label="链接id" prop="linkId">
<el-input v-model="form.linkId" placeholder="请输入链接id" maxlength="30" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="链接名字" prop="linkName">
<el-input v-model="form.linkName" placeholder="请输入链接名字" maxlength="100" />
<el-form-item label="配置名称" prop="configName">
<el-input v-model="form.configName" placeholder="请输入配置名称" maxlength="30" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="所属公司" prop="affiliationCompanyName">
<el-input v-model="form.affiliationCompanyName" placeholder="请输入所属公司" maxlength="100" />
<el-form-item label="链接数据" prop="configValue">
<el-input v-model="form.configValue" placeholder="请输入链接数据" maxlength="100" />
</el-form-item>
</el-col>
</el-row>
<!-- <el-row> -->
<!-- </el-row> -->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
@ -110,7 +75,7 @@
</template>
<script>
import { listConfigService, editConfigService } from "@/api/rights/configService";
import { listConfigService, editConfigService,detailsConfigService } from "@/api/rights/configService";
export default {
name: "configService",
@ -134,15 +99,13 @@ export default {
title: "",
//
open: false,
//
dateRange: [],
//
form: {},
//
queryParams: {
pageNum: 1,
pageSize: 10,
configName: undefined
configName: 'hj'
},
//
columns: [
@ -180,6 +143,18 @@ export default {
if (!value) return true;
return data.label.indexOf(value) !== -1;
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids;
detailsConfigService(id).then(response => {
this.form = response.data;
console.log('form',response.data)
this.open = true;
this.title = "修改核减配置";
});
},
//
cancel() {
this.open = false;
@ -188,9 +163,8 @@ export default {
//
reset() {
this.form = {
linkId : undefined,
linkName: undefined,
affiliationCompanyName: undefined
configName : undefined,
configValue: undefined
};
this.resetForm("form");
},

39
src/views/rights/link/index.vue

@ -70,39 +70,8 @@
<el-table-column label="链接id" align="center" key="linkId" prop="linkId" v-if="columns[1].visible" width="300"/>
<el-table-column label="链接名称" align="center" key="linkName" prop="linkName" v-if="columns[2].visible" width="300"/>
<el-table-column label="所属公司" align="center" key="affiliationCompanyName" prop="affiliationCompanyName" v-if="columns[3].visible" width="200"/>
<!-- <el-table-column
label="操作"
align="center"
width="160"
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['img:banner:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['img:banner:delete']"
>删除</el-button>
</template>
</el-table-column> -->
</el-table>
<!-- <pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/> -->
</el-col>
</el-row>
@ -167,10 +136,10 @@ export default {
//
form: {},
//
// queryParams: {
// pageNum: 1,
// pageSize: 10
// },
queryParams: {
pageNum: 1,
pageSize: 10
},
//
columns: [
{ key: 0, label: `id`, visible: true },

3
src/views/rights/rightsOrder/index.vue

@ -82,6 +82,7 @@
<script>
import { listRightsOrder } from "@/api/rights/rightsOrder";
import { addRightsDateRange } from "@/utils/ruoyi";
export default {
name: "rightsOrder",
@ -141,7 +142,7 @@ export default {
/** 查询RightsOrder列表 */
getList() {
this.loading = true;
listRightsOrder(this.addDateRange(this.queryParams,this.dateTimeRange)).then(response => {
listRightsOrder(this.addRightsDateRange(this.queryParams,this.dateTimeRange)).then(response => {
this.rightsOrderList = response.records;
this.total = response.total;
this.loading = false;

Loading…
Cancel
Save