Merge branch 'master' of http://49.4.49.126:3000/Gyee_web/sisMobilePhone

components/bracelet/raceletDetails/heartbeatDetails.vue

@@ -474,7 +474,7 @@ button{
 			font-size: 28upx;
 		}
 .bc{
-	height: 673px;
+	height: 680px;
 	width: 100%;
 	background-color: #242424;
 }

components/detail/Detail.vue

@@ -484,7 +484,7 @@ export default {
 					position: 'top',
 					float: 'right'
 				},
-				fontSize: 11,
+				fontSize: 6,
 				background: '#242424',
 				pixelRatio: _self.pixelRatio,
 				animation: true,