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
shenshaokai
jinfa-platform
Commits
74e4ba2f
Commit
74e4ba2f
authored
Nov 13, 2020
by
GuanHua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:1.支付跳转链接有误问题;2.商品列表列表模式链接问题;3.进货单无图片时页面报错问题
parent
1cb82e1e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
8 deletions
+10
-8
list.tsx
src/pages/lxMall/commodity/list.tsx
+1
-1
index.tsx
src/pages/lxMall/order/index.tsx
+3
-3
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 @
74e4ba2f
...
...
@@ -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 @
74e4ba2f
...
...
@@ -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/utils/index.ts
View file @
74e4ba2f
...
...
@@ -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 @
74e4ba2f
...
...
@@ -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