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
fde85c8e
Commit
fde85c8e
authored
Jan 04, 2021
by
GuanHua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 商城下单接口添加参数
parent
f8ff772e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
4 deletions
+9
-4
index.tsx
src/pages/lxMall/components/ChannelHeader/index.tsx
+2
-1
index.tsx
src/pages/lxMall/components/ShopHeader/index.tsx
+2
-1
index.tsx
src/pages/lxMall/order/index.tsx
+5
-2
No files found.
src/pages/lxMall/components/ChannelHeader/index.tsx
View file @
fde85c8e
...
@@ -4,6 +4,7 @@ import { Input } from 'antd'
...
@@ -4,6 +4,7 @@ import { Input } from 'antd'
import
{
GetTemplateWebMemberChannelWebMemberChannelMainResponse
}
from
'@/services/TemplateApi'
import
{
GetTemplateWebMemberChannelWebMemberChannelMainResponse
}
from
'@/services/TemplateApi'
import
isEmpty
from
'lodash/isEmpty'
import
isEmpty
from
'lodash/isEmpty'
import
styles
from
'./index.less'
import
styles
from
'./index.less'
import
ImageBox
from
'@/components/ImageBox'
import
{
LAYOUT_TYPE
}
from
'@/constants'
import
{
LAYOUT_TYPE
}
from
'@/constants'
import
{
GlobalConfig
}
from
'@/global/config'
import
{
GlobalConfig
}
from
'@/global/config'
...
@@ -54,7 +55,7 @@ const Header: React.FC<HeaderPropsType> = (props) => {
...
@@ -54,7 +55,7 @@ const Header: React.FC<HeaderPropsType> = (props) => {
<
div
className=
{
styles
.
header_container
}
>
<
div
className=
{
styles
.
header_container
}
>
<
div
className=
{
styles
.
logo
}
>
<
div
className=
{
styles
.
logo
}
>
<
a
href=
{
`${type === LAYOUT_TYPE.channel ? GlobalConfig.channelRootRoute : GlobalConfig.ichannelRootRoute}?channelId=${shopUrlParam}`
}
>
<
a
href=
{
`${type === LAYOUT_TYPE.channel ? GlobalConfig.channelRootRoute : GlobalConfig.ichannelRootRoute}?channelId=${shopUrlParam}`
}
>
<
img
src
=
{
shopInfo
?.
logo
}
/>
<
ImageBox
width=
{
145
}
height=
{
50
}
imgUrl
=
{
shopInfo
?.
logo
}
/>
</
a
>
</
a
>
</
div
>
</
div
>
<
div
className=
{
styles
.
mall_search
}
>
<
div
className=
{
styles
.
mall_search
}
>
...
...
src/pages/lxMall/components/ShopHeader/index.tsx
View file @
fde85c8e
...
@@ -5,6 +5,7 @@ import { history, Link } from 'umi'
...
@@ -5,6 +5,7 @@ import { history, Link } from 'umi'
import
isEmpty
from
'lodash/isEmpty'
import
isEmpty
from
'lodash/isEmpty'
import
shop_icon
from
'@/assets/imgs/shop_icon.png'
import
shop_icon
from
'@/assets/imgs/shop_icon.png'
import
credit_icon
from
'@/assets/imgs/credit_icon.png'
import
credit_icon
from
'@/assets/imgs/credit_icon.png'
import
ImageBox
from
'@/components/ImageBox'
import
styles
from
'./index.less'
import
styles
from
'./index.less'
import
cx
from
'classnames'
import
cx
from
'classnames'
import
{
PublicApi
}
from
'@/services/api'
import
{
PublicApi
}
from
'@/services/api'
...
@@ -86,7 +87,7 @@ const ShopHeader: React.FC<ShopHeaderPropsType> = (props) => {
...
@@ -86,7 +87,7 @@ const ShopHeader: React.FC<ShopHeaderPropsType> = (props) => {
<
div
className=
{
styles
.
shop_header
}
>
<
div
className=
{
styles
.
shop_header
}
>
<
div
className=
{
styles
.
shop_header_container
}
>
<
div
className=
{
styles
.
shop_header_container
}
>
<
div
className=
{
styles
.
logo
}
>
<
div
className=
{
styles
.
logo
}
>
<
a
href=
"/"
><
img
src
=
{
logo
}
/></
a
>
<
a
href=
"/"
><
ImageBox
width=
{
145
}
height=
{
50
}
imgUrl
=
{
logo
}
/></
a
>
</
div
>
</
div
>
{
{
shopInfo
?
(
shopInfo
?
(
...
...
src/pages/lxMall/order/index.tsx
View file @
fde85c8e
...
@@ -302,7 +302,7 @@ const Order: React.FC<OrderPropsType> = (props) => {
...
@@ -302,7 +302,7 @@ const Order: React.FC<OrderPropsType> = (props) => {
/**
/**
* 提交订单
* 提交订单
*/
*/
const
submitOrder
=
(
signatureLogId
?:
number
)
=>
{
const
submitOrder
=
(
signatureLogId
?:
number
,
contractUrl
?:
string
)
=>
{
const
params
:
any
=
{
const
params
:
any
=
{
orderModel
:
getOrderMode
(),
// 下单模式
orderModel
:
getOrderMode
(),
// 下单模式
needTheInvoice
:
needTheInvoice
?
1
:
0
,
needTheInvoice
:
needTheInvoice
?
1
:
0
,
...
@@ -367,7 +367,10 @@ const Order: React.FC<OrderPropsType> = (props) => {
...
@@ -367,7 +367,10 @@ const Order: React.FC<OrderPropsType> = (props) => {
if
(
signatureLogId
)
{
if
(
signatureLogId
)
{
params
.
signatureLogId
=
signatureLogId
params
.
signatureLogId
=
signatureLogId
params
.
electronicContractUrl
=
contractUrl
,
params
.
electronicContractName
=
contractInfo
.
contractName
}
}
setConfirmLoading
(
true
)
setConfirmLoading
(
true
)
PublicApi
.
postOrderProcurementOrderAdd
(
params
).
then
(
res
=>
{
PublicApi
.
postOrderProcurementOrderAdd
(
params
).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
if
(
res
.
code
===
1000
)
{
...
@@ -460,7 +463,7 @@ const Order: React.FC<OrderPropsType> = (props) => {
...
@@ -460,7 +463,7 @@ const Order: React.FC<OrderPropsType> = (props) => {
if
(
res
.
code
===
1000
)
{
if
(
res
.
code
===
1000
)
{
if
(
res
.
data
.
state
===
4
)
{
if
(
res
.
data
.
state
===
4
)
{
clearTimeout
(
timer
)
clearTimeout
(
timer
)
submitOrder
(
signatureLogId
)
submitOrder
(
signatureLogId
,
res
.
data
.
contractUrl
)
}
else
{
}
else
{
timer
=
setTimeout
(()
=>
{
timer
=
setTimeout
(()
=>
{
if
(
checkoutCount
<
20
)
{
if
(
checkoutCount
<
20
)
{
...
...
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