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
b848e5d4
Commit
b848e5d4
authored
Oct 24, 2020
by
郝聪敏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修改host
parent
fa420366
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
42 additions
and
81 deletions
+42
-81
config.js
config/config.js
+2
-2
env.config.js
config/env.config.js
+6
-4
AvatarDropdown.jsx
src/components/GlobalHeader/AvatarDropdown.jsx
+1
-1
RightContent.jsx
src/components/GlobalHeader/RightContent.jsx
+0
-16
menu.js
src/models/menu.js
+0
-18
user.js
src/models/user.js
+20
-2
Admin.jsx
src/pages/Admin.jsx
+1
-34
service.js
src/pages/orderManage/pendingDeliveryOrder/service.js
+11
-3
menu.js
src/services/menu.js
+1
-1
No files found.
config/config.js
View file @
b848e5d4
...
...
@@ -84,10 +84,10 @@ export default {
routes
:
[
{
path
:
'
/
'
,
component
:
'
./Admin
'
,
redirect
:
'
/orderManage/pendingDeliveryOrder
'
,
},
{
path
:
'
orderManage/pendingDeliveryOrder
'
,
path
:
'
/
orderManage/pendingDeliveryOrder
'
,
name
:
'
pendingDeliveryOrder
'
,
component
:
'
./orderManage/pendingDeliveryOrder
'
,
},
...
...
config/env.config.js
View file @
b848e5d4
const
isProduction
=
process
.
env
.
NODE_ENV
===
'
production
'
;
let
envAPi
=
{
// api: '//backstms-qa.liangkebang.net',
// api: '//yapi.quantgroups.com/mock/351',
api
:
'
//192.168.28.66:80
'
,
api
:
'
//backstms-vcc2.liangkebang.net
'
,
// kdspApi: '//yapi.quantgroups.com/mock/351',
// kdspApi: '//192.168.28.66:80',
kdspApi
:
'
https://kdsp-op-vcc2.liangkebang.net
'
};
let
prodApi
=
{
api
:
'
//kdsp-operation.q-gp.com
'
,
api
:
'
//backstms.q-gp.com
'
,
kdspApi
:
'
//kdsp-op.q-gp.com
'
,
};
let
exportApi
;
...
...
src/components/GlobalHeader/AvatarDropdown.jsx
View file @
b848e5d4
...
...
@@ -57,7 +57,7 @@ class AvatarDropdown extends React.Component {
return
currentUser
&&
currentUser
.
name
?
(
<
HeaderDropdown
overlay=
{
menuHeaderDropdown
}
>
<
span
className=
{
`${styles.action} ${styles.account}`
}
>
<
Avatar
size=
"small"
className=
{
styles
.
avatar
}
src=
{
currentUser
.
avatar
}
alt=
"avatar"
/>
<
Avatar
icon=
"user"
style=
{
{
backgroundColor
:
'
#388bd8
'
,
marginRight
:
'
10px
'
}
}
/>
<
span
className=
{
styles
.
name
}
>
{
currentUser
.
name
}
</
span
>
</
span
>
</
HeaderDropdown
>
...
...
src/components/GlobalHeader/RightContent.jsx
View file @
b848e5d4
...
...
@@ -15,22 +15,6 @@ const GlobalHeaderRight = props => {
return
(
<
div
className=
{
className
}
>
<
HeaderSearch
className=
{
`${styles.action} ${styles.search}`
}
placeholder=
"站内搜索"
defaultValue=
"umi ui"
dataSource=
{
[
'
搜索提示一
'
,
'
搜索提示二
'
,
'
搜索提示三
'
]
}
/>
<
Tooltip
title=
"使用文档"
>
<
a
target=
"_blank"
href=
"https://pro.ant.design/docs/getting-started"
rel=
"noopener noreferrer"
className=
{
styles
.
action
}
>
<
Icon
type=
"question-circle-o"
/>
</
a
>
</
Tooltip
>
<
Avatar
/>
</
div
>
);
...
...
src/models/menu.js
View file @
b848e5d4
...
...
@@ -47,24 +47,6 @@ const MenuModel = {
return
value
;
};
const
menuData
=
initializationData
(
payload
);
menuData
.
push
({
icon
:
"
laptop
"
,
id
:
"
47291f3a-dfd8-4c4e-8fa8-5cf262ccf9a2
"
,
name
:
"
订单管理
"
,
path
:
"
/orderManage
"
,
picture
:
"
laptop
"
,
type
:
{
name
:
"
资源组
"
,
value
:
1
},
uri
:
"
/operation
"
,
children
:
[{
icon
:
"
reconciliation
"
,
id
:
"
169e18a2-0b65-465e-a090-f9b2edc442f3
"
,
name
:
"
待发货订单
"
,
path
:
"
/orderManage/pendingDeliveryOrder
"
,
picture
:
"
reconciliation
"
,
type
:
{
name
:
"
菜单
"
,
value
:
2
},
uri
:
"
/operation/operationCheck
"
,
}],
});
return
{
...
state
,
menuData
};
},
},
...
...
src/models/user.js
View file @
b848e5d4
import
{
queryCurrent
,
query
as
queryUsers
}
from
'
@/services/user
'
;
import
{
queryCurrent
,
query
as
queryUsers
,
homeInfo
}
from
'
@/services/user
'
;
import
localStorage
from
'
@/utils/localStorage
'
;
const
UserModel
=
{
namespace
:
'
user
'
,
state
:
{
currentUser
:
{},
homeInfo
:
{},
},
effects
:
{
*
fetch
(
_
,
{
call
,
put
})
{
...
...
@@ -16,9 +18,21 @@ const UserModel = {
*
fetchCurrent
(
_
,
{
call
,
put
})
{
const
response
=
yield
call
(
queryCurrent
);
if
(
response
.
code
===
2000
)
{
localStorage
.
set
(
'
user
'
,
JSON
.
stringify
(
response
.
data
));
}
yield
put
({
type
:
'
saveCurrentUser
'
,
payload
:
response
,
payload
:
response
.
data
,
});
},
*
homeInfo
(
_
,
{
call
,
put
})
{
const
response
=
yield
call
(
homeInfo
);
yield
put
({
type
:
'
saveData
'
,
payload
:
{
homeInfo
:
response
.
data
,
},
});
},
},
...
...
@@ -26,6 +40,10 @@ const UserModel = {
saveCurrentUser
(
state
,
action
)
{
return
{
...
state
,
currentUser
:
action
.
payload
||
{}
};
},
saveData
(
state
,
action
)
{
const
data
=
action
.
payload
;
return
{
...
state
,
...
data
};
},
changeNotifyCount
(
state
=
{
...
...
src/pages/Admin.jsx
View file @
b848e5d4
...
...
@@ -3,39 +3,6 @@ import { Card, Typography, Alert, Icon } from 'antd';
import
{
PageHeaderWrapper
}
from
'
@ant-design/pro-layout
'
;
export
default
()
=>
(
<
PageHeaderWrapper
content=
" 这个页面只有 admin 权限才能查看"
>
<
Card
>
<
Alert
message=
"umi ui 现已发布,欢迎使用 npm run ui 启动体验。"
type=
"success"
showIcon
banner
style=
{
{
margin
:
-
12
,
marginBottom
:
48
,
}
}
/>
<
Typography
.
Title
level=
{
2
}
style=
{
{
textAlign
:
'
center
'
,
}
}
>
<
Icon
type=
"smile"
theme=
"twoTone"
/>
Ant Design Pro
{
'
'
}
<
Icon
type=
"heart"
theme=
"twoTone"
twoToneColor=
"#eb2f96"
/>
You
</
Typography
.
Title
>
</
Card
>
<
p
style=
{
{
textAlign
:
'
center
'
,
marginTop
:
24
,
}
}
>
Want to add more pages? Please refer to
{
'
'
}
<
a
href=
"https://pro.ant.design/docs/block-cn"
target=
"_blank"
rel=
"noopener noreferrer"
>
use block
</
a
>
。
</
p
>
<
PageHeaderWrapper
>
</
PageHeaderWrapper
>
);
src/pages/orderManage/pendingDeliveryOrder/service.js
View file @
b848e5d4
import
request
from
'
@/utils/request
'
;
import
{
stringify
}
from
'
querystring
'
;
import
_
from
'
lodash
'
;
import
request
from
'
@/utils/request
'
;
import
config
from
'
../../../../config/env.config
'
;
// 待发货订单
export
async
function
queryToSend
(
params
)
{
const
transformedParam
=
{
...
...
@@ -12,6 +14,7 @@ export async function queryToSend(params) {
};
const
{
data
:
{
current
,
records
,
total
,
size
}
}
=
await
request
.
post
(
'
/api/kdsp/op/mch-order/list
'
,
{
prefix
:
config
.
kdspApi
,
data
:
stringify
(
_
.
omitBy
(
transformedParam
,
v
=>
!
v
)),
headers
:
{
'
Content-Type
'
:
'
application/x-www-form-urlencoded
'
,
...
...
@@ -27,17 +30,22 @@ export async function queryToSend(params) {
// 快递公司
export
async
function
queryExpress
()
{
const
{
data
}
=
await
request
.
get
(
'
/api/kdsp/op/express/list
'
);
const
{
data
}
=
await
request
.
get
(
'
/api/kdsp/op/express/list
'
,
{
prefix
:
config
.
kdspApi
,
});
return
data
;
}
export
async
function
updateExpress
(
params
)
{
return
request
.
post
(
'
/api/kdsp/op/mch-order/update-express-info
'
,
{
prefix
:
config
.
kdspApi
,
data
:
params
});
}
export
async
function
getGoods
(
orderId
)
{
const
{
data
}
=
await
request
.
get
(
`/api/kdsp/op/mch-order/skus?orderId=
${
orderId
}
`
);
const
{
data
}
=
await
request
.
get
(
`/api/kdsp/op/mch-order/skus?orderId=
${
orderId
}
`
,
{
prefix
:
config
.
kdspApi
,
});
return
data
;
}
\ No newline at end of file
src/services/menu.js
View file @
b848e5d4
import
request
from
'
@/utils/request
'
;
export
async
function
getMenuData
()
{
return
request
.
post
(
'
/user/getresources/APP0
01
'
);
return
request
.
post
(
'
/user/getresources/APP0
13
'
);
}
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