1.2.13

app.js

@@ -23,7 +23,7 @@ App({
     }
   },
   globalData: {
-    Version: "1.2.12",
+    Version: "1.2.13",
     IsProduction: true,
     ProgramID: 106,
     AppID: "wx313a8f2c0741efe1",
@@ -56,6 +56,8 @@ App({
     NewUserNumberMax:6,//邀请新用户最大值
     IsSaveCustom:false,//是否保存了定制
     goto:"",//用于服务直达的跳转
+    IsShowMiaoguo:false,
     IsRefresh: false,
+    IsShowGift:0,
   }
 })

app.json

@@ -44,12 +44,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/activate.js

@@ -2,171 +2,107 @@ 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({
-      Containnerheight: common.getSystemHeight(),
-      ProgramList: server.getProgramList(),
+      Height: common.getSystemHeight(),
+      Text0: text0,
+      Text1: text1,
+      Text2: text2,
+      Text3: text3,
+      OrderType: options.type,
     });
 
-    this.init();
-  },
-  onUnload:function(){
-    productList=[];
+    //适配ipad
+    var systemInfo = wx.getSystemInfoSync();
+    if (systemInfo.model) {
+      if (systemInfo.model.indexOf("iPad") >= 0) {
+        this.setData({
+          ipad: "ipad",
+        })
+      }
+    }
   },
-  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]);
-            }
+  //得到用户信息
+  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);
           }
-        }
-
-        that.setData({
-          List: data,
         });
-
-        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',
-                })
-              }
-            });
-          }
-        }
+      },
+      fail: function (res) {
+        console.log(res);
       }
-      wx.hideLoading();
-
     });
   },
-  gotoFeedback: function () {
-    server.gotoFeedback();
-  },
-  gotoActive: function (e) {
+  login: function (param, param2) {
     var that = this;
-    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) {
-
-          }
-        });
+    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;
     }
-    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) {
-
-        }
+    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
       });
-    }
-    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: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      path: 'pages/index/index?UserID=' + app.globalData.userInfo.UserID,
       imageUrl: app.globalData.ShareImage,
     }
   },

package4/main/activate.json

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

package4/main/activate.wxml

@@ -1,34 +1,10 @@
-<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 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>
+  <view class="line2 {{ipad}}"></view>
+  <text class="text3">{{Text3}}</text>
 </view>

package4/main/activate.wxss

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

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

@@ -74,52 +74,18 @@ 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 = "../images/FACE.png";
-              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);
       }
     });
   },
