1.2.20

package4/main/activate.js

@@ -2,107 +2,171 @@ import common from '../../utils/util';
 import server from '../../utils/main';
 
 const app = getApp();
+var productList = [];
 
 Page({
   data: {
-    fileUrl: app.globalData.fileUrl,
   },
   onLoad: function (options) {
-    var text0 = "", text1 = "", text2 = "", text3 = "";
-    text0 = "会员登录";
-    text1 = "无需注册，微信授权即可登录";
-    text2 = "去登录";
-    text3 = "注意：会员登录后可使用付费功能。授权微信用户信息即可一键登录。为保障消费权益，购买后请尽快授权用户信息。登录后才能正常使用统计、排行、我的订单、套装、礼品卡等功能。";
 
     this.setData({
-      Height: common.getSystemHeight(),
-      Text0: text0,
-      Text1: text1,
-      Text2: text2,
-      Text3: text3,
-      OrderType: options.type,
+      Containnerheight: common.getSystemHeight(),
+      ProgramList: server.getProgramList(),
     });
 
-    //适配ipad
-    var systemInfo = wx.getSystemInfoSync();
-    if (systemInfo.model) {
-      if (systemInfo.model.indexOf("iPad") >= 0) {
-        this.setData({
-          ipad: "ipad",
-        })
-      }
-    }
+    this.init();
   },
-  //得到用户信息
-  getUserInfo: function () {
-    var that = this
-   
-    wx.getUserProfile({
-      desc: "登录注册",
-      success: function (res2) {
-        
-        app.globalData.userInfo.NickName = res2.userInfo.nickName;
-        app.globalData.userInfo.AvatarUrl = res2.userInfo.avatarUrl;
-        
-        //调用登录接口
-        wx.login({
-          success: function (res0) {
-            app.globalData.userInfo.Code = res0.code;
-            that.login(app.globalData.userInfo, res2.userInfo);
+  onUnload:function(){
+    productList=[];
+  },
+  init: function (e, isRemind) {
+    var that = this;
+    wx.showLoading({
+      title: '装载中',
+    });
+    server.getData('GetUserActivateListByUserID500?UserID=' + app.globalData.userInfo.UserID + "&ProductID=" + app.globalData.ProgramID, function (data) {
+      if (data && data.length > 0) {
+        var programList = server.getProgramList();
+        for (var i = 0; i < programList.length; i++) {
+          for (var j = 0; j < data.length; j++) {
+            if (programList[i].ID == data[j].ProductID) {
+              data[j].Name = programList[i].Name;
+              data[j].ImageUrl = programList[i].ImageUrl;
+              data[j].appId = programList[i].appId;
+              data[j].path = programList[i].path;
+              //不是当前小程序不解锁
+              if (app.globalData.ProgramID == data[j].ProductID)
+                app.globalData.userInfo.IsMember = 1;
+            }
+          }
+        }
+
+        if (productList.length > 0) {
+          for (var i = 0; i < productList.length; i++) {
+            var b = false;
+            for (var j = 0; j < data.length; j++) {
+              if (productList[i].ProductID == data[j].ProductID) {
+                b = true;
+                
+                break;
+              }
+            }
+            if (!b) {
+              productList[i].IsActivate = 1;
+              data.push(productList[i]);
+            }
           }
+        }
+
+        that.setData({
+          List: data,
         });
-      },
-      fail: function (res) {
-        console.log(res);
+
+        productList = data;
+
+        if (isRemind) {
+          wx.showModal({
+            title: '产品未激活',
+            content: '您有产品未激活，请立即点击红色“去激活”按钮。',
+            showCancel: false,
+            confirmText: "知道了",
+          });
+        }
+
+        wx.setStorageSync("HasActivate", 1);
+        wx.hideLoading();
+      }
+      else {
+        if (isRemind) {
+          var arr = [];
+          for (var i = 0; i < productList.length; i++) {
+            arr.push(productList[i].ProductID);
+          }
+          wx.redirectTo({
+            url: "./activateFinish?idarr="+arr.join(","),
+          });
+          productList = [];
+          wx.removeStorageSync("HasActivate");
+        }
+        else{
+          for (var i = 0; i < productList.length; i++) {
+            productList[i].IsActivate = 1;
+          }
+
+          if (productList.length>0){
+            that.setData({
+              List: productList,
+            });
+          }
+          else{
+            wx.removeStorageSync("HasActivate");
+            wx.showModal({
+              title: '提醒',
+              content: '产品已激活。',
+              showCancel: false,
+              confirmText: "去首页",
+              success:function(){
+                wx.reLaunch({
+                  url: '../../pages/index/index',
+                })
+              }
+            });
+          }
+        }
       }
+      wx.hideLoading();
+
     });
   },
-  login: function (param, param2) {
+  gotoFeedback: function () {
+    server.gotoFeedback();
+  },
+  gotoActive: function (e) {
     var that = this;
-    var url = "Login";
-    switch (app.globalData.ProgramID) {
-      case 164:
-        url = "MathStar" + url;
-        break;
-      case 105:
-        url = "Math" + url;
-        break;
-      case 106:
-        url = "Hanzi" + url;
-        break;
-      case 98:
-        url = "Pinyin" + url;
-        break;
-      case 99:
-        url = "Phonics" + url;
-        break;
+    var productid = e.currentTarget.dataset.id;
+
+    if (productid == app.globalData.ProgramID) {
+      server.getData('UpdateWXUsersAll500?ProductID=' + productid
+        + "&ProductUserID=" + app.globalData.userInfo.UserID
+        + "&CurrentProductID=" + productid
+        + "&CurrentUserID=" + app.globalData.userInfo.UserID, function (data) {
+          if (data) {
+
+          }
+        });
     }
-    server.postData(url, {
-      Code: param.Code,
-      NickName: param2.nickName,
-      AvatarUrl: param2.avatarUrl,
-      Language: param2.language,
-      Gender: param2.gender,
-      City: param2.city,
-      Province: param2.province,
-      Country: param2.country,
-      ProgramVersion: app.globalData.Version,
-      Introducer: app.globalData.introducer,
-      UserSource: app.globalData.userSource,
-      SourceID: app.globalData.SourceID,
-      LastUserSource: app.globalData.userSource,
-      iv: param.iv,
-      encryptedData: param.encryptedData,
-    }, function (data) {
-      wx.navigateBack({
-        delta: 1
+    else {
+      var appId = e.currentTarget.dataset.appid;
+      var path = e.currentTarget.dataset.path;
+
+      path += "&ProductID=" + app.globalData.ProgramID;
+      path += "&ProductUserID=" + app.globalData.userInfo.UserID;
+
+      wx.navigateToMiniProgram({
+        appId: appId,
+        path: path,
+        success(res) {
+
+        }
       });
+    }
+    var data = this.data.List;
+    for (var i = 0; i < data.length; i++) {
+      if (data[i].ProductID == productid) {
+        data[i].IsActivate = 0;
+      }
+    }
+    that.setData({
+      List: data,
     });
   },
+  gotoFinish: function () {
+    this.init(null, true);
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,
-      path: 'pages/index/index?UserID=' + app.globalData.userInfo.UserID,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
       imageUrl: app.globalData.ShareImage,
     }
   },

package4/main/activate.json

@@ -1,4 +1,6 @@
 {
-  "navigationBarTitleText": "会员登录",
-  "enablePullDownRefresh": false
+  "navigationBarTitleText": "激活产品",
+  "navigationBarBackgroundColor": "#ffffff",
+  "navigationBarTextStyle": "black",
+  "backgroundColor": "#F0F0F0"
 }

package4/main/activate.wxml

@@ -1,10 +1,34 @@
-<view class="container FlexColumn" style='height:{{Height}}rpx;'>
-  <image src="../images/accredit.png" class="bg" />
-  <text class="text0">{{Text0}}</text>
-  <text class="text1">{{Text1}}</text>
-  <view class="btn">
-    <button  class="btn1" catchtap="getUserInfo">{{Text2}}</button>
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class='text1 FlexColumn' bindtap='gotoFeedback'>
+    <view>您有产品未激活，必须激活才能继续其它操作，请立即处理。如</view>
+    <view class='FlexRow'>
+      <view>遇到问题请切换到“唱意教育家长助手”通过</view>
+      <view class='text11'>意见反馈</view>
+      <view>联系我们为</view>
+    </view>
+    <view>您处理。</view>
+  </view>
+
+  <view class="panelItem FlexRow" wx:for="{{List}}" wx:key="index">
+    <view class="Left FlexRow">
+      <image src='../images/{{item.ImageUrl}}' class="img" />
+      <view class="title1">
+        {{item.Name}}
+      </view>
+    </view>
+    <view class="Right">
+      <view class='btnActivate' wx:if="{{item.IsActivate==-1}}" bindtap="gotoActive" data-id="{{item.ProductID}}" data-appid="{{item.appId}}" data-path="{{item.path}}">去激活</view>
+      <view class='btnRefresh btnActivate' wx:if="{{item.IsActivate==0}}" bindtap="init">刷新</view>
+      <view class='text2' wx:if="{{item.IsActivate==1}}">已激活</view>
+    </view>
+  </view>
+  <view class='lineFooter'></view>
+
+  <image src='../images/file_0401.png' class="file_0401" />
+  <view class='lineFooter'></view>
+  <view style='height:240rpx'></view>
+
+  <view class='footer FlexRow' bindtap="gotoFinish">
+    完成
   </view>
-  <view class="line2 {{ipad}}"></view>
-  <text class="text3">{{Text3}}</text>
 </view>

package4/main/activate.wxss

@@ -1,75 +1,83 @@
-.bg{
-  width: 100%;
-  height:769rpx;
-  position: fixed;
-  bottom: 0;
-  left:0;
+.container {
+  background-color: #f0f0f0;
+  color:#1e1e1e;
+  font-weight: 500;
 }
 
-.text0{
-  font-size:36rpx;
-  text-align: center;
-  margin-top: 280rpx;
-  z-index: 10;
+.text1{
+  width:690rpx;
+  font-size:24rpx;
+  align-items: flex-start;
+  margin: 50rpx 0;
 }
 
-.text1{
-  font-size:44rpx;
-  text-align: center;
-  margin-top: 10rpx;
-  z-index: 10;
+.text11{
+  color:#B3443B;
+  text-decoration: underline;
 }
 
+.panelItem{
+  width:100%;
+  height:111rpx;
+  background-color: #fff;
+  justify-content: space-between;
+  margin-top: 1rpx;
+}
 
-.btn {
-  width: 600rpx;
-  height: 104rpx;
-  background-color: #035834;
-  border-radius: 14rpx;
-  margin-top: 90rpx;
-  z-index: 10;
+.Left {
+  margin-left: 30rpx;
+  justify-content: flex-start;
 }
 
-.btn1 {
-  width: 100%;
-  height: 90rpx;
-  background-color: #03AF69;
-  border-radius: 14rpx;
-  position:relative;
-  top:0;
-  font-size: 36rpx;
-  text-align: center;
-  line-height: 90rpx;
-  color:#fff;
+.Right {
+  margin-right: 30rpx;
+  justify-content: flex-end;
 }
 
-.line2{
-  width: 600rpx;
-  height:3rpx;
-  background-color: #593613;
-  margin-top:350rpx;
-  z-index: 10;
+.img{
+  width:50rpx;
+  height:50rpx;
+  border-radius: 10rpx;
 }
 
-.ipad{
-  margin-top:140rpx;
+.title1{
+  margin-left: 20rpx;
+  font-size:28rpx;
 }
 
-.text3{
-  font-size:22rpx;
-  width:560rpx; 
-  margin-top: 40rpx;
-  z-index: 10;
-  font-weight: 400;
+.btnActivate{
+  width:108rpx;
+  height:50rpx;
+  border-radius: 10rpx;
+  background-color: #E5321C;
+  color:#fff;
+  font-size:24rpx;
+  text-align: center;
+  line-height: 50rpx;
+}
+.btnRefresh{
+  background-color: #0792E4;
+}
+.text2{
+  color:#329468;
+  font-size:28rpx;
 }
 
-.buyOK{
-  width: 106rpx;
-  height:106rpx;
-  margin-top: 120rpx;
+.file_0401{
+  width:100%;
+  height:1879rpx;
+  margin-top: 50rpx;
 }
-.text4{
-  font-size:64rpx;
-  margin-top: 20rpx;
-  font-weight: 500;
+
+
+.footer{
+  width: 100%;
+  height: 140rpx;
+  position: fixed;
+  bottom: 0;
+  line-height: 140rpx;
+  font-size:48rpx;
+  color:#fff;
+  text-align: center;
+  background-color: #0792E4;
 }

package4/main/giftinfo.js

@@ -34,12 +34,7 @@ Page({
     var that=this;
     wx.getSetting({
       success(res) {
-        if (!res.authSetting['scope.userInfo']) {
-          wx.navigateTo({
-            url: '../../pages/main/accredit?url=giftinfo'
-          });
-        }
-        else {
+        
           wx.showModal({
             title: '慎重转发',
             content: '请勿转发到群。如误转，只能在聊天窗口中撤回（1分钟内）。',
@@ -49,7 +44,7 @@ Page({
           that.setData({
             canGive: true,
           });
-        }
+        
       }
     });
     

package4/main/miaoguoreadme.wxml

@@ -1,6 +1,6 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="text1">活动规则</view>
-  <text class="text2">① 本活动只针对自2021年3月？？日起报名秒过的用户，在此之前报名的老用户不享受此活动优惠项目。\n
+  <text class="text2">① 本活动只针对自2021年3月1日起报名秒过的用户，在此之前报名的老用户不享受此活动优惠项目。\n
 ② 秒过新手培训只能报名一次，不能重复报名。\n
 ③ 符合本活动规则的有效报名是指：打开秒过小程序；支付报名费；关注秒过学习法公众号；添加班务员微信；收到班务员开班安排的通知。以上整个流程中的任何环节均不可或缺。请按系统引导信息一步步完成。\n
 ④ 有效报名可获得唱意公司旗下5款产品各20天免费有效期。产品包括：语文汉语拼音、语文识字、英语自然拼读、数学计算题、口算星球。\n

package4/main/payfinish.js

@@ -20,10 +20,7 @@ Page({
       wx.hideLoading();
     },5000);
 
-    if (paytype == "4") {
-      wx.setStorageSync("HasActivate", 1);
-    }
-    else if (paytype=="3"){
+    if (paytype=="3"){
       app.globalData.userInfo.IsMember = 1;
       app.globalData.IsLocked=0;
     }
@@ -43,11 +40,7 @@ Page({
         url: "./limited?IsShowButton=1",
       });
     }
-    if (this.data.Paytype == "4") {
-      wx.redirectTo({
-        url: "./activate",
-      });
-    }
+   
     if (this.data.Paytype == "5") {
       wx.redirectTo({
         url: "./giftlist",

package4/main/paylist.js

@@ -6,12 +6,20 @@ const app = getApp();
 Page({
   data: {
     PayList: null,
+    IsLogin:1,
   },
   onLoad: function (options) {
     this.setData({
       Containnerheight: common.getSystemHeight(),
     });
-    this.init();
+
+    if (app.globalData.userInfo)
+      this.init();
+    else{
+      this.setData({
+        IsLogin: -1,
+      });
+    }
   },
   init: function () {
     var that = this;
@@ -31,16 +39,63 @@ Page({
           }
         }
         that.setData({
+          IsLogin: 1,
           PayList: data,
         });
       }
       else {
         that.setData({
+          IsLogin: 1,
           PayList: [],
         });
       }
     });
   },
+  showLogin:function(){
+    this.setData({
+      IsLogin: -2,
+    });
+  },
+  hideLogin:function(){
+    this.setData({
+      IsLogin: -1,
+    });
+  },
+  onKeyInput: function (e) {
+    var that=this; 
+    that.setData({
+      UserName: e.detail.value
+    });
+  },
+  onKeyInput2: function (e) {
+    var that=this; 
+    that.setData({
+      UserPwd: e.detail.value
+    });
+  },
+  login: function () {
+    var that = this;
+
+    server.getData('Login20221228?UserName=' + that.data.UserName + "&UserPwd="+that.data.UserPwd+"&ProductID=" + app.globalData.ProgramID, function (data) {
+      if (data) {
+        if (data>0){
+            app.globalData.userInfo={};
+            app.globalData.userInfo.UserID=data;
+            that.init();
+        }
+        else {
+          wx.showToast({
+            title: '用户名或密码不正确',
+          });
+        }
+      }
+      else {
+        wx.showToast({
+          title: '登录出错',
+        });
+      }
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

package4/main/paylist.wxml

@@ -1,4 +1,5 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  
   <view style='height:50rpx'></view>
   <view class="panel1 FlexColumn" wx:for="{{PayList}}" wx:key="index" wx:if="{{PayList.length>0}}">
     <view class="item0 item FlexRow">
@@ -54,4 +55,21 @@
   </view>
 
   <view class='panelNull' wx:if="{{PayList.length==0}}">没有帐单</view>
+
+  <view class="panelIsLogin" wx:if="{{IsLogin==-1}}" bindtap="showLogin">
+    登录查看订单
+  </view>
+  
+  <view  wx:if="{{IsLogin==-2}}" class="panelLogin FlexColumn" style='height:{{Containnerheight}}rpx;'>
+    <view class="panelLogin1 FlexColumn">
+      <view class="text1">用户名</view>
+      <input class="input" bindinput="onKeyInput" value="{{UserName}}"/>
+      <view class="text1">密码</view>
+      <input class="input" password="true" bindinput="onKeyInput2" value="{{UserPwd}}"/>
+      <view class="panelLogin2 FlexRow">
+        <view class="panelLogin21" bindtap="hideLogin">取消</view>
+        <view class="panelLogin21" bindtap="login">登录</view>
+      </view>
+    </view>
+  </view>
 </view>

package4/main/paylist.wxss

@@ -104,4 +104,59 @@
 .panelNull{
   margin-top: 462rpx;
   font-size:48rpx;
+}
+
+.panelIsLogin{
+  background: #FFFFFF;
+  border: 4rpx solid #E65A20;
+  border-radius: 20rpx;
+  font-size: 36rpx;
+  color: #E65A20;
+  text-align: center;
+  width:500rpx;
+  height:100rpx;
+  line-height: 100rpx;
+  margin-top: 400rpx;
+}
+
+.panelLogin{
+  width:100%;
+  background-color: rgba(0,0,0,0.5);
+  position: fixed;
+  top:0;
+}
+.panelLogin1{
+  width:560rpx;
+  height:577rpx;
+  position: fixed;
+  top:313rpx;
+  background-color: #fff;
+  border-radius: 8rpx;
+  justify-content: flex-start;
+}
+.text1{
+  width:480rpx;
+  margin-top: 60rpx;
+  font-size: 28rpx;
+}
+.input{
+  width:480rpx;
+  height:90rpx;
+  background:#FFFFFF;
+  border: 1rpx solid #979797;
+  margin-top:20rpx;
+  color:#1e1e1e;
+  padding-left: 10rpx;
+}
+
+.panelLogin2{
+  width:100%;
+  margin-top: 74rpx;
+}
+
+.panelLogin21{
+  width:280rpx;
+  text-align: center;
+  font-size:36rpx;
+  font-weight: 400;
 }

pages/index/index.js

@@ -127,17 +127,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.userInfo.IsShow = isShow;
+          //app.globalData.userInfo.AvatarUrl = param.avatarUrl;
+
+          // 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.userInfo.IsShow = isShow;
+          app.globalData.userInfo.IsShow = data.IsShow;
 
           app.globalData.IsLocked = data.IsLocked;
           

pages/main/index.js

@@ -94,24 +94,19 @@ Page({
       AvatarUrl: app.globalData.userInfo.AvatarUrl,
     });
     
-    if (wx.getStorageSync("HasActivate") == 1) {
+    
+    this.getData();
+
+    if (app.globalData.goto) {
+      var url = "../main/list?id=1";
+      if (app.globalData.goto == "test")
+        url = '../main/test';
       wx.navigateTo({
-        url: '../../package4/main/activate',
+        url: url,
       });
+      app.globalData.goto = "";
     }
-    else {
-      this.getData();
-
-      if (app.globalData.goto) {
-        var url = "../main/list?id=1";
-        if (app.globalData.goto == "test")
-          url = '../main/test';
-        wx.navigateTo({
-          url: url,
-        });
-        app.globalData.goto = "";
-      }
-    }
+    
     var miaoguoADTime = wx.getStorageSync("miaoguoADTime");
     if (miaoguoADTime) {
       if (this.data.IsShow == 1 && this.data.IsMember == 1 && isMiaoguoADShow && common.formatTime(new Date()) >= miaoguoADTime) {
@@ -254,13 +249,7 @@ Page({
     });
   },
   gotoMemberCenter: function () {
-    if (app.globalData.userInfo.NickName=="陌生用户" && app.globalData.userInfo.IsShow>0) {
-      //请去授权
-      wx.navigateTo({
-        url: './accredit?type=accredit',
-      });
-    }
-    else if (app.globalData.userInfo.IsShow>0) {
+    if (app.globalData.userInfo.IsShow>=0) {
       wx.navigateTo({
         url: './userinfo',
       });

pages/main/index.wxml

@@ -1,5 +1,5 @@
 <view class="container FlexColumn" style='min-height:{{Height}}rpx;'>
-  
+
   <view class="panelTop FlexRow">
     <view class="Avatar FlexColumn">
       <image src='../images/userface_default.png' class="AvatarImage" bindtap="gotoMemberCenter">
@@ -7,7 +7,7 @@
       <image src='{{AvatarUrl}}' class="AvatarImage1" bindtap="gotoMemberCenter">
       </image>
     </view>
-    
+
     <view class="panelTop1 FlexColumn">
       <view class="number" wx:if="{{!IsAccredit}}">-</view>
       <view class="number" wx:if="{{IsAccredit}}">{{DayNumber}}</view>
@@ -30,8 +30,7 @@
   </view>
   <view class="panelList FlexRow">
     <view class="panelItem btn FlexColumn" wx:for="{{List}}" wx:key="*this">
-      <image  src='../images/{{item.ImageUrl}}' bindtap="goto" data-url="{{item.Url}}"
-      class="itemImg" />
+      <image src='../images/{{item.ImageUrl}}' bindtap="goto" data-url="{{item.Url}}" class="itemImg" />
     </view>
     <view class="panelTool FlexColumn">
       <view class="panelTool1">自测工具</view>
@@ -50,77 +49,83 @@
     </view>
 
     <image src='../images/png02016.png' class="png02016" />
-    <view class="panelOther FlexRow">
-      <view class="panelOther1">其它产品</view>
-      <image src='../images/home_triangle_up.png' class="home_triangle_up" />
-    </view>
-  </view>
-  <view class="panelProduct FlexColumn">
-    <view class="panelProduct10 panelProduct0 FlexColumn">
-      <view class="panelProduct1">全科练习</view>
-      <view class="panelProduct3 FlexRow" bindtap="showMiaoguo" >
-        <image src='../images/sofewareicon_mg.png' class="sofewareicon_mg" />
-        <view class="panelProduct31 FlexColumn">
-          <view class="panelProduct311">秒过</view>
-          <view class="panelProduct312">基础知识记忆工具</view>
-        </view>
+
+    <block wx:if="{{IsShow==1}}">
+      <view class="panelOther FlexRow">
+        <view class="panelOther1">其它产品</view>
+        <image src='../images/home_triangle_up.png' class="home_triangle_up" />
       </view>
-    </view>
 
-    <view class="panelProduct1">单科练习</view>
-    <view class="panelProduct10 FlexRow" style="width:100%;">
-      <view class="panelProduct0 FlexColumn">
-        <view class="panelProduct2">数学</view>
-        <view class="panelProduct3 FlexRow" bindtap='switchProgram' data-appid='wxa5441bbf344692ba' >
-          <image src='../images/sofewareicon_ks.png' class="sofewareicon_mg" />
-          <view class="panelProduct31 FlexColumn">
-            <view class="panelProduct311">口算星球</view>
-            <view class="panelProduct312">好玩的口算敏捷练习</view>
-          </view>
-        </view>
-        <view class="panelProduct3 FlexRow" bindtap='switchProgram' data-appid='wx1fef080f74481cbd' >
-          <image src='../images/sofewareicon_jst.png' class="sofewareicon_mg" />
+    </block>
+  </view>
+
+  <block wx:if="{{IsShow==1}}">
+    <view class="panelProduct FlexColumn">
+      <view class="panelProduct10 panelProduct0 FlexColumn">
+        <view class="panelProduct1">全科练习</view>
+        <view class="panelProduct3 FlexRow" bindtap="showMiaoguo">
+          <image src='../images/sofewareicon_mg.png' class="sofewareicon_mg" />
           <view class="panelProduct31 FlexColumn">
-            <view class="panelProduct311">计算题打印</view>
-            <view class="panelProduct312">打印竖式横式计算题</view>
+            <view class="panelProduct311">秒过</view>
+            <view class="panelProduct312">基础知识记忆工具</view>
           </view>
         </view>
       </view>
-      <view class="panelProduct0 FlexColumn">
-        <view class="panelProduct2">语文</view>
-        <view class="panelProduct3 FlexRow" bindtap='switchProgram' data-appid='wx331e8dd070f01d0e' >
-          <image src='../images/sofewareicon_py.png' class="sofewareicon_mg" />
-          <view class="panelProduct31 FlexColumn">
-            <view class="panelProduct311">汉语拼音</view>
-            <view class="panelProduct312">纯正发音练习</view>
+
+      <view class="panelProduct1">单科练习</view>
+      <view class="panelProduct10 FlexRow" style="width:100%;">
+        <view class="panelProduct0 FlexColumn">
+          <view class="panelProduct2">数学</view>
+          <view class="panelProduct3 FlexRow" bindtap='switchProgram' data-appid='wxa5441bbf344692ba'>
+            <image src='../images/sofewareicon_ks.png' class="sofewareicon_mg" />
+            <view class="panelProduct31 FlexColumn">
+              <view class="panelProduct311">口算星球</view>
+              <view class="panelProduct312">好玩的口算敏捷练习</view>
+            </view>
+          </view>
+          <view class="panelProduct3 FlexRow" bindtap='switchProgram' data-appid='wx1fef080f74481cbd'>
+            <image src='../images/sofewareicon_jst.png' class="sofewareicon_mg" />
+            <view class="panelProduct31 FlexColumn">
+              <view class="panelProduct311">计算题打印</view>
+              <view class="panelProduct312">打印竖式横式计算题</view>
+            </view>
           </view>
         </view>
-        <view class="panelProduct3 FlexRow" bindtap='switchProgram' data-appid='wx313a8f2c0741efe1' >
-          <image src='../images/sofewareicon_sz.png' class="sofewareicon_mg" />
-          <view class="panelProduct31 FlexColumn">
-            <view class="panelProduct311">识字</view>
-            <view class="panelProduct312">小学六年课本同步</view>
+        <view class="panelProduct0 FlexColumn">
+          <view class="panelProduct2">语文</view>
+          <view class="panelProduct3 FlexRow" bindtap='switchProgram' data-appid='wx331e8dd070f01d0e'>
+            <image src='../images/sofewareicon_py.png' class="sofewareicon_mg" />
+            <view class="panelProduct31 FlexColumn">
+              <view class="panelProduct311">汉语拼音</view>
+              <view class="panelProduct312">纯正发音练习</view>
+            </view>
+          </view>
+          <view class="panelProduct3 FlexRow" bindtap='switchProgram' data-appid='wx313a8f2c0741efe1'>
+            <image src='../images/sofewareicon_sz.png' class="sofewareicon_mg" />
+            <view class="panelProduct31 FlexColumn">
+              <view class="panelProduct311">识字</view>
+              <view class="panelProduct312">小学六年课本同步</view>
+            </view>
           </view>
         </view>
       </view>
-    </view>
-    
-    <view style="width:100%;height:20rpx;"></view>
-    <view class="panelProduct10 panelProduct0 FlexColumn" bindtap='switchProgram' data-appid='wxb54a6d5aff836ee3' >
-      <view class="panelProduct1">英语</view>
-      <view class="panelProduct3 FlexRow">
-        <image src='../images/sofewareicon_pd.png' class="sofewareicon_mg" />
-        <view class="panelProduct31 FlexColumn">
-          <view class="panelProduct311">自然拼读</view>
-          <view class="panelProduct312">英语国家母语学习法</view>
+
+      <view style="width:100%;height:20rpx;"></view>
+      <view class="panelProduct10 panelProduct0 FlexColumn" bindtap='switchProgram' data-appid='wxb54a6d5aff836ee3'>
+        <view class="panelProduct1">英语</view>
+        <view class="panelProduct3 FlexRow">
+          <image src='../images/sofewareicon_pd.png' class="sofewareicon_mg" />
+          <view class="panelProduct31 FlexColumn">
+            <view class="panelProduct311">自然拼读</view>
+            <view class="panelProduct312">英语国家母语学习法</view>
+          </view>
         </view>
       </view>
+      <view style="width:100%;height:60rpx;"></view>
     </view>
-    <view style="width:100%;height:60rpx;"></view>
-  </view>
-  
-  <image bindtap="showMiaoguo" src='../images/home_banner.png' class="home_banner" />
-          
+
+    <image bindtap="showMiaoguo" src='../images/home_banner.png' class="home_banner" />
+  </block>
 </view>
 
 <view class="HelpInfo2 FlexColumn" style='height:{{Height}}rpx;' wx:if="{{IsMiaoguoAD2==1}}">
@@ -156,7 +161,7 @@
 
 <view class="PanelMiaoguo FlexColumn" style='height:{{Height}}rpx;' wx:if="{{IsShowMiaoguo==1}}" catchtap="closeMiaoguo">
   <view class="PanelMiaoguo1 FlexColumn">
-    <image src='../images/bm_sy_illus.png' class="bm_sy_illus"/>
+    <image src='../images/bm_sy_illus.png' class="bm_sy_illus" />
     <view class="Text1">该记的记不住</view>
     <view class="Text2">用「秒过」</view>
     <text class="Text3">帮助孩子记牢语数外基础知识的\n工具和练习方法</text>

pages/main/userinfo.js

@@ -16,6 +16,7 @@ Page({
       ProgramID:app.globalData.ProgramID,
       IsShow: app.globalData.userInfo.IsShow,
       IsLocked: app.globalData.IsLocked,
+      IsIOS:app.globalData.IsIOS,
     });
   },
   goto:function(e){

pages/main/userinfo.wxml

@@ -19,7 +19,8 @@
   </view>
   <view class='lineFooter'></view>
 
-  <block wx:if="{{IsShow==1 && IsLocked==1}}">
+  <block wx:if="{{(IsShow==1 && IsLocked==1) || (IsShow<=0 && !IsIOS)}}">
+  
     <view class="panelTitle FlexRow">
       <view class="panelTitle1">我的卡包</view>
     </view>