Merge branch 'master' of http://119.23.72.7/shiyu/icsalesProgram

pages/person/certification/certificationmanage/index.wxml

@@ -48,7 +48,7 @@
         </button>
     </block>
     <block wx:elif="{{authInfo.status === 3}}">
-        <button class="btn" data-type="3" data-id="{{authInfo.id}}" data-url='/pages/tab/home/home' bind:tap="toUrl">
+        <button class="btn" data-type="3" data-id="{{authInfo.id}}" data-url='/pages/tab/me/me' bind:tap="toUrl">
             返回会员中心
         </button>
     </block>

pages/tab/me/me.js

@@ -10,6 +10,7 @@ Page({
    */
   data: {
     isShow: false,
+    headPic: '',
     userInfo: {
       avatar: '',
       mobile: ''
@@ -60,9 +61,23 @@ Page({
       token: wx.getStorageSync('access_token')
     }, (res) => {
       if (res.errcode === 0) {
+
+        // 未企业认证的时候优先读取微信头像
+        if (res.data.avatar == '') {
+          this.setData({
+            headPic: res.data.wechat_oauth.oauth_head
+          });
+        } else {
+          this.setData({
+            headPic: res.data.avatar
+          });
+        }
+
         this.setData({
           userInfo: res.data
         });
+
+
       }
     }, true);
   },
@@ -101,7 +116,7 @@ Page({
 
     //认证管理
     if (e.currentTarget.dataset.type == 'certification') {
-     
+
       if (this.data.userInfo.auth_status == null) {
 
         wx.navigateTo({

pages/tab/me/me.wxml

 <view class="mine">
     <view class="head row verCenter">
         <view class="pic">
-            <cover-image class="im" src="{{userInfo.avatar ? userInfo.avatar:'/res/images/imgs/heads.png'}}"></cover-image>
+            <cover-image class="im" src="{{headPic ?  headPic:'/res/images/imgs/heads.png'}}"></cover-image>
         </view>
         <view class="text">
             <text class="t1">{{userInfo.company_name}}</text>
             <view class="row verCenter">
                 <text class="t2" selectable="false" space="false" decode="false">普通会员</text>
                 <view>
-                    <text class="t3">红包:</text>
-                    <text class="t4">13,123</text>
+                    <text class="t3">红包：</text>
+                    <text class="t4">{{userInfo.integral || 0}}</text>
                 </view>
             </view>
         </view>