diff --git a/src/components/avatar/index.js b/src/components/avatar/index.js index de14bbc25..353216115 100644 --- a/src/components/avatar/index.js +++ b/src/components/avatar/index.js @@ -58,6 +58,7 @@ AtAvatar.defaultProps = { size: 'normal', circle: false, image: '', + text: '', openData: {}, customStyle: {}, } @@ -66,6 +67,7 @@ AtAvatar.propTypes = { size: PropTypes.oneOf(['large', 'normal', 'small']), circle: PropTypes.bool, image: PropTypes.string, + text: PropTypes.string, openData: PropTypes.object, customStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.string]), } diff --git a/src/components/timeline/index.js b/src/components/timeline/index.js index 6048527f3..a7a544021 100644 --- a/src/components/timeline/index.js +++ b/src/components/timeline/index.js @@ -36,9 +36,9 @@ export default class AtTimeline extends AtComponent { if (icon) dotClass.push('at-timelineitem__icon') return ( - + - + {icon && } diff --git a/src/pages/view/noticebar/index.js b/src/pages/view/noticebar/index.js index 447b4b34c..e1f9c8514 100644 --- a/src/pages/view/noticebar/index.js +++ b/src/pages/view/noticebar/index.js @@ -19,8 +19,8 @@ export default class NoticebarPage extends Taro.Component { } onGotoMore () { - if (Taro.getEnv() === Taro.ENV_TYPE.WEAPP) Taro.showModal({ content: '点击了更多!' }) - else if (Taro.getEnv() === Taro.ENV_TYPE.WEB) alert('您点击了更多!') + if (Taro.getEnv() === Taro.ENV_TYPE.WEB) alert('您点击了更多!') + else Taro.showModal({ content: '点击了更多!' }) } render () {