Skip to content

肖康 / Europa-web

Go to a project
Commit 4d71bc5a by 肖康
Options

Merge branch 'master' into dev

parents 190f92db cf8fcb19
Inline Side-by-side
Showing with 142 additions and 12 deletions
components/Footer/index.module.css 0 → 100644
.mvFooterBox {
height: 160px;
background: #F4F4F4;
}
.mvFooterBox .cons {
width: 1226px;
height: 120px;
margin: 0 auto;
padding-top: 25px;
}
.mvFooterBox .cons .img {
height: 56px;
width: 160px;
position: relative;
top: 8px;
}
.mvFooterBox .cons .navlink {
margin-top: 24px;
}
.mvFooterBox .cons .navlink a {
padding: 0 40px;
border-left: 1px solid #d1d1d1;
font-size: 14px;
color: #000;
height: 19px;
}
.mvFooterBox .cons .navlink a:hover {
color: #FF9A00;
}
.mvFooterBox .cons .navlink a:first-child {
border-left: 0px;
}
.mvFooterBox .cons .navlink a:last-child {
padding-right: 0px;
}
.mvFooterBox .footerBot {
height: 40px;
background: #FF9A00;
}
.mvFooterBox .footerBot .consp {
width: 1226px;
margin: 0 auto;
height: 40px;
line-height: 40px;
color: #FF9A00;
font-size: 14px;
color: #fff;
}
.mvFooterBox .footerBot .consp a {
color: #fff;
margin-left: 30px;
}
components/Footer/index.module.min.css
.mvFooterBox{height:160px;background:#F4F4F4}.mvFooterBox .cons{width:1226px;height:120px;margin:0 auto;padding-top:25px}.mvFooterBox .cons .img{height:90px;width:90px}.mvFooterBox .cons .navlink{margin-top:24px}.mvFooterBox .cons .navlink a{padding:0 40px;border-left:1px solid #d1d1d1;font-size:14px;color:#000;height:19px}.mvFooterBox .cons .navlink a:hover{color:#FF9A00}.mvFooterBox .cons .navlink a:first-child{border-left:0px}.mvFooterBox .cons .navlink a:last-child{padding-right:0px}.mvFooterBox .footerBot{height:40px;background:#FF9A00}.mvFooterBox .footerBot .consp{width:1226px;margin:0 auto;height:40px;line-height:40px;color:#FF9A00;font-size:14px;color:#fff}.mvFooterBox .footerBot .consp a{color:#fff;margin-left:30px} .mvFooterBox{height:160px;background:#F4F4F4}.mvFooterBox .cons{width:1226px;height:120px;margin:0 auto;padding-top:25px}.mvFooterBox .cons .img{height:56px;width:160px;position:relative;top:8px}.mvFooterBox .cons .navlink{margin-top:24px}.mvFooterBox .cons .navlink a{padding:0 40px;border-left:1px solid #d1d1d1;font-size:14px;color:#000;height:19px}.mvFooterBox .cons .navlink a:hover{color:#FF9A00}.mvFooterBox .cons .navlink a:first-child{border-left:0px}.mvFooterBox .cons .navlink a:last-child{padding-right:0px}.mvFooterBox .footerBot{height:40px;background:#FF9A00}.mvFooterBox .footerBot .consp{width:1226px;margin:0 auto;height:40px;line-height:40px;color:#FF9A00;font-size:14px;color:#fff}.mvFooterBox .footerBot .consp a{color:#fff;margin-left:30px}
components/Footer/index.module.scss
...@@ -7,8 +7,10 @@ ...@@ -7,8 +7,10 @@
margin: 0 auto; margin: 0 auto;
padding-top: 25px; padding-top: 25px;
.img { .img {
height: 90px; height: 56px;
width: 90px; width: 160px;
position: relative;
top:8px;
} }
.navlink { .navlink {
margin-top: 24px; margin-top: 24px;
......
components/Footer/index.tsx
...@@ -8,7 +8,7 @@ const Footer = () => { ...@@ -8,7 +8,7 @@ const Footer = () => {
<> <>
<div className={`${footerCss.mvFooterBox} `}> <div className={`${footerCss.mvFooterBox} `}>
<div className={`${footerCss.cons} boxsiz row bothSide`} > <div className={`${footerCss.cons} boxsiz row bothSide`} >
<img src='/images/logo.png' alt='' className={`${footerCss.img} `}/> <img src='/images/logofoot.png' alt='' className={`${footerCss.img} `}/>
<div className={`${footerCss.navlink} cons boxsiz row bothSide`}> <div className={`${footerCss.navlink} cons boxsiz row bothSide`}>
<Link href='/brands.html'>品牌馆</Link> <Link href='/brands.html'>品牌馆</Link>
<Link href='/about.html'>关于我们</Link> <Link href='/about.html'>关于我们</Link>
......
components/Header/components/SearchH/index.module.css 0 → 100644
.mvSearchBox {
height: 146px;
background: #FFFFFF;
}
.mvSearchBox .cons {
width: 1226px;
margin: 0 auto;
padding-top: 22px;
}
.mvSearchBox .cons .logoImg {
width: 228px;
height: 80px;
margin-top: 13px;
}
.mvSearchBox .cons .searchInputBox {
width: 630px;
height: 40px;
background: #FFFFFF;
border-radius: 2px;
border: 1px solid #FF9A00;
margin-top: 13px;
margin-left: 103px;
}
.mvSearchBox .cons .searchInputBox .inputGoods {
width: 451px;
height: 38px;
line-height: 38px;
padding: 0 15px;
border-right: 1px solid #FF9A00;
}
.mvSearchBox .cons .searchInputBox .inputNums {
width: 108px;
height: 38px;
line-height: 38px;
padding: 0 15px;
border-right: 1px solid #FF9A00;
}
.mvSearchBox .cons .searchInputBox .searchbtn {
width: 70px;
height: 38px;
cursor: pointer;
background: #FF9A00;
}
.mvSearchBox .cons .searchInputBox .searchbtn i {
font-size: 26px;
color: #fff;
}
.mvSearchBox .cons .searchInputBox .searchbtn:hover {
background: #E18800;
}
.mvSearchBox .cons .collectButton {
width: 70px;
height: 40px;
background: #FFFFFF;
border-radius: 2px;
margin-top: 15px;
border: 1px solid #E0E0E0;
}
components/Header/components/SearchH/index.module.min.css
.mvSearchBox{height:146px;background:#FFFFFF}.mvSearchBox .cons{width:1226px;margin:0 auto;padding-top:22px}.mvSearchBox .cons .logoImg{width:118px;height:118px;margin-left:54px;margin-top:-5px}.mvSearchBox .cons .searchInputBox{width:630px;height:40px;background:#FFFFFF;border-radius:2px;border:1px solid #FF9A00;margin-top:13px;margin-left:103px}.mvSearchBox .cons .searchInputBox .inputGoods{width:451px;height:38px;line-height:38px;padding:0 15px;border-right:1px solid #FF9A00}.mvSearchBox .cons .searchInputBox .inputNums{width:108px;height:38px;line-height:38px;padding:0 15px;border-right:1px solid #FF9A00}.mvSearchBox .cons .searchInputBox .searchbtn{width:70px;height:38px;cursor:pointer;background:#FF9A00}.mvSearchBox .cons .searchInputBox .searchbtn i{font-size:26px;color:#fff}.mvSearchBox .cons .searchInputBox .searchbtn:hover{background:#E18800}.mvSearchBox .cons .collectButton{width:70px;height:40px;background:#FFFFFF;border-radius:2px;margin-top:15px;border:1px solid #E0E0E0} .mvSearchBox{height:146px;background:#FFFFFF}.mvSearchBox .cons{width:1226px;margin:0 auto;padding-top:22px}.mvSearchBox .cons .logoImg{width:228px;height:80px;margin-top:13px}.mvSearchBox .cons .searchInputBox{width:630px;height:40px;background:#FFFFFF;border-radius:2px;border:1px solid #FF9A00;margin-top:13px;margin-left:103px}.mvSearchBox .cons .searchInputBox .inputGoods{width:451px;height:38px;line-height:38px;padding:0 15px;border-right:1px solid #FF9A00}.mvSearchBox .cons .searchInputBox .inputNums{width:108px;height:38px;line-height:38px;padding:0 15px;border-right:1px solid #FF9A00}.mvSearchBox .cons .searchInputBox .searchbtn{width:70px;height:38px;cursor:pointer;background:#FF9A00}.mvSearchBox .cons .searchInputBox .searchbtn i{font-size:26px;color:#fff}.mvSearchBox .cons .searchInputBox .searchbtn:hover{background:#E18800}.mvSearchBox .cons .collectButton{width:70px;height:40px;background:#FFFFFF;border-radius:2px;margin-top:15px;border:1px solid #E0E0E0}
components/Header/components/SearchH/index.module.scss
...@@ -6,10 +6,9 @@ ...@@ -6,10 +6,9 @@
margin:0 auto; margin:0 auto;
padding-top: 22px; padding-top: 22px;
.logoImg{ .logoImg{
width: 118px; width: 228px;
height: 118px; height: 80px;
margin-left: 54px; margin-top: 13px;
margin-top: -5px;
} }
.searchInputBox{ .searchInputBox{
......
components/Header/components/SearchH/index.tsx
...@@ -58,7 +58,7 @@ const SearchH = () => { ...@@ -58,7 +58,7 @@ const SearchH = () => {
<div className={styles.mvSearchBox}> <div className={styles.mvSearchBox}>
<div className={`${styles.cons} row bothSide boxsiz`}> <div className={`${styles.cons} row bothSide boxsiz`}>
<Link href='/'><img className={styles.logoImg} src='/images/logo.png' alt='' /></Link> <Link href='/'><img className={styles.logoImg} src='/images/logohead.png' alt='' /></Link>
{ {
router.pathname=="/login"|| router.pathname=="/reg"?'': router.pathname=="/login"|| router.pathname=="/reg"?'':
<div className={`${styles.searchInputBox} row boxsiz`}> <div className={`${styles.searchInputBox} row boxsiz`}>
......
configReact.tsx
...@@ -2,5 +2,5 @@ const os = require('os'); ...@@ -2,5 +2,5 @@ const os = require('os');
export const QQURL='https://wpa.qq.com/msgrd?v=3&amp;uin=1908059998&amp;site=qq&amp;menu=yes' export const QQURL='https://wpa.qq.com/msgrd?v=3&amp;uin=1908059998&amp;site=qq&amp;menu=yes'
export const API_URL=((os.hostname()=="192.168.1.62"||os.hostname()=="MS-NDPSTQVAWPAX"||os.hostname()=="dev235"||os.hostname()=="localhost"||os.hostname()=="erpweb.liexindev.com")?'http://erpweb.liexindev.net':'http://api.chiplinks.net') export const API_URL=((os.hostname()=="192.168.1.62"||os.hostname()=="MS-NDPSTQVAWPAX"||os.hostname()=="dev235"||os.hostname()=="localhost"||os.hostname()=="erpweb.liexindev.com")?'http://erpweb.liexindev.net':'https://api.chiplinks.net')
pages/index/components/HomeBanner.tsx
import styles from '../index.module.scss' import styles from '../index.module.scss'
import { Swiper, SwiperSlide } from 'swiper/react'; import { Swiper, SwiperSlide } from 'swiper/react';
import { Autoplay, Pagination } from 'swiper/modules'; import { Autoplay, Pagination } from 'swiper/modules';
...@@ -7,6 +6,7 @@ import 'swiper/css/pagination'; ...@@ -7,6 +6,7 @@ import 'swiper/css/pagination';
import Image from 'next/image'; import Image from 'next/image';
const HomeBanner = () => { const HomeBanner = () => {
console.log("jenkens")
const bannerList = [ const bannerList = [
{ {
title: '麒麟电子商城', title: '麒麟电子商城',
......
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 sign in to comment