From b5e5ee0d9ca03cf023118f63f782d10ff6032e53 Mon Sep 17 00:00:00 2001 From: amir hosein gorji Date: Tue, 14 Sep 2021 18:11:21 +0430 Subject: [PATCH] =?UTF-8?q?=D8=A8=D9=87=D8=B7=20=D8=A6=D8=AE=D8=B0=D9=87?= =?UTF-8?q?=D9=85=D8=AB=20=D8=A7=D8=AE=D8=A6=D8=AB1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/AppRouter.js | 19 +-- src/Redux/reducers/public.js | 24 ++-- src/views/Home/Footer/index.js | 15 +- src/views/Home/HomeSearch/Select/index.js | 3 +- src/views/Home/HomeSearch/index.js | 40 +++++- src/views/Home/HomeSearch/index.scss | 101 +++++++++++++- src/views/Home/HomeSlider/Blog/index.js | 9 +- src/views/Home/HomeSlider/Blog/index.scss | 32 +++-- src/views/Home/HomeSlider/Header/index.scss | 4 +- src/views/Home/HomeSlider/Simple/index.js | 18 ++- src/views/Home/HomeSlider/Simple/index.scss | 12 +- src/views/Home/HomeSlider/index.js | 2 +- src/views/Home/HomeStatic/Identifier/index.js | 38 ++---- src/views/Home/HomeStatic/Simple/index.js | 2 +- src/views/Home/HomeStatic/Vitrin/index.js | 19 +-- src/views/Home/HomeStatic/index.js | 40 +++++- src/views/Home/HomeStatic/index.scss | 30 ++++ src/views/Home/Navbar/Laptop/index.js | 2 +- .../Mobile/NavbarDrawer/NavbarDrawer.js | 128 +++++++++++++----- src/views/Home/Navbar/Mobile/index.js | 62 ++++++++- src/views/Home/Navbar/Mobile/index.scss | 23 ++++ src/views/Home/SingleBlog/index.js | 2 +- src/views/Home/index.js | 73 ++++------ src/views/MyBooks/index.js | 5 +- src/views/Products/Product/index.js | 12 +- src/views/Products/Product/index.scss | 15 +- src/views/QRScan/index.js | 2 +- 27 files changed, 529 insertions(+), 203 deletions(-) diff --git a/src/AppRouter.js b/src/AppRouter.js index ebe5aed..4dbc290 100644 --- a/src/AppRouter.js +++ b/src/AppRouter.js @@ -67,24 +67,17 @@ class AppRouter extends Component { render() { const mobile = window.innerWidth < 1000 ? true : false; let status = proxy.status(); - let home = mobile ? ( + console.log({ status }); + let home = ( - {status ? ( - this.props.profile.status ? ( - - ) : ( - // - - ) + {status && status.status == 0 ? ( + ) : ( - + )} - ) : ( - - - ); + return ( diff --git a/src/Redux/reducers/public.js b/src/Redux/reducers/public.js index e7baafb..3ab3f5e 100644 --- a/src/Redux/reducers/public.js +++ b/src/Redux/reducers/public.js @@ -35,21 +35,23 @@ export default function publicApi(state = initialState, action) { switch (type) { case "public/homePage": let itemsLevel; - if (window.innerWidth > 1000) { - const jadidTarin = data.filter( - (item) => item.title === "جدیدترین کتاب‌های دانوین" - ); - itemsLevel = jadidTarin[0].data - .map((item) => item.book.gradeId * 1) - .sort((a, b) => a - b) - .map((e) => grades[e]); - itemsLevel.unshift("همه"); - } + // if (window.innerWidth > 1000) { + const jadidTarin = data.filter( + (item) => item.title === "جدیدترین کتاب‌های دانوین" + ); + itemsLevel = jadidTarin[0] + ? jadidTarin[0].data + .map((item) => item.book.gradeId * 1) + .sort((a, b) => a - b) + .map((e) => grades[e]) + : []; + itemsLevel.unshift("پایه تحصیلی"); + // } return { ...state, loading: false, - levels: window.innerWidth > 1000 ? [...new Set(itemsLevel)] : [], + levels: [...new Set(itemsLevel)], error: null, homeData: data, }; diff --git a/src/views/Home/Footer/index.js b/src/views/Home/Footer/index.js index cfb6470..29eefe4 100644 --- a/src/views/Home/Footer/index.js +++ b/src/views/Home/Footer/index.js @@ -17,24 +17,21 @@ export default class Footer extends Component {

دانوین کجاست؟

- لورم ایپسوم متن ساختگی با تولید سادگی نامفهوم از صنعت چاپ، و - با استفاده از طراحان گرافیک است، چاپگرها و متون بلکه روزنامه - و مجله در ستون و سطرآنچنان که لازم است، و برای شرایط فعلی - تکنولوژی مورد نیاز، و کاربردهای متنوع با هدف بهبود ابزارهای - کاربردی می باشد، کتابهای زیادی در شصت و سه{" "} + ما در دانوین با هدف ایجاد زیرساخت تعاملی و آموزشی با تولید + محتوایی جذاب بصورت کتاب قصد داریم تغییراتی بنیادین در نظام + آموزش و پرورش کشور ایجاد کنیم.

آدرس -

- تهران خیابان انقلاب اسلامی بن بست سروش پلاک 2 طبقه چهار -

+

آدرس: تهران، میدان فردوسی، خیابان موسوی، پلاک ۳۰

+ {/*

شماره تماس: ۸۸۸۱۴۶۳۷-۰۲۱

*/}
- 02163462405 + ۸۸۸۱۴۶۳۷ تماس
diff --git a/src/views/Home/HomeSearch/Select/index.js b/src/views/Home/HomeSearch/Select/index.js index 92625ec..32afa4f 100644 --- a/src/views/Home/HomeSearch/Select/index.js +++ b/src/views/Home/HomeSearch/Select/index.js @@ -56,7 +56,8 @@ export default function CustomizedSelects(props) { parent.setState({ filters: { ...parent.state.filters, - [name]: e.target.value === "همه" ? [] : [e.target.value], + [name]: + e.target.value === "پایه تحصیلی" ? [] : [e.target.value], }, }) } diff --git a/src/views/Home/HomeSearch/index.js b/src/views/Home/HomeSearch/index.js index 512036f..cc62780 100644 --- a/src/views/Home/HomeSearch/index.js +++ b/src/views/Home/HomeSearch/index.js @@ -25,7 +25,7 @@ class HomeSearch extends Component { render() { const { height, levels } = this.props; - return ( + return window.innerWidth > 1000 ? (
+ ) : ( + <> +
+
+ + this.setState({ + filters: { ...this.state.filters, search: e.target.value }, + }) + } + /> + + +
+ ); } } diff --git a/src/views/Home/HomeSearch/index.scss b/src/views/Home/HomeSearch/index.scss index 85cc2ff..a67fcff 100644 --- a/src/views/Home/HomeSearch/index.scss +++ b/src/views/Home/HomeSearch/index.scss @@ -48,9 +48,10 @@ padding: 5px 10px 5px 100px !important; } } + &__select { - position: relative; - margin-left: 20px; + // position: relative; + // margin-left: 20px; & img { position: absolute; left: 27px; @@ -67,3 +68,99 @@ padding: 7px 50px; } } + +.home-mobile-search { + // width: 100%; + // padding: 5px; + // box-shadow: 0px 0px 2px rgb(200, 200, 200); + // border-radius: 7px; + justify-content: space-between; + align-items: center; + flex: 1; + margin: 10px 7px 0; + font-family: numeralLight; + &__input:focus { + // border: 1px solid green; + box-shadow: 0px 0px 6px rgb(42, 197, 63); + } + &__input { + width: 100%; + padding: 10px; + box-shadow: 0px 0px 2px rgb(200, 200, 200); + border: 0px; + flex: 1; + border: 0px; + border-radius: 7px; + font-size: 11px; + color: green; + // padding: 5px 10px 0px; + font-size: 16px; + &::placeholder { + color: #d8dce5; + font-size: 16px; + } + &:focus { + outline: 0px !important; + } + } + .MuiFormControl-root { + margin: 0px !important; + margin-right: 0px !important; + width: 100%; + select:focus { + // border: 1px solid green; + box-shadow: 0px 0px 6px rgb(42, 197, 63); + } + select { + padding: 10px; + box-shadow: 0px 0px 2px rgb(200, 200, 200); + font-family: numeralLight; + height: 100%; + width: 100% !important; + direction: rtl; + border: 0px !important; + border-radius: 7px; + text-align: center !important; + + color: #02733c !important; + &:focus { + background-color: white !important; + } + } + .MuiNativeSelect-icon { + display: none; + } + .MuiNativeSelect-select { + // padding: 5px 10px 5px 100px !important; + } + } + &__select { + position: relative; + width: 100%; + // margin-left: 5px; + position: relative; + top: 5px; + & img { + position: relative; + top: -20px; + left: 10px; + float: left; + width: 20px; + height: 10px; + } + select { + width: 100%; + } + } + &__submit { + position: relative; + top: -37px; + left: 5px; + border: 0px; + background-color: #7dc241; + font-size: 13px; + color: white; + border-radius: 5px; + padding: 5px 7px; + } +} diff --git a/src/views/Home/HomeSlider/Blog/index.js b/src/views/Home/HomeSlider/Blog/index.js index f662cbb..3e6950e 100644 --- a/src/views/Home/HomeSlider/Blog/index.js +++ b/src/views/Home/HomeSlider/Blog/index.js @@ -110,14 +110,19 @@ export default class Simple extends Component {
{/* */} -
+
مطالعه کامل در {data.duration} دقیقه تاریخ انتشار {moment(data.createdAt).format("YYYY/MM/DD")}
- {data.buttonText} + + {data.buttonText || "ادامه مطلب"} +
-

{data.name}

-

{data.subTitle}

+

+ {data.name} +

+ {data.subTitle ? ( +

+ {data.subTitle} +

+ ) : null} {data.price ? (
{data.price} تومان diff --git a/src/views/Home/HomeSlider/Simple/index.scss b/src/views/Home/HomeSlider/Simple/index.scss index 7afd08e..f59cc23 100644 --- a/src/views/Home/HomeSlider/Simple/index.scss +++ b/src/views/Home/HomeSlider/Simple/index.scss @@ -1,5 +1,6 @@ .slider-simple { - padding: 10px; + padding: 0 10px; + text-align: center; a { width: 100%; text-decoration: none; @@ -13,13 +14,14 @@ } h1 { font-family: numeralMedium; - margin-top: 15px; - color: #7dc241; + margin-top: 5px; + margin-bottom: 5px; + color: #41c26f; letter-spacing: -1px; } h2 { font-family: numeralLight; - margin-top: 10px; + margin-top: 5px; color: #6f7074; } } @@ -32,7 +34,7 @@ } &__price { width: 100%; - margin-top: 15px; + margin-top: 5px; text-align: center; &--old { font-family: numeralLight; diff --git a/src/views/Home/HomeSlider/index.js b/src/views/Home/HomeSlider/index.js index 8158929..7ee34be 100644 --- a/src/views/Home/HomeSlider/index.js +++ b/src/views/Home/HomeSlider/index.js @@ -146,7 +146,7 @@ export default class HomeSlider extends Component { itemsToShow={number} isRTL={true} enableTilt={false} - showArrows={true} + showArrows={false} pagination={false} > {data.map((item, i) => ( diff --git a/src/views/Home/HomeStatic/Identifier/index.js b/src/views/Home/HomeStatic/Identifier/index.js index 0d0be38..0752b61 100644 --- a/src/views/Home/HomeStatic/Identifier/index.js +++ b/src/views/Home/HomeStatic/Identifier/index.js @@ -1,29 +1,17 @@ -import React from 'react'; -import Flex from '../Flex/index'; -import Simple from '../Simple/index'; -import Vitrin from '../Vitrin/index'; -import Column from '../3D/index'; +import React from "react"; +import Flex from "../Flex/index"; +import Simple from "../Simple/index"; +import Vitrin from "../Vitrin/index"; +import Column from "../3D/index"; -export default function Identifier(props){ - const {data} = props; - return( +export default function Identifier(props) { + const { data, status } = props; + return ( <> - { - data.design === 'flex' ? - : null - } - { - data.design === 'simple' ? - : null - } - { - data.design === 'vitrin' ? - : null - } - { - data.design === '3d' ? - : null - } + {data.design === "flex" ? : null} + {data.design === "simple" ? : null} + {data.design === "vitrin" ? : null} + {data.design === "3d" ? : null} ); -} \ No newline at end of file +} diff --git a/src/views/Home/HomeStatic/Simple/index.js b/src/views/Home/HomeStatic/Simple/index.js index 4e354fa..90252cc 100644 --- a/src/views/Home/HomeStatic/Simple/index.js +++ b/src/views/Home/HomeStatic/Simple/index.js @@ -9,7 +9,7 @@ const fontSize = { }; export default function Simple(props) { - const { data } = props; + const { data, status } = props; const parentStyle = { // backgroundImage: `url('${data.imageUrl}')`, background: data.fileId diff --git a/src/views/Home/HomeStatic/Vitrin/index.js b/src/views/Home/HomeStatic/Vitrin/index.js index 946bf16..8b2d0ba 100644 --- a/src/views/Home/HomeStatic/Vitrin/index.js +++ b/src/views/Home/HomeStatic/Vitrin/index.js @@ -23,38 +23,39 @@ export default function Vitrin(props) { }; return ( -
- +

{data.title}

- +
{data.books.map((item, i) => ( ))} - + مشاهده بیشتر - +
-
+ ); } const Item = (props) => { const { data } = props; return ( - {"عکس - +
); }; diff --git a/src/views/Home/HomeStatic/index.js b/src/views/Home/HomeStatic/index.js index 772c494..d9cd7f3 100644 --- a/src/views/Home/HomeStatic/index.js +++ b/src/views/Home/HomeStatic/index.js @@ -1,9 +1,9 @@ import React, { Component } from "react"; import ChevronLeftIcon from "@material-ui/icons/ChevronLeft"; import Identifier from "./Identifier/index"; - +import proxy from "~/Redux/proxy"; import "./index.scss"; - +const status = proxy.status(); const maxDesktopSize = 1250; const fontSize = { @@ -49,11 +49,15 @@ export default class HomeStatic extends Component { {window.innerWidth < 1000 ? (
- {data.map((item, i) => ( - - ))} + {data.map((item, i) => + status ? ( + + ) : ( + + ) + )}
) : null} @@ -85,7 +89,29 @@ const Item = (props) => { alt="عکس" />
- ) : null} + ) : ( +
+ عکس +
+

+ {props.data.topText} +

+

+ {props.data.bottomText} +

+
+
+ )} ); }; diff --git a/src/views/Home/HomeStatic/index.scss b/src/views/Home/HomeStatic/index.scss index d18bb21..4a9fa42 100644 --- a/src/views/Home/HomeStatic/index.scss +++ b/src/views/Home/HomeStatic/index.scss @@ -1,6 +1,7 @@ .home-static { margin: 20px 0px; width: 100%; + justify-content: space-between; &__list { justify-content: space-between; width: 100%; @@ -24,6 +25,35 @@ } } } + &__list2 { + justify-content: space-between; + // width: 50%; + &--item { + // box-shadow: 0px 0px 5px rgb(200, 200, 200); + border: 1px solid #eee; + font-family: numeralMedium; + align-items: center; + border-radius: 10px; + margin: 5px; + padding: 15px 10px; + justify-content: space-around; + text-align: center; + div { + text-align: right; + h2 { + // font-weight: bold; + font-size: 20px; + letter-spacing: -1px; + } + } + img { + padding-top: 5px; + margin: auto; + // border-radius: 10px; + height: 35px; + } + } + } } .mobile-home-static { diff --git a/src/views/Home/Navbar/Laptop/index.js b/src/views/Home/Navbar/Laptop/index.js index e67d916..0076713 100644 --- a/src/views/Home/Navbar/Laptop/index.js +++ b/src/views/Home/Navbar/Laptop/index.js @@ -91,7 +91,7 @@ export default class LaptopNavbar extends Component { to={"/auth"} className="laptop-navbar__signup" > - ورود به حساب کاربری + ورود یا ثبت‌نام )} diff --git a/src/views/Home/Navbar/Mobile/NavbarDrawer/NavbarDrawer.js b/src/views/Home/Navbar/Mobile/NavbarDrawer/NavbarDrawer.js index e2ad286..c0c1c29 100644 --- a/src/views/Home/Navbar/Mobile/NavbarDrawer/NavbarDrawer.js +++ b/src/views/Home/Navbar/Mobile/NavbarDrawer/NavbarDrawer.js @@ -20,7 +20,7 @@ import mobileMail from "~/assets/icons/mobileMail.svg"; import mobileProfile from "~/assets/icons/mobileProfile.svg"; import mobileDanger from "~/assets/icons/mobileDanger.svg"; import mobileLogout from "~/assets/icons/mobileLogout.svg"; - +import proxy from "~/Redux/proxy"; import "./NavbarDrawer.scss"; class NavbarDrawer extends Component { state = { @@ -28,44 +28,102 @@ class NavbarDrawer extends Component { }; render() { + const statusx = proxy.status(); + this.links = [ + { + name: "صفحه اصلی", + link: "/", + icon: صفحه اصلی, + toast: "", + message: "", + }, + { + name: "ورود یا ثبت نام", + link: "/auth", + icon: کتاب‌های من, + toast: "", + message: "", + }, + { + name: "فروشگاه", + link: "/products", + icon: کتاب‌های من, + toast: "", + message: "", + }, + { + name: "بلاگ", + link: "/blogs", + icon: بلاگ, + toast: "", + message: "", + }, + { + name: "پشتیبانی", + link: "/support", + icon: پشتیبانی, + toast: "", + message: "", + // onClick: this.props.logout, + }, + { + name: "خروج", + link: "/auth", + icon: خروج, + toast: "", + message: "", + onClick: () => { + localStorage.removeItem("refresh"); + localStorage.removeItem("access"); + localStorage.removeItem("userData"); + window.location.reload(); + }, + }, + ]; const { status } = this.props; + let score = 2; return (
-
- <> - -
-

{status.firstName + " " + status.lastName}

-
- + {statusx ? ( +
+ <> + - {this.state.dropdown ? ( -
this.setState({ dropdown: false })} - > - {score ? {score} امتیاز : null} - -
- ) : ( -
this.setState({ dropdown: true })} - > - {score ? {score} امتیاز : null}{" "} - -
- )} -
+
+

{status.firstName + " " + status.lastName}

+
+ + + {this.state.dropdown ? ( +
this.setState({ dropdown: false })} + > + {score ? {score} امتیاز : null} + +
+ ) : ( +
this.setState({ dropdown: true })} + > + {score ? {score} امتیاز : null}{" "} + +
+ )} +
+ ) : null} {this.state.dropdown ? (
{/* {this.props.users.map((item, i) => ( @@ -87,7 +145,7 @@ class NavbarDrawer extends Component {
) : null}
- {this.props.links.map((item, key) => ( + {(statusx ? this.props.links : this.links).map((item, key) => ( maxDesktopSize ? 15 : window.innerWidth / 85, + a: window.innerWidth > maxDesktopSize ? 15 : window.innerWidth / 85, + }, + mobile: { + h1: window.innerWidth > maxMobileSize ? 30 : window.innerWidth / 18, + p: window.innerWidth > maxMobileSize ? 18 : window.innerWidth / 28, + h2: window.innerWidth > maxMobileSize ? 20 : window.innerWidth / 23, + li: window.innerWidth > maxMobileSize ? 16 : window.innerWidth / 28, + }, +}; const useStyles = makeStyles({ list: { width: window.innerWidth * 0.8, @@ -26,6 +40,7 @@ const useStyles = makeStyles({ }); export default function MobileNavbar(props) { + const status = proxy.status(); const classes = useStyles(); const [state, setState] = useState({ top: false, @@ -63,21 +78,62 @@ export default function MobileNavbar(props) { />
); + if (!status) + return ( + + ); return (
*/}
منو + + لوگو +
diff --git a/src/views/Home/Navbar/Mobile/index.scss b/src/views/Home/Navbar/Mobile/index.scss index 7de9890..7c59898 100644 --- a/src/views/Home/Navbar/Mobile/index.scss +++ b/src/views/Home/Navbar/Mobile/index.scss @@ -9,11 +9,27 @@ z-index: 400; padding: 0px 10px 0px; height: 50px; + box-shadow: 0px 0px 6px rgba(0, 0, 0, 0.3); + &__signup { + font-family: numeralLight; + text-decoration: none; + color: white; + background-color: #6cbe44; + border-radius: 6px; + padding: 5px 10px; + &:hover { + color: white; + } + } &__menu { justify-self: flex-start; img { width: 26px; } + .logo { + width: 85px; + margin-right: 10px; + } } &__logo { position: absolute; @@ -26,6 +42,13 @@ width: 85px; } } + &__logo2 { + margin: 0 10px; + img { + // transform: translate(20px, 0px); + width: 85px; + } + } &__left { justify-self: flex-end; img { diff --git a/src/views/Home/SingleBlog/index.js b/src/views/Home/SingleBlog/index.js index 14707eb..2462a42 100644 --- a/src/views/Home/SingleBlog/index.js +++ b/src/views/Home/SingleBlog/index.js @@ -32,7 +32,7 @@ export default class SingleBlog extends Component { style={{ fontSize: fontSize.desktop.a }} to={"/blogs/" + data.id} > - ادامه + ادامه مطلب
diff --git a/src/views/Home/index.js b/src/views/Home/index.js index 8924800..17076ac 100644 --- a/src/views/Home/index.js +++ b/src/views/Home/index.js @@ -36,59 +36,46 @@ import Loader from "~/components/Loader/index"; // import home_ar from "~/assets/icons/home_ar(2).png"; import "./index.scss"; + class Home extends Component { componentDidMount() { + const mobile = window.innerWidth < 1000; window.scrollTo(0, 0); - if (window.innerWidth < 1000) { + if (mobile && this.props.status) { this.props.getHomeData({ device: 2 }); } else { - this.props.getHomeData({ device: 1 }); + this.props.getHomeData({ device: 1, mobile: mobile ? 1 : 0 }); } } render() { - const { homeData, loading } = this.props; + const { homeData, loading, status } = this.props; + const mobile = window.innerWidth < 1000; + if (loading) + return ( +
+ +
+ ); return ( <> - {window.innerWidth > 1000 ? ( - !loading ? ( - <> -
- - {homeData.map((item, i) => ( - - ))} -
-
- - ) : ( -
- -
- ) - ) : null} - {window.innerWidth < 1000 ? ( - !loading ? ( - <> -
- - {homeData.map((item, i) => ( - - ))} -
- - ) : ( -
- -
- ) - ) : null} + <> +
+ + {homeData.map((item, i) => ( + + ))} +
+ {window.innerWidth > 1000 ?
: null} + ); } @@ -144,7 +131,7 @@ const Identifier = (props) => { /> ) : null ) : null} - {props.item.type === "search" && window.innerWidth > 1000 ? ( + {props.item.type === "search" ? ( ) : null} {props.item.type === "membership" && window.innerWidth > 1000 ? ( diff --git a/src/views/MyBooks/index.js b/src/views/MyBooks/index.js index 6f4c04d..2a5c46c 100644 --- a/src/views/MyBooks/index.js +++ b/src/views/MyBooks/index.js @@ -27,7 +27,8 @@ const fontSize = { class MyBooks extends React.Component { componentDidMount() { - this.props.getList(); + console.log(this.props); + // this.props.getList(); window.scrollTo(0, 0); } @@ -109,7 +110,7 @@ class MyBooks extends React.Component { export default connect( (state) => ({ - list: state.userProduct.mylist, + list: state.userProduct.mylist || [], checkEmpty: state.userProduct.checkEmpty, // status: state.user.status, }), diff --git a/src/views/Products/Product/index.js b/src/views/Products/Product/index.js index 7dae0ee..a05f714 100644 --- a/src/views/Products/Product/index.js +++ b/src/views/Products/Product/index.js @@ -29,8 +29,8 @@ export default class Product extends Component { return ( <> {window.innerWidth < 1000 ? ( -
{product.name}
- @@ -50,7 +50,7 @@ export default class Product extends Component { {product.product[1].price} تومان - +
-
+ ) : null} {window.innerWidth > 1000 ? (
diff --git a/src/views/Products/Product/index.scss b/src/views/Products/Product/index.scss index 6a1174f..1cd1f55 100644 --- a/src/views/Products/Product/index.scss +++ b/src/views/Products/Product/index.scss @@ -98,7 +98,8 @@ width: 80%; margin: 10px auto; justify-content: space-between; - a { + a, + div { width: 48%; padding: 5px 3px; border-radius: 7px; @@ -142,7 +143,8 @@ margin: 0px; text-align: center; } - a { + a, + div { width: 48%; padding: 5px 3px; border-radius: 7px; @@ -163,7 +165,8 @@ margin: 10px auto; flex-direction: column; - a { + a, + div { width: 100%; padding: 10px 5px; border-radius: 7px; @@ -206,7 +209,8 @@ color: #4d4d4d; letter-spacing: -1px; } - a { + a, + div { width: 48%; padding: 5px 3px; border-radius: 7px; @@ -227,7 +231,8 @@ margin: 10px auto; flex-direction: column; - a { + a, + div { width: 100%; padding: 10px 5px; border-radius: 7px; diff --git a/src/views/QRScan/index.js b/src/views/QRScan/index.js index aba14a4..f00a44c 100644 --- a/src/views/QRScan/index.js +++ b/src/views/QRScan/index.js @@ -93,7 +93,7 @@ class QRScan extends Component { {window.innerWidth < 1000 ? ( <>
- + {/*
بازگشت
*/}