Merge branch 'develop' of git.yoho.cn:fe/yohoblk-wap into develop

 <div class="my-page">
 <div class="my-page">
     <div class="my-header">
     <div class="my-header">
+        <span class="setting icon icon-setting" id="setting"></span>
         <a class="user-info" id="user-info" {{#if userinfourl}} href='{{userinfourl}}' {{/if}}>
         <a class="user-info" id="user-info" {{#if userinfourl}} href='{{userinfourl}}' {{/if}}>
             <span class="user-avatar"  {{#if head_ico}} style="background-image: url('{{head_ico}}');" {{/if}}></span>
             <span class="user-avatar"  {{#if head_ico}} style="background-image: url('{{head_ico}}');" {{/if}}></span>
             <br><span class="username">{{profile_name}}</span>
             <br><span class="username">{{profile_name}}</span>

@@ -25,3 +25,8 @@ $('#address').on('click', function() {
         'type': '2'
         'type': '2'
     });
     });
 });
 });
+
+// 系统设置
+$('#setting').on('click', function() {
+    yoho.goSetting();
+})

@@ -6,17 +6,28 @@
         color: #000;
         color: #000;
     }
     }
 
 
+    .my-header {
+        background: resolve("home/header-bg.png");
+        background-size: cover;
+
+        .setting  {
+            float: left;
+            margin-top: 30px;
+            margin-left: 15px;
+            font-size: 46px;
+        }
+    }
+
     .user-info {
     .user-info {
         display: block;
         display: block;
         position: relative;
         position: relative;
         padding: 0 30px;
         padding: 0 30px;
+        margin: 0 180px;
         color: #000;
         color: #000;
         font-size: 34px;
         font-size: 34px;
         line-height: 138px;
         line-height: 138px;
         height: 469px;
         height: 469px;
         text-align: center;
         text-align: center;
-        background: resolve("home/header-bg.png");
-        background-size: cover;
 
 
         .user-avatar {
         .user-avatar {
             display: inline-block;
             display: inline-block;