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
91e7f63f
Commit
91e7f63f
authored
Nov 13, 2020
by
前端-钟卫鹏
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
9e6f2e72
ea6b1c9f
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
12 additions
and
10 deletions
+12
-10
list.tsx
src/pages/lxMall/commodity/list.tsx
+1
-1
index.tsx
src/pages/lxMall/commodityDetail/index.tsx
+1
-0
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
index.tsx
src/pages/transaction/electronicContracts/template/index.tsx
+1
-1
No files found.
src/pages/lxMall/commodity/list.tsx
View file @
91e7f63f
...
...
@@ -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/commodityDetail/index.tsx
View file @
91e7f63f
...
...
@@ -532,6 +532,7 @@ const CommodityDetail = (props) => {
name
:
commodityDetail
.
name
,
packing
:
commodityDetail
.
packing
,
unitName
:
commodityDetail
.
unitName
,
attribute
:
attrAndValList
.
attributeAndValueList
}
let
sessionKey
=
`inquiry
${
selectCommodityId
}${
new
Date
().
getTime
()}
`
...
...
src/pages/lxMall/order/index.tsx
View file @
91e7f63f
...
...
@@ -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 @
91e7f63f
...
...
@@ -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 @
91e7f63f
...
...
@@ -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 @
91e7f63f
...
...
@@ -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
}
>
...
...
src/pages/transaction/electronicContracts/template/index.tsx
View file @
91e7f63f
...
...
@@ -180,7 +180,7 @@ const Template: React.FC<{}> = () => {
type
:
'string'
,
'x-component'
:
'Search'
,
'x-component-props'
:
{
placeholder
:
'
搜索
'
,
placeholder
:
'
合同模板名称
'
,
advanced
:
false
,
},
},
...
...
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