fix: Avatar LoadMore Button

Author: pengshanglong

src/components/avatar/index.jsx

@@ -28,7 +28,7 @@ export default {
     },
     openData: {
       type: Object,
-      default: () => {},
+      default: () => ({}),
     },
     customStyle: {
       type: [Object, String],
@@ -40,7 +40,7 @@ export default {
     },
   },
 
-  render() {
+  render(h) {
     const { size, circle, image, text, openData, customStyle, className } = this
     const rootClassName = ['at-avatar']
     const iconSize = SIZE_CLASS[size || 'normal']
@@ -52,19 +52,17 @@ export default {
     let letter = ''
     if (text) letter = text[0]
 
-    let elem
-    if (openData && openData.type === 'userAvatarUrl' && this.$isWEAPP()) {
-      // TODO OpenData Component
-      elem = <OpenData type={openData.type}></OpenData>
-    } else if (image) {
-      elem = <image class="at-avatar__img" src={image} />
-    } else {
-      elem = <text class="at-avatar__text">{letter}</text>
-    }
-
+    const isOpenData = openData && openData.type === 'userAvatarUrl' && this.$isWEAPP()
+    const isImage = !isOpenData && image !== ''
+    const isText = !isOpenData && !image
+    console.log('isOpenData', isOpenData)
+    console.log('isImage', isImage)
+    console.log('isText', isText)
     return (
       <view class={classNames(rootClassName, classObject, className)} style={customStyle}>
-        {elem}
+        {isOpenData && <OpenData type={openData.type}></OpenData>}
+        {isImage && <image class="at-avatar__img" src={image} />}
+        {isText && <view class="at-avatar__text">{letter}</view>}
       </view>
     )
   },

src/components/button/index.jsx

@@ -196,13 +196,7 @@ export default {
     const loadingColor = type === 'primary' ? '#fff' : ''
     const loadingSize = size === 'small' ? '30' : 0
 
-    let loadingComponent = null
     if (loading) {
-      loadingComponent = (
-        <view className="at-button__icon">
-          <Loading color={loadingColor} size={loadingSize} />
-        </view>
-      )
       rootClassName.push('at-button--icon')
     }
 
@@ -248,7 +242,6 @@ export default {
             <Loading color={loadingColor} size={loadingSize} />
           </view>
         )}
-        {loadingComponent}
         <view class="at-button__text">{this.$slots.default}</view>
       </view>
     )

src/components/load-more/index.jsx

@@ -1,4 +1,5 @@
 import classNames from 'classnames'
+import Button from '../button/index'
 import AtActivityIndicator from '../activity-indicator/index'
 
 export default {
@@ -61,9 +62,9 @@ export default {
     } else if (status === 'more') {
       component = (
         <view class="at-load-more__cnt">
-          <AtButton full onClick={this.onClick} customStyle={moreBtnStyle}>
+          <Button full onTap={this.onClick} customStyle={moreBtnStyle}>
             {moreText}
-          </AtButton>
+          </Button>
         </view>
       )
     } else {

src/pages/index/index.vue

@@ -18,13 +18,13 @@
         color="#F00"
       />
     </Badge>
-    <Button 
+    <!-- <Button 
       loading 
       type="primary"
       :on-click="onClick"
     >
       hello
-    </Button>
+    </Button> -->
     <Fab>fab</Fab>
     <Avatar text="111" />
     <Curtain