Merge branch 'master' of ssh://8.134.10.79:222/Leadfyy.co/ec.uniapp-master

components/uni-countdown/uni-countdown.vue

@@ -109,16 +109,16 @@
 		},
 		computed: {
 			dayText() {
-				return t("uni-countdown.day")
+				return t("天")
 			},
 			hourText(val) {
-				return t("uni-countdown.h")
+				return t("时")
 			},
 			minuteText(val) {
-				return t("uni-countdown.m")
+				return t("分")
 			},
 			secondText(val) {
-				return t("uni-countdown.s")
+				return t("秒")
 			},
 		},
 		watch: {
@@ -256,7 +256,7 @@
 		justify-content: center;
 		align-items: center;
 		line-height: $countdown-height;
-		margin: 5rpx;
+		// margin: 5rpx;
 		text-align: center;
 		font-size: $uni-font-size-sm;
 	}