Merge remote-tracking branch 'origin/master'

src/components/Btmbutton.vue

@@ -33,10 +33,10 @@
 				  <span>应急物资</span>
 			  </div>
 			  <div class="btm-con3">
-					<i class="iconfont yj-icon-fengsu"></i>
-					<i class="iconfont yj-icon-fengxiang"></i>
-					<i class="iconfont yj-icon-jiangyuliang"></i>
-					<i class="iconfont yj-icon-shidu"></i>
+					<span><i class="iconfont yj-icon-fengsu"></i><u>风力</u></span>
+					  <span><i class="iconfont yj-icon-fengxiang"></i><u>东南风</u></span>
+					  <span><i class="iconfont yj-icon-jiangyuliang"></i><u>10mm</u></span>
+					  <span><i class="iconfont yj-icon-shidu"></i><u>93</u></span>
 			  </div>
 			  <div class="btn-left">
 				  <p><i class="iconfont yj-icon-tongxunlu"></i>通讯录</p>
@@ -253,16 +253,26 @@ export default {
 		padding-right: 30px;
 	}
 	.btm-con3{
-		width:220px ;
+		width:250px ;
 		height: 20px;
 		margin: 75px auto 0px auto;
 		display: flex;
 		flex-direction: row;
 		justify-content: space-between;
 	}
+	.btm-con3 span{
+		margin: 0px 5px;
+	}
 	.btm-con3 i{
 		color: #fff;
 		font-size: 16px;
+
+	}
+	.btm-con3 u{
+		color: #fff;
+		font-size: 14px;
+		text-decoration: none;
+		padding-left: 5px;
 	}
 	.btn-left{
 		position: absolute;