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

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

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

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

@@ -248,6 +248,7 @@
         return (index, type) => {
           let color = type === 'bg' ? '' : this.color
           let day = index + 1
+
           let date = `${this.year}-${this.month}-${day}`
           let timestamp = new Date(date.replace(/\-/g,'/')).getTime()
           let start = this.startDate.replace(/\-/g,'/')
@@ -487,8 +488,9 @@
         let daysArr = days.map((item) => {
           let bottomInfo = this.showLunar ? Calendar.solar2lunar(this.year, this.month, item).IDayCn : ''
           let color = this.showLunar ? this.lunarColor : this.activeColor
+          let date = `${this.year}-${this.month}-${item}`
           if (
-            (this.mode === 'date' && this.day == item) || 
+            (this.mode === 'date'  && date == this.activeDate) ||
             (this.mode === 'range' && (this.startDay == item || this.endDay == item))
           ) {
             color = this.activeColor
@@ -501,7 +503,7 @@
               bottomInfo = this.endText
             }
           }
-          
+
           return {
             day: item,
             color: color,

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) {