Pre Merge pull request !9 from wssam/N/A

控制内容line-height高度在tag里居中

Signed-off-by: wssam <573616439@qq.com>

componentsPage/keyboard/keyboard.vue

@@ -200,7 +200,7 @@
 						return
 					}
 					// this.licensePlateValue[this.currentLicensePlateIndex] = e
-					this.$set(this.licensePlateValue, this.currentLicensePlateIndex, e)
+					this.$set(this.licensePlateValue, this.currentLicensePlateIndex, e+"")
 					this.currentLicensePlateIndex++
 					// 判断车牌是否已经选择完成
 					if (this.currentLicensePlateIndex === 8) {

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

@@ -12,7 +12,8 @@
           top: stickyTop + 'px',
           left: left + 'px',
           width: width === 'auto' ? 'auto' : width + 'px',
-          zIndex: elZIndex
+          zIndex: elZIndex,
+          backgroundColor: backgroundColorStyle
         }"
       >
         <slot></slot>
@@ -83,9 +84,6 @@
       stickyStyle() {
         let style = {}
         style.height = this.fixed ? this.height + 'px' : 'auto'
-        if (this.backgroundColorStyle) {
-          style.color = this.backgroundColorStyle
-        }
         if (this.elZIndex) {
           style.zIndex = this.elZIndex
         }

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

@@ -119,21 +119,25 @@
             style.padding = '0 12rpx'
             style.fontSize = '20rpx'
             style.height = '32rpx'
+            style.lineHeight = '32rpx'
             break
           case 'lg':
             style.padding = '0 20rpx'
             style.fontSize = '28rpx'
             style.height = '62rpx'
+            style.lineHeight = '62rpx'
             break
           default:
             style.padding = '0 16rpx'
             style.fontSize = '24rpx'
             style.height = '48rpx'
+            style.lineHeight = '48rpx'
             break
         }
         
         style.width = this.width || '120rpx'
         style.height = this.height || style.height
+        style.lineHeight = this.height || style.height
         
         style.padding = this.padding || style.padding
         if (this.margin) {