molong/tuniao-ui
1
0
Fork 0
mirror of https://gitee.com/TSpecific/tuniao-ui.git synced 2026-06-07 03:53:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Aisen
2024-06-21 18:24:09 +08:00
parent 6142c5c654 d0f4356c9f
commit 0d09b34409
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tuniao-ui/components/tn-action-sheet/tn-action-sheet.vue
+1 -1
View File
@@ -139,7 +139,7 @@
} }
}, },
elZIndex() { elZIndex() {
return this.zIndex ? this.zIndex : this.$t.zIndex.popup return this.zIndex ? this.zIndex : this.$tn.zIndex.popup
} }
}, },
methods: { methods: {
tuniao-ui/components/tn-avatar/tn-avatar.vue
+9 -1
View File
@@ -1,7 +1,7 @@
<template> <template>
<view <view
class="tn-avatar-class tn-avatar" class="tn-avatar-class tn-avatar"
:class="[backgroundColorClass,avatarClass]" :class="[backgroundColorClass,fontColorClass,avatarClass]"
:style="[avatarStyle]" :style="[avatarStyle]"
@tap="click" @tap="click"
> >
@@ -176,6 +176,14 @@
} else if (this.shadow && this.showImg) { } else if (this.shadow && this.showImg) {
style.backgroundImage = `url(${this.src})` style.backgroundImage = `url(${this.src})`
} }
if(this.fontColorStyle) {
style.color = this.fontColorStyle
}
if(this.fontSizeStyle) {
style.fontSize = this.fontSizeStyle
}
if (this.border) { if (this.border) {
style.border = `${this.borderSize}rpx solid ${this.borderColor}` style.border = `${this.borderSize}rpx solid ${this.borderColor}`