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

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

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

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

@@ -45,7 +45,7 @@
 		 v-if="type === 'select'"
 		 class="tn-input__text"
 		 > 
-		 {{defaultValue}}
+		 {{defaultValue == undefined || defaultValue == '' ? placeholder : defaultValue }}
 		 </view>
 		 
 		 <input

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