+
{selectedGrade
? gradeFilterBooks?.map((product, index) => (
-
-
+
+
{product?.product?.book?.name}
-
- {"پایه" + " " + grades[product?.product?.book?.gradeId]}
-
-
- {product?.productType === 2 ? "نسخه فیزیکی" : "نسخه دیجیتال"}
-
+
+
+
+ {"پایه" + " " + grades[product?.product?.book?.gradeId]}
+
+
+
+ {product?.productType === 2 ? "نسخه فیزیکی" : "نسخه دیجیتال"}
+
+
-
+
{product.count}
-
-
- {product?.product?.price} تومان
+
+
+ {product?.product?.price} تومان
+
);
diff --git a/src/views/ShoppingCart/index.js b/src/views/ShoppingCart/index.js
index afec360..f985cc9 100644
--- a/src/views/ShoppingCart/index.js
+++ b/src/views/ShoppingCart/index.js
@@ -10,22 +10,6 @@ import alertIcon from "../../assets/icons/alert.svg";
import { connect } from "react-redux";
-const PriceStatus = ({ name, value, type, isDark }) => {
- return (
-
- {name}
-
- {value + " " + "تومان"}
-
-
- );
-};
-
function ShoppingCart({
isDark,
isMobile,
@@ -43,8 +27,8 @@ function ShoppingCart({
desktopContentTransform,
}) {
useEffect(() => {
- // getList();
- // getFactorInfo({ userId });
+ getList();
+ getFactorInfo({ userId });
setHeaderOptions(headerOptions);
}, []);
@@ -63,13 +47,52 @@ function ShoppingCart({
- {[0,1].map((product, index) => (
+ {list.map((product, index) => (
))}
);
};
+
+ const PriceStatus = ({ name, value, type }) => {
+ return isMobile ? (
+
+ {name}
+
+ {value + " " + "تومان"}
+
+
+ ) : (
+
+
+ {name}
+
+
+ {value}
+
+ تومان
+
+
+
+ );
+ };
+
return isMobile ? (
{list.map((product, index) => (
@@ -81,19 +104,16 @@ function ShoppingCart({
name="مبلغ سبد خرید"
value={factorInfo?.sumPrice}
type="normal"
- isDark={isDark}
/>
@@ -124,14 +144,61 @@ function ShoppingCart({
) : (
-
+
-
+
+
+
+
+ جمع کل سبد خرید
+
+
+ {factorInfo?.payPrice}
+ تومان
+
+
+
+
+
+ هزینه ارسال کالا پس از تعیین محل آدرس مشخص میشود
+
+
+
);
}
diff --git a/tailwind.config.js b/tailwind.config.js
index e7fba29..13888b5 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -20,6 +20,7 @@ module.exports = {
yellow3: "#EFFF00",
gray36: "#363636",
orange1: "#FF6600",
+ greenBA: "#06BACE",
green1: "#00FF80",
gray20: "#202020",
gray2077: "#20202077",
@@ -67,18 +68,18 @@ module.exports = {
greenBA: "#06BACE",
}),
fontSize: {
- 'xs': 'clamp(calc(100vw / 38), 8, 13)',
- 'sm': '.875rem',
- 'tiny': '.875rem',
- 'base': '1rem',
- 'lg': '1.125rem',
- 'xl': '1.25rem',
- '2xl': '1.5rem',
- '3xl': '1.875rem',
- '4xl': '2.25rem',
- '5xl': '3rem',
- '6xl': '4rem',
- '7xl': '5rem',
+ 'xs': 'clamp(9px, 2.78vw, 11px)',
+ 'sm': 'clamp(11px, 3.02vw , 13px)',
+ 'tiny': 'clamp(13px,3.28vw, 15px)',
+ 'base': 'clamp(15px, 3.52vw, 17px)',
+ 'lg': 'clamp(17px, 3.76vw, 19px)',
+ 'xl': 'clamp(19px, 4vw, 21px)',
+ '2xl': 'clamp(21px, 4.24vw, 23px)',
+ '3xl': 'clamp(23px, 4.48vw, 25px)',
+ '4xl': 'clamp(25px, 4.72vw, 27px)',
+ '5xl': 'clamp(27px, 4.96vw, 29px)',
+ '6xl': 'clamp(29px, 5.22vw, 31px)',
+ '7xl': 'clamp(31px, 4.46vw, 33px)',
'sm-1': '0.5rem'
},
extend: {