Merge branch 'feature-zyw' into 'dev'

Feature zyw

See merge request !21

src/component/personCenter/personCenter.wxml

@@ -27,7 +27,7 @@
       </view>
     </view>
   </view>
-  <view class='df tc' wx:if='{{memberActivateStatus}}'>
+  <view class='df tc'>
     <view class='df-1 point person-right' bindtap="toBonusDetails" wx:if="{{personCenter.bonus == 0}}">
       <view class='point-number' style="color:{{personCenter.fontColor}};">{{integralNum}}</view>
       <view class='point-desc' style="color:{{personCenter.fontColor}};">积分</view>

src/component/picNav/picNav.js

@@ -42,7 +42,6 @@ Component({
 			const accountInfo = utils.getAccountInfo()
       const userInfo = wx.getStorageSync('_baseUserInfo')
       if (userInfo){
-       
           if(accountInfo.miniProgram.appId == appid){
             if (!memberActivateStatus){
               wxService.openCard()

src/utils/Http.js

@@ -151,7 +151,8 @@ class Http {
     if (error.msg && error.msg !='该用户尚未登录'){
       wx.showToast({
         title: `${error.msg}`,
-        icon: 'none'
+        icon: 'none',
+        duration:2500
       })
     }
     console.log(JSON.stringify(error))