1.2.0

pages/index/index.js

@@ -155,6 +155,20 @@ Page({
         }
         else {
           app.globalData.userInfo = data;
+
+          var isShow = data.IsShow;
+          if (isShow == -1) {
+            isShow = 0;
+          }
+          else {
+            var systemInfo = wx.getSystemInfoSync();
+            if (isShow == 0 && systemInfo.system && systemInfo.system.indexOf("Android") >= 0) {
+              isShow = 1;
+            }
+          }
+          app.globalData.IsShow = data.IsShow;
+
+          app.globalData.IsLocked = data.IsLocked;
           
           if (that.data.ProductID) {
             var url = "../../package4/main/activateOK?ProductID=" + that.data.ProductID

pages/main/index.js

@@ -31,6 +31,9 @@ Page({
       Height: common.getSystemHeight(),
       NickName: app.globalData.userInfo.NickName,
       AvatarUrl: app.globalData.userInfo.AvatarUrl,
+      IsLocked: app.globalData.IsLocked,
+      IsShow: app.globalData.IsShow,
+      IsMember: app.globalData.userInfo.IsMember
     });
 
     var that = this;
@@ -144,50 +147,9 @@ Page({
           HanziNumber: hanziNumber,
           FinishedCount: finishedCount,
           ReviewCount: reviewCount,
-          IsFirstDay: data.IsFirstDay,
-          NewUserNumber: data.NewUserNumber,
-          NewUserNumberMax: app.globalData.NewUserNumberMax,
-          IsMember: data.IsMember,
-          IsShow: data.IsShow,
         });
-
         wx.setStorageSync("FinishedList", data.FinishedList);
         wx.setStorageSync("ReviewList", data.ReviewList);
-
-        common.getStorageValue(that, "IsMemberForeverRemind", 0, function () {
-          if (that.data.IsMemberForeverRemind == 0
-            && that.data.NewUserNumber >= app.globalData.NewUserNumberMax
-            && that.data.NewUserNumber < 999999) {
-            that.setData({
-              IsMemberForeverRemind: 1,
-            });
-            wx.setStorageSync("IsMemberForeverRemind", 2);
-          }
-        });
-
-        if (data.DayNumber2)
-          app.globalData.DayNumber = data.DayNumber2;
-        else
-          app.globalData.DayNumber = data.DayNumber;
-
-        var isShow = data.IsShow;
-        if (isShow == -1) {
-          isShow = 0;
-        }
-        else {
-          var systemInfo = wx.getSystemInfoSync();
-          if (isShow == 0 && systemInfo.system && systemInfo.system.indexOf("Android") >= 0) {
-            isShow = 1;
-          }
-        }
-
-        app.globalData.IsShow = isShow;
-        that.setData({
-          IsShow: isShow,
-        });
-
-        app.globalData.userInfo.IsMember = data.IsMember;
-
       }
     });
 

pages/main/userinfo.wxml

@@ -19,73 +19,74 @@
   </view>
   <view class='lineFooter'></view>
 
-  <view class="panelTitle FlexRow">
-    <view class="panelTitle1">我的卡包</view>
-  </view>
-  <view class="panelItem FlexRow" bindtap='goto' data-url='../../package4/main/paylist'>
-    <view class="panelItem1">我的帐单</view>
-    <view class="panelItem2 FlexRow">
-      <image src='../images/Arrow.png' class="Arrow" />
+  <block wx:if="{{IsShow==1 && IsLocked==1}}">
+    <view class="panelTitle FlexRow">
+      <view class="panelTitle1">我的卡包</view>
     </view>
-  </view>
-  <view class="lineWidthAll FlexRow">
-    <view class="lineWidth720"></view>
-  </view>
-  <view class="panelItem FlexRow" bindtap='goto' data-url='../../package4/main/coupon'>
-    <view class="panelItem1">我的优惠券</view>
-    <view class="panelItem2 FlexRow">
-      <image src='../images/Arrow.png' class="Arrow" />
+    <view class="panelItem FlexRow" bindtap='goto' data-url='../../package4/main/paylist'>
+      <view class="panelItem1">我的帐单</view>
+      <view class="panelItem2 FlexRow">
+        <image src='../images/Arrow.png' class="Arrow" />
+      </view>
     </view>
-  </view>
-  <view class="lineWidthAll FlexRow">
-    <view class="lineWidth720"></view>
-  </view>
-  <view class="panelItem FlexRow" bindtap='goto' data-url='../../package4/main/giftlist'>
-    <view class="panelItem1">我的礼品卡</view>
-    <view class="panelItem2 FlexRow">
-      <image src='../images/Arrow.png' class="Arrow" />
+    <view class="lineWidthAll FlexRow">
+      <view class="lineWidth720"></view>
     </view>