-
   login: function (param) {
     var that = this;
 

pages/main/index.js

@@ -10,7 +10,56 @@ var isMiaoguoADShow=false;
 Page({
   data: {
     Version: app.globalData.Version,
-    ListProgram: server.getProgramListOld(),
+    List: [
+      {
+        ImageUrl: "home_plate_11.png",
+        Url: "../main/list?id=1",
+      },
+      {
+        ImageUrl: "home_plate_12.png",
+        Url: "../main/list?id=2",
+      },
+      {
+        ImageUrl: "home_plate_21.png",
+        Url: "../main/list?id=3",
+      },
+      {
+        ImageUrl: "home_plate_22.png",
+        Url: "../main/list?id=4",
+      },
+      {
+        ImageUrl: "home_plate_31.png",
+        Url: "../main/list?id=5",
+      },
+      {
+        ImageUrl: "home_plate_32.png",
+        Url: "../main/list?id=6",
+      },
+      {
+        ImageUrl: "home_plate_41.png",
+        Url: "../main/list?id=7",
+      },
+      {
+        ImageUrl: "home_plate_42.png",
+        Url: "../main/list?id=8",
+      },
+      {
+        ImageUrl: "home_plate_51.png",
+        Url: "../main/list?id=9",
+      },
+      {
+        ImageUrl: "home_plate_52.png",
+        Url: "../main/list?id=10",
+      },
+      {
+        ImageUrl: "home_plate_61.png",
+        Url: "../main/list?id=11",
+      },
+      {
+        ImageUrl: "home_plate_62.png",
+        Url: "../main/list?id=12",
+      },
+    ],
     NickName: "陌生用户",
     IsMember: 1,
     NewUserNumber: 2,
@@ -19,56 +68,43 @@ Page({
     ReviewCount: "0",
     FinishedCount: "0",
     IsAccredit: false,
-    NavClass1: "",
-    NavClass2: "nav2",
     IsRemind: false,
     IsMemberForeverRemind: 0,
-    IsExit: false,
     IsMiaoguoAD: false,
     IsMiaoguoAD2:0,
+    IsShowGift:0,
   },
   onLoad: function (options) {
     //app.globalData.userInfo.UserID=5;
     this.setData({
       Height: common.getSystemHeight(),
-      NickName: app.globalData.userInfo.NickName,
-      AvatarUrl: app.globalData.userInfo.AvatarUrl,
+      ListProgram: server.getProgramListOld(),
+      IsShowGift:app.globalData.userInfo.IsShowGift,
     });
 
     var that = this;
-    wx.getSetting({
-      success(res) {
-        if (res.authSetting['scope.userInfo'] || app.globalData.userInfo.IsShow <= 0) {
-          that.setData({
-            IsAccredit: true,
-          });
-        }
-        else {
-          wx.navigateTo({
-            url: './accredit',
-          });
-        }
-      }
-    })
-
-    common.getStorageValue(this, "IsRemind", true, function () { });
-
-    if (app.globalData.IsIPad) {
-      if (app.globalData.systemInfo.windowHeight < app.globalData.systemInfo.windowWidth) {
-        this.setData({
-          IsExit: true,
-        });
-      }
-    }
+   
     isMiaoguoADShow = false;
   },
   onShow: function () {
     this.setData({
       IsLocked: app.globalData.IsLocked,
       IsShow: app.globalData.userInfo.IsShow,
-      IsMember: app.globalData.userInfo.IsMember
+      IsMember: app.globalData.userInfo.IsMember,
+      NickName: app.globalData.userInfo.NickName,
+      AvatarUrl: app.globalData.userInfo.AvatarUrl,
     });
 
+    if (app.globalData.userInfo.NickName=="陌生用户" && app.globalData.userInfo.IsShow>0) {
+      this.setData({
+        IsRemind:true,
+      });
+    }
+    else{
+      this.setData({
+        IsRemind:false,
+      });
+    }
     if (wx.getStorageSync("HasActivate") == 1) {
       wx.navigateTo({
         url: '../../package4/main/activate',
@@ -77,19 +113,6 @@ Page({
     else {
       this.getData();
 
-      if (wx.getStorageSync("indexNav")) {
-        var obj = {
-          currentTarget: {
-            dataset: {
-              id: 2,
-            }
-          }
-        }
-        this.selectNav(obj);
-        wx.removeStorageSync("indexNav");
-      }
-
-
       if (app.globalData.goto) {
         var url = "../main/list?id=1";
         if (app.globalData.goto == "test")
@@ -99,19 +122,7 @@ Page({
         });
         app.globalData.goto = "";
       }
-      else {
-        var IsRemindTest = wx.getStorageSync("IsRemindTest");
-        if (IsRemindTest == 1) {
-          wx.setStorageSync('IsRemindTest', 2);
-          wx.navigateTo({
-            url: '../main/test',
-          });
-        }
-      }
     }
-
-    common.getStorageValue(this, "IsMiaoguoAD", true, function () { });
-
     var miaoguoADTime = wx.getStorageSync("miaoguoADTime");
     if (miaoguoADTime) {
       if (this.data.IsShow == 1 && this.data.IsMember == 1 && isMiaoguoADShow && common.formatTime(new Date()) >= miaoguoADTime) {
@@ -125,6 +136,13 @@ Page({
     }
 
     isMiaoguoADShow=true;
+
+    if (app.globalData.IsShowMiaoguo){
+      this.setData({
+        IsShowMiaoguo:1,
+      });
+      app.globalData.IsShowMiaoguo=false;
+    }
   },
   getData: function () {
     var that = this;
@@ -172,6 +190,7 @@ Page({
           hanziNumber = 0;
         }
         that.setData({
+          IsAccredit:true,
           DayNumber: data.DayNumber,
           HanziNumber: hanziNumber,
           FinishedCount: finishedCount,
@@ -196,35 +215,6 @@ Page({
       });
     }
   },
-  selectNav: function (e) {
-    var that = this;
-    var id = e.currentTarget.dataset.id;
-    //console.log(id);
-    if (id == "1") {
-      this.setData({
-        NavClass1: "",
-        NavClass2: "nav2",
-      })
-    }
-    else if (id == "2") {
-      this.setData({
-        NavClass1: "nav2",
-        NavClass2: "nav3",
-        IsRemind: false,
-      })
-      wx.setStorageSync('IsRemind', false);
-      wx.pageScrollTo({
-        scrollTop: 0
-      });
-
-      var url = e.currentTarget.dataset.url;
-      if (url == "orderlist") {
-        setTimeout(function () {
-          that.gotoAllPay();
-        }, 1000);
-      }
-    }
-  },
   goto: function (e) {
     var url = e.currentTarget.dataset.url;
     wx.navigateTo({
@@ -238,6 +228,8 @@ Page({
       wx.setStorageSync('IsMiaoguoAD', false); 
       wx.setStorageSync("miaoguoADTime", common.formatTime(common.addDate("d", 15, new Date())));
     }
+
+    app.globalData.userInfo.IsShowGift=0;
   },
   gotoSearch: function (e) {
     wx.navigateTo({
@@ -264,7 +256,7 @@ Page({
   switchProgram: function (e) {
     wx.navigateToMiniProgram({
       appId: e.currentTarget.dataset.appid,
-      path: e.currentTarget.dataset.path,
+      path: "pages/index/index?SourceID="+app.globalData.ProgramID,
       extraData: {
       },
       success(res) {
@@ -273,9 +265,17 @@ Page({
     });
   },
   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',
+      });
+    }
   },
   updateMember: function () {
     if (app.globalData.userInfo.UserID == 1) {
@@ -297,6 +297,7 @@ Page({
   close: function (e) {
     this.setData({
       IsMiaoguoAD2: 0,
+      IsShowGift:0,
     });
     var num=e.currentTarget.dataset.num;
     if (num>0){
@@ -304,6 +305,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/index.wxml

@@ -1,5 +1,5 @@
 <view class="container FlexColumn" style='min-height:{{Height}}rpx;'>
-  <view class="index0 FlexColumn">
+  <!-- <view class="index0 FlexColumn">
     <image src='../images/home_banner_header_sz.png' class="home_banner_header_sz" bindtap='goto' data-id="topAD" data-url='../../package4/main/newuser' wx:if="{{IsMiaoguoAD && IsMember==1 && IsShow==1}}" />
     <view class="index1 FlexRow">
       <view class="{{NavClass1}} nav FlexColumn" bindtap='selectNav' data-id="1">
@@ -210,11 +210,132 @@
   </block>
   <view class="index5 FlexColumn" wx:if="{{NavClass1!='nav2' && IsShow==1}}">
     <image mode="widthFix" src='../images/home_banner_footer.png' class="home_banner" bindtap='goto' data-url='../../package4/main/newuser' />
+  </view> -->
+  <view class="panelTop FlexRow">
+    <view class="Avatar FlexColumn">
+      <image src='../images/userface_default.png' class="AvatarImage" bindtap="gotoMemberCenter">
+      </image>
+      <image wx:if="{{!IsRemind}}" 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>
+      <view class="panelTop11 FlexRow">持续天数</view>
+    </view>
+    <view class="panelTop1 FlexColumn">
+      <view class="number" wx:if="{{!IsAccredit}}">-</view>
+      <view class="number" wx:if="{{IsAccredit}}">{{FinishedCount}}</view>
+      <view class="panelTop11 FlexRow">已学章节</view>
+    </view>
+    <view class="panelTop1 FlexColumn">
+      <view class="number" wx:if="{{!IsAccredit}}">-</view>
+      <view class="number" wx:if="{{IsAccredit}}">{{HanziNumber}}</view>
+      <view class="panelTop11 FlexRow">总共识字</view>
+    </view>
+    <image src='../images/home_header_bg.png' class="home_header_bg" />
+    <image wx:if="{{IsRemind}}" src='../images/message_home_01.png' class="message_home_01" />
+  </view>
+  <view class="panelTop2 FlexRow" wx:if="{{IsMember==0 && IsShow==1}}" bindtap="goto" data-url="../../package4/main/buyad">
+    <view class="panelTop21">帐户已过期，点这里升级到正式版</view>
+  </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" />
+    </view>
+    <view class="panelTool FlexColumn">
+      <view class="panelTool1">自测工具</view>
+      <view class="panelTool2 FlexRow">
+        <view class="btn1 btn FlexRow" bindtap='gotoSearch'>
+          <image src='../images/universalpic_magnifier_black_30x30.png' class="search" />
+        </view>
+        <view class="btn2 btn FlexRow" bindtap="gotoReview">
+          <view>复习</view>
+          <view class="number2" wx:if="{{ReviewCount>0}}">{{ReviewCount}}</view>
+        </view>
+        <view class="btn2 btn FlexRow" bindtap="gotoTest">
+          <view>测试</view>
+        </view>
+      </view>
+    </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>
+      </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" />
+          <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 class="HelpInfo2 FlexColumn" style='height:{{Height}}rpx;' wx:if="{{IsMiaoguoAD2==1}}">
+<!-- <view class="HelpInfo2 FlexColumn" style='height:{{Height}}rpx;' wx:if="{{IsMiaoguoAD2==1}}">
   <view class="btn" bindtap='goto' data-url='../../package4/main/newuser' data-id="topAD">
     <view class="btn1 FlexColumn">
       <image src='../images/home_banner_window.png' class="home_banner_window" />
@@ -227,10 +348,52 @@
   <view class="close FlexColumn" bindtap='close' data-num="0">
     <image src='../images/02024.png' class="closeImage" />
   </view>
+</view> -->
+
+<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>
+  </view>
+  <view class="close2 FlexColumn" bindtap='close' data-num="1">
+    以后再看
+  </view>
+  <view class="close FlexColumn" bindtap='close' data-num="0">
+    <image src='../images/02024.png' class="closeImage" />
+  </view>
+</view>
+
+<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/02023.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:{{Height}}rpx;'>
-  <view class='IsExitText'>请竖起屏幕再打开小程序</view>
-  <navigator class='isExit' open-type="exit" target="miniProgram">确认</navigator>
+    <view class="btnReadme" catchtap='goto' data-url='../../package4/main/miaoguoreadme'></view>
+    <view class="btnRecord" catchtap='goto' data-url='../../package4/main/getgiftlist'></view>
+  </view>
 </view>

pages/main/index.wxss

@@ -1,4 +1,4 @@
-.container {
+/* .container {
   background-color: #F5E2BE;
   justify-content: flex-start;
   font-weight: 500;
@@ -459,4 +459,419 @@
 .HelpInfo2 .closeImage{
   width:33rpx;
   height:33rpx;
+} */
+
+.container {
+  background-color: #F5E2BE;
+  justify-content: flex-start;
+  font-weight: 500;
+}
+.panelTop{
+  width:100%;
+  height:120rpx;
+  justify-content: flex-start;
+  position: relative;
+}
+
+.Avatar{
+  width:80rpx;
+  height:80rpx;
+  background-color: #FEF5DA;
+  border-radius: 20rpx;
+  margin:0 45rpx 0 70rpx;
+  justify-content: flex-end;
+  position: relative;
+}
+.AvatarImage{
+  width:80rpx;
+  height:90rpx;
+}
+.AvatarImage1{
+  width:80rpx;
+  height:80rpx;
+  border-radius: 18rpx;
+  position: absolute;
+  top:-10rpx;
+  left:0;
+
+}
+.panelTop1{
+  width:120rpx;
+  justify-content: center;
+  position: relative;
+  z-index: 10;
+}
+
+.number{
+  font-family: 'SF UI Display Light';
+  font-weight: 200;
+  font-style: normal;
+  font-size:36rpx;
+}
+
+.panelTop11{
+  color:#1E1E1E;
+  font-size:22rpx;
+}
+
+.home_header_bg{
+  width:250rpx;
+  height: 120rpx;
+  position: absolute;
+  right:0;
+  z-index: 5;
+}
+
+.message_home_01{
+  width:265rpx;
+  height: 127rpx;
+  position: absolute;
+  top:80rpx;
+  left:70rpx;
+  z-index: 10;
+}
+
+.panelTop2{
+  width:100%;
+  height:80rpx;
+  background-color: #DFC7A4;
+  align-items: flex-end;
+}
+
+.panelTop21{
+  width:400rpx;
+  height:42rpx;
+  background-color: #593613;
+  text-align: center;
+  border-radius: 8rpx;
+  line-height:42rpx;
+  font-size:24rpx;
+  color:#fff;
+}
+
+.panelList{
+  width:100%;
+  flex-wrap: wrap;
+  background-color: #DFC7A4;
+}
+
+.btn {
+  border-radius: 20rpx;
+  background-color: #F8F8F8;
+  box-shadow: 0 20rpx 1rpx #CDB797;
+}
+
+.panelItem{
+  width:330rpx;
+  height:306rpx;
+  background-color: #F8F8F8;
+  margin:40rpx 15rpx 0 15rpx;
+  
+}
+
+.itemImg{
+  width:207rpx;
+  height:206rpx;
+}
+
+.panelTool{
+  width:690rpx;
+  margin:62rpx 0 80rpx 0;
+}
+
+.panelTool1{
+  color:#593613;
+  font-size:48rpx; 
+}
+
+.panelTool2{
+  width:690rpx;
+  margin-top:30rpx;
+  justify-content: space-between;
+}
+
+.btn1{
+  width:100rpx;
+  height:100rpx;
+}
+
+.btn2{
+  width:275rpx;
+  height:100rpx;
+  position: relative;
+  font-size:36rpx;
+  line-height: 100rpx;
+  text-align: center;
+}
+.search{
+  width:30rpx;
+  height:30rpx;
+}
+
+.number2{
+  min-width:53rpx;
+  height:50rpx;
+  border-radius: 8rpx;
+  background-color: #593613;
+  color:#fff;
+  line-height: 50rpx;
+  text-align: center;
+  font-size:24rpx;
+  font-family: Arial;
+  position: absolute;
+  right:20rpx;
+}
+
+.png02016{
+  width:754rpx;
+  height:35rpx;
+}
+
+.panelOther{
+  width:100%;
+  height:197rpx;
+  background-color: #CDB797;
+  position: relative;
+  align-items: flex-start;
+}
+
+.panelOther1{
+  color:#593613;
+  margin:80rpx 0 0 0;
+  font-size:48rpx; 
+}
+
+.home_triangle_up{
+  width:34rpx;
+  height:20rpx;
+  position: absolute;
+  bottom:0;
+  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:100%;
+  height: 280rpx;
+}
+
+.HelpInfo2 {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  background-color:#F5E2BE;
+  justify-content: flex-start;
+  z-index: 100;
+}
+
+.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);
+}
+
+.HelpInfo2 .btn1 {
+  width: 100%;
+  height: 640rpx;
+  border-radius: 40rpx;
+  color: #fff;
+  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;
+}
+
+.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;
+}
+
+.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: #B3443B;
+}
+.HelpInfo211{
+  font-size:60rpx;
+  margin-top:30rpx;
+}
+.HelpInfo212{
+  font-size:36rpx;
+}
+.png02014{
+  width:190rpx;
+  height:190rpx;
 }

pages/main/userinfo.wxml

@@ -42,7 +42,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>
@@ -87,28 +96,7 @@
     </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>

project.config.json

@@ -11,6 +11,7 @@
     "uploadWithSourceMap": true,
     "useMultiFrameRuntime": true,
     "useApiHook": true,
+    "useApiHostProcess": true,
     "babelSetting": {
       "ignore": [],
       "disablePlugins": [],
@@ -23,8 +24,7 @@
     "userConfirmedBundleSwitch": false,
     "packNpmManually": false,
     "packNpmRelationList": [],
-    "minifyWXSS": true,
-    "useApiHostProcess": false
+    "minifyWXSS": true
   },
   "compileType": "miniprogram",
   "libVersion": "2.3.0",