1.1.0

pages/index/index.js

@@ -147,14 +147,10 @@ Page({
               isShow = 1;
             }
           }
+          app.globalData.IsShow = data.IsShow;
 
-          if (data.DayNumber>=5){
-            app.globalData.IsLocked =true;
-          }
-          console.log(data.DayNumber);
-
-          app.globalData.IsShow = isShow;
-
+          app.globalData.IsLocked = data.IsLocked;
+          
           //app.globalData.userInfo.AvatarUrl = param.avatarUrl;
           that.getQuestionType(function () {
 

pages/main/list.js

@@ -97,12 +97,10 @@ Page({
             if (SelectID == data[i].List[k].ID)
               data[i].List[k].Select = true;
 
-            if (k > 0 && app.globalData.IsLocked && app.globalData.IsShow == 1) {
+            if (k > 0 && app.globalData.IsShow == 1 && app.globalData.IsLocked==1 && app.globalData.userInfo.IsMember==0) {
               data[i].List[k].IsLocked = true;
               data[i].List[k].LockCSS = "desaturate";
             }
-
-
             if (this.data.filter == "vertical") {
               if (data[i].List[k].QuestionNumber3 > 0)
                 list.push(data[i].List[k]);

pages/main/userinfo.js

@@ -14,8 +14,8 @@ Page({
       Containnerheight: common.getSystemHeight(),
       ProgramList: server.getProgramList(),
       ProgramID:app.globalData.ProgramID,
-      IsShow: app.globalData.IsShow,
       IsLocked: app.globalData.IsLocked,
+      IsShow: app.globalData.IsShow,
     });
   },
   goto:function(e){

pages/main/userinfo.wxml

@@ -18,74 +18,74 @@
     </view>
   </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>