Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
黄庭坚
jinfa-platform
Commits
041a6a3d
Commit
041a6a3d
authored
Nov 06, 2020
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://10.0.0.22:3000/lingxi/lingxi-business-paltform
into dev
parents
e6303639
2cfc4bda
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
24 deletions
+25
-24
RightContent.tsx
src/layouts/components/RightContent.tsx
+23
-23
index.tsx
src/pages/lxMall/commodityDetail/index.tsx
+2
-1
No files found.
src/layouts/components/RightContent.tsx
View file @
041a6a3d
...
...
@@ -28,29 +28,29 @@ const GlobalHeaderRight: React.SFC<{}> = (props) => {
return
(
<
div
className=
{
className
}
>
<
Link
to=
'/'
style=
{
{
color
:
'rgba(0, 0, 0, 0.85)'
}
}
>
返回商城
</
Link
>
<
Roles
/>
<
Location
/>
<
SelectLang
/>
<
Tooltip
title=
"消息"
>
<
a
target=
"_blank"
href=
""
rel=
"noopener noreferrer"
className=
{
styles
.
action
}
>
<
BellOutlined
/>
</
a
>
</
Tooltip
>
<
Tooltip
title=
"服务"
>
<
a
target=
"_blank"
href=
""
rel=
"noopener noreferrer"
className=
{
styles
.
action
}
>
<
CustomerServiceOutlined
/>
</
a
>
</
Tooltip
>
<
Roles
/>
<
Location
/>
<
SelectLang
/>
<
Tooltip
title=
"消息"
>
<
a
target=
"_blank"
href=
""
rel=
"noopener noreferrer"
className=
{
styles
.
action
}
>
<
BellOutlined
/>
</
a
>
</
Tooltip
>
<
Tooltip
title=
"服务"
>
<
a
target=
"_blank"
href=
""
rel=
"noopener noreferrer"
className=
{
styles
.
action
}
>
<
CustomerServiceOutlined
/>
</
a
>
</
Tooltip
>
<
Avatar
/>
</
div
>
);
...
...
src/pages/lxMall/commodityDetail/index.tsx
View file @
041a6a3d
...
...
@@ -451,7 +451,8 @@ const CommodityDetail = (props) => {
if
(
clickFlag
)
{
clickFlag
=
false
PublicApi
.
postOrderDirectPayment
({
productId
:
selectCommodityId
}).
then
(
res
=>
{
//@ts-ignore
PublicApi
.
postOrderDirectPayment
({
productId
:
selectCommodityId
,
memberId
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
message
.
destroy
()
let
buyCommodityInfo
=
{
...
...
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