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
5fb7da00
Commit
5fb7da00
authored
Nov 13, 2020
by
GuanHua
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into test
parents
87cd4ea1
e64bef61
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
9 deletions
+10
-9
list.tsx
src/pages/lxMall/commodity/list.tsx
+1
-1
index.tsx
src/pages/lxMall/order/index.tsx
+3
-3
index.tsx
src/pages/lxMall/pay/components/credit/index.tsx
+0
-1
index.ts
src/pages/lxMall/pay/utils/index.ts
+3
-3
index.tsx
src/pages/lxMall/purchaseOrder/index.tsx
+3
-1
No files found.
src/pages/lxMall/commodity/list.tsx
View file @
5fb7da00
...
...
@@ -99,7 +99,7 @@ const CommodityList: React.FC<CommodityListPropsType> = (props) => {
{
commodityList
.
map
((
item
,
index
)
=>
(
<
div
key=
{
`commodity_list_item_column_${index}`
}
className=
{
cx
(
styles
.
commodity_list_item
,
styles
.
column
)
}
>
<
a
href=
{
`/${layoutType === LAYOUT_TYPE.channel ? 'channelmall' : 'shop'}/commodity/detail?id=${item.id}&type=${item.priceType}&shopId=${btoa(JSON.stringify({ shopId: item.storeId, memberId: item.memberId }))}`
}
target=
"_blank"
>
<
a
href=
{
getCommodityDetailLink
(
item
)
}
target=
"_blank"
>
<
div
className=
{
styles
.
goods_img
}
>
{
item
.
mainPic
?
<
img
src=
{
item
.
mainPic
}
/>
:
<
Skeleton
.
Image
style=
{
{
width
:
120
,
height
:
120
}
}
/>
...
...
src/pages/lxMall/order/index.tsx
View file @
5fb7da00
...
...
@@ -326,13 +326,13 @@ const Order: React.FC<OrderPropsType> = (props) => {
const
linkToUrl
=
(
path
:
string
)
=>
{
switch
(
layoutType
)
{
case
LAYOUT_TYPE
.
channel
:
history
.
replace
(
`
${
GlobalConfig
.
channelRootRoute
}${
path
}
?
channelId=
${
shopUrlParam
}
`
)
history
.
replace
(
`
${
GlobalConfig
.
channelRootRoute
}${
path
}
&
channelId=
${
shopUrlParam
}
`
)
break
case
LAYOUT_TYPE
.
ichannel
:
history
.
replace
(
`
${
GlobalConfig
.
ichannelRootRoute
}${
path
}
?
channelId=
${
shopUrlParam
}
`
)
history
.
replace
(
`
${
GlobalConfig
.
ichannelRootRoute
}${
path
}
&
channelId=
${
shopUrlParam
}
`
)
break
default
:
history
.
replace
(
`
${
path
}
?channelId=
${
shopUrlParam
}
`
)
history
.
replace
(
`
${
path
}
`
)
break
}
...
...
src/pages/lxMall/pay/components/credit/index.tsx
View file @
5fb7da00
...
...
@@ -89,7 +89,6 @@ const CreditPayWay: React.FC<CreditPayWayPropsType> = (props) => {
message
.
destroy
()
message
.
success
(
"支付成功"
)
linkToUrl
(
`/pay/result?orderId=
${
orderId
}
`
,
layoutType
,
shopUrlParam
)
history
.
replace
(
`/pay/result?orderId=
${
orderId
}
`
)
}
else
{
setConfirmLoading
(
false
)
message
.
destroy
()
...
...
src/pages/lxMall/pay/utils/index.ts
View file @
5fb7da00
...
...
@@ -5,13 +5,13 @@ import { LAYOUT_TYPE } from '@/constants'
export
const
linkToUrl
=
(
path
:
string
,
layoutType
,
shopUrlParam
)
=>
{
switch
(
layoutType
)
{
case
LAYOUT_TYPE
.
channel
:
history
.
replace
(
`
${
GlobalConfig
.
channelRootRoute
}${
path
}
?
channelId=
${
shopUrlParam
}
`
)
history
.
replace
(
`
${
GlobalConfig
.
channelRootRoute
}${
path
}
&
channelId=
${
shopUrlParam
}
`
)
break
case
LAYOUT_TYPE
.
ichannel
:
history
.
replace
(
`
${
GlobalConfig
.
ichannelRootRoute
}${
path
}
?
channelId=
${
shopUrlParam
}
`
)
history
.
replace
(
`
${
GlobalConfig
.
ichannelRootRoute
}${
path
}
&
channelId=
${
shopUrlParam
}
`
)
break
default
:
history
.
replace
(
`
${
path
}
?channelId=
${
shopUrlParam
}
`
)
history
.
replace
(
`
${
path
}
`
)
break
}
...
...
src/pages/lxMall/purchaseOrder/index.tsx
View file @
5fb7da00
...
...
@@ -710,7 +710,9 @@ const PurchaseOrder: React.FC<PurchaseOrderPropsType> = (props) => {
</
div
>
<
div
className=
{
cx
(
styles
.
order_list_item_item
,
styles
.
goods_info
)
}
>
<
div
className=
{
styles
.
order_list_item_item_imgbox
}
>
<
ImageBox
width=
{
80
}
height=
{
80
}
imgUrl=
{
childItem
.
commodityUnitPrice
.
commodityPic
[
0
]
}
direction=
"column"
/>
{
childItem
.
commodityUnitPrice
.
commodityPic
&&
<
ImageBox
width=
{
80
}
height=
{
80
}
imgUrl=
{
childItem
.
commodityUnitPrice
.
commodityPic
[
0
]
}
direction=
"column"
/>
}
</
div
>
<
div
>
<
div
className=
{
styles
.
order_list_item_item_name
}
>
...
...
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