Browse Source

提交

dev
gwbvipvip 1 year ago
parent
commit
8dca1e68ec
4 changed files with 7 additions and 4 deletions
  1. +1
    -1
      config/proxy.js
  2. +3
    -0
      src/pages/member/memberInfo/index.jsx
  3. +1
    -1
      src/pages/order/DailyReport/index.jsx
  4. +2
    -2
      src/pages/order/order-summary-manage/index.jsx

+ 1
- 1
config/proxy.js View File

@@ -9,7 +9,7 @@
export default {
dev: {
'/kitchen/': {
target: 'https://192.168.1.63:5001',
target: 'https://localhost:5001',
changeOrigin: true,
secure: false, //关闭证书验证
pathRewrite: {


+ 3
- 0
src/pages/member/memberInfo/index.jsx View File

@@ -377,6 +377,9 @@ const MemberManage = () => {
dataIndex: 'nickName',
valueType: 'textarea',
hideInForm: true,
render: (_, record) => (
<a>{isBase64(record.nickName) ? decodeBPABase64(record.nickName) : record.nickName}</a>
)
},
{
title: '性别',


+ 1
- 1
src/pages/order/DailyReport/index.jsx View File

@@ -102,7 +102,7 @@ const App = () => {
items={new Array(2).fill(null).map((_, i) => {
const id = String(i + 1);
return {
label: id == 1 ? `收总览` : `支付渠道`,
label: id == 1 ? `收总览` : `支付渠道`,
key: id,
children: <Table
columns={columns}


+ 2
- 2
src/pages/order/order-summary-manage/index.jsx View File

@@ -190,7 +190,7 @@ const Manage = () => {
width: 120,
},
{
title: '应款金额',
title: '应款金额',
dataIndex: 'orderOriginalMoney',
renderText: (val) => `${val}¥`,
hideInSearch: true,
@@ -203,7 +203,7 @@ const Manage = () => {
width: 120,
},
{
title: '实付款金额',
title: '实付款金额',
dataIndex: 'orderRealMoney',
hideInSearch: true,
renderText: (val) => `${val}¥`,


Loading…
Cancel
Save