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

@@ -8,8 +8,8 @@ Page({
    * 页面的初始数据
    */
   data: {
-    height:0,
-    info:null
+    height: 0,
+    info: null
   },
 
   /**
@@ -18,9 +18,8 @@ Page({
   onLoad: function (options) {
     let rect = wx.getMenuButtonBoundingClientRect();
     this.setData({
-      height:rect.top+rect.height
+      height: rect.top + rect.height
     })
-    
   },
   supplier:function(){
     app.globalData.weburl = "https://m.cloud.sz-trip.com/Audit"
@@ -28,26 +27,26 @@ Page({
       url: '/pages/pbService/web/index',
     })
   },
-  retail:function(){
-    common.user_post('commission/getCommissionUser',{}).then(res=>{
-      if(res.code==0){
+  retail: function () {
+    common.user_post('commission/getCommissionUser', {}).then(res => {
+      if (res.code == 0) {
         wx.navigateTo({
           url: 'retail/apply/index',
         })
       }
-      else if(res.data.status==0){
+      else if (res.data.status == 0) {
         wx.showToast({
           title: '正在审核中，请联系管理员',
-          icon:'none'
+          icon: 'none'
         })
       }
-      else if(res.data.status==2){
+      else if (res.data.status == 2) {
         wx.showToast({
           title: '审核拒绝，请联系管理员',
-          icon:'none'
+          icon: 'none'
         })
       }
-      else if(res.data.status==1){
+      else if (res.data.status == 1) {
         wx.navigateTo({
           url: 'retail/index',
         })
@@ -65,9 +64,9 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    userApi.user_post("user/getMyInfo").then(res=>{
+    userApi.user_post("user/getMyInfo").then(res => {
       this.setData({
-        info:res.data
+        info: res.data
       })
     })
   },

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>
@@ -43,23 +46,23 @@
   </view>
   <view class="user-box">
     <navigator url="cartlist/list" class="user-box-line">
-    购物车
+      购物车
     </navigator>
-    
+
     <navigator url="order/team/list" class="user-box-line">
-    团体订单
+      团体订单
     </navigator>
     <!-- <navigator url="videoCoupon/index" class="user-box-line">
     中奖纪录
     </navigator> -->
     <navigator url="service/index" class="user-box-line">
-    在线客服
+      在线客服
     </navigator>
     <navigator url="coupon/index" class="user-box-line">
-    我的卡券
+      我的卡券
     </navigator>
     <navigator url="likes/index" class="user-box-line">
-    我的收藏
+      我的收藏
     </navigator>
     <view bindtap="supplier" class="user-box-line">
     商户审核
@@ -74,16 +77,16 @@
     我要分销
     </view> -->
     <navigator url="verify/index" class="user-box-line" wx:if="{{info && info.name_verification=='UNCERTFIED'}}">
-    实名认证
+      实名认证
     </navigator>
   </view>
   <view class="user-box" style="margin-bottom:0">
     <navigator url="linkman/index" class="user-box-line">
-    出游人信息
+      出游人信息
     </navigator>
     <navigator url="address/index" class="user-box-line">
-    收货地址
+      收货地址
     </navigator>
   </view>
 </view>
-<view style="height:20rpx"></view>
+<view style="height:20rpx"></view>