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
c9a32492
Commit
c9a32492
authored
Jan 14, 2021
by
GuanHua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 1.修复品牌为空时无法下单问题,2.修复用户信用积分显示不正确的问题
parent
dce96c02
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
6 deletions
+5
-6
index.tsx
src/pages/channel/components/templateItem/index.tsx
+0
-1
index.tsx
src/pages/lxMall/commodityDetail/index.tsx
+2
-2
index.tsx
src/pages/lxMall/components/TopBar/index.tsx
+1
-1
index.tsx
src/pages/lxMall/purchaseOrder/index.tsx
+2
-2
No files found.
src/pages/channel/components/templateItem/index.tsx
View file @
c9a32492
...
...
@@ -2,7 +2,6 @@ import React from 'react'
import
{
PlayCircleOutlined
}
from
'@ant-design/icons'
import
cx
from
'classnames'
import
{
Link
}
from
'umi'
import
default_img
from
'@/assets/imgs/template_default_img.png'
import
styles
from
'./index.less'
interface
TemplateItemPropsType
{
...
...
src/pages/lxMall/commodityDetail/index.tsx
View file @
c9a32492
...
...
@@ -547,8 +547,8 @@ const CommodityDetail = (props) => {
name
:
commodityDetail
.
name
,
priceRange
:
commodityPriceInfo
,
memberDiscount
:
parameter
,
category
:
commodityDetail
.
customerCategory
.
name
,
brand
:
commodityDetail
.
brand
.
name
,
category
:
commodityDetail
.
customerCategory
&&
commodityDetail
.
customerCategory
.
name
,
brand
:
commodityDetail
.
brand
&&
commodityDetail
.
brand
.
name
,
stockCount
:
stockCount
,
minOrder
:
commodityDetail
.
minOrder
,
commodityPic
:
attrAndValList
.
commodityPic
?
attrAndValList
.
commodityPic
[
0
]
:
commodityDetail
.
mainPic
,
...
...
src/pages/lxMall/components/TopBar/index.tsx
View file @
c9a32492
...
...
@@ -74,7 +74,7 @@ const TopBar: React.FC<TopBarPropsType> = (props) => {
<
div
className=
{
styles
.
userInfo_card_header
}
>
<
ImageBox
width=
{
64
}
height=
{
64
}
circle=
{
true
}
direction=
"column"
imgUrl=
{
defaultAvatar
}
/>
<
div
className=
{
styles
.
userInfo_card_column
}
>
<
div
className=
{
styles
.
credit_count
}
>
信用积分:
<
span
>
{
numFormat
(
userInfo
.
score
||
0
)
}
</
span
></
div
>
<
div
className=
{
styles
.
credit_count
}
>
信用积分:
<
span
>
{
numFormat
(
userInfo
.
creditPoint
||
0
)
}
</
span
></
div
>
<
div
className=
{
styles
.
user_type
}
>
{
userInfo
.
levelTag
}
</
div
>
</
div
>
<
div
className=
{
styles
.
sign_out_btn
}
onClick=
{
handleSignOut
}
>
退出账号
</
div
>
...
...
src/pages/lxMall/purchaseOrder/index.tsx
View file @
c9a32492
...
...
@@ -565,8 +565,8 @@ const PurchaseOrder: React.FC<PurchaseOrderPropsType> = (props) => {
name
:
item
.
commodityUnitPrice
.
commodity
.
name
,
minOrder
:
item
.
commodityUnitPrice
.
commodity
.
minOrder
,
priceRange
:
item
.
commodityUnitPrice
.
priceRange
,
category
:
item
.
commodityUnitPrice
.
commodity
.
customerCategory
.
name
,
brand
:
item
.
commodityUnitPrice
.
commodity
.
brand
.
name
,
category
:
item
.
commodityUnitPrice
.
commodity
.
customerCategory
&&
item
.
commodityUnitPrice
.
commodity
.
customerCategory
.
name
,
brand
:
item
.
commodityUnitPrice
.
commodity
.
brand
&&
item
.
commodityUnitPrice
.
commodity
.
brand
.
name
,
commodityPic
:
item
.
commodityUnitPrice
.
commodity
.
mainPic
,
attribute
:
item
.
commodityUnitPrice
.
attributeAndValueList
,
stockCount
:
item
.
stockCount
||
0
,
...
...
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