diff --git a/src/common/constant.js b/src/common/constant.js index 9980dbf..08f3a2c 100644 --- a/src/common/constant.js +++ b/src/common/constant.js @@ -10,7 +10,7 @@ export const BASE_URL = CURRENT_BASE_URL // export const BASE_URL = `http://192.168.1.9:50005/lymarket` // 发 // export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发 // export const BASE_URL = `https://dev.zzfzyc.com/lymarket` // 开发环境 -// export const BASE_URL = `https://www.zzfzyc.com/lymarket` // 正式环境 +// export const BASE_URL = `https://www.zzfzyc.com/lymarket` // 正式环境 // export const BASE_URL = `http://192.168.1.5:40001/lymarket` // 王霞 // export const BASE_URL = `http://192.168.1.7:50002/lymarket` // 添 // export const BASE_URL = `http://192.168.1.22:50002/lymarket` // 婷 diff --git a/src/components/banner/index.module.scss b/src/components/banner/index.module.scss index db835a6..6199ffa 100644 --- a/src/components/banner/index.module.scss +++ b/src/components/banner/index.module.scss @@ -1,18 +1,17 @@ -.swiper_con{ - padding:0 20px; - height: 178px; - .xswiper { - height: 100% !important; +.swiper_con { + padding: 0 20px; + height: 270px; + .xswiper { + height: 100% !important; + border-radius: 20px; + .image_item { + width: 100%; + height: 100%; + image { + width: 100%; + height: 100%; border-radius: 20px; - .image_item{ - width: 100%; - height: 100%; - - image{ - width: 100%; - height: 100%; - border-radius: 20px; - } - } + } } -} \ No newline at end of file + } +} diff --git a/src/components/search/index.module.scss b/src/components/search/index.module.scss index bd72902..40e27da 100644 --- a/src/components/search/index.module.scss +++ b/src/components/search/index.module.scss @@ -1,69 +1,69 @@ -.search_main{ +.search_main { + display: flex; + align-items: center; + position: relative; + width: 100%; + z-index: 0; + .icon_a_sousuo1_self { + font-size: 40px; + color: $color_font_two; + } + .search_con { + position: relative; display: flex; align-items: center; - position: relative; width: 100%; - z-index: 0; - .icon_a_sousuo1_self{ - font-size: 37px; - color: $color_font_two; - } - .search_con{ - position: relative; - display: flex; - align-items: center; - width: 100%; - input{ - font-size: 27px; - background: #eee; - width: 100%; - height: 60px; - border-radius: 50px; - padding: 0 60px; - box-sizing: border-box; - z-index:0; - &::-webkit-input-placeholder { /* WebKit browsers */ - color: #999; - font-size: 16px; - } - - &::-moz-placeholder { /* Mozilla Firefox 19+ */ - color: #999; - font-size: 16px; - } - - &::-ms-input-placeholder { /* Internet Explorer 10+ */ - color: #999; - font-size: 16px; - } - } - .search_closeBtn{ - position: absolute; - right: 10px; - } - - } - .btn{ - width: 100px; - font-size: $font_size_medium; - color: $color_font_two; - display: flex; - justify-content: center; - align-items: center; + input { + font-size: 27px; + background: #eee; + width: 100%; + height: 72px; + border-radius: 50px; + padding: 0 60px 0 80px; + box-sizing: border-box; + z-index: 0; + &::-webkit-input-placeholder { + /* WebKit browsers */ + color: #999; + font-size: 16px; + } + &::-moz-placeholder { + /* Mozilla Firefox 19+ */ + color: #999; + font-size: 16px; + } + + &::-ms-input-placeholder { + /* Internet Explorer 10+ */ + color: #999; + font-size: 16px; + } } - .icon_inner{ - margin-right: 20px; - position: absolute; - left: 10px; - margin-right: 0; - z-index: 10; + .search_closeBtn { + position: absolute; + right: 10px; } - .icon_out{ - margin-right: 10px; - } - .input_out{ - padding-left: 20px !important; - } - -} \ No newline at end of file + } + .btn { + width: 100px; + font-size: $font_size_medium; + color: $color_font_two; + display: flex; + justify-content: center; + align-items: center; + } + .icon_inner { + margin-right: 20px; + position: absolute; + left: 24px; + margin-right: 0; + z-index: 10; + } + .icon_out { + margin-right: 10px; + } + .input_out { + padding-left: 20px !important; + } +} diff --git a/src/components/search/index.tsx b/src/components/search/index.tsx index 7d0c709..5e811c7 100644 --- a/src/components/search/index.tsx +++ b/src/components/search/index.tsx @@ -18,6 +18,7 @@ type Params = { btnTitle?: string debounceTime?: number //防抖时间,不设默认为零 defaultValue?: string + borderRadius?: string } export default memo( @@ -35,6 +36,7 @@ export default memo( btnTitle = '搜索', //搜索文字 debounceTime = 0, //防抖时间,不设默认为零 defaultValue = '', //默认值 + borderRadius = '50rpx', }: Params, ref, ) => { @@ -85,6 +87,7 @@ export default memo( )}> )} { return ( setShowShopCart(!showShopCart)}> - - goLink('/pages/collection/index')}> - 我的收藏 - goLink('/pages/searchList/search')}> - + + +