Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
merchant-manage-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ui
merchant-manage-ui
Commits
a49db38b
Commit
a49db38b
authored
Nov 16, 2022
by
beisir
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 售后流程修改
parent
946cea22
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
159 additions
and
4 deletions
+159
-4
config.js
config/config.js
+7
-0
env.config.js
config/env.config.js
+1
-1
index.jsx
src/pages/AfterSalesClaimForm/index.jsx
+117
-0
upload.jsx
src/pages/PaymentMange/ToExamine/upload.jsx
+2
-1
data.js
src/pages/PaymentMange/data.js
+14
-2
data.js
src/pages/ReconciliationQuery/data.js
+12
-0
data.js
src/pages/SettlementSheet/data.js
+6
-0
No files found.
config/config.js
View file @
a49db38b
...
...
@@ -146,6 +146,13 @@ export default {
icon
:
'
smile
'
,
component
:
'
./AfterSaleManage/index
'
,
},
{
title
:
'
商户管理后台
'
,
path
:
'
/afterSalesClaimForm
'
,
name
:
'
afterSalesClaimForm
'
,
icon
:
'
smile
'
,
component
:
'
./AfterSalesClaimForm/index
'
,
},
{
title
:
'
商户管理后台
'
,
path
:
'
/afterSaleManageOld
'
,
...
...
config/env.config.js
View file @
a49db38b
...
...
@@ -6,7 +6,7 @@ const envAPi = {
kdspOpApi
:
`https://sc-merchant-api-
${
environment
}
.liangkebang.net`
,
kdspApi
:
`https://sc-merchant-api-
${
environment
}
.liangkebang.net`
,
goodsApi
:
`https://sc-merchant-api-
${
environment
}
.liangkebang.net`
,
querysApi
:
`https://sc-merchant-api-
${
environment
}
.liangkebang.net`
,
querysApi
:
`https://sc-merchant-api-
${
environment
}
.liangkebang.net
/admin/merchant/sc-settlement
`
,
prologueDomain
:
`https://mall-
${
environment
}
.liangkebang.net`
,
qiniuHost
:
'
https://kdspstatic.q-gp.com/
'
,
opapiHost
:
`https://opapi-
${
environment
}
.liangkebang.net`
,
...
...
src/pages/AfterSalesClaimForm/index.jsx
0 → 100644
View file @
a49db38b
// import React, { useState, useRef, useEffect } from 'react';
// import ProTable from '@ant-design/pro-table';
// import { PageHeaderWrapper } from '@ant-design/pro-layout';
// import { columns, auditStatusValueEnum } from './staticdata';
// import { accountApplyList, accountApplyDetail } from './service';
// import ExamineFormModal from './ExamineFormModal';
// import styled from './index.less';
// import { getAppChannelAllList } from '@/services/common';
// /**
// * 渠道管理-审批记录 和 财务管理-资金审核
// * 共用一个页面
// * @param {*} router options
// * @returns ReactDOM
// */
// const CapitalExamine = ({ route }) => {
// const isAudit = route.name === 'capitalExamine'; // 是否时资金审核页面
// const ref = useRef();
// const actionRef = useRef();
// const [examVisible, setExamVisible] = useState(false);
// const [examLoading, setExamLoading] = useState(false);
// const [channelAllList, setChannelAllList] = useState({});
// const search = {
// collapsed: false,
// collapseRender: () => null,
// };
// const query = async param => {
// const timeArray = param?.createdAt;
// if (timeArray?.length) {
// const [createdStartAt, createdEndAt] = timeArray;
// param.createdStartAt = createdStartAt;
// param.createdEndAt = createdEndAt;
// delete param.createdAt;
// }
// const [data] = await accountApplyList(param);
// return {
// total: data.total,
// data: data?.records,
// };
// };
// const openExamineFormModal = async (row, audit) => {
// setExamLoading(true);
// const [data, error] = await accountApplyDetail(row.id);
// if (!error) {
// data.audit = !!audit;
// data.auditStatusName = auditStatusValueEnum[data.auditStatus].text;
// actionRef.current.setDetailData(data);
// setExamVisible(true);
// }
// setExamLoading(false);
// };
// const closeExamineFormModal = () => {
// setExamVisible(false);
// };
// const columsOptions = {
// isAudit,
// openExamineFormModal,
// channelAllList,
// };
// // 获取所有渠道
// const getChannelAllList = async () => {
// const [data] = (await getAppChannelAllList()) || [];
// const list = {};
// if (data) {
// data.forEach(item => {
// list[item.id] = item.name;
// });
// setChannelAllList(list);
// }
// };
// const refreshTable = () => {
// ref.current.reload();
// };
// useEffect(() => {
// getChannelAllList();
// }, []);
// const onReset = () => {};
// return (
// <PageHeaderWrapper>
// <ProTable
// bordered
// loading={examLoading}
// type="cardList"
// request={query}
// className={styled.tableProName}
// tableClassName="capital"
// columns={columns(columsOptions, 'parent')}
// rowKey={(_, index) => index}
// search={search}
// options={false}
// actionRef={ref}
// toolBarRender={false}
// pagination={{
// pageSize: 10,
// }}
// onReset={onReset}
// // toolBarRender={[]}
// scroll={{ x: '100%', y: 430 }}
// ></ProTable>
// <ExamineFormModal
// refresh={refreshTable}
// examVisible={examVisible}
// wrappedComponentRef={actionRef}
// closeExamineFormModal={closeExamineFormModal}
// />
// </PageHeaderWrapper>
// );
// };
// export default CapitalExamine;
src/pages/PaymentMange/ToExamine/upload.jsx
View file @
a49db38b
...
...
@@ -2,6 +2,7 @@ import { Upload, Icon, Modal, message, Button, notification } from 'antd';
import
React
,
{
useState
,
useEffect
}
from
'
react
'
;
import
config
from
'
../../../../config/env.config
'
;
import
styles
from
'
../style.less
'
;
import
UUID
from
'
../../../utils/uuid
'
;
import
{
qiniuToken
}
from
'
@/services/qiniu
'
;
const
qiniu
=
require
(
'
@/utils/qiniu.min.js
'
);
...
...
@@ -60,7 +61,7 @@ class PicturesWall extends React.Component {
}
const
vm
=
this
;
// eslint-disable-next-line new-cap
const
data
=
`
${
filename
}
-
${
new
Date
().
getTime
()}
.
${
suffix
}
`
;
const
data
=
`
${
UUID
.
createUUID
()}
.
${
suffix
}
`
;
const
observable
=
qiniu
.
upload
(
file
,
data
,
token
);
const
observer
=
{
next
()
{
...
...
src/pages/PaymentMange/data.js
View file @
a49db38b
...
...
@@ -104,8 +104,14 @@ export function columns(res, pages) {
align
:
'
center
'
,
},
{
title
:
'
蓝字金额
'
,
title
:
()
=>
(
<
div
style
=
{{
textAlign
:
'
center
'
}}
>
<
div
>
蓝字金额
<
/div
>
<
div
style
=
{{
color
:
'
#f00
'
}}
>
(
开票金额
)
<
/div
>
<
/div
>
),
dataIndex
:
'
currentRefundAmount
'
,
key
:
'
currentRefundAmount
'
,
width
:
'
100px
'
,
hideInSearch
:
true
,
align
:
'
center
'
,
...
...
@@ -113,9 +119,15 @@ export function columns(res, pages) {
{
title
:
'
应付金额
'
,
dataIndex
:
'
payableAmount
'
,
width
:
'
1
0
0px
'
,
width
:
'
1
4
0px
'
,
hideInSearch
:
true
,
align
:
'
center
'
,
render
:
(
value
,
row
)
=>
(
<
div
>
<
div
style
=
{{
color
:
'
#f00
'
}}
>
赔付
({
row
.
claimAmount
})
<
/div
>
<
div
>
(
实付
{
value
})
<
/div
>
<
/div
>
),
},
{
title
:
'
是否缺少红字发票
'
,
...
...
src/pages/ReconciliationQuery/data.js
View file @
a49db38b
...
...
@@ -68,6 +68,12 @@ export function columns(pages) {
width
:
'
100px
'
,
hideInSearch
:
true
,
align
:
'
center
'
,
render
:
(
value
,
row
)
=>
(
<
div
>
<
div
>
{
value
}
<
/div
>
<
div
>
累计赔付金额
<
/div
>
<
/div
>
),
},
{
title
:
'
笔数
'
,
...
...
@@ -75,6 +81,12 @@ export function columns(pages) {
width
:
'
100px
'
,
hideInSearch
:
true
,
align
:
'
center
'
,
render
:
(
value
,
row
)
=>
(
<
div
>
<
div
>
{
value
}
<
/div
>
<
div
>
累计赔付笔数
<
/div
>
<
/div
>
),
},
{
title
:
'
状态
'
,
...
...
src/pages/SettlementSheet/data.js
View file @
a49db38b
...
...
@@ -97,6 +97,12 @@ export function columns(pages) {
width
:
'
100px
'
,
hideInSearch
:
true
,
align
:
'
center
'
,
render
:
(
value
,
row
)
=>
(
<
div
>
<
div
>
{
value
}
<
/div
>
<
div
>
(
赔付
{
row
.
claimAmount
})
<
/div
>
<
/div
>
),
},
{
title
:
'
结算金额
'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment