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
120e0a50
Commit
120e0a50
authored
Feb 23, 2021
by
GuanHua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修改渠道商城价格问题
parent
758ee567
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
22 additions
and
14 deletions
+22
-14
index.tsx
src/pages/lxMall/commodityDetail/index.tsx
+3
-2
index.less
src/pages/lxMall/components/Category/index.less
+1
-1
index.less
src/pages/lxMall/components/MainNav/index.less
+1
-1
index.tsx
src/pages/lxMall/components/MainNav/index.tsx
+8
-2
index.less
src/pages/lxMall/index/index.less
+1
-0
index.tsx
src/pages/lxMall/index/index.tsx
+1
-0
colors.less
src/theme/science/styles/colors.less
+7
-8
No files found.
src/pages/lxMall/commodityDetail/index.tsx
View file @
120e0a50
...
...
@@ -249,7 +249,7 @@ const CommodityDetail = (props) => {
fetchCommonCategoryCommodityList
(
res
.
data
.
customerCategory
.
id
,
res
.
data
.
priceType
)
}
if
(
getAuth
()
&&
res
.
data
?.
isMemberPrice
)
{
if
(
getAuth
()
&&
res
.
data
?.
priceType
===
1
&&
res
.
data
?.
isMemberPrice
)
{
getMemberCredit
(
res
.
data
?.
memberId
,
res
.
data
?.
memberRoleId
)
}
}
else
{
...
...
@@ -815,7 +815,8 @@ const CommodityDetail = (props) => {
})
})
try
{
tempPriceRange
=
tempPriceRange
.
sort
((
a
,
b
)
=>
a
.
price
<
b
.
price
?
1
:
-
1
)
console
.
log
(
tempPriceRange
,
"tempPriceRange"
)
tempPriceRange
=
tempPriceRange
.
sort
((
a
,
b
)
=>
a
.
min
>
b
.
max
?
1
:
-
1
)
}
catch
(
error
)
{
console
.
log
(
error
)
}
...
...
src/pages/lxMall/components/Category/index.less
View file @
120e0a50
...
...
@@ -67,7 +67,7 @@
.main_category,
.sub_category a,
.right_icon {
color: var(--
mall_main_colo
r);
color: var(--
category_content_title_text_hove
r);
}
.category_type_content {
...
...
src/pages/lxMall/components/MainNav/index.less
View file @
120e0a50
...
...
@@ -39,7 +39,7 @@
&.active {
&>a {
color:
@mall_main_color
;
color:
var(--mall_main_nav_hover_color)
;
}
}
}
...
...
src/pages/lxMall/components/MainNav/index.tsx
View file @
120e0a50
/*
* @Author: ghua
* @Date: 2020-08-13 14:24:10
* @LastEditTime: 2021-02-23 09:47:36
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: /lingxi-business-paltform/src/pages/lxMall/components/MainNav/index.tsx
*/
import
React
from
'react'
import
{
Link
}
from
'umi'
import
cx
from
'classnames'
import
{
LAYOUT_TYPE
}
from
'@/constants'
import
Category
from
'../Category'
...
...
@@ -43,7 +50,6 @@ const MainNav: React.FC<MainNavPropsType> = (props) => {
}
</
ul
>
</
div
>
</
div
>
)
}
...
...
src/pages/lxMall/index/index.less
View file @
120e0a50
.mall_index {
background-color: #F4F5F7;
padding-bottom: 52px;
...
...
src/pages/lxMall/index/index.tsx
View file @
120e0a50
...
...
@@ -9,6 +9,7 @@ import { Advert, FloorLine } from 'lingxi-design-ui'
import
FloorSkeleton
from
'../components/FloorSkeleton'
import
{
LAYOUT_TYPE
}
from
'@/constants'
import
styles
from
'./index.less'
import
'@/theme/style/colors.less'
interface
MallIndexPropsType
{
SiteStore
?:
any
;
...
...
src/theme/science/styles/colors.less
View file @
120e0a50
...
...
@@ -5,12 +5,10 @@
--mall_main_color: #00B37A;
--mall_main_color_opacity_2: #daf2e7;
--mall_sub_color: #daf2e7;
// --mall_main_color: #D32F2F;
// --mall_main_color_opacity_2: rgba(211, 47, 47, .2);
// --mall_sub_color: rgba(211, 47, 47, 0.1);
--mall_main_nav_hover_color: #00B37A;
--category_content_bg: #FFFFFF;
--category_content_title_text: #303133;
--category_content_title_text_hover: #00B37A;
--category_content_sub_title_text: #606266;
}
...
...
@@ -19,10 +17,11 @@
.theme-channel-science {
font-size: 14px;
--mall_main_color: #464552;
--mall_sub_color: #
FFFFF
F;
--mall_sub_color: #
00B37
F;
--mall_main_nav_hover_color: #00B37A;
--category_content_bg: #464552;
--category_content_title_text: #FFFFFF;
--category_content_title_text_hover: #FFFFFF;
--category_content_sub_title_text: rgba(255, 255, 255, 0.45);
}
...
...
@@ -31,10 +30,10 @@
font-size: 14px;
--mall_main_color: #00B37A;
--mall_sub_color: #daf2e7;
// --mall_main_color: #D32F2F;
// --mall_sub_color: rgba(211, 47, 47, 0.1);
--mall_main_nav_hover_color: #00B37A;
--nav_active_bg: #008C65;
--category_content_bg: #FFFFFF;
--category_content_title_text: #303133;
--category_content_title_text_hover: #00B37A;
--category_content_sub_title_text: #606266;
}
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