fix: 修复支付宝问题

jd-opensource · Dec 24, 2018 · b12fe13 · b12fe13
1 parent 9248146
commit b12fe13
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -36,9 +36,9 @@ export default class AtTimeline extends AtComponent {
       if (icon) dotClass.push('at-timelineitem__icon')
 
       return (
-        <View className={itemRootClassName} key={index}>
+        <View className={classNames(itemRootClassName)} key={index}>
           <View className='at-timelineitem__tail'></View>
-          <View className={dotClass}>
+          <View className={classNames(dotClass)}>
             {icon && <AtIcon customStyle={{ fontSize: '16px' }} value={icon} ></AtIcon>}
           </View>
           <View className='at-timelineitem__content'>

diff --git 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 () {