Merge branch 'develop' of http://101.37.147.115:3000/mz666/bocai_supplyChain into develop

pages/mine/index.js

@@ -78,7 +78,7 @@ Page({
    */
   onLoad: function (options) {
     setTimeout(() => {
-      console.log(app.globalData.loginUserInfo);
+      console.log('mine:',app.globalData.loginUserInfo);
       this.setData({
         isLogin: app.globalData.isLogin,
         hasUserInfo: app.globalData.hasUserInfo,

pages/userDetail/index.wxml

@@ -60,7 +60,7 @@
     </view>
   </navigator>-->
   <view class hover-class="none" hover-stop-propagation="false">
-    <navigator class="bgf br8" url="/pages/realName1/index" hover-class="hcb" open-type="navigate" wx:if="{{userInfo.idauth == 0}}">
+    <navigator class="bgf br8" url="/pages/realName1/index" hover-class="hcb" open-type="navigate" wx:if="{{userInfo.user.idauth == 0}}">
       <view class="realname mt_10 br_8">
         <view class="fw500">实名认证</view>
         <view>
@@ -69,14 +69,14 @@
         </view>
       </view>
     </navigator>
-    <navigator class="bgf br8" url="/pages/trueName/index?realName={{userInfo.realName}}" open-type="navigate" wx:else>
+    <navigator class="bgf br8" url="/pages/trueName/index?realName={{userInfo.user.realName}}" open-type="navigate" wx:else>
       <view class="realname mt_10 br_8 bgf" hover-class="hcb">
         <view class="fw500">
           实名认证
           <view class="iconfont icon-yirenzheng ysd-base-color fw400 f18 ml4" style="line-height:1"></view>
         </view>
         <view>
-          <view class="display-flex c9" style="align-items:center">{{userInfo.realName}}</view>
+          <view class="display-flex c9" style="align-items:center">{{userInfo.user.realName}}</view>
           <view class="iconfont icon-gengduo11 c9"></view>
         </view>
       </view>