1.1.13

app.js

@@ -26,7 +26,7 @@ App({
     }
   },
   globalData: {
-    version: "1.1.11",
+    version: "1.1.13",
     IsProduction: true,
     ProgramID: 105,
     AppID: "wx1fef080f74481cbd",

app.json

@@ -45,12 +45,13 @@
         "main/activateFinish",
         "main/giftcard",
         "main/giftlist",
+        "main/getgiftlist",
         "main/giftinfo",
         "main/coupon",
         "main/limited",
         "main/invite",
         "main/share",
-        "main/newuser",
+        "main/miaoguoreadme",
         "main/list"
       ]
     }

package4/main/buyad.js

@@ -9,6 +9,7 @@ Page({
   onLoad: function (options) {
     this.setData({
       Containnerheight: common.getSystemHeight(),
+      ProgramID: app.globalData.ProgramID,
     });
     this.init();
   },
@@ -38,10 +39,18 @@ Page({
       url: "./list?IsGift=1",
     });
   },
-  closePage:function(){
-    wx.navigateBack({
-      delta: 1
-    });
+  closePage:function(e){
+    if (e.currentTarget.dataset.type){
+      app.globalData.IsShowMiaoguo=true;
+      wx.navigateBack({
+        delta: 3
+      });
+    }
+    else{
+      wx.navigateBack({
+        delta: 1
+      });
+    }
   },
   onShareAppMessage: function () {
     return {

package4/main/buyad.wxml

@@ -1,4 +1,6 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <image src='../images/pay_shoppingguide_illus_03_{{ProgramID}}.png' class="pay_shoppingguide_illus_03" bindtap="closePage" data-type="openAD" />
+  
   <view class='panel1 FlexColumn'>
     <image src='../images/pay_shoppingguide_illus_01.png' class="pay_shoppingguide_illus_01" />
     <view class='panel11 FlexRow'>

package4/main/buyad.wxss

@@ -3,11 +3,16 @@
   color:#1e1e1e;
 }
 
+.pay_shoppingguide_illus_03{
+  width: 610rpx;
+  height: 174rpx;
+  margin-top: 40rpx;
+}
+
 .panel1 {
   width: 610rpx;
-  margin-top: 100rpx;
+  margin-top: 30rpx;
   justify-content: flex-start;
-  background-color: #AE5138;
   border-radius: 10rpx;
   box-shadow: 0 20rpx 1rpx #AE5138,
   0 50rpx 1rpx #2E1E2F;
@@ -63,6 +68,8 @@
   width:610rpx;
   height:192rpx;
   margin-top: 74rpx;
+  position: relative;
+  z-index: 10;
 }
 
 .text1{
@@ -71,14 +78,15 @@
   color:#FE6659;
   text-decoration: underline;
   z-index: 10;
-  background-color: #342535;
+  background-color:rgba(0,0,0,0);
   border: 0rpx solid;
 }
 
 .pay_shoppingguide_footer{
   width:100%;
   height:350rpx;
-  margin-top: -23rpx;
+  position: fixed;
+  bottom:130rpx;
 }
 
 .text2{
@@ -89,4 +97,6 @@
   font-size:48rpx;
   text-align: center;
   background-color: #6B4D4E;
+  position: fixed;
+  bottom:0;
 }

package4/main/getgiftlist.js

@@ -0,0 +1,47 @@
+import common from '../../utils/util';
+import server from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    List:[],
+  },
+  onLoad: function (options) {
+    this.setData({
+      Containnerheight: common.getSystemHeight(),
+    });
+    this.init();
+  },
+  init:function(){
+    var that = this;
+    wx.showLoading({
+      title: '请稍后',
+    })
+    server.getData('GetProductGivePresent?UserID=' + app.globalData.userInfo.UserID + "&ProductID=" + app.globalData.ProgramID, function (data) {
+      wx.hideLoading({});
+      if (data) {
+        var arr=server.getProgramList();
+        for(var i=0;i<arr.length;i++){
+          for(var j=0;j<data.length;j++){
+            if (arr[i].ID==data[j].ProgramID){
+              data[j].ProgramName=arr[i].Name;
+              data[j].ProgramUrl=arr[i].ImageUrl;
+              break;
+            }
+          }
+        }
+        that.setData({
+          List: data,
+        });
+      }
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

package4/main/getgiftlist.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "获赠的礼品卡",
+  "navigationBarBackgroundColor": "#ffffff",
+  "navigationBarTextStyle": "black",
+  "backgroundColor": "#F0F0F0"
+}

package4/main/getgiftlist.wxml

@@ -0,0 +1,27 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <block wx:if="{{List.length>0}}" wx:for="{{List}}" wx:key="index">
+    <view class='panel FlexColumn'>
+      <view class='panel1 FlexColumn'>
+        <view class='panel11 FlexRow'>
+          <view class='Title1'>激活时间</view>
+          <view class='Title2'>{{item.CreateTime}}</view>
+        </view>
+        <view class='panel11 FlexRow'>
+          <view class='Title1'>有效期延长至</view>
+          <view class='Title2'>{{item.ProductServiceTime}}</view>
+        </view>
+      </view>
+      <view class='lineWidth750'></view>
+      <view class='panel2 FlexRow'>
+        <image src='../images/{{item.ProgramUrl}}' class="product_icon_py_70x70" />
+        <view class='Title3'>{{item.ProgramName}}</view>
+      </view>
+    </view>
+    <view class='lineFooter'></view>
+  </block>
+
+  <view class='panelNull FlexColumn' wx:if="{{List.length==0}}">
+    <view class='Title5'>没有获赠的礼品卡</view>
+  </view>
+  <view style='height:100rpx;'></view>
+</view>

package4/main/getgiftlist.wxss

@@ -0,0 +1,62 @@
+.container {
+  background-color: #f0f0f0;
+  color: #1e1e1e;
+  font-weight: 400;
+}
+
+.panel{
+  margin-top: 50rpx;
+  width:100%;
+  background-color: #fff;
+}
+
+.panel .panel1{
+  align-items: flex-start;
+  margin:0 0 0 30rpx;
+  width:700rpx;
+  height:131rpx;
+}
+
+.panel .panel11{
+  margin:3rpx 0;
+}
+
+.panel .Title1{
+  font-size:20rpx;
+  color:#9B9B9B;
+  font-weight: 400;
+  width:120rpx;
+}
+
+.panel .Title2{
+  font-size:20rpx;
+  margin: 0 0 0 10rpx;
+  
+}
+
+.panel .panel2{
+  width: 100%;
+  height:111rpx;
+  justify-content: flex-start;
+}
+
+.product_icon_py_70x70{
+  width:50rpx;
+  height:50rpx;
+  margin:0 0 0 30rpx;
+  border-radius: 10rpx;
+}
+
+.panel .Title3{
+  font-size:28rpx;
+  margin-left: 20rpx;
+}
+
+.panelNull{
+  margin-top: 412rpx;
+}
+
+.panelNull .Title5{
+  font-size:48rpx;
+  font-weight: 500;
+}

package4/main/giftlist.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "我的礼品卡",
+  "navigationBarTitleText": "购买的礼品卡",
   "navigationBarBackgroundColor": "#ffffff",
   "navigationBarTextStyle": "black",
   "backgroundColor": "#F0F0F0"

package4/main/miaoguoreadme.js

@@ -0,0 +1,22 @@
+import common from '../../utils/util';
+import server from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    
+  },
+  onLoad: function (options) {
+    this.setData({
+      Containnerheight: common.getSystemHeight(),
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

package4/main/miaoguoreadme.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "活动规则",
+  "navigationBarBackgroundColor": "#ffffff",
+  "navigationBarTextStyle": "black",
+  "backgroundColor": "#F0F0F0"
+}

package4/main/miaoguoreadme.wxml

@@ -0,0 +1,11 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="text1">活动规则</view>
+  <text class="text2">① 本活动只针对自2021年3月？？日起报名秒过的用户，在此之前报名的老用户不享受此活动优惠项目。\n
+② 秒过新手培训只能报名一次，不能重复报名。\n
+③ 符合本活动规则的有效报名是指：打开秒过小程序；支付报名费；关注秒过学习法公众号；添加班务员微信；收到班务员开班安排的通知。以上整个流程中的任何环节均不可或缺。请按系统引导信息一步步完成。\n
+④ 有效报名可获得唱意公司旗下5款产品各20天免费有效期。产品包括：语文汉语拼音、语文识字、英语自然拼读、数学计算题、口算星球。\n
+⑤ 报名后，请尽快打开这5款产品，系统会自动延长有效期。您可以通过「首页 -> 点击用户头像 -> 会员中心 -> 获增的礼品卡」查询。\n
+⑥ 「获增的礼品卡」只能查询已打开的产品，想要查看完整5款的记录，请把产品全部打开一遍后回到该功能复查。\n
+⑦ 如需人工咨询，请通过报名时添加的微信与班务员联系。客服工作时间：10:00-22:00。\n
+活动最终解释权归唱意公司所有。如有争议请在报名后与班务员协商解决。感谢您的配合。</text>
+</view>

package4/main/miaoguoreadme.wxss

@@ -0,0 +1,16 @@
+.container {
+  background-color: #f0f0f0;
+  color: #1e1e1e;
+  font-weight: 500;
+}
+
+.text1 {
+  width: 690rpx;
+  font-size:36rpx;
+  margin:50rpx 0 0 0;
+}
+.text2 {
+  width: 690rpx;
+  font-size:24rpx;
+  margin:30rpx 0 0 0;
+}

package4/main/newuser.js

@@ -1,59 +0,0 @@
-import common from '../../utils/util';
-import main from '../../utils/main';
-
-var app = getApp();
-
-Page({
-  data: {
-    PanelShow: 0,
-    ImagePath: app.globalData.uploadImageUrl,
-  },
-  onLoad: function (options) {
-    var that = this;
-    that.setData({
-      Containnerheight: common.getSystemHeight(),
-    });
-    that.init();
-
-    wx.setNavigationBarColor({
-      frontColor: "#ffffff",
-      backgroundColor: "#9BD41C",
-    });
-
-  },
-  init: function () {
-    var that = this;
-    main.getData("GetClassList?Flag=0", function (data) {
-      if (data && data.length>0) {
-        that.setData({
-          StartDate: common.formatDateCHS(data[0].StartDate),
-        })
-      }
-    });
-  },
-  gotoPanel2:function(){
-      this.setData({
-        PanelShow:1,
-      })
-  },
-  copyManager: function () {
-    wx.setClipboardData({
-      data: "秒过学习法",
-      success(res) {
-        wx.showModal({
-          title: '已复制',
-          showCancel: false,
-          content: "请在微信添加公众号中长按粘贴。",
-          confirmText: "知道了",
-        });
-      }
-    });
-  },
-  onShareAppMessage: function () {
-    return {
-      title: app.globalData.ShareTitle,
-      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
-      imageUrl: app.globalData.ShareImage,
-    }
-  },
-})

package4/main/newuser.json

@@ -1,5 +0,0 @@
-{
-  "navigationBarTitleText": "秒过学习法",
-  "navigationBarBackgroundColor": "#9BD41C",
-  "navigationBarTextStyle": "white"
-}

package4/main/newuser.wxml

@@ -1,31 +0,0 @@
-<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-
-  <block wx:if="{{PanelShow==0}}">
-    <image class="img" lazy-load="true" mode="widthFix" src='{{ImagePath}}web/promotion_leaflet_c01.png' />
-    <image class="img" lazy-load="true" mode="widthFix" src='{{ImagePath}}web/promotion_leaflet_c02.png' />
-    <image class="img" lazy-load="true" mode="widthFix" src='{{ImagePath}}web/promotion_leaflet_c03.png' />
-    <view class="panelBottom FlexRow">
-      <view class="panelBottom1 FlexColumn" wx:if="{{!StartDate}}">
-        <view class='text7'>16天手把手</view>
-        <view class='text8'>还您上手新方法</view>
-      </view>
-      <view class="panelBottom1 FlexColumn" wx:if="{{StartDate}}">
-        <view class='text7'>近期开班时间</view>
-        <view class='text8'>{{StartDate}}</view>
-      </view>
-      <view class="btn2 FlexColumn" bindtap="gotoPanel2">
-        去报名
-      </view>
-    </view>
-    <view style="height:140rpx;"></view>
-  </block>
-  <block wx:if="{{PanelShow==1}}">
-    <view class='text1'>报名步骤</view>
-    <view class='text2'>第一步</view>
-    <text class='text3'>手动关注公众号《秒过学习法》</text>
-
-    <view class="btn" bindtap='copyManager'>复制公众号名称</view>
-    <view class='text4'>第二步</view>
-    <view class='text3'>关注后点击“开通新手包”</view>
-  </block>
-</view>

package4/main/newuser.wxss

@@ -1,78 +0,0 @@
-.container{
-  background-color: #ffffff;
-  color:#1E1E1E;
-}
-
-.img{
-  width:100%;
-}
-
-
-.panelBottom{
-  width:100%;
-  height:140rpx;
-  position: fixed;
-  bottom: 0;
-  background-color: #329468;
-  z-index: 10;
-  justify-content: space-between;
-}
-
-.panelBottom1{
-  margin-left: 30rpx;
-  color:#fff;
-  align-items: flex-start;
-}
-
-.text7{
-  font-size:24rpx;
-}
-
-.text8{
-  font-size:36rpx;
-}
-
-
-.text1{
-  margin: 200rpx 0 0 0;
-  font-size:64rpx;
-  color:#329468;
-}
-.text2{
-  margin: 10rpx 0 0 0;
-  font-size:36rpx;
-}
-.text3{
-  font-size:28rpx;
-  font-weight: 400;
-}
-
-.btn{
-  font-size:36rpx;
-  width:520rpx;
-  height:90rpx;
-  border-radius: 10rpx;
-  text-align: center;
-  line-height: 90rpx;
-  color:#fff;
-  background-color: #329468;
-  margin-top: 30rpx;
-}
-
-.btn2{
-  font-size:48rpx;
-  width:380rpx;
-  height:100rpx;
-  border-radius: 10rpx;
-  text-align: center;
-  line-height: 100rpx;
-  color:#1E1E1E;
-  background-color: #FFDD0C;
-  margin-right: 30rpx;
-}
-
-.text4{
-  margin: 60rpx 0 0 0;
-  font-size:36rpx;
-}
-

pages/index/index.js

@@ -57,44 +57,12 @@ Page({
       success: function (res0) {
         app.globalData.userInfo = {};
         app.globalData.userInfo.Code = res0.code;
-        //console.log("Code:" + res0.code);
-
-        wx.getSetting({
-          scope: "scope.userInfo",
-          success(res) {
-            if (!res.authSetting['scope.userInfo']) {
-              app.globalData.userInfo.nickName = "陌生用户";
-              app.globalData.userInfo.language = "";
-              app.globalData.userInfo.gender = "0";
-              app.globalData.userInfo.city = "";
-              app.globalData.userInfo.province = "";
-              app.globalData.userInfo.country = "";
-              app.globalData.userInfo.avatarUrl = "";
-              that.login(app.globalData.userInfo);
-            } else {
-              wx.getUserInfo({
-                withCredentials: false,
-                success: function (res) {
-                  app.globalData.userInfo = res.userInfo;
-
-                  app.globalData.userInfo.NickName = app.globalData.userInfo.nickName;
-                  app.globalData.userInfo.AvatarUrl = app.globalData.userInfo.avatarUrl;
-
-                  app.globalData.userInfo.Code = res0.code;
-                  that.login(app.globalData.userInfo);
-
-                },
-                fail: function (res) {
-                  that.login(app.globalData.userInfo);
-                }
-              });
-
-            }
-          }
-        });
+        //console.log("Code:" + res0.code);app.globalData.userInfo.nickName = "陌生用户";
+        that.login(app.globalData.userInfo);
+        
       },
       fail: function () {
-        timeout2 = setTimeout(function () {
+        setTimeout(function () {
           that.getUserInfo();
           console.log("reboot:" + new Date().getTime());
         }, 2000);
@@ -108,13 +76,6 @@ Page({
     server.getLocalHost(function () {
       server.postData('MathLogin', {
         Code: param.Code,
-        NickName: param.nickName,
-        Language: param.language,
-        Gender: param.gender,
-        City: param.city,
-        Province: param.province,
-        Country: param.country,
-        AvatarUrl: param.avatarUrl,
         Introducer: app.globalData.introducer,
         UserSource: app.globalData.userSource,
         SourceID: app.globalData.SourceID,

pages/main/accredit.js

@@ -8,20 +8,19 @@ Page({
     fileUrl: app.globalData.fileUrl,
   },
   onLoad: function (options) {
-    var text0 = "", text1 = "", text2 = "", text4 = "", text5 = "";
-    text0 = "用户登录";
-    text1 = "需要您的授权";
-    text2 = "去授权";
-    text4 = "提醒：授权仅获取微信头像和昵称，";
-    text5 = "其它信息均受到微信保护。不授权将使个性化功能无法正常运作，特别是解锁、优惠礼品等会员功能。为保障您的消费权益，请尽快授权用户信息。";
+    var text0 = "", text1 = "", text2 = "", text3 = "";
+    text0 = "会员登录";
+    text1 = "无需注册，微信授权即可登录";
+    text2 = "去登录";
+    text3 = "注意：会员登录后可使用付费功能。授权微信用户信息即可一键登录。为保障消费权益，购买后请尽快授权用户信息。登录后才能正常使用统计、排行、我的订单、套装、礼品卡等功能。";
 
     this.setData({
       Height: common.getSystemHeight(),
       Text0: text0,
       Text1: text1,
       Text2: text2,
-      Text4: text4,
-      Text5: text5,
+      Text3: text3,
+      OrderType: options.type,
     });
 
     //适配ipad
@@ -33,59 +32,28 @@ Page({
         })
       }
     }
-
-  },
-  goto: function (e) {
-    var that = this;
-    wx.getSetting({
-      success(res) {
-        if (!res.authSetting['scope.userInfo']) {
-          wx.authorize({
-            scope: 'scope.userInfo',
-            success() {
-              that.getUserInfo();
-            },
-            fail() {
-              wx.openSetting({
-                success(res) {
-                  that.getUserInfo();
-                },
-              });
-            }
-          })
-        }
-        else {
-          that.getUserInfo();
-        }
-      }
-    })
-
   },
   //得到用户信息
   getUserInfo: function () {
     var that = this
-    //调用登录接口
-    wx.login({
-      success: function (res0) {
-        wx.getUserInfo({
-          withCredentials: true,
-          success: function (res) {
+   
+    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;
-            app.globalData.userInfo.iv = res.iv;
-            app.globalData.userInfo.encryptedData = res.encryptedData;
-
-            app.globalData.userInfo.NickName = res.userInfo.nickName;
-            app.globalData.userInfo.AvatarUrl = res.userInfo.avatarUrl;
-
-            that.login(app.globalData.userInfo, res.userInfo);
-          },
-          fail: function (res) {
-
+            that.login(app.globalData.userInfo, res2.userInfo);
           }
         });
       },
-      fail: function () {
-
+      fail: function (res) {
+        console.log(res);
       }
     });
   },

pages/main/accredit.json

@@ -1,6 +1,7 @@
 {
-  "navigationBarBackgroundColor": "#99607C",
-  "navigationBarTextStyle": "white",
-  "navigationBarTitleText": "登录",
-  "backgroundColor": "#99607C"
+  "navigationBarTitleText": "会员登录",  
+  "navigationBarBackgroundColor": "#FEBD00",
+  "navigationBarTextStyle": "black",
+  "backgroundColor": "#FEBD00",
+  "enablePullDownRefresh": false
 }

pages/main/accredit.wxml

@@ -1,19 +1,10 @@
 <view class="container FlexColumn" style='height:{{Height}}rpx;'>
   <image src="../images/accredit.png" class="bg" />
-  <image src="../images/universalpic_face_default_blue_size01.png" class="universalpic_face_default_blue_size01" />
-
   <text class="text0">{{Text0}}</text>
   <text class="text1">{{Text1}}</text>
-
   <view class="btn">
-    <view class="btn1">
-      <button open-type="getUserInfo" bindgetuserinfo="goto" class="btn2">{{Text2}}</button>
-    </view>
+    <button  class="btn1" catchtap="getUserInfo">{{Text2}}</button>
   </view>
-
-  <view class="text3">
-    <text class="text4">{{Text4}}</text>
-    <text class="text5">{{Text5}}</text>
-  </view>
-
+  <view class="line2 {{ipad}}"></view>
+  <text class="text3">{{Text3}}</text>
 </view>

pages/main/accredit.wxss

@@ -1,29 +1,18 @@
-.container {
-  background-color: #99607C;
-  justify-content: flex-start;
-  color: #FFD48B;
-  font-weight: 500;
+.container{
+  background-color: #FEBD00;
 }
-
 .bg{
   width: 100%;
-  height:490rpx;
+  height:769rpx;
   position: fixed;
   bottom: 0;
   left:0;
 }
 
-.universalpic_face_default_blue_size01{
-  width: 160rpx;
-  height:160rpx;
-  border-radius: 50%;
-  margin-top: 80rpx;
-}
-
 .text0{
   font-size:36rpx;
   text-align: center;
-  margin-top: 40rpx;
+  margin-top: 280rpx;
   z-index: 10;
 }
 
@@ -36,34 +25,33 @@
 
 
 .btn {
-  width: 520rpx;
-  height: 118rpx;
-  background-color:rgba(0,0,0,0.2);
+  width: 600rpx;
+  height: 104rpx;
+  background-color: #035834;
   border-radius: 14rpx;
-  margin-top: 50rpx;
+  margin-top: 90rpx;
   z-index: 10;
 }
 
 .btn1 {
-  width: 100%;
-  height: 104rpx;
-  background-color: #D6A665;
-  border-radius: 14rpx;
-  position:relative;
-  top:0;
-}
-
-.btn2 {
   width: 100%;
   height: 90rpx;
-  background-color: #FFCD79;
+  background-color: #03AF69;
   border-radius: 14rpx;
   position:relative;
   top:0;
   font-size: 36rpx;
   text-align: center;
   line-height: 90rpx;
-  color:#713312;
+  color:#fff;
+}
+
+.line2{
+  width: 600rpx;
+  height:3rpx;
+  background-color: #593613;
+  margin-top:350rpx;
+  z-index: 10;
 }
 
 .ipad{
@@ -72,14 +60,19 @@
 
 .text3{
   font-size:22rpx;
-  width:470rpx; 
+  width:560rpx; 
   margin-top: 40rpx;
   z-index: 10;
   font-weight: 400;
 }
+
+.buyOK{
+  width: 106rpx;
+  height:106rpx;
+  margin-top: 120rpx;
+}
 .text4{
-  color:#FFD48B;
+  font-size:64rpx;
+  margin-top: 20rpx;
+  font-weight: 500;
 }
-.text5{
-  color:#C8A5C4;
-}

pages/main/default.js

@@ -16,17 +16,15 @@ Page({
     IsMember: 1,
     AvatarUrl: "",
     IsAccredit: false,
-    IsExit: false,
     IsMiaoguoAD: false,
     IsMiaoguoAD2: 0,
   },
   onLoad: function () {
     var that = this;
     this.setData({
-      Containnerheight: server.getWindowHeight(),
+      Height: server.getWindowHeight(),
       ProgramList: server.getProgramListOld(),
-      NickName: app.globalData.userInfo.NickName,
-      AvatarUrl: app.globalData.userInfo.AvatarUrl,
+      IsShowGift:app.globalData.userInfo.IsShowGift,
     });
     wx.login({
       success: function (res0) {
@@ -34,25 +32,15 @@ Page({
       }
     });
 
-    if (app.globalData.IsIPad) {
-      if (app.globalData.systemInfo.windowHeight < app.globalData.systemInfo.windowWidth) {
-        this.setData({
-          IsExit: true,
-        });
-      }
-    }
-
     isMiaoguoADShow = false;
   },
   onUnload: function () {
 
   },
   onShow: function () {
-    if (wx.getStorageSync("HasActivate") == 1) {
-      wx.navigateTo({
-        url: '../../package4/main/activate',
-      });
-    }
+
+    var that = this;
+
     var list = wx.getStorageSync("AnswerList");
     var answerLength = 0;
     if (list && list.length > 0) {
@@ -68,28 +56,35 @@ Page({
     this.setData({
       AnswerLength: answerLength,
       ErrorCount: errorCount,
-      IsShow:app.globalData.userInfo.IsShow,
+      IsLocked: app.globalData.IsLocked,
+      IsShow: app.globalData.userInfo.IsShow,
+      IsMember: app.globalData.userInfo.IsMember,
+      NickName: app.globalData.userInfo.NickName,
+      AvatarUrl: app.globalData.userInfo.AvatarUrl,
     });
 
-    var that = this;
-    wx.getSetting({
-      success(res) {
-        if (res.authSetting['scope.userInfo'] || app.globalData.userInfo.IsShow <= 0) {
-          that.setData({
-            IsAccredit: true,
-          });
-          that.downloadUserAvatar();
-          common.getStorageValue(that, "HelpHidden1", false, function () {
-            that.showHelp();
-          });
-        } else {
-          wx.navigateTo({
-            url: './accredit',
-          });
-        }
-      }
-    });
+    if (app.globalData.userInfo.NickName=="陌生用户" && app.globalData.userInfo.IsShow>0) {
+      this.setData({
+        IsRemind:true,
+      });
+    }
+    else{
+      that.setData({
+        IsAccredit: true,
+        IsRemind:false,
+      });
+      that.downloadUserAvatar();
+      common.getStorageValue(that, "HelpHidden1", false, function () {
+        that.showHelp();
+      });
+    }
 
+    if (wx.getStorageSync("HasActivate") == 1) {
+      wx.navigateTo({
+        url: '../../package4/main/activate',
+      });
+    }
+    
     common.getStorageValue(this, "IsMiaoguoAD", true, function () { });
 
     var miaoguoADTime = wx.getStorageSync("miaoguoADTime");
@@ -105,6 +100,13 @@ Page({
     }
 
     isMiaoguoADShow = true;
+
+    if (app.globalData.IsShowMiaoguo){
+      this.setData({
+        IsShowMiaoguo:1,
+      });
+      app.globalData.IsShowMiaoguo=false;
+    }
   },
   downloadUserAvatar: function () {
     var avatar = wx.getStorageSync("Avatar");
@@ -145,6 +147,7 @@ Page({
       wx.setStorageSync('IsMiaoguoAD', false);
       wx.setStorageSync("miaoguoADTime", common.formatTime(common.addDate("d", 15, new Date())));
     }
+    app.globalData.userInfo.IsShowGift=0;
   },
   gotoHelp: function () {
     wx.redirectTo({
@@ -164,17 +167,26 @@ Page({
   switchProgram: function (e) {
     wx.navigateToMiniProgram({
       appId: e.currentTarget.dataset.appid,
-      path: e.currentTarget.dataset.path,
-      extraData: {},
+      path: "pages/index/index?SourceID="+app.globalData.ProgramID,
+      extraData: {
+      },
       success(res) {
         // 打开成功
       }
     });
   },
   gotoMemberCenter: function () {
-    wx.navigateTo({
-      url: './userinfo',
-    });
+    if (app.globalData.userInfo.NickName=="陌生用户" && app.globalData.userInfo.IsShow>0) {
+      //请去授权
+      wx.navigateTo({
+        url: './accredit?type=accredit',
+      });
+    }
+    else if (app.globalData.userInfo.IsShow>0) {
+      wx.navigateTo({
+        url: './userinfo',
+      });
+    }
   },
   gotoFeedback: function () {
     server.gotoFeedback();
@@ -250,6 +262,7 @@ Page({
   close: function (e) {
     this.setData({
       IsMiaoguoAD2: 0,
+      IsShowGift:0,
     });
     var num = e.currentTarget.dataset.num;
     if (num > 0) {
@@ -257,6 +270,20 @@ Page({
       time = common.formatTime(time);
       wx.setStorageSync("miaoguoADTime", time);
     }
+    app.globalData.userInfo.IsShowGift=0;
+  },
+  showMiaoguo:function(){
+    this.setData({
+      IsShowMiaoguo: 1,
+      IsMiaoguoAD2: 0,
+    });
+    app.globalData.userInfo.IsShowGift=0;
+    wx.setStorageSync("miaoguoADTime", common.formatTime(common.addDate("d", 15, new Date())));
+  },
+  closeMiaoguo:function(){
+    this.setData({
+      IsShowMiaoguo: 0,
+    });
   },
   onShareAppMessage: function () {
     return {

pages/main/default.wxml

@@ -1,6 +1,5 @@
-<view class="container FlexColumn" style="min-height:{{Containnerheight}}rpx;">
+<view class="container FlexColumn" style="min-height:{{Height}}rpx;">
   <view class="index0 FlexColumn">
-    <image src='../images/home_banner_header_jst.png' class="home_banner_header_sz" bindtap='goto' data-id="topAD" data-url='../../package4/main/newuser' wx:if="{{IsMiaoguoAD && IsMember==1 && IsShow==1}}" />
     <scroll-view class="scroll-view_H" scroll-x>
       <image class="homepage_headline_illus" src="../images/homepage_headline_illus.png" />
       <scroll-view scroll-y class="scrollview">
@@ -9,7 +8,6 @@
     </scroll-view>
   </view>
   <view class="panel FlexColumn">
-
     <view class="line1"></view>
     <view class="panel0 FlexRow">
       <view class="panel00 FlexColumn">
@@ -23,7 +21,8 @@
         </view>
         <view class="panel001 FlexRow">
           <view class="panel0010 FlexRow">
-            <image wx:for="{{[1,2,3,4]}}" wx:key="index" bindtap='gotoList' data-id="{{item}}" class="homepage_question_illus_grade01" src="../images/homepage_question_illus_grade0{{item}}.png" />
+            <image wx:for="{{[1,2,3,4]}}" wx:key="index" bindtap='gotoList' data-id="{{item}}"
+              class="homepage_question_illus_grade01" src="../images/homepage_question_illus_grade0{{item}}.png" />
           </view>
         </view>
         <view class="panel0011">
@@ -58,25 +57,26 @@
                 </view>
 
                 <view class="btn20 btn0" bindtap='gotoAnswer'>
-                  <view class="btn3 btn10">
+                  <view class="btn30 btn10">
                     对答案
                   </view>
                 </view>
               </view>
             </view>
             <view class="panel00201 FlexRow" bindtap="gotoMemberCenter">
-              <image wx:if="{{!IsAccredit}}" class="universalpic_face_default_black_size01" src="../images/universalpic_face_default_black_size01.png" bindtap='gotoBindGetUserInfo' />
+              <image wx:if="{{!IsAccredit}}" class="universalpic_face_default_black_size01"
+                src="../images/universalpic_face_default_black_size01.png" bindtap='gotoBindGetUserInfo' />
               <image wx:if="{{IsAccredit}}" class="universalpic_face_default_black_size01" src="{{AvatarUrl}}" />
-              <view class="gear FlexRow">
-                <image src='../images/02022.png' class="img" />
-              </view>
+              <image wx:if="{{IsRemind}}" src='../images/message_home_01.png' class="message_home_01" />
+  
             </view>
           </view>
           <image class="homepage_clipboard_illus_clip" src="../images/homepage_clipboard_illus_clip.png" />
           <image class="homepage_clipboard_illus_ruler" src="../images/homepage_clipboard_illus_ruler.png" />
 
         </view>
-        <image class="universalpic_line_zigzag_brown_down" src="../images/universalpic_line_zigzag_brown_down.png" />
+
+        <!-- <image class="universalpic_line_zigzag_brown_down" src="../images/universalpic_line_zigzag_brown_down.png" />
         <image class="universalpic_line_zigzag_brown_up" src="../images/universalpic_line_zigzag_brown_up.png" />
         <view class="panel003 circularBottom FlexColumn">
           <view class="panel0030 FlexRow">
@@ -119,20 +119,93 @@
               <image src='../images/home_banner_footer600.png' class="home_banner" bindtap='goto' data-url='../../package4/main/newuser' />
             </view>
           </view>
+        </view> 
+        <view style="height:100rpx;width:100%"></view>
+        -->
+      </view>
+    </view>
+    <view class="panel1 FlesColumn">
+      <view class="panelOther FlexRow">
+        <view class="panelOther1">其它产品</view>
+        <image src='../images/home_triangle_up.png' class="home_triangle_up" />
+      </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>
+          </view>
         </view>
 
-        <view style="height:100rpx;width:100%"></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="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 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>
+
+      <image bindtap="showMiaoguo" src='../images/home_banner.png' class="home_banner" />
+
     </view>
   </view>
 </view>
-<image hidden="{{HelpHidden1}}" bindtap='closeHelp' class="Help_aside_homepage" src="../images/Help_aside_homepage.png" />
+<image hidden="{{HelpHidden1}}" bindtap='closeHelp' class="Help_aside_homepage"
+  src="../images/Help_aside_homepage.png" />
 
-<view class="HelpInfo2 FlexColumn" style='height:{{Containnerheight}}rpx;' wx:if="{{IsMiaoguoAD2==1}}">
-  <view class="btn" bindtap='goto' data-url='../../package4/main/newuser' data-id="topAD">
-    <view class="btn1 FlexColumn">
+<view class="HelpInfo2 FlexColumn" style='height:{{Height}}rpx;' wx:if="{{IsMiaoguoAD2==1}}">
+  <view class="btn">
+    <view class="btn1 FlexColumn" catchtap="showMiaoguo">
       <image src='../images/home_banner_window.png' class="home_banner_window" />
-      <view class="btn2">了解一下</view>
+      <view class="btn2">去领取</view>
     </view>
   </view>
   <view class="close2 FlexColumn" bindtap='close' data-num="1">
@@ -143,10 +216,38 @@
   </view>
 </view>
 
-<audio hidden='true' id="myAudio"></audio>
-<canvas class='Canvas' canvas-id="MyCanvas"></canvas>
+<view class="HelpInfo2 FlexColumn" style='height:{{Height}}rpx;' wx:if="{{IsShowGift==1}}">
+  <view class="btn">
+    <view class="btn1 FlexColumn" catchtap="showMiaoguo">
+      <view class="HelpInfo21 FlexColumn">
+        <image src='../images/02014.png' class="png02014" />
+        <view class="HelpInfo211">有效期已延长</view>
+        <view class="HelpInfo212">计算题20天礼品卡已兑换成功</view>
+      </view>
+      <view class="btn2" catchtap='goto' data-url='../../package4/main/getgiftlist'>查看记录</view>
+    </view>
+  </view>
+  <view class="close FlexColumn" bindtap='close' data-num="0">
+    <image src='../images/02024.png' class="closeImage" />
+  </view>
+</view>
+
+<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"/>
+    <view class="Text1">该记的记不住</view>
+    <view class="Text2">用「秒过」</view>
+    <text class="Text3">帮助孩子记牢语数外基础知识的\n工具和练习方法</text>
+    <view class="Text4">了解详情，欢迎参加</view>
+    <view class="Text5">新手培训</view>
+    <view class="btn3 FlexColumn" bindtap='switchProgram' data-appid='wx84b3feac6069eec3'>
+      <image src='../images/bm_sy_banner-open.png' class="bm_sy_banner-open" />
+    </view>
 
-<view wx:if="{{IsExit}}" class="IsExitContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
-  <view class='IsExitText'>请竖起屏幕再打开小程序</view>
-  <navigator class='isExit' open-type="exit" target="miniProgram">确认</navigator>
-</view>
+    <view class="btnReadme" catchtap='goto' data-url='../../package4/main/miaoguoreadme'></view>
+    <view class="btnRecord" catchtap='goto' data-url='../../package4/main/getgiftlist'></view>
+  </view>
+</view>
+
+<audio hidden='true' id="myAudio"></audio>
+<canvas class='Canvas' canvas-id="MyCanvas"></canvas>

pages/main/default.wxss

@@ -144,10 +144,12 @@ page{
 }
 .panel002 {
   width: 100%;
-  height:698rpx;
+  height:658rpx;
   background-color: #723c30;
   position: relative;
   align-items: flex-start;
+  border-bottom-left-radius: 20rpx;
+  border-bottom-right-radius: 20rpx;
 }
 
 .panel0020 {
@@ -191,7 +193,7 @@ page{
   margin-top: 70rpx;
   font-weight: 500;
   position: relative;
-  width: 154rpx;
+  width: 174rpx;
   height:50rpx;
   text-align: center;
 }
@@ -260,7 +262,7 @@ page{
   margin-left: 14rpx;
 }
 
-.btn3 {
+.btn30 {
   background-color: #3b85d0;
 }
 
@@ -477,38 +479,171 @@ page{
 }
 
 
-.IsExitContainer{
-  background-color: #B9DC5D;
-  z-index: 100;
+.index5{
+  width:100%;
+  justify-content: flex-start;
+}
+
+
+/* .HelpInfo2 {
   position: fixed;
-  top:0;
+  left: 0;
+  top: 0;
+  width: 100%;
+  background-color: rgba(185, 220, 93, 0.95);
+  justify-content: flex-start;
+  z-index: 100;
 }
-.IsExitText{
-  margin-top: 200rpx;
-  color:#1e1e1e;
-  font-size:36rpx;
+
+.HelpInfo2 .btn {
+  width: 600rpx;
+  height: 640rpx;
+  background-color: #D2D2D2;
+  border-radius: 40rpx;
+  margin: 15rpx;
+  position: relative;
+  margin-top: 222rpx;
+  box-shadow: 0 0 30rpx rgba(0, 0, 0, 0.5);
 }
-.isExit{
-  border: 1rpx solid #1e1e1e;
-  color:#1e1e1e;
-  border-radius: 10rpx;
-  margin-top: 80rpx;
-  padding: 20rpx;
-  width:100rpx;
-  font-size:36rpx;
+
+.HelpInfo2 .btn1 {
+  width: 100%;
+  height: 640rpx;
+  border-radius: 40rpx;
+  color: #1e1e1e;
   text-align: center;
+  font-size: 36rpx;
+  justify-content: flex-start;
 }
 
+.HelpInfo2 .home_banner_window {
+  width: 600rpx;
+  height: 500rpx;
+  border-top-left-radius: 40rpx;
+  border-top-right-radius: 40rpx;
+}
 
-.index5{
+.HelpInfo2 .btn2 {
+  width: 100%;
+  height: 120rpx;
+  line-height: 120rpx;
+  background-color: #F0F0F0;
+  color: #1e1e1e;
+  text-align: center;
+  font-size: 48rpx;
+  font-weight: 500;
+  border-bottom-left-radius: 40rpx;
+  border-bottom-right-radius: 40rpx;
+}
+.HelpInfo2 .close2 {
+  position: fixed;
+  bottom:207rpx;
+  font-size:26rpx;
+  color: #1e1e1e;
+  text-decoration: underline;
+  font-weight: 500;
+  z-index: 100;
+  width:100%;
+  height:50rpx;
+}
+.HelpInfo2 .close {
+  width: 100%;
+  height: 235rpx;
+  position: fixed;
+  bottom:0;
+}
+
+.HelpInfo2 .closeImage{
+  width:33rpx;
+  height:33rpx;
+} */
+
+.panel1{
   width:100%;
+  position: absolute;
+  top:1800rpx;
+}
+
+.panelOther{
+  width:100%;
+  height:160rpx;
   justify-content: flex-start;
+  align-items: flex-start;
+  position: relative;
+}
+
+.panelOther1{
+  color:#fff;
+  margin:60rpx 0 0 50rpx;
+  font-size:36rpx; 
+}
+
+.home_triangle_up{
+  width:34rpx;
+  height:20rpx;
+  position: absolute;
+  bottom:0;
+  left:105rpx;
+  z-index: 10;
+}
+
+.panelProduct{
+  width:100%;
+  background-color: #fff;
+  align-items: flex-start;
+}
+.panelProduct0{
+  width:50%;
+  font-size:32rpx;
+  color:#4D4D4D;
+  justify-content: flex-start;
+  align-items: flex-start;
+}
+.panelProduct1{
+  background-color: #fff;
+  margin: 50rpx 0 0 50rpx;
+  font-size:32rpx;
+  color:#4D4D4D;
+}
+
+.panelProduct10{
+  width:100%;
+}
+
+.panelProduct2{
+  background-color: #fff;
+  margin: 0 0 0 50rpx;
+  font-size:32rpx;
+  color:#4D4D4D;
+}
+
+.panelProduct3{
+  width:300rpx;
+  margin:30rpx 0 0 50rpx;
+  justify-content: flex-start;
+}
+
+.sofewareicon_mg{
+  width:66rpx;
+  height:66rpx;
+}
+
+
+.panelProduct31{
+  margin:0 0 0 30rpx;
+  align-items: flex-start;
+}
+.panelProduct311{
+  font-size:28rpx;
+}
+.panelProduct312{
+  font-size:20rpx;
+  color:#4D4D4D;
 }
 
 .home_banner{
-   width:600rpx;
-   height:320rpx;
-   margin: 40rpx 0 50rpx 0;
+  width:100%;
+  height: 280rpx;
 }
 
 .HelpInfo2 {
@@ -516,7 +651,7 @@ page{
   left: 0;
   top: 0;
   width: 100%;
-  background-color: rgba(185, 220, 93, 0.95);
+  background-color: #B9DC5D;
   justify-content: flex-start;
   z-index: 100;
 }
@@ -583,3 +718,107 @@ page{
   width:33rpx;
   height:33rpx;
 }
+
+.PanelMiaoguo{
+  width:100%;
+  background-color: rgba(0, 0, 0, 0.5);
+  z-index: 20;
+  position: fixed;
+  left: 0;
+  top: 0;
+  justify-content: flex-start;
+}
+
+.PanelMiaoguo1{
+  width:100%;
+  height:1055rpx;
+  background-color: #1A264C;
+  color:#fff;
+  position: fixed;
+  left: 0;
+  bottom: 0;
+  justify-content: flex-start;
+}
+
+.Text1{
+  font-size:32rpx;
+  margin-top:70rpx;
+}
+.Text2{
+  font-size:64rpx;
+}
+
+.Text3{
+  font-size:32rpx;
+  text-align: center;
+}
+
+.Text4{
+  font-size:32rpx;
+  margin-top:50rpx;
+  color:#FF970C;
+}
+.Text5{
+  font-size:68rpx;
+  color:#FF970C;
+}
+.btn3{
+  width:580rpx;
+  height:130rpx;
+  border-radius: 20rpx;
+  background-color:#FF970C;
+  margin-top:20rpx;
+}
+.bm_sy_banner-open{
+  width:220rpx;
+  height:70rpx;
+}
+.bm_sy_illus{
+  width:100%;
+  height:360rpx;
+}
+
+.btnRecord{
+  width:220rpx;
+  height:80rpx;
+  position: absolute;
+  left:232rpx;
+  top:270rpx;
+  z-index: 20;
+}
+.btnReadme{
+  width:125rpx;
+  height:80rpx;
+  position: absolute;
+  left:35rpx;
+  top:270rpx;
+  z-index: 20;
+}
+
+.HelpInfo21{
+  width:100%;
+  height:500rpx;
+  border-top-left-radius: 40rpx;
+  border-top-right-radius: 40rpx;
+  background-color: #DAEB99;
+}
+.HelpInfo211{
+  font-size:60rpx;
+  margin-top:30rpx;
+}
+.HelpInfo212{
+  font-size:36rpx;
+}
+.png02014{
+  width:190rpx;
+  height:190rpx;
+}
+
+.message_home_01{
+  width:265rpx;
+  height: 127rpx;
+  position: absolute;
+  top:145rpx;
+  left:40rpx;
+  z-index: 10;
+}

pages/main/userinfo.js

@@ -6,7 +6,7 @@ const app = getApp();
 Page({
   data: {
     FileUrl: app.globalData.imageUrl,
-    Version: app.globalData.Version,
+    Version: app.globalData.version,
     ProgramName: app.globalData.ProgramName,
   },
   onLoad: function (options) {

pages/main/userinfo.wxml

@@ -41,7 +41,16 @@
       <view class="lineWidth720"></view>
     </view>
     <view class="panelItem FlexRow" bindtap='goto' data-url='../../package4/main/giftlist'>
-      <view class="panelItem1">我的礼品卡</view>
+      <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/getgiftlist'>
+      <view class="panelItem1">获赠的礼品卡</view>
       <view class="panelItem2 FlexRow">
         <image src='../images/Arrow.png' class="Arrow" />
       </view>
@@ -86,29 +95,6 @@
     </view>
     <view class='lineFooter'></view>
   </block>
-  <view class="panelTitle FlexRow">
-    <view class="panelTitle1">更多学习工具</view>
-  </view>
-  <block wx:for="{{ProgramList}}" wx:key="index" wx:if="{{item.IsShow}}">
-    <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
-      <view class="lineWidth620"></view>
-    </view>
-    <view class="panelItem0 panelItem FlexRow" bindtap='switchProgram' data-appid='{{item.appId}}' data-path='{{item.path}}'>
-
-      <view class="FlexRow">
-        <image src='../images/{{item.ImageUrl}}' class="universalpic_product_jisuanti_icon_size01" />
-        <view class="panelItem13 FlexColumn">
-          <view class="panelItem11">{{item.Name}}</view>
-          <view class="panelItem12">{{item.Name2}}</view>
-        </view>
-      </view>
-      <view class="panelItem2 FlexRow">
-        <image src='../images/Arrow.png' class="Arrow" />
-      </view>
-    </view>
-  </block>
-  <view class='lineFooter'></view>
-
   <view class="panelTitle FlexRow">
     <view class="panelTitle1">支持</view>
   </view>

project.config.json

@@ -6,28 +6,27 @@
     "postcss": true,
     "minified": true,
     "newFeature": true,
+    "scopeDataCheck": false,
     "checkInvalidKey": true,
     "checkSiteMap": true,
     "uploadWithSourceMap": true,
     "useMultiFrameRuntime": true,
     "useApiHook": true,
+    "useApiHostProcess": true,
     "babelSetting": {
       "ignore": [],
       "disablePlugins": [],
       "outputPath": ""
     },
     "useIsolateContext": true,
-    "useCompilerModule": false,
-    "userConfirmedUseCompilerModuleSwitch": false,
     "userConfirmedBundleSwitch": false,
     "packNpmManually": false,
     "packNpmRelationList": [],
     "minifyWXSS": true,
-    "bundle": false,
-    "useApiHostProcess": true
+    "showES6CompileOption": false
   },
   "compileType": "miniprogram",
-  "libVersion": "2.3.0",
+  "libVersion": "2.15.0",
   "appid": "wx1fef080f74481cbd",
   "projectname": "%E6%95%B0%E5%AD%A6%E8%AE%A1%E7%AE%97%E9%A2%98",
   "isGameTourist": false,