Merge branch 'master' of http://www.jiyou-tech.com:3000/chenming/496_dongfengqichen_wxsmall

496_dongfengqichen/app.js

       this.globalData.userInfoData = {};
       this.globalData.userInfoData.avatarUrl = userInfoData.avatarUrl;
       this.globalData.userInfoData.nickName = userInfoData.nickName;
+      this.globalData.userInfoData.userLevel = userInfoData.userLevel;
     }else{
       if (openid){
         this.getUserInfo();
         this.globalData.userInfoData.nickName = nickName;
         wx.setStorageSync('userInfoData', {
           avatarUrl: avatarUrl,
-          nickName: nickName
+          nickName: nickName,
+          userLevel:0
         })
       }
      }, this, "POST")
         if (res.data && res.data.avatarUrl) {
           this.globalData.userInfoData = {};
           this.globalData.userInfoData.avatarUrl = res.data.avatarUrl;
-          this.globalData.userInfoData.nickName = res.data.nickName;
+          this.globalData.userInfoData.nickName = res.data.nickName; 
+          this.globalData.userInfoData.userLevel = res.data.userLevel; 
           wx.setStorageSync('userInfoData', {
             avatarUrl: res.data.avatarUrl,
-            nickName: res.data.nickName
+            nickName: res.data.nickName,
+            userLevel: res.data.userLevel
           })
         }
       }

496_dongfengqichen/pages/index/index.wxml

 <!--index.wxml-->
 <view class="all" wx:if="{{mainShow}}">
-  <view class="main">
+  <view class="main" wx:if="{{isStartAdvertising==0 || !isStartAdvertisingShow}}">
     <view class="contentFrame">
       <view class="swiperFrame">
         <swiper class="swiperSty" autoplay current="{{swiperCurrent}}" bindchange="swiperChange">
     </view>
     <service></service>
   </view>
-  <tabBar></tabBar>
+  <tabBar wx:if="{{isStartAdvertising==0 || !isStartAdvertisingShow}}"></tabBar>
+    <!-- <view wx:if="{{isStartAdvertisingShow}}" class='imgBg' catchtouchmove="ture"></view> -->
     <image wx:if="{{isStartAdvertisingShow}}" style="opacity:{{isStartAdvertising}};" src="{{startAdvertisingUrl}}" class='imgBg' catchtouchmove="ture"></image>
 </view>

496_dongfengqichen/pages/myCenter/myCenter.js

     if (app.globalData.userInfoData) {
       this.data.userData.avatarUrl = app.globalData.userInfoData.avatarUrl;
       this.data.userData.nickName = app.globalData.userInfoData.nickName;
+      this.data.userData.userLevel = app.globalData.userInfoData.userLevel;
       this.setData({
         userData: this.data.userData
       })
         if (res.data && res.data.avatarUrl) {
           this.data.userData.userLevel = res.data.userLevel;
           if (!app.globalData.userInfoData) {
+            console.log(app.globalData.userInfoData);
             this.data.userData.avatarUrl = res.data.avatarUrl;
             this.data.userData.nickName = res.data.nickName;
+            this.data.userData.userLevel = res.data.userLevel;
             app.globalData.userInfoData = {};
             app.globalData.userInfoData.avatarUrl = res.data.avatarUrl;
             app.globalData.userInfoData.nickName = res.data.nickName;
+            app.globalData.userInfoData.userLevel = res.data.userLevel;
             wx.setStorageSync('userInfoData', {
               avatarUrl: res.data.avatarUrl,
-              nickName: res.data.nickName
+              nickName: res.data.nickName,
+              userLevel: res.data.userLevel,
             })
+          } else if (app.globalData.userInfoData && app.globalData.userInfoData.userLevel != res.data.userLevel){
+            app.globalData.userInfoData.userLevel = res.data.userLevel;
+            wx.setStorageSync('userInfoData', app.globalData.userInfoData);
           }
           this.setData({
             userData: this.data.userData,