Merge remote-tracking branch 'origin/master'

tuniao-ui/components/tn-action-sheet/tn-action-sheet.vue

@@ -139,7 +139,7 @@
         }
       },
       elZIndex() {
-        return this.zIndex ? this.zIndex : this.$t.zIndex.popup
+        return this.zIndex ? this.zIndex : this.$tn.zIndex.popup
       }
     },
     methods: {

tuniao-ui/components/tn-avatar/tn-avatar.vue

@@ -1,7 +1,7 @@
 <template>
   <view
     class="tn-avatar-class tn-avatar"
-    :class="[backgroundColorClass,avatarClass]"
+    :class="[backgroundColorClass,fontColorClass,avatarClass]"
     :style="[avatarStyle]"
     @tap="click"
   >
@@ -176,6 +176,14 @@
         } else if (this.shadow && this.showImg) {
           style.backgroundImage = `url(${this.src})`
         }
+
+        if(this.fontColorStyle) {
+			style.color = this.fontColorStyle
+		}
+		
+		if(this.fontSizeStyle) {
+			style.fontSize = this.fontSizeStyle
+		}
         
         if (this.border) {
           style.border = `${this.borderSize}rpx solid ${this.borderColor}`