Skip to content

M
mr-julyedu
Commit c945923f by zhanghaozhe
Options

Merge branch 'search-result' into dev 

# Conflicts:
#	public/api.js
parents ba312042 40315e34
Showing with 230 additions and 82 deletions
.storybook/preview.js
import './style.scss' import './style.scss'
import '../src/assets/font/iconfont.css'
import '@csstools/normalize.css/normalize.css'
\ No newline at end of file
public/api.js
var API = { var API = {
'www': 'http://www-test.julyedu.com', 'www': 'http://www-test.julyedu.com',
'home': 'http://fast-test.julyedu.com', 'home': 'http://fast-test.julyedu.com',
'search-api': 'https://search.julyedu.com', 'search-api': 'http://search-test.julyedu.com',
'passport-api': 'http://passport-test.julyedu.com', 'passport-api': 'http://passport-test.julyedu.com',
'base-api': 'http://api-test.julyedu.com', 'base-api': 'http://api-test.julyedu.com',
'record': 'record.julyedu.com:8001', 'record': 'record.julyedu.com:8001',
'process-api': 'ws:process-test.julyedu.com:9502', 'process-api': 'ws:process-test.julyedu.com:9502',
'm': 'http://m-test.julyedu.com', 'm': 'http://m-test.julyedu.com',
//terminal
'ws': 'ws://47.93.119.175:8888/ws', 'ws': 'ws://47.93.119.175:8888/ws',
} }
src/common/address/address.stories.tsx 0 → 100644
import React from 'react'
import Address from "./index";
import {text, boolean, withKnobs} from '@storybook/addon-knobs'
import {action} from '@storybook/addon-actions'
export default {
title: 'address',
component: Address,
decorators: [withKnobs]
}
let visible = true,
title = '收货地址',
subtitle = '获奖用户（以最终榜单为准）请及时填写收货信息',
address = '金域国际中心',
phone = '1331234123',
name = '某某某'
export const Default = () => {
visible = boolean('visible', visible)
name = text('name', name)
phone = text('phone', phone)
address = text('address', address)
title = text('title(optional)', title)
subtitle = text('subtitle(optional)', subtitle)
return <Address visible={visible}
subtitle={subtitle}
title={title}
name={name}
phone={phone}
address={address}
onClose={action('onClose')}
validate={() => ({name: '姓名'})}
onError={(errors) => {
console.log(errors);}}
onSubmit={(values, formikHelpers) => {
console.log(formikHelpers);
}}
/>
}
\ No newline at end of file
src/common/address/index.scss
.common-address-container {
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
width: 300px;
padding: 20px 25px;
background: #fff;
border-radius: 10px;
box-sizing: border-box;
text-align: center;
.title {
margin-bottom: 8px;
color: #525C65;
font-size: 16px;
}
.subtitle {
margin-bottom: 15px;
font-size: 13px;
color: #ED6A1D;
text-align: left;
}
input {
width: 250px;
height: 40px;
line-height: 40px;
border: 1px solid #DDD;
font-size: 13px;
color: #999;
outline: 0;
-webkit-appearance: none;
&:nth-child(n+2) {
margin-top: 10px;
}
&::placeholder {
color: #999;
}
}
.submit {
margin-top: 18px;
width: 121px;
height: 33px;
background: #09f;
border-radius: 17px;
font-size: 15px;
color: #fff;
-webkit-appearance: none;
outline: 0;
border: 0;
}
.close{
position: absolute;
left: 50%;
bottom: -56px;
transform: translateX(-50%);
font-size: 26px;
color: #fff;
}
}
\ No newline at end of file
src/common/address/index.tsx
import React, {Component} from 'react' import React, {Component} from 'react'
import './index.scss' import './index.scss'
import MaskCover from "../cover"; import MaskCover from "../cover";
import {Formik, Form, Field, FormikHelpers, FormikErrors} from "formik";
interface PersonalInfo { interface PersonalInfo {
name: string name: string
...@@ -9,20 +10,51 @@ interface PersonalInfo { ...@@ -9,20 +10,51 @@ interface PersonalInfo {
} }
interface Props extends PersonalInfo { interface Props extends PersonalInfo {
subtitle: string subtitle?: string
title?: string title?: string
onSubmit?: () => PersonalInfo onClose: () => void
visible: boolean
validate: () => void
onSubmit: (values: PersonalInfo, formikHelpers: FormikHelpers<PersonalInfo>) => void
onError: (errors: FormikErrors<PersonalInfo>) => void
} }
class Address extends Component<Props> { const Address: React.FC<Props> = ({name, phone, address, title, subtitle, visible, onClose, validate, onSubmit, onError}) => {
render() { return (
return <MaskCover> visible ?
<div className="address-container"> <MaskCover>
<div className="title"></div> <div className="common-address-container">
<div className="subtitle"></div> <div className="title">{title}</div>
<div className="subtitle">{subtitle}</div>
<Formik initialValues={{name, phone, address}}
enableReinitialize={true}
onSubmit={onSubmit}
validate={validate}
>
{
(props) => {
if (props.errors) {
onError(props.errors)
}
return <Form className={'form'}>
<Field placeholder={'姓名'} name='name'></Field>
<Field placeholder={'手机号'} name='phone'></Field>
<Field placeholder={'地址'} name='address'></Field>
<button type={'submit'} className={'submit'}>提交</button>
</Form>
}
}
</Formik>
<i className={'iconfont iconiconfront-2 close'} onClick={onClose}></i>
</div> </div>
</MaskCover> </MaskCover>
} : null
)
}
Address.defaultProps = {
title: '收货信息',
subtitle: '获奖用户（以最终榜单为准）请及时填写收货信息'
} }
export default Address export default Address
src/components/search/search-result.js
import React, { PureComponent } from 'react'; import React, { PureComponent } from 'react'
import SearchHeader from './searchHead' import SearchHeader from './searchHead'
import VList from 'src/common/VList' import VList from 'src/common/VList'
import { http, getParam } from 'src/utils' import { http, getParam } from 'src/utils'
...@@ -6,16 +6,15 @@ import './search-result.scss' ...@@ -6,16 +6,15 @@ import './search-result.scss'
import Recommendation from './recommendation' import Recommendation from './recommendation'
import throttle from 'lodash/throttle' import throttle from 'lodash/throttle'
const ForwardRefSearchHead = React.forwardRef((props, ref) => { const ForwardRefSearchHead = React.forwardRef((props, ref) => {
return <SearchHeader {...props} forwardedRef={ref}/> return <SearchHeader {...props} forwardedRef={ref} />
}) })
const Bottom = ({item}) => { const Bottom = ({ item }) => {
return ( return (
<div className='bottom'> <div className="bottom">
<span className='price'>¥{item.price1}</span> <span className="price">¥{item.price1}</span>
<span className='stale-price'>¥{item.price0}</span> <span className="stale-price">¥{item.price0}</span>
</div> </div>
) )
} }
...@@ -31,10 +30,11 @@ class SearchResult extends PureComponent { ...@@ -31,10 +30,11 @@ class SearchResult extends PureComponent {
value: decodeURIComponent(getParam('word')) || '', value: decodeURIComponent(getParam('word')) || '',
searchHistory: JSON.parse(localStorage.getItem('searchHistory')) || [], searchHistory: JSON.parse(localStorage.getItem('searchHistory')) || [],
fixedHeader: false, fixedHeader: false,
searchHeadStyle: {top: 0}, searchHeadStyle: { top: 0 },
swipeDirection: this.swipeUp, swipeDirection: this.swipeUp,
isHide: false, isHide: false,
basicTop: 0 basicTop: 0,
resultCount: 0,
} }
componentDidMount() { componentDidMount() {
...@@ -46,16 +46,15 @@ class SearchResult extends PureComponent { ...@@ -46,16 +46,15 @@ class SearchResult extends PureComponent {
document.removeEventListener('scroll', this.handleScroll) document.removeEventListener('scroll', this.handleScroll)
} }
getCourses = word => {
getCourses = (word) => { http.get(`${API['search-api']}/search/${word}?type=v2-course&page=1`).then(res => {
http.get(`${API['search-api']}/search/${word}?type=course&page=1`)
.then(res => {
const data = res.data const data = res.data
if (data.errno === 0) { if (data.errno === 0) {
this.setState({ this.setState({
courseList: data.data.info['search_data'].course courseList: data.data.info['search_data'].course,
}); resultCount: data.data.info['search_data'].num,
})
} }
}) })
} }
...@@ -69,31 +68,31 @@ class SearchResult extends PureComponent { ...@@ -69,31 +68,31 @@ class SearchResult extends PureComponent {
} }
handleChange = value => { handleChange = value => {
this.setState({value}) this.setState({ value })
} }
toCourseDetail = (id) => { toCourseDetail = id => {
const {history} = this.props; const { history } = this.props
history.push(`/detail?id=${id}`) history.push(`/detail?id=${id}`)
} }
handleScroll = throttle(() => { handleScroll = throttle(() => {
let y = window.scrollY < 0? 0 : window.scrollY, let y = window.scrollY < 0 ? 0 : window.scrollY,
headY = this.searchHead.current.offsetTop, headY = this.searchHead.current.offsetTop,
h = this.searchHead.current.offsetHeight; h = this.searchHead.current.offsetHeight
if(y > this.prevScrollY) { if (y > this.prevScrollY) {
this.setState({ this.setState({
searchHeadStyle: { searchHeadStyle: {
top : `${-h}px` top: `${-h}px`,
} },
}); })
} }
if(y < this.prevScrollY) { if (y < this.prevScrollY) {
this.setState({ this.setState({
searchHeadStyle: { searchHeadStyle: {
top: 0 top: 0,
} },
}); })
} }
// if (y < this.prevScrollY) { // if (y < this.prevScrollY) {
// if (this.state.swipeDirection === this.swipeDown) { // if (this.state.swipeDirection === this.swipeDown) {
...@@ -118,7 +117,6 @@ class SearchResult extends PureComponent { ...@@ -118,7 +117,6 @@ class SearchResult extends PureComponent {
// } // }
// }) // })
// } // }
// }) // })
// } // }
...@@ -132,15 +130,14 @@ class SearchResult extends PureComponent { ...@@ -132,15 +130,14 @@ class SearchResult extends PureComponent {
// } // }
// }) // })
// } // }
this.prevScrollY = y; this.prevScrollY = y
}, 0) }, 0)
render() { render() {
const { courseList, isHide } = this.state; const { courseList, isHide, resultCount } = this.state
return ( return (
<div <div className={'search-result'}>
className={'search-result'}>
<ForwardRefSearchHead <ForwardRefSearchHead
handleSearch={this.handleSearch} handleSearch={this.handleSearch}
value={this.state.value} value={this.state.value}
...@@ -150,55 +147,51 @@ class SearchResult extends PureComponent { ...@@ -150,55 +147,51 @@ class SearchResult extends PureComponent {
ref={this.searchHead} ref={this.searchHead}
isHide={isHide} isHide={isHide}
/> />
{ {resultCount > 0 && <div className="result-count">共{resultCount}个结果</div>}
{courseList && courseList.length > 0 ? (
courseList && courseList.length > 0 ?
<ul> <ul>
{ {courseList.map((item, index) => {
courseList.map(item => {
const Info = ( const Info = (
<div className="info"> <div className="info">
<p className='title text-overflow-2'>{item.course_title}</p> <p
<p className='des text-overflow-1'>{item.simpledescription}</p> className="title text-overflow-2"
<Bottom dangerouslySetInnerHTML={{
item={item} __html:
/> item.highlight?.course_title?.length > 0 ? item.highlight.course_title[0] : item.course_title,
}}
></p>
<p className="des text-overflow-1">{item.simpledescription}</p>
<Bottom item={item} />
</div> </div>
) )
const status = ( const status =
(item['bargain_num'] || item['groupon_num']) ? item['bargain_num'] || item['groupon_num'] ? (
<div <div className="status">
className='status'> {item['bargain_num'] === 0 ? `砍价减${item['groupon_num']}元` : `拼团减${item['bargain_num']}元`}
{
item['bargain_num'] === 0 ? `砍价减${item['groupon_num']}元` : `拼团减${item['bargain_num']}元`
}
</div> </div>
: null ) : null
)
return ( return (
<VList <VList
img={item.image_name} img={item.image_name}
toDetail={this.toCourseDetail} toDetail={this.toCourseDetail}
key={item.course_id} key={index}
info={Info} info={Info}
id={item['course_id']} id={item['course_id']}
status={status} status={status}
/> />
) )
}) })}
}
</ul> </ul>
: <div className="empty"> ) : (
<img src={require('./image/ss_empty.png')} alt=""/> <div className="empty">
<img src={require('./image/ss_empty.png')} alt="" />
抱歉，没有搜到相关内容！ 抱歉，没有搜到相关内容！
</div> </div>
} )}
<Recommendation/> <Recommendation />
</div> </div>
); )
} }
} }
export default SearchResult
export default SearchResult;
\ No newline at end of file
src/components/search/search-result.scss
@import "src/assets/css/variable"; @import 'src/assets/css/variable';
.search-result { .search-result {
padding-top: 44px; padding-top: 44px;
...@@ -16,13 +16,23 @@ ...@@ -16,13 +16,23 @@
} }
} }
.result-count {
width: 375px;
height: 30px;
background: #f7f7fb;
border-top: 1px solid #ddd;
color: #333;
font-size: 12px;
text-align: center;
line-height: 30px;
}
ul { ul {
list-style: none; list-style: none;
border-top:1px solid #ddd;
} }
.v-list-item{ .v-list-item {
.content{ .content {
width: 100%; width: 100%;
} }
} }
...@@ -31,14 +41,17 @@ ...@@ -31,14 +41,17 @@
width: 50%; width: 50%;
position: relative; position: relative;
display: block; display: block;
.title{ .title {
font-size: $font_16; font-size: $font_16;
color:#525C65; color: #525c65;
em {
color: #09f;
}
} }
.des { .des {
font-size: $font_14; font-size: $font_14;
color:#777; color: #777;
margin-top: 10px; margin-top: 10px;
} }
......
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