Merge branch 'master' of http://git.ahbmz.com/wechat/wechat.junfei.iiixo.com

pages/contactUs/contactUs.wxml

@@ -4,14 +4,14 @@
 <view class="container">
     <view class="contact_info" style="margin-top: 6rpx;">
     <van-icon name="manager" color="white" />
-    <text style="float: right; margin-top: 0rpx;" decode="true">{{phone}}</text>
+    <text style="margin-top: 0rpx;" decode="true">{{phone}}</text>
    </view>
    <view class="contact_info">
     <van-icon name="phone" color="white" />
     <text>公司电话：{{tel}}</text>
    </view>
    <view class="contact_info">
-    <van-icon style="position: relative; top: -45rpx;" name="location" color="white" />
+    <van-icon name="location" color="white" />
     <text>公司地址：{{address}}</text>
    </view>
    

pages/contactUs/contactUs.wxss

@@ -19,16 +19,21 @@ margin: 0 26rpx 0 0;
     line-height: 48rpx;
 }
 .contact_info {
-    
+    position: relative;
     padding: 25rpx 45rpx 0;
     font-size: 26rpx;
     color: #333;
     clear: both;
 }
+van-icon {
+    position: absolute;
+    top: 25rpx;
+}
 .contact_info text {
     line-height: 48rpx;
     display: inline-block;
     width: 580rpx;
+    margin-left: 70rpx;
 }
 map {
     width: 100%;