Merge branch 'master' of http://git.xmainc.com:3000/panyiping/jundaosuzhou_wechatxcx

# Conflicts:
#	pages/user/user.js
#	pages/user/user.wxml

pages/user/user.js

@@ -20,7 +20,6 @@ Page({
     this.setData({
       height: rect.top + rect.height
     })
-    
   },
   supplier:function(){
     app.globalData.weburl = "https://m.cloud.sz-trip.com/Audit"

pages/user/user.wxml

@@ -1,11 +1,14 @@
 <!--pages/user/user.wxml-->
 <view>
-  <image class="topbg" style="height:calc({{height}}px + 341rpx)" src="https://static.ticket.sz-trip.com/xcxImages/user/topbg.png" mode="aspectFill"></image>
+  <image class="topbg" style="height:calc({{height}}px + 341rpx)"
+    src="https://static.ticket.sz-trip.com/xcxImages/user/topbg.png" mode="aspectFill"></image>
   <view style="height:{{height}}rpx"></view>
   <navigator url="profile/index" class="top-box" wx:if="{{info}}">
     <image class="headimg" src="{{info.avatar}}" mode="aspectFill"></image>
     <view class="userinfo">
-      <view class="username">{{info.nickname}}<image wx:if="{{info.gender==1 || info.gender==2}}" mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/user/sex{{info.gender}}.png"></image></view>
+      <view class="username">{{info.nickname}}<image wx:if="{{info.gender==1 || info.gender==2}}" mode="widthFix"
+          src="https://static.ticket.sz-trip.com/xcxImages/user/sex{{info.gender}}.png"></image>
+      </view>
       <view>id：{{info.id}}</view>
     </view>
   </navigator>