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

pages/person/certification/certificationmanage/index.wxml

@@ -48,7 +48,7 @@
             更新认证信息
             更新认证信息
         </button>
         </button>
     </block>
     </block>
-    <block wx:elif="{{authInfo.status === 1}}">
+    <block wx:elif="{{authInfo.status === 2}}">
         <button class="btn" data-type="2" data-id="{{authInfo.id}}" data-url='/pages/person/certification/addcertification/index' bind:tap="toUrl">
         <button class="btn" data-type="2" data-id="{{authInfo.id}}" data-url='/pages/person/certification/addcertification/index' bind:tap="toUrl">
             重新提交信息
             重新提交信息
         </button>
         </button>

pages/person/invitation/index.js

@@ -71,7 +71,7 @@ Page({
 
 
     return {
     return {
       title: '邀请好友',
       title: '邀请好友',
-      path: "/pages/person/auth/index?from=share&user_id=" + user_id
+      path: "/pages/person/auth/index?from=invites&user_id=" + user_id
     }
     }
 
 
   },
   },

pages/person/invitation/index.wxml

 <view class="invitation" hover-class="none" hover-stop-propagation="false">
 <view class="invitation" hover-class="none" hover-stop-propagation="false">
     <view class="tip row bothSide verCenter {{isShowTip?'':'noheight'}}" style="position:relative;white-space: nowrap;">
     <view class="tip row bothSide verCenter {{isShowTip?'':'noheight'}}" style="position:relative;white-space: nowrap;">
         <view class="wrap column">
         <view class="wrap column">
-            <swiper vertical="true" circular="true" interval="5000" autoplay display-multiple-items='2' class="sw">
+            <swiper vertical="true" circular="true" interval="3000" autoplay display-multiple-items='2' class="sw">
                 <swiper-item wx:for="{{invitesInfo.recent_invites}}" wx:key="{{item}}">
                 <swiper-item wx:for="{{invitesInfo.recent_invites}}" wx:key="{{item}}">
                     <view class="tip-left row verCenter">
                     <view class="tip-left row verCenter">
                         <text class="icon iconfont iconiconxiantiaoshouji12 tip-icon"></text>
                         <text class="icon iconfont iconiconxiantiaoshouji12 tip-icon"></text>

pages/person/invitationrecord/index.wxml

@@ -4,7 +4,7 @@
             <view class="wrap row bothSide verCenter bor">
             <view class="wrap row bothSide verCenter bor">
                 <view class="column">
                 <view class="column">
                     <text class="t1">{{item.invited_user_name}}</text>
                     <text class="t1">{{item.invited_user_name}}</text>
-                    <text class="t2">2019-05-10 10:15</text>
+                    <text class="t2">{{item.add_time}}</text>
                 </view>
                 </view>
                 <view class="row verCenter">
                 <view class="row verCenter">
                     <text class="t3">+</text>
                     <text class="t3">+</text>

pages/person/withdrawal/index.js

@@ -73,10 +73,13 @@ Page({
    * 用户点击右上角分享
    * 用户点击右上角分享
    */
    */
   onShareAppMessage: function () {
   onShareAppMessage: function () {
+    if (this.data.weixin_exchange_info.exchange_id) {
       return {
       return {
         title: '好友助力',
         title: '好友助力',
         path: "/pages/person/helpfriend/index?exchange_id=" + this.data.weixin_exchange_info.exchange_id
         path: "/pages/person/helpfriend/index?exchange_id=" + this.data.weixin_exchange_info.exchange_id
       }
       }
+    }
+
   },
   },
   /**
   /**
    * 获取数据
    * 获取数据