-  </view>
-  <view class='lineFooter'></view>
+    <view class="panelItem FlexRow" bindtap='goto' data-url='../../package4/main/coupon'>
+      <view class="panelItem1">我的优惠券</view>
+      <view class="panelItem2 FlexRow">
+        <image src='../images/Arrow.png' class="Arrow" />
+      </view>
+    </view>
+    <view class="lineWidthAll FlexRow">
+      <view class="lineWidth720"></view>
+    </view>
+    <view class="panelItem FlexRow" bindtap='goto' data-url='../../package4/main/giftlist'>
+      <view class="panelItem1">我的礼品卡</view>
+      <view class="panelItem2 FlexRow">
+        <image src='../images/Arrow.png' class="Arrow" />
+      </view>
+    </view>
+    <view class='lineFooter'></view>
 
-  <view class="panelTitle FlexRow">
-    <view class="panelTitle1">选购</view>
-  </view>
-  <view class="panelItem0 panelItem FlexRow" bindtap='goto' data-url='../../package4/main/order?id={{ProgramID}}&paytype=3'>
-    <view class="panelItem10 panelItem1 FlexColumn">
-      <view class="panelItem11">单款续费</view>
-      <view class="panelItem12">会员续费或首次购买正式版</view>
+    <view class="panelTitle FlexRow">
+      <view class="panelTitle1">选购</view>
     </view>
-    <view class="panelItem2 FlexRow">
-      <image src='../images/Arrow.png' class="Arrow" />
+    <view class="panelItem0 panelItem FlexRow" bindtap='goto' data-url='../../package4/main/order?id={{ProgramID}}&paytype=3'>
+      <view class="panelItem10 panelItem1 FlexColumn">
+        <view class="panelItem11">单款续费</view>
+        <view class="panelItem12">会员续费或首次购买正式版</view>
+      </view>
+      <view class="panelItem2 FlexRow">
+        <image src='../images/Arrow.png' class="Arrow" />
+      </view>
     </view>
-  </view>
-  <view class="lineWidthAll FlexRow">
-    <view class="lineWidth720"></view>
-  </view>
-  <view class="panelItem0 panelItem FlexRow" bindtap='goto' data-url='../../package4/main/list?IsGift=0'>
-    <view class="panelItem10 panelItem1 FlexColumn">
-      <view class="panelItem11">套装选购</view>
-      <view class="panelItem12">语数英工具套装优惠购</view>
+    <view class="lineWidthAll FlexRow">
+      <view class="lineWidth720"></view>
     </view>
-    <view class="panelItem2 FlexRow">
-      <image src='../images/Arrow.png' class="Arrow" />
+    <view class="panelItem0 panelItem FlexRow" bindtap='goto' data-url='../../package4/main/list?IsGift=0'>
+      <view class="panelItem10 panelItem1 FlexColumn">
+        <view class="panelItem11">套装选购</view>
+        <view class="panelItem12">语数英工具套装优惠购</view>
+      </view>
+      <view class="panelItem2 FlexRow">
+        <image src='../images/Arrow.png' class="Arrow" />
+      </view>
     </view>
-  </view>
-  <view class="lineWidthAll FlexRow">
-    <view class="lineWidth720"></view>
-  </view>
-  <view class="panelItem0 panelItem FlexRow" bindtap='goto' data-url='../../package4/main/list?IsGift=1'>
-    <view class="panelItem10 panelItem1 FlexColumn">
-      <view class="panelItem11">购买礼品卡</view>
-      <view class="panelItem12">馈赠亲朋正式版</view>
+    <view class="lineWidthAll FlexRow">
+      <view class="lineWidth720"></view>
     </view>
-    <view class="panelItem2 FlexRow">
-      <image src='../images/Arrow.png' class="Arrow" />
+    <view class="panelItem0 panelItem FlexRow" bindtap='goto' data-url='../../package4/main/list?IsGift=1'>
+      <view class="panelItem10 panelItem1 FlexColumn">
+        <view class="panelItem11">购买礼品卡</view>
+        <view class="panelItem12">馈赠亲朋正式版</view>
+      </view>
+      <view class="panelItem2 FlexRow">
+        <image src='../images/Arrow.png' class="Arrow" />
+      </view>
     </view>
-  </view>
-  <view class='lineFooter'></view>
-
+    <view class='lineFooter'></view>
+  </block>
   <view class="panelTitle FlexRow">
     <view class="panelTitle1">更多学习工具</view>
   </view>