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
903a58b6
Commit
903a58b6
authored
Nov 23, 2020
by
GuanHua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:商品不存在样式优化
parent
a00f45dd
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
103 additions
and
9 deletions
+103
-9
index.tsx
src/pages/lxMall/commodity/index.tsx
+3
-3
list.less
src/pages/lxMall/commodity/list.less
+5
-4
error.tsx
src/pages/lxMall/commodityDetail/error.tsx
+37
-0
index.less
src/pages/lxMall/commodityDetail/index.less
+55
-0
index.tsx
src/pages/lxMall/commodityDetail/index.tsx
+0
-0
index.tsx
...all/components/FindMore/components/popularShops/index.tsx
+1
-1
index.tsx
...all/components/FindMore/components/shoppingNews/index.tsx
+1
-1
index.tsx
src/pages/lxMall/order/index.tsx
+1
-0
No files found.
src/pages/lxMall/commodity/index.tsx
View file @
903a58b6
import
React
,
{
useState
,
useEffect
,
useCallback
,
useRef
}
from
'react'
import
{
CaretUpOutlined
,
CaretDownOutlined
,
UnorderedListOutlined
,
AppstoreOutlined
,
CloseOutlined
,
QuestionCircleOutlined
}
from
'@ant-design/icons'
import
React
,
{
useState
,
useEffect
}
from
'react'
import
{
CaretUpOutlined
,
CaretDownOutlined
,
UnorderedListOutlined
,
AppstoreOutlined
,
CloseOutlined
}
from
'@ant-design/icons'
import
Filter
from
'../components/Filter'
import
{
FILTER_TYPE
}
from
'@/constants'
import
cx
from
'classnames'
...
...
@@ -13,7 +13,7 @@ import { store } from '@/store'
import
{
PublicApi
}
from
'@/services/api'
import
{
LAYOUT_TYPE
}
from
'@/constants'
import
{
PostSearchShopEnterpriseGetCommodityListResponseDetail
}
from
'@/services/SearchApi'
import
bannerImg
from
'@/assets/imgs/banner_2.png'
//
import bannerImg from '@/assets/imgs/banner_2.png'
import
arrowDownIcon
from
'@/assets/imgs/arrow_down.png'
import
arrowDownActiveIcon
from
'@/assets/imgs/arrow_down_active.png'
import
styles
from
'./index.less'
...
...
src/pages/lxMall/commodity/list.less
View file @
903a58b6
...
...
@@ -147,12 +147,13 @@
color: #303133;
text-align: left;
margin-top: 12px;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
//
display: -webkit-box;
//
-webkit-box-orient: vertical;
//
-webkit-line-clamp: 2;
text-overflow: ellipsis;
overflow: hidden;
-webkit-box-orient: vertical;
white-space: nowrap;
// -webkit-box-orient: vertical;
word-wrap: break-word;
word-break: break-all;
}
...
...
src/pages/lxMall/commodityDetail/error.tsx
0 → 100644
View file @
903a58b6
import
React
from
'react'
import
noResultIcon
from
'@/assets/imgs/no_result_icon.png'
import
styles
from
'./index.less'
interface
ErrorResultPropsType
{
errorMessage
:
string
}
const
ErrorResult
:
React
.
FC
<
ErrorResultPropsType
>
=
(
props
)
=>
{
const
{
errorMessage
}
=
props
return
(
<
div
className=
{
styles
.
no_result_container
}
>
<
div
className=
{
styles
.
no_result
}
>
<
div
className=
{
styles
.
no_result_tip
}
>
<
div
className=
{
styles
.
no_result_tip_img
}
>
<
img
src=
{
noResultIcon
}
/>
</
div
>
<
div
className=
{
styles
.
no_result_tip_text
}
>
{
errorMessage
}
</
div
>
</
div
>
<
div
className=
{
styles
.
no_result_suggest
}
>
<
ul
className=
{
styles
.
no_result_suggest_list
}
>
<
li
>
出现的可能原因:
</
li
>
<
li
>
1、管理员冻结了该商品
</
li
>
<
li
>
2、商品链接出现错误
</
li
>
</
ul
>
</
div
>
</
div
>
</
div
>
)
}
export
default
ErrorResult
\ No newline at end of file
src/pages/lxMall/commodityDetail/index.less
View file @
903a58b6
...
...
@@ -362,4 +362,58 @@
color: #FFF;
}
}
}
.no_result_container {
width: 1200px;
margin: 0 auto;
}
.no_result {
width: 300px;
margin: 0 auto;
padding: 200px 0;
&_tip {
font-size: 14px;
color: #D32F2F;
font-weight: 500;
display: flex;
&_text {
line-height: 30px;
}
&_search {
color: #303133;
}
&_img {
width: 30px;
height: 30px;
overflow: hidden;
margin-right: 16px;
&>img {
width: 30px;
height: 30px;
}
}
}
&_suggest {
margin-top: 12px;
font-size: 12px;
color: #909399;
padding-left: 46px;
&_list {
padding: 0;
margin: 0;
&>li {
list-style: none;
}
}
}
}
\ No newline at end of file
src/pages/lxMall/commodityDetail/index.tsx
View file @
903a58b6
This diff is collapsed.
Click to expand it.
src/pages/lxMall/components/FindMore/components/popularShops/index.tsx
View file @
903a58b6
...
...
@@ -30,7 +30,7 @@ const PopularShops: React.FC<PopularShopsPropsType> = (props) => {
<
div
className=
{
styles
.
popular_shops_list
}
>
{
shopList
&&
shopList
.
map
((
item
,
index
)
=>
index
<=
5
&&
(
<
div
className=
{
styles
.
popular_shops_list_item
}
>
<
div
className=
{
styles
.
popular_shops_list_item
}
key=
{
item
.
memberShopId
}
>
<
div
className=
{
styles
.
popular_shops_rank
}
>
0
{
index
+
1
}
</
div
>
<
div
className=
{
styles
.
popular_shops_logo
}
>
<
ImageBox
width=
{
36
}
height=
{
36
}
imgUrl=
{
item
.
memberLogo
}
/>
...
...
src/pages/lxMall/components/FindMore/components/shoppingNews/index.tsx
View file @
903a58b6
...
...
@@ -48,7 +48,7 @@ const ShoppingNews: React.FC = () => {
</
div
>
<
div
className=
{
styles
.
popular_buy_dynamic_list_item_content
}
>
<
span
className=
{
styles
.
content_text
}
>
{
item
.
count
||
0
}
条回应
</
span
>
<
span
className=
{
styles
.
content_time
}
>
{
moment
(
item
.
deliveryTime
).
format
(
"MM/DD HH:mm"
)
}
</
span
>
<
span
className=
{
styles
.
content_time
}
>
{
moment
(
item
.
deliveryTime
||
""
).
format
(
"MM/DD HH:mm"
)
}
</
span
>
</
div
>
</
div
>
))
...
...
src/pages/lxMall/order/index.tsx
View file @
903a58b6
...
...
@@ -195,6 +195,7 @@ const Order: React.FC<OrderPropsType> = (props) => {
if
(
orderItem
.
logistics
?.
deliveryType
===
1
&&
orderItem
.
logistics
?.
carriageType
===
2
&&
orderItem
.
logistics
?.
useTemplate
&&
templateId
)
{
orderProductList
.
push
({
templateId
,
count
:
orderItem
.
count
,
weight
:
orderItem
.
logistics
?.
weight
,
})
}
...
...
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