Skip to content

J
jinfa-admin
Commit 72b71a27 authored by Bill's avatar Bill
Browse files
Options

Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-system into dev

parents 7782ad98 ce8b7035
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 508 additions and 302 deletions
src/components/NiceForm/components/AntUpload/index.tsx
View file @ 72b71a27
......@@ -111,7 +111,7 @@ const normalizeFileList = fileList => {
status: file.status,
name: file.name,
url: file.downloadURL || file.imgURL || file.url,
...file.response,
...file.response.data,
thumbUrl: file.imgURL || getImageByUrl(file.downloadURL || file.url, {
exclude: ['.png', '.jpg', '.jpeg', '.gif']
})
......
src/pages/comment/manage/schema/index.tsx
View file @ 72b71a27
import { ISchema } from '@formily/antd';
import { FORM_FILTER_PATH } from '@/formSchema/const';
export const listSearchSchema: ISchema = {
type: 'object',
properties: {
megaLayout: {
type: 'object',
'x-component': 'mega-layout',
properties: {
TOPLAYOUT: {
type: 'object',
'x-component': 'Mega-Layout',
'x-component-props': {
grid: true,
},
properties: {
ctl: {
type: 'object',
'x-component': 'Children',
'x-component-props': {
children: '{{controllerBtns}}',
},
},
product: {
type: 'string',
'x-component': 'Search',
'x-component-props': {
placeholder: '搜索',
tip: '输入 交易商品 进行搜索',
},
},
},
},
[FORM_FILTER_PATH]: {
type: 'object',
'x-component': 'Flex-Layout',
'x-component-props': {
colStyle: {
marginLeft: 20,
},
},
properties: {
subMemberName: {
type: 'string',
default: undefined,
'x-component-props': {
placeholder: '被评价方',
allowClear: true,
},
},
memberName: {
type: 'string',
default: undefined,
'x-component-props': {
placeholder: '评价方',
allowClear: true,
},
},
star: {
type: 'string',
default: undefined,
enum: [
{
label: '一星',
value: 1,
},
{
label: '二星',
value: 2,
},
{
label: '三星',
value: 3,
},
{
label: '四星',
value: 4,
},
{
label: '五星',
value: 5,
},
],
'x-component-props': {
placeholder: '评价星级(全部)',
allowClear: true,
},
},
'[createTimeStart, createTimeEnd]': {
type: 'string',
default: '',
'x-component': 'dateSelect',
'x-component-props': {
placeholder: '评价时间(全部)',
allowClear: true,
},
},
'[dealTimeStart, dealTimeEnd]': {
type: 'string',
default: '',
'x-component': 'dateSelect',
'x-component-props': {
placeholder: '交易时间(全部)',
allowClear: true,
},
},
'comment': {
type: 'string',
default: '',
'x-component-props': {
placeholder: '评价内容',
allowClear: true,
},
},
submit: {
'x-component': 'Submit',
'x-mega-props': {
span: 1,
},
'x-component-props': {
children: '查询',
},
},
},
},
},
},
},
import { ISchema } from '@formily/antd';
import { FORM_FILTER_PATH } from '@/formSchema/const';
export const listSearchSchema: ISchema = {
type: 'object',
properties: {
megaLayout: {
type: 'object',
'x-component': 'mega-layout',
properties: {
TOPLAYOUT: {
type: 'object',
'x-component': 'Mega-Layout',
'x-component-props': {
grid: true,
},
properties: {
ctl: {
type: 'object',
'x-component': 'Children',
'x-component-props': {
children: '{{controllerBtns}}',
},
},
product: {
type: 'string',
'x-component': 'Search',
'x-component-props': {
placeholder: '搜索',
tip: '输入 交易商品 进行搜索',
},
},
},
},
[FORM_FILTER_PATH]: {
type: 'object',
'x-component': 'Flex-Layout',
'x-component-props': {
colStyle: {
marginLeft: 20,
},
},
properties: {
subMemberName: {
type: 'string',
default: undefined,
'x-component-props': {
placeholder: '被评价方',
allowClear: true,
style: {
width: 160,
},
},
},
memberName: {
type: 'string',
default: undefined,
'x-component-props': {
placeholder: '评价方',
allowClear: true,
style: {
width: 160,
},
},
},
star: {
type: 'string',
default: undefined,
enum: [
{
label: '一星',
value: 1,
},
{
label: '二星',
value: 2,
},
{
label: '三星',
value: 3,
},
{
label: '四星',
value: 4,
},
{
label: '五星',
value: 5,
},
],
'x-component-props': {
placeholder: '评价星级(全部)',
allowClear: true,
style: {
width: 160,
},
},
},
'[createTimeStart, createTimeEnd]': {
type: 'string',
default: '',
'x-component': 'dateSelect',
'x-component-props': {
placeholder: '评价时间(全部)',
allowClear: true,
style: {
width: 160,
},
},
},
'[dealTimeStart, dealTimeEnd]': {
type: 'string',
default: '',
'x-component': 'dateSelect',
'x-component-props': {
placeholder: '交易时间(全部)',
allowClear: true,
style: {
width: 160,
},
},
},
'comment': {
type: 'string',
default: '',
'x-component-props': {
placeholder: '评价内容',
allowClear: true,
style: {
width: 160,
},
},
},
submit: {
'x-component': 'Submit',
'x-mega-props': {
span: 1,
},
'x-component-props': {
children: '查询',
},
},
},
},
},
},
},
};
\ No newline at end of file
src/pages/member/memberLevel/index.tsx
View file @ 72b71a27
import React, { useRef } from 'react';
import { history } from 'umi';
import { Button, Card, message } from 'antd';
import { StandardTable } from 'god';
import { ColumnType } from 'antd/lib/table/interface';
import { createFormActions } from '@formily/antd';
import EyePreview from '@/components/EyePreview';
import StatusSwitch from '@/components/StatusSwitch';
import NiceForm from '@/components/NiceForm';
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { levelSchema } from './schema';
import { PublicApi } from '@/services/api';
import styles from './index.less';
const formActions = createFormActions();
const fetchData = async (params: any) => {
const res = await PublicApi.getMemberManageLevelPage(params);
if (res.code === 1000) {
return res.data;
}
return {};
};
const MemberLevel: React.FC<[]> = () => {
const ref = useRef<any>({});
const columns: ColumnType<any>[] = [
{
title: 'ID',
dataIndex: 'id',
align: 'center',
},
{
title: '会员等级',
dataIndex: 'level',
align: 'center',
render: (text: any, record: any) => (
<div className={styles[`levelIcon${record.level}`]}></div>
),
},
{
title: '会员等级标签',
dataIndex: 'levelTag',
align: 'center',
key: 'levelTag',
render: (text: any, record: any) => (
<EyePreview
url={`/memberAbility/manage/level/addEquity?id=${record.id}&preview=1`}
>
{text}
</EyePreview>
),
},
{
title: '会员等级类型',
dataIndex: 'memberLevelTypeName',
align: 'center',
},
{
title: '升级分值标签',
dataIndex: 'scoreTag',
align: 'center',
},
{
title: '会员角色名称',
dataIndex: 'roleName',
align: 'center',
},
{
title: '角色类型',
dataIndex: 'roleTypeName',
align: 'center',
},
{
title: '会员类型',
dataIndex: 'memberTypeName',
align: 'center',
},
{
title: '升级阈值',
dataIndex: 'point',
align: 'center',
},
{
title: '状态',
dataIndex: 'status',
align: 'center',
render: (text: any, record: any) => (
<StatusSwitch
handleConfirm={() => handleModify(record)}
record={record}
fieldNames="status"
/>
),
},
{
title: '操作',
dataIndex: 'option',
align: 'center',
render: (text: any, record: any) => (
<Button
type="link"
onClick={() =>
history.push(`/memberAbility/manage/level/addEquity?id=${record.id}`)
}
>
设置
</Button>
),
},
];
// status： 0-无效 1-生效
const handleModify = record => {
const disabled = record.status === 0;
PublicApi.postMemberManageLevelUpdatestatus({
id: record.id,
status: disabled ? 1 : 0,
}, {
ctlType: 'none',
}).then(res => {
if (res.code === 1000) {
const msg = disabled ? '启用成功' : '禁用成功'
message.success(msg);
ref.current.reload();
}
});
};
return (
<Card>
<StandardTable
tableProps={{ rowKey: 'id' }}
columns={columns}
currentRef={ref}
fetchTableData={(params: any) => fetchData(params)}
controlRender={
<NiceForm
actions={formActions}
onSubmit={values => ref.current.reload(values)}
effects={($, actions) => {
// $('onFieldInputChange', 'levelTag').subscribe(state => {
// ref.current.reload(state.values);
// });
useStateFilterSearchLinkageEffect(
$,
actions,
'levelTag',
FORM_FILTER_PATH,
);
}}
schema={levelSchema}
/>
}
/>
</Card>
);
};
export default MemberLevel;
import React, { useRef } from 'react';
import { history } from 'umi';
import { Button, Card, message } from 'antd';
import { StandardTable } from 'god';
import { ColumnType } from 'antd/lib/table/interface';
import { createFormActions } from '@formily/antd';
import { Input } from '@formily/antd-components';
import EyePreview from '@/components/EyePreview';
import StatusSwitch from '@/components/StatusSwitch';
import NiceForm from '@/components/NiceForm';
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { levelSchema } from './schema';
import { PublicApi } from '@/services/api';
import styles from './index.less';
const formActions = createFormActions();
const fetchData = async (params: any) => {
const res = await PublicApi.getMemberManageLevelPage(params);
if (res.code === 1000) {
return res.data;
}
return {};
};
const MemberLevel: React.FC<[]> = () => {
const ref = useRef<any>({});
const columns: ColumnType<any>[] = [
{
title: 'ID',
dataIndex: 'id',
align: 'center',
},
{
title: '会员等级',
dataIndex: 'level',
align: 'center',
render: (text: any, record: any) => (
<div className={styles[`levelIcon${record.level}`]}></div>
),
},
{
title: '会员等级标签',
dataIndex: 'levelTag',
align: 'center',
key: 'levelTag',
render: (text: any, record: any) => (
<EyePreview
url={`/memberAbility/manage/level/addEquity?id=${record.id}&preview=1`}
>
{text}
</EyePreview>
),
},
{
title: '会员等级类型',
dataIndex: 'memberLevelTypeName',
align: 'center',
},
{
title: '升级分值标签',
dataIndex: 'scoreTag',
align: 'center',
},
{
title: '会员角色名称',
dataIndex: 'roleName',
align: 'center',
},
{
title: '角色类型',
dataIndex: 'roleTypeName',
align: 'center',
},
{
title: '会员类型',
dataIndex: 'memberTypeName',
align: 'center',
},
{
title: '升级阈值',
dataIndex: 'point',
align: 'center',
},
{
title: '状态',
dataIndex: 'status',
align: 'center',
render: (text: any, record: any) => (
<StatusSwitch
handleConfirm={() => handleModify(record)}
record={record}
fieldNames="status"
/>
),
},
{
title: '操作',
dataIndex: 'option',
align: 'center',
render: (text: any, record: any) => (
<Button
type="link"
onClick={() =>
history.push(`/memberAbility/manage/level/addEquity?id=${record.id}`)
}
>
设置
</Button>
),
},
];
// status： 0-无效 1-生效
const handleModify = record => {
const disabled = record.status === 0;
PublicApi.postMemberManageLevelUpdatestatus({
id: record.id,
status: disabled ? 1 : 0,
}, {
ctlType: 'none',
}).then(res => {
if (res.code === 1000) {
const msg = disabled ? '启用成功' : '禁用成功'
message.success(msg);
ref.current.reload();
}
});
};
return (
<Card>
<StandardTable
tableProps={{ rowKey: 'id' }}
columns={columns}
currentRef={ref}
fetchTableData={(params: any) => fetchData(params)}
controlRender={
<NiceForm
actions={formActions}
components={{
Input,
}}
onSubmit={values => ref.current.reload(values)}
effects={($, actions) => {
// $('onFieldInputChange', 'levelTag').subscribe(state => {
// ref.current.reload(state.values);
// });
useStateFilterSearchLinkageEffect(
$,
actions,
'levelTag',
FORM_FILTER_PATH,
);
}}
schema={levelSchema}
/>
}
/>
</Card>
);
};
export default MemberLevel;
src/pages/member/memberLevel/schema/index.tsx
View file @ 72b71a27
......@@ -43,6 +43,9 @@ export const levelSchema: ISchema = {
'x-component-props': {
placeholder: '角色名称',
allowClear: true,
style: {
width: 160,
},
},
},
submit: {
......
src/pages/member/memberMaintain/index.tsx
View file @ 72b71a27
This diff is collapsed.
src/pages/member/memberMaintain/schema/index.tsx
View file @ 72b71a27
......@@ -50,6 +50,9 @@ export const importSchema: ISchema = {
'x-component-props': {
placeholder: '会员类型(全部)',
allowClear: true,
style: {
width: 160,
},
},
},
roleId: {
......@@ -59,6 +62,9 @@ export const importSchema: ISchema = {
'x-component-props': {
placeholder: '会员角色(全部)',
allowClear: true,
style: {
width: 160,
},
},
},
level: {
......@@ -68,6 +74,9 @@ export const importSchema: ISchema = {
'x-component-props': {
placeholder: '会员等级(全部)',
allowClear: true,
style: {
width: 160,
},
},
},
source: {
......@@ -77,6 +86,9 @@ export const importSchema: ISchema = {
'x-component-props': {
placeholder: '申请来源(全部)',
allowClear: true,
style: {
width: 160,
},
},
},
innerStatus: {
......@@ -86,6 +98,9 @@ export const importSchema: ISchema = {
'x-component-props': {
placeholder: '内部状态(全部)',
allowClear: true,
style: {
width: 160,
},
},
},
outerStatus: {
......@@ -95,6 +110,9 @@ export const importSchema: ISchema = {
'x-component-props': {
placeholder: '外部状态(全部)',
allowClear: true,
style: {
width: 160,
},
},
},
status: {
......@@ -104,6 +122,9 @@ export const importSchema: ISchema = {
'x-component-props': {
placeholder: '会员状态(全部)',
allowClear: true,
style: {
width: 160,
},
},
},
'[startDate, endDate]': {
......@@ -113,6 +134,9 @@ export const importSchema: ISchema = {
'x-component-props': {
placeholder: '时间范围(全部)',
allowClear: true,
style: {
width: 160,
},
},
},
submit: {
......
src/pages/member/memberPr1/index.tsx
View file @ 72b71a27
This diff is collapsed.
src/pages/member/memberPr2/index.tsx
View file @ 72b71a27
This diff is collapsed.
src/pages/member/memberPrConfirm/index.tsx
View file @ 72b71a27
This diff is collapsed.
src/pages/member/memberPrConfirm/schema/index.ts 0 → 100644
View file @ 72b71a27
/*
* @Author: XieZhiXiong
* @Date: 2021-01-08 15:34:40
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-01-08 15:34:41
* @Description:
*/
import { ISchema } from '@formily/antd';
import { FORM_FILTER_PATH } from '@/formSchema/const';
export const auditSchema: ISchema = {
type: 'object',
properties: {
MEGA_LAYOUT: {
type: 'object',
'x-component': 'mega-layout',
properties: {
topLayout: {
type: 'object',
'x-component': 'mega-layout',
'x-component-props': {
grid: true,
},
properties: {
ctl: {
type: 'object',
'x-component': 'Children',
'x-component-props': {
children: '{{controllerBtns}}',
},
},
name: {
type: 'string',
'x-component': 'Search',
'x-component-props': {
placeholder: '搜索',
tip: '输入 会员名称 进行搜索',
},
},
},
},
[FORM_FILTER_PATH]: {
type: 'object',
'x-component': 'flex-layout',
'x-component-props': {
colStyle: {
marginLeft: 20,
},
},
properties: {
memberTypeId: {
type: 'string',
default: undefined,
enum: [],
'x-component-props': {
placeholder: '会员类型(全部)',
allowClear: true,
style: {
width: 160,
},
},
},
// status: {
// type: 'string',
// default: undefined,
// enum: [],
// 'x-component-props': {
// placeholder: '会员状态(全部)',
// allowClear: true,
// },
// },
roleId: {
type: 'string',
default: undefined,
enum: [],
'x-component-props': {
placeholder: '会员角色(全部)',
allowClear: true,
style: {
width: 160,
},
},
},
level: {
type: 'string',
default: undefined,
enum: [],
'x-component-props': {
placeholder: '会员等级(全部)',
allowClear: true,
style: {
width: 160,
},
},
},
source: {
type: 'string',
default: undefined,
enum: [],
'x-component-props': {
placeholder: '申请来源(全部)',
allowClear: true,
style: {
width: 160,
},
},
},
innerStatus: {
type: 'string',
default: undefined,
enum: [],
'x-component-props': {
placeholder: '内部状态(全部)',
allowClear: true,
style: {
width: 160,
},
},
},
'[startDate, endDate]': {
type: 'string',
default: '',
'x-component': 'dateSelect',
'x-component-props': {
placeholder: '时间范围(全部)',
allowClear: true,
style: {
width: 160,
},
},
},
submit: {
'x-component': 'Submit',
'x-mega-props': {
span: 1,
},
'x-component-props': {
children: '查询',
},
},
},
},
},
},
},
};
\ No newline at end of file
src/pages/member/memberPrSubmit/index.tsx
View file @ 72b71a27
This diff is collapsed.
src/pages/member/schema/auditSchema.ts
View file @ 72b71a27
......@@ -48,6 +48,9 @@ export const auditSchema: ISchema = {
'x-component-props': {
placeholder: '会员类型(全部)',
allowClear: true,
style: {
width: 160,
},
},
},
// status: {
......@@ -66,6 +69,9 @@ export const auditSchema: ISchema = {
'x-component-props': {
placeholder: '会员角色(全部)',
allowClear: true,
style: {
width: 160,
},
},
},
level: {
......@@ -75,6 +81,9 @@ export const auditSchema: ISchema = {
'x-component-props': {
placeholder: '会员等级(全部)',
allowClear: true,
style: {
width: 160,
},
},
},
source: {
......@@ -84,6 +93,9 @@ export const auditSchema: ISchema = {
'x-component-props': {
placeholder: '申请来源(全部)',
allowClear: true,
style: {
width: 160,
},
},
},
'[startDate, endDate]': {
......@@ -93,6 +105,9 @@ export const auditSchema: ISchema = {
'x-component-props': {
placeholder: '时间范围(全部)',
allowClear: true,
style: {
width: 160,
},
},
},
submit: {
......
src/pages/returnManage/components/RefundModal/UploadVoucher/index.tsx
View file @ 72b71a27
......@@ -100,7 +100,7 @@ const UploadVoucher: React.FC<UploadVoucherProps> = ({
...rest,
fileList: fileList.map(item => item.status === 'done' && ({
name: item.name,
proveUrl: item.data.url,
proveUrl: item.url,
})).filter(Boolean),
},
}, 'uploadVoucher');
......
src/pages/returnManage/components/ReturnDetailInfo/index.tsx
View file @ 72b71a27
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-05 18:02:18
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-12-29 13:50:18
* @LastEditTime: 2021-01-07 17:49:33
* @Description: 退款明细
*/
import React, { useState } from 'react';
......@@ -298,12 +298,6 @@ const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({
</div>
)
}
<div
className={styles['deliver-item-return']}
onClick={() => handleRefund(item.refundId, PAY_CHANNEL_OFFLINE, item.refundAmount)}
>
退款
</div>
{/* 线下支付 才有确认 与 查看功能 */}
{item.channel === PAY_CHANNEL_OFFLINE && (
<>
......
src/utils/index.ts
View file @ 72b71a27
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment