Commit 120e0a50 authored by GuanHua's avatar GuanHua

fix: 修改渠道商城价格问题

parent 758ee567
...@@ -249,7 +249,7 @@ const CommodityDetail = (props) => { ...@@ -249,7 +249,7 @@ const CommodityDetail = (props) => {
fetchCommonCategoryCommodityList(res.data.customerCategory.id, res.data.priceType) 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) getMemberCredit(res.data?.memberId, res.data?.memberRoleId)
} }
} else { } else {
...@@ -815,7 +815,8 @@ const CommodityDetail = (props) => { ...@@ -815,7 +815,8 @@ const CommodityDetail = (props) => {
}) })
}) })
try { 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) { } catch (error) {
console.log(error) console.log(error)
} }
......
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
.main_category, .main_category,
.sub_category a, .sub_category a,
.right_icon { .right_icon {
color: var(--mall_main_color); color: var(--category_content_title_text_hover);
} }
.category_type_content { .category_type_content {
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
&.active { &.active {
&>a { &>a {
color: @mall_main_color; color: var(--mall_main_nav_hover_color);
} }
} }
} }
......
/*
* @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 React from 'react'
import { Link } from 'umi'
import cx from 'classnames' import cx from 'classnames'
import { LAYOUT_TYPE } from '@/constants' import { LAYOUT_TYPE } from '@/constants'
import Category from '../Category' import Category from '../Category'
...@@ -43,7 +50,6 @@ const MainNav: React.FC<MainNavPropsType> = (props) => { ...@@ -43,7 +50,6 @@ const MainNav: React.FC<MainNavPropsType> = (props) => {
} }
</ul> </ul>
</div> </div>
</div> </div>
) )
} }
......
.mall_index { .mall_index {
background-color: #F4F5F7; background-color: #F4F5F7;
padding-bottom: 52px; padding-bottom: 52px;
......
...@@ -9,6 +9,7 @@ import { Advert, FloorLine } from 'lingxi-design-ui' ...@@ -9,6 +9,7 @@ import { Advert, FloorLine } from 'lingxi-design-ui'
import FloorSkeleton from '../components/FloorSkeleton' import FloorSkeleton from '../components/FloorSkeleton'
import { LAYOUT_TYPE } from '@/constants' import { LAYOUT_TYPE } from '@/constants'
import styles from './index.less' import styles from './index.less'
import '@/theme/style/colors.less'
interface MallIndexPropsType { interface MallIndexPropsType {
SiteStore?: any; SiteStore?: any;
......
...@@ -5,12 +5,10 @@ ...@@ -5,12 +5,10 @@
--mall_main_color: #00B37A; --mall_main_color: #00B37A;
--mall_main_color_opacity_2: #daf2e7; --mall_main_color_opacity_2: #daf2e7;
--mall_sub_color: #daf2e7; --mall_sub_color: #daf2e7;
// --mall_main_color: #D32F2F; --mall_main_nav_hover_color: #00B37A;
// --mall_main_color_opacity_2: rgba(211, 47, 47, .2);
// --mall_sub_color: rgba(211, 47, 47, 0.1);
--category_content_bg: #FFFFFF; --category_content_bg: #FFFFFF;
--category_content_title_text: #303133; --category_content_title_text: #303133;
--category_content_title_text_hover: #00B37A;
--category_content_sub_title_text: #606266; --category_content_sub_title_text: #606266;
} }
...@@ -19,10 +17,11 @@ ...@@ -19,10 +17,11 @@
.theme-channel-science { .theme-channel-science {
font-size: 14px; font-size: 14px;
--mall_main_color: #464552; --mall_main_color: #464552;
--mall_sub_color: #FFFFFF; --mall_sub_color: #00B37F;
--mall_main_nav_hover_color: #00B37A;
--category_content_bg: #464552; --category_content_bg: #464552;
--category_content_title_text: #FFFFFF; --category_content_title_text: #FFFFFF;
--category_content_title_text_hover: #FFFFFF;
--category_content_sub_title_text: rgba(255, 255, 255, 0.45); --category_content_sub_title_text: rgba(255, 255, 255, 0.45);
} }
...@@ -31,10 +30,10 @@ ...@@ -31,10 +30,10 @@
font-size: 14px; font-size: 14px;
--mall_main_color: #00B37A; --mall_main_color: #00B37A;
--mall_sub_color: #daf2e7; --mall_sub_color: #daf2e7;
// --mall_main_color: #D32F2F; --mall_main_nav_hover_color: #00B37A;
// --mall_sub_color: rgba(211, 47, 47, 0.1);
--nav_active_bg: #008C65; --nav_active_bg: #008C65;
--category_content_bg: #FFFFFF; --category_content_bg: #FFFFFF;
--category_content_title_text: #303133; --category_content_title_text: #303133;
--category_content_title_text_hover: #00B37A;
--category_content_sub_title_text: #606266; --category_content_sub_title_text: #606266;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment