Merge branch 'liuxin' into develop

src/pages/myInfo/my-info.vue

@@ -10,8 +10,8 @@
       <div class="card">
         <div class="card-info">
           <div class="card-top">
-            <img src="@/assets/myInfo/arrow-left.png" @click.native="changePageHead" >
-            <span>用户名</span>
+            <img src="@/assets/myInfo/1.jpg" @click="changePageHead" >
+            <span>{{ user_phone }}</span>
           </div>
           <div class="card-bottom">
             <div>
@@ -85,6 +85,7 @@ export default {
       user_bp_status: '',
       user_bp_class: '',
       bp_id: '',
+      user_phone: '',
     }
   },
   beforeRouteEnter (to, from, next) {
@@ -232,6 +233,7 @@ export default {
           vm.user_bp_status = res.info.user_bp_status
           vm.user_bp_class = res.info.user_bp_class
           vm.bp_id = res.info.user_bp_id
+          vm.user_phone = res.info.user_phone
         } else {
           this.hlsPopup.showLongCenter(res.message)
         }
@@ -319,7 +321,7 @@ export default {
       font-size: 15px;
       margin-left: 16px;
       position: relative;
-      margin-top: 88px;
+      margin-top: 60px;
     }
     .userInfo::before {
       content: "";
@@ -365,7 +367,7 @@ export default {
     background: #00469c;
     border-radius: 4px;
     color: #fff;
-    margin-bottom: 100px;
+    margin-bottom: 60px;
     margin-left:2%;
   }
 }