1.6.18

app.js

@@ -1,6 +1,6 @@
 App({
   globalData: {
-    Version: "1.6.14",
+    Version: "1.6.18",
     IsProduction: true,
     ShareTitle: "高效学习从秒过开始",
     SharePath: "pages/index/index",

pages/index/index.js

@@ -45,11 +45,18 @@ Page({
       if (options.scene) {
         var scene = decodeURIComponent(options.scene);
         console.log("scene:" + scene);
-        var introducer = 0;
-        if (scene.indexOf("UserID") >= 0)
-          introducer = scene.substr(scene.indexOf("UserID") + 7);
-        console.log("introducer:" + introducer);
-        app.globalData.introducer = scene;
+        if (scene.indexOf("type=print")>=0){
+          options.type="print";
+          options.PUserID=scene.substr(scene.indexOf("UserID") + 7);
+          options.PrintID=scene.substring(scene.indexOf("PrintID") + 8,scene.indexOf("&UserID"));
+        }
+        else{
+          var introducer = 0;
+          if (scene.indexOf("UserID") >= 0)
+            introducer = scene.substr(scene.indexOf("UserID") + 7);
+          console.log("introducer:" + introducer);
+          app.globalData.introducer = scene;
+        }
       }
 
       if (options.type == "share") {
@@ -134,10 +141,10 @@ Page({
           gotoUrl: "../other/pay?PayType=6&PayUserID="+options.PayUserID+"&DayNumber="+options.DayNumber+"&Price="+options.Price+"&Remark="+options.Remark,
         });
       }
-      else if (options.type == "paycontinue") {
+      else if (options.type == "print") {
         this.setData({
           gotoType: "other",
-          gotoUrl: "../other/pay?PayType=7&EndDate="+options.EndDate,
+          gotoUrl: "../main/searchCardList?PrintID="+options.PrintID,
         });
       }
     }

pages/main/cardInfo.js

@@ -1,5 +1,6 @@
 import common from '../../utils/util';
 import main from '../../utils/main';
+import constant from '../../utils/constant';
 
 const app = getApp();
 
@@ -18,18 +19,26 @@ Page({
     var that = this;
     var card={};
     var list = app.globalData.CardList;
+    var arrStudyPlay=constant.arrStudyPlay;
     for (var i = 0; i < list.length; i++) {
       if (id == list[i].MiaoguoCardID) {
         card.CreateTimeStr = common.formatDateCHS(list[i].CreateTime);
-        card.FirstTimeStr = common.formatDateCHS(list[i].FirstTime);
-        if (!card.FirstTimeStr)
-          card.FirstTimeStr="无";
-        card.LastTimeStr = common.formatDateCHS(list[i].LastTime);
-        if (!card.LastTimeStr)
-          card.LastTimeStr="无";
         card.LimitTimeStr = common.formatDateCHS(list[i].LimitTime);
         card.LearnNumber = list[i].LearnNumber;
         card.CardID=id;
+        for(var j=0;j<arrStudyPlay.length;j++){
+          if (list[i].CardType==arrStudyPlay[j].CardType){
+            card.CardType=arrStudyPlay[j].Name;
+            break;
+          }
+        }
+        if (list[i].FirstTime=="1900-01-01 00:00:00"){
+          card.Status="新题卡";
+        }
+        else{
+          card.Status="旧题卡";
+        }
+
         break;
       }
     }

pages/main/cardInfo.wxml

@@ -14,11 +14,10 @@
   </view>
   <view class="panelItem FlexRow">
     <view class="panelItem1 FlexColumn">
-      <view class="panelItem11">首次练习时间</view>
-      <text class="panelItem12">新题卡无时间</text>
+      <view class="panelItem11">学习计划</view>
     </view>
     <view class="panelItem2 FlexRow">
-      {{CardInfo.FirstTimeStr}}
+      {{CardInfo.CardType}}
     </view>
   </view>
   <view class="lineWidthAll FlexRow">
@@ -26,11 +25,20 @@
   </view>
   <view class="panelItem FlexRow">
     <view class="panelItem1 FlexColumn">
-      <view class="panelItem11">最近练习时间</view>
-      <text class="panelItem12">新题卡无时间</text>
+      <view class="panelItem11">题卡状态</view>
     </view>
     <view class="panelItem2 FlexRow">
-      {{CardInfo.LastTimeStr}}
+      {{CardInfo.Status}}
+    </view>
+  </view>
+  <view class="Remark FlexRow" wx:if="{{CardInfo.Status=='新题卡' && CardInfo.LearnNumber>0}}">
+    <view class="RemarkLine"></view>
+    <view class="Remark1 FlexRow">
+        <image src='../images/universalpic_exmark_deepyellow_26x26.png' class="universalpic_exmark_deepyellow_26x26" />
+        <view class="FlexColumn">
+        <text class="Remark11">题卡状态已发生改变，现在以新题卡的形式重新练习。</text>
+        <text class="Remark11">调整学习计划会使题卡状态发生改变，主要包括两种情况：将题卡从日常练习方案转入紧急练习方案；将题卡从留白区转入日常或紧急练习方案。</text>
+        </view>
     </view>
   </view>
   <view class="lineWidthAll FlexRow">
@@ -39,7 +47,7 @@
   <view class="panelItem0 panelItem FlexRow">
     <view class="panelItem1 FlexColumn">
       <view class="panelItem11">到期时间</view>
-      <text class="panelItem12">回想的最佳时机；受任务限量控制\n可能需要排队等待；留白题卡无时间</text>
+      <text class="panelItem12">预计下次练习的时间；实际情况\n根据任务限量的设置可能排队顺延</text>
     </view>
 
     <view class="panelItem2 FlexRow">

pages/main/cardInfo.wxss

@@ -61,4 +61,34 @@
   width:16rpx;
   height:26rpx;
   margin-left: 30rpx;
+}
+
+.Remark{
+  width: 100%;
+  height:158rpx;
+  justify-content: flex-start;
+  background-color: #FCE8C5;
+}
+
+.RemarkLine{
+  width:10rpx;
+  height:156rpx;
+  background-color: #F5A623;
+}
+.Remark1{
+  height:156rpx;
+  justify-content: flex-start;
+}
+
+.universalpic_exmark_deepyellow_26x26{
+  width: 26rpx;
+  height:26rpx;
+  margin:0 20rpx;
+}
+
+.Remark11{
+  width: 644rpx;
+  font-size: 20rpx;
+  color:#694405;
+  margin:5rpx 0;
 }

pages/main/default.js

@@ -40,6 +40,11 @@ Page({
       }
     }
 
+    wx.showShareMenu({
+      withShareTicket: true,
+      menus: ['shareAppMessage', 'shareTimeline']
+    })
+
   },
   onHide: function () {
     wx.hideLoading();
@@ -297,16 +302,30 @@ Page({
 
       that.setData({
         IsShowUserID: true,
-        ChangeuUserID:userid,
+        ChangeUserID:userid,
       });
     }
   },
   onKeyInput: function (e) {
     var id = e.detail.value;
+    var usertype = e.currentTarget.dataset.type;
+    
     var that = this;
-    that.setData({
-      ChangeuUserID: id,
-    });
+    if (usertype=="userid"){
+      that.setData({
+        ChangeUserID: id,
+      });
+    }
+    else if (usertype=="newuserid"){
+      that.setData({
+        ChangeNewUserID: id,
+      });
+    }
+    else if (usertype=="introduceruserid"){
+      that.setData({
+        ChangeIntroducerUserID: id,
+      });
+    }
   },
   setSelectUser: function (e) {
     var that = this;
@@ -314,31 +333,80 @@ Page({
       || app.globalData.userInfo.UserID == 2 
       || app.globalData.userInfo.UserID == 3 
       || app.globalData.userInfo.UserID == 4) {
-      var userid = that.data.ChangeuUserID;
+      var userid = that.data.ChangeUserID;
       wx.setStorageSync("UserID", userid);
       
       app.globalData.userInfo.UserID = userid;
-      var url = "GetMiaoguoWXUserInfo?UserID=" + app.globalData.userInfo.UserID + "&FieldStr=NickName,ProductServiceTime,AvatarUrl";
-      main.getData(url, function (data) {
-        if (data) {
-          wx.setNavigationBarTitle({
-            title: data.NickName
-          });
-          main.getUserConfig();
-          app.globalData.userInfo.ProductServiceTime=data.ProductServiceTime;
-          
-          if (app.globalData.userInfo.UserID!=2){
-            app.globalData.userInfo.NickName=data.NickName;
-            app.globalData.userInfo.AvatarUrl=data.AvatarUrl;
-          }
+      var fieldStr="&FieldStr=NickName,ProductServiceTime,AvatarUrl";
+      that.getUserInfo(userid,fieldStr,function(data){
+        wx.setNavigationBarTitle({
+          title: data.NickName
+        });
+        main.getUserConfig();
+        app.globalData.userInfo.ProductServiceTime=data.ProductServiceTime;
+        
+        if (app.globalData.userInfo.UserID!=2){
+          app.globalData.userInfo.NickName=data.NickName;
+          app.globalData.userInfo.AvatarUrl=data.AvatarUrl;
         }
       });
+      
       that.setData({
         IsShowUserID: false,
       });
       that.onShow();
     }
   },
+  getUserInfoFunction:function(e){
+    var that = this;
+    var userid=e.currentTarget.dataset.id;
+    var type1=e.currentTarget.dataset.type;
+    var fieldStr="&FieldStr=NickName,AvatarUrl";
+    if (userid){
+      that.getUserInfo(userid,fieldStr,function(data){
+        if (type1==1){
+          that.setData({
+            IntroducerAvatar: data.AvatarUrl,
+            IntroducerNickName: data.NickName,
+          });
+        }
+        else{
+          that.setData({
+            NewUserAvatar: data.AvatarUrl,
+            NewUserNickName: data.NickName,
+          });
+        }
+      });
+    }
+  },
+  getUserInfo:function(userID,fieldStr,callback){
+    var url = "GetMiaoguoWXUserInfo?UserID=" + userID + fieldStr;
+    main.getData(url, function (data) {
+      if (data) {
+        callback(data);
+      }
+    });
+  },
+  setUserIntroducer: function (e) {
+    var that = this;
+    if (that.data.ChangeNewUserID && that.data.ChangeIntroducerUserID){
+      if (app.globalData.userInfo.UserID == 1
+        || app.globalData.userInfo.UserID == 2 
+        || app.globalData.userInfo.UserID == 3 
+        || app.globalData.userInfo.UserID == 4) {
+          var url = "UpdateIntroducer?UserID=" + that.data.ChangeNewUserID + "&Introducer="+that.data.ChangeIntroducerUserID;
+          main.getData(url, function (data) {
+            that.setData({
+              ChangeNewUserID: null,
+              ChangeIntroducerUserID: null,
+            });
+            wx.showToast({
+              title: '介绍人更改成功',
+            })
+          });
+      }
+    }
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,
@@ -346,4 +414,7 @@ Page({
       imageUrl: app.globalData.ShareImage,
     }
   },
+  onShareTimeline: function () {
+    return this.onShareAppMessage();
+  },
 })

pages/main/default.wxml

@@ -68,16 +68,36 @@
 </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 class='IsExitText'>点击关闭小程序。然后把屏幕竖起来，在竖屏情况下重开小程序。</view>
+  <navigator class='isExit' open-type="exit" target="miniProgram">关闭小程序</navigator>
 </view>
 
 <view wx:if="{{IsShowUserID}}" class="IsExitContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
-    <input class='input' type="number" value="{{ChangeuUserID}}" bindinput="onKeyInput" />
-    <button class="btnShowUserID" bindtap="setSelectUser">确定</button>
+    <input class='input' type="number" value="{{ChangeUserID}}" bindinput="onKeyInput" data-type="userid" />
+    <button class="btnShowUserID" bindtap="setSelectUser">查看用户数据</button>
     <view style="height:50rpx;"></view>
     <button class="btnShowUserID" bindtap="goto" data-url="../other/webview?PageID=9999">网页访问钥匙</button>
     <button class="btnShowUserID" bindtap="goto" data-url="../other/webviewInterior">访问统计网页</button>
+    <view style="height:50rpx;"></view>
     <button class="btnShowUserID" bindtap="goto" data-url="../other/paycustom">自定义开据</button>
+    <view style="height:50rpx;"></view>
+    <view class="panel2 FlexRow">
+      <input class='input2 input' type="number" placeholder="新用户ID" value="{{ChangeNewUserID}}" bindinput="onKeyInput" data-type="newuserid"/>
+      <button class="btn2" bindtap="getUserInfoFunction" data-id="{{ChangeNewUserID}}" data-type="0">查看</button>
+    </view>
+    <view class="panel2 FlexRow" wx:if="{{NewUserAvatar}}">
+      <image class="Avatar2" src='{{NewUserAvatar}}' />
+      <view class="NickName2">{{NewUserNickName}}</view>
+    </view>
+    <view class="panel2 FlexRow">
+      <input class='input2 input' type="number" placeholder="介绍人ID" value="{{ChangeIntroducerUserID}}" bindinput="onKeyInput" data-type="introduceruserid"/>
+      <button class="btn2" bindtap="getUserInfoFunction" data-id="{{ChangeIntroducerUserID}}" data-type="1">查看</button>
+    </view>
+    <view class="panel2 FlexRow" wx:if="{{IntroducerAvatar}}">
+      <image class="Avatar2" src='{{IntroducerAvatar}}' />
+      <view  class="NickName2">{{IntroducerNickName}}</view>
+    </view>
+    <button class="btnShowUserID" bindtap="setUserIntroducer">更改用户介绍人</button>
+    
 </view>
 

pages/main/default.wxss

@@ -261,6 +261,33 @@
   font-size:24rpx;
   margin-top: 30rpx;
 }
+.panel2{
+  width:500rpx;
+  margin-top: 10rpx;  
+}
+.Avatar2{
+  width: 50rpx;
+  height:50rpx;
+  background-color: #E3E3E3;
+  border-radius: 5rpx;
+  margin-right: 10rpx;
+}
+.NickName2{
+  max-width:200rpx;
+  overflow-x: hidden;
+  font-size: 20rpx;
+  color:#fff;
+}
+.input2{
+  width: 200rpx;
+  margin-top: 0rpx;
+  margin-left: 10rpx;
+}
 .btnShowUserID{
   margin-top: 30rpx;
+}
+.btn2{
+  height:50rpx;
+  font-size: 22rpx;
+  margin:0 10rpx 0 10rpx;
 }

pages/main/detail.js

@@ -707,6 +707,7 @@ Page({
         showCancel: false,
         confirmText: "知道了",
         success(res) {
+          clearTimeout(timeoutEveryCard);
           if (res.confirm) {
             that.timeCompute();
           }

pages/main/detail.wxml

@@ -120,7 +120,6 @@
   <block wx:if="{{NumberNew+NumberReview+NumberHistory==0}}">
     <view class='panelLast FlexColumn' style='height:{{Containnerheight}}rpx;background-color:{{Color.BackColor}};top:{{topBarHeight}}rpx;'>
       <view class='text1{{IsIPad}}'>做完了</view>
-
       <view class="panelLastTime FlexColumn">
         <view style='color:{{Color.FrontColor1}};'>今日练习总共用时</view>
         <view class="time1 FlexRow" style='color:{{Color.LineColor}}'>
@@ -136,8 +135,6 @@
         <view style='color:{{Color.FrontColor1}};'>每分钟可练习</view>
         <view class="time2" style='color:{{Color.LineColor}}'>{{Speed1}}</view>
       </view>
-
-
       <view class='panelLastFooter'>
         <view class="panelLastFooter1 FlexRow" bindtap='buildShareImage'>
           <image src="../images/universalpic_screenshot_gray_30x30.png" class='universalpic_screenshot_gray_30x30' />

pages/main/preview.wxml

@@ -67,12 +67,6 @@
       <view class='btn1 FlexRow' catchtap="previewNext" data-id="{{PrevID}}" wx:if="{{PrevID>0}}">
         <image class="universalpic_next_gray_30x30" src='../images/universalpic_prev_gray_30x30.png' />
       </view>
-      <!-- <view class='btn22 FlexRow' wx:if="{{IsShowAnswer[0]==1}}" catchtap='onHideAnswer'>
-        隐藏答案
-      </view>
-      <view class='btn22 FlexRow' wx:if="{{IsShowAnswer[0]==0}}" catchtap='onShowAnswer'>
-        显示答案
-      </view> -->
       <button class="btn21" open-type='share'>分享给大家</button>
       <view class='btn1 FlexRow' catchtap="previewNext" data-id="{{NextID}}" wx:if="{{NextID>0}}">
         <image class="universalpic_next_gray_30x30" src='../images/universalpic_next_gray_30x30.png' />

pages/main/previewMenu.js

@@ -30,6 +30,7 @@ Page({
     that.setData({
       Containnerheight: main.getWindowHeight(),
       CardType:options.CardType,
+      CardTypeHistory:options.CardType,
       MiaoguoCardID:options.ID,
       IsSave:options.IsSave || 0,
       Today:today,
@@ -47,6 +48,25 @@ Page({
     var that = this;
     var cardType=e.currentTarget.dataset.cardtype;
     if (cardType!=that.data.CardType){
+      if (cardType==1 || (that.data.CardTypeHistory==-1 && cardType==0)){
+        var limitTime=common.formatTime(common.addDate("d",0,new Date()),"-",true);
+        that.setData({
+          LimitTime: limitTime,
+          LimitTimeStr: common.formatDateCHS(limitTime),
+          IsSelected:"_Selected"
+        });
+      }
+      else{
+        var limitTime=historyLimitTime;
+        if (that.data.CardTypeHistory==-1)
+          limitTime=common.formatTime(common.addDate("d",0,new Date()),"-",true);
+        that.setData({
+          LimitTime: limitTime,
+          LimitTimeStr: common.formatDateCHS(limitTime),
+          IsSelected:"",
+        });
+      }
+
       if (cardType == 1 && that.data.CardNumberUrgent>=200){
         wx.showToast({
           title: '紧急练习容量已满',
@@ -118,6 +138,9 @@ Page({
       var DayNumber=e.currentTarget.dataset.daynumber;
       if (DayNumber==-1){
         limitTime=historyLimitTime;
+        if (that.data.CardTypeHistory==-1)
+          limitTime=common.formatTime(common.addDate("d",0,new Date()),"-",true);
+        
         wx.showToast({
           title: '日期已还原',
           mask: true,

pages/main/previewMenu.wxml

@@ -34,7 +34,7 @@
       <view class="panelItemCircleTop panelStudyPlan1 FlexRow">
         <view class="panelStudyPlan11 FlexColumn">
           <view class="text7">到期时间</view> 
-          <view class="text6">到这天可被练习</view>
+          <view class="text6">下次练习的时间</view>
         </view>
         <view class="panelStudyPlan12 FlexRow">
           <view class="text7{{IsSelected}}">{{LimitTimeStr}}</view> 
@@ -63,8 +63,8 @@
   </view>
 
   <view class="panelHelp FlexRow">
-    <image class="universalpic_exmark_deepyellow_70x70" src='../images/universalpic_exmark_deepyellow_70x70.png' />
-    <text class="text8">因数据无法回溯，确定后不能撤销，务请谨慎。\n\n暂时不想练的题卡请移往“留白区”，不建议删除。\n\n修改学习计划后，请记得回到秒过首页，点击小红点打开学习计划栏目，启用对应练习方案。日常、紧急都可以独立练习，也可以串联成“整体练习”。</text>
+    <image class="universalpic_exmark_deepyellow_70x70" src='../images/universalpic_exmark_deepyellow_26x26.png' />
+    <text class="text8">学习计划保存后不能撤销，务请谨慎。\n\n特别注意：从日常转入紧急练习方案的题卡，以及从留白转入日常练习或紧急练习方案的题卡，将在操作当天以新题卡形式被重新练习。如实际没有练习到，则需适当调高所属练习方案的任务限量。\n\n不想练习的题卡，请转入留白。</text>
   </view>
   <view class="footerHeight"></view>
 </view>

pages/main/previewMenu.wxss

@@ -159,11 +159,12 @@
 
 .panelHelp {
   width: 710rpx;
-  background-color: #fff;
+  background-color: #FCE8C5;
   border-radius: 20rpx;
   margin-top: 20rpx;
   align-items: flex-start;
   padding: 30rpx 0;
+  color:#694405;
 }
 
 .universalpic_exmark_deepyellow_70x70 {

pages/main/searchCardList.js

@@ -11,6 +11,8 @@ var arrOrder = [
   { Name: "练习较多", Value: "ac.LearnNumber desc,ac.MiaoguoCardID desc" },
   { Name: "练习较少", Value: "ac.LearnNumber,ac.MiaoguoCardID" },
   { Name: "最近练习", Value: "ac.LastTime desc" },
+  { Name: "到期升序", Value: "ac.LimitTime asc" },
+  { Name: "到期降序", Value: "ac.LimitTime desc" },
 ];
 
 Page({
@@ -19,6 +21,7 @@ Page({
     ArrOrder: arrOrder,
     OrderType: 1,
     CardType:2,
+    PrintID:0,
   },
   onLoad: function (options) {
     var that = this;
@@ -52,6 +55,15 @@ Page({
       });
       IsCollect = 1;
     }
+    else if (options.PrintID) {
+      wx.setNavigationBarTitle({
+        title: "打印卷题卡清单"
+      });
+      that.setData({
+        PrintID:options.PrintID,
+      });
+      that.getPrintList();
+    }
     else if (options.CardType != 2) {
       var title = "日常练习";
       if (options.CardType == 1)
@@ -78,10 +90,12 @@ Page({
   },
   onShow: function () {
     var that = this;
-    if (that.data.IsNew)
-      that.onOrder({ currentTarget: { dataset: { value: 4 } } });
-    else
-      that.getList();
+    if (!that.data.PrintID){
+      if (that.data.IsNew)
+        that.onOrder({ currentTarget: { dataset: { value: 4 } } });
+      else
+        that.getList();
+    }
 
     //题卡主题色
     var arrColorIndex = wx.getStorageSync("ColorIndexArr");
@@ -128,7 +142,7 @@ Page({
       }
     }
 
-    if (!that.data.IsToday && !that.data.Search) {
+    if (!that.data.IsToday && !that.data.PrintID && !that.data.Search) {
       main.getData("GetUserCardCount?UserID=" + app.globalData.userInfo.UserID+"&CardType="+that.data.CardType+"&IsCollect="+that.data.IsCollect, function (data) {
         if (data) {
           that.setData({
@@ -308,6 +322,38 @@ Page({
       }
     });
   },
+  getPrintList: function (e) {
+    wx.showLoading({
+      title: '请稍候',
+    });
+    setTimeout(function () {
+      wx.hideLoading();
+    }, 5000);
+
+    var that = this;
+    var url = 'GetMiaoguoCardList2?UserID=' + app.globalData.userInfo.UserID+'&PrintID='+that.data.PrintID;
+    main.getData(url, function (data) {
+      if (data) {
+        if (data.List.length>0){
+          var list=[];
+          for (var i = 0; i < data.List.length; i++) {
+            data.List[i].Number = i+1;
+            list.push(data.List[i]);
+          }
+          app.globalData.CardList = list;
+          that.getList();
+
+          wx.setNavigationBarColor({
+            frontColor: "#000000",
+            backgroundColor: "#ffffff",
+          });
+        }
+        else{
+          that.onSearch();
+        }
+      }
+    });
+  },
   addCard: function () {
     wx.redirectTo({
       url: './add?type=add&id=0',

pages/main/searchCardList.wxml

@@ -7,16 +7,16 @@
       </view>
     </view>
     <view class="panelTop0 FlexRow">
-      <view class='panelTop1' wx:if='{{IsCollect || IsToday || CardType==1 || CardType==-1}}'>
+      <view class='panelTop1' wx:if='{{IsCollect || IsToday || CardType==1 || CardType==-1 || PrintID}}'>
       </view>
-      <view class='panelTop1 FlexRow' bindtap='addCard' wx:if='{{!IsCollect && !IsToday && CardType!=1 && CardType!=-1}}'>
+      <view class='panelTop1 FlexRow' bindtap='addCard' wx:if='{{!PrintID && !IsCollect && !IsToday && CardType!=1 && CardType!=-1}}'>
         <image class="universalpic_add_black_30x30" src='../images/universalpic_add_black_30x30.png' />
       </view>
       <view>{{Count}}张题卡</view>
-      <view class='panelTop1 FlexRow' bindtap='showOrder' wx:if="{{List.length>0 && !IsCollect && !IsToday}}">
+      <view class='panelTop1 FlexRow' bindtap='showOrder' wx:if="{{List.length>0 && !IsCollect && !IsToday && !PrintID}}">
         <image class="universalpic_sequence_black_30x30" src='../images/universalpic_sequence_black_30x30.png' />
       </view>
-      <view class='panelTop1 FlexRow' wx:if='{{List.length==0 || IsCollect || IsToday}}'>
+      <view class='panelTop1 FlexRow' wx:if='{{List.length==0 || IsCollect || IsToday || PrintID}}'>
       </view>
     </view>
   </view>
@@ -39,13 +39,21 @@
               </view>
             </view>
             <view class="panelItem2 FlexColumn">
-              <view wx:if="{{OrderType==1}}">{{item.UpdateTimeStr}}</view>
-              <view wx:if="{{OrderType==2 || OrderType==3}}">{{item.CreateTimeStr}}</view>
-              <view wx:if="{{OrderType==4 || OrderType==5}}">{{item.LearnNumber}}次</view>
-              <view wx:if="{{OrderType==6}}">{{item.LastTimeStr}}</view>
-              <view class='panelItem21'>
-                <image class="universalpic_fav_default_gray_26x24" src='../images/universalpic_fav_default_gray_26x24.png' wx:if="{{item.IsCollect==1}}" />
-              </view>
+              <block wx:if="{{!PrintID}}">
+                <view wx:if="{{OrderType==1}}">{{item.UpdateTimeStr}}</view>
+                <view wx:if="{{OrderType==2 || OrderType==3}}">{{item.CreateTimeStr}}</view>
+                <view wx:if="{{OrderType==4 || OrderType==5}}">{{item.LearnNumber}}次</view>
+                <view wx:if="{{OrderType==6}}">{{item.LastTimeStr}}</view>
+                <view wx:if="{{OrderType==7 || OrderType==8}}">{{item.LimitTimeStr}}</view>
+                <view class='panelItem21'>
+                  <image class="universalpic_fav_default_gray_26x24" src='../images/universalpic_fav_default_gray_26x24.png' wx:if="{{item.IsCollect==1}}" />
+                </view>
+              </block>
+              <block wx:if="{{PrintID}}">
+                <view>题目{{item.Number}}</view>
+                <view class='panelItem21'>
+                </view>
+              </block>
             </view>
           </view>
         </view>

pages/main/searchCardList.wxss

@@ -280,7 +280,7 @@
 
 .numberContainerFooter101 {
   width: 100%;
-  height: 334rpx;
+  height: 434rpx;
   justify-content: flex-start;
   align-items: flex-start;
 }

pages/marketing/extenduser.json

@@ -1,3 +1,3 @@
 {
-  "navigationBarTitleText": "推广名单"
+  "navigationBarTitleText": "推广记录"
 }

pages/marketing/index.wxml

@@ -5,6 +5,15 @@
     <view class="panelTitle2"></view>
   </view>
   <view class="panelItem FlexRow" bindtap="goto" data-url="../../pages/other/webview?PageID=7">
+    <view class="panelItem1">活动介绍</view>
+    <view class="panelItem2 FlexRow">
+      <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
+    </view>
+  </view>
+  <view class="lineWidthAll FlexRow">
+    <view class="lineWidth720"></view>
+  </view>
+  <view class="panelItem FlexRow" bindtap="goto" data-url="../../pages/other/webview?PageID=9">
     <view class="panelItem1">活动规则</view>
     <view class="panelItem2 FlexRow">
       <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
@@ -23,15 +32,16 @@
     <view class="lineWidth720"></view>
   </view>
   <view class="panelItem FlexRow" bindtap="goto" data-url="./extenduser?PageType=0">
-    <view class="panelItem1">推广效果</view>
+    <view class="panelItem1">推广记录</view>
     <view class="panelItem2 FlexRow">
       <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
   </view>
-  <view class='lineFooter'></view>
-  <view class="line1"></view>
+  <view class="lineWidthAll FlexRow">
+    <view class="lineWidth720"></view>
+  </view>
   <view class="panelItem FlexRow" bindtap="goto" data-url="./award">
-    <view class="panelItem1">奖励</view>
+    <view class="panelItem1">奖励记录</view>
     <view class="panelItem2 FlexRow">
       <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>

project.config.json

@@ -24,11 +24,11 @@
 			"outputPath": ""
 		},
 		"useIsolateContext": true,
-		"useCompilerModule": false,
+		"useCompilerModule": true,
 		"userConfirmedUseCompilerModuleSwitch": false
 	},
 	"compileType": "miniprogram",
-	"libVersion": "2.11.2",
+	"libVersion": "2.11.3",
 	"appid": "wx84b3feac6069eec3",
 	"projectname": "miaoguo_master",
 	"debugOptions": {
@@ -107,7 +107,7 @@
 					"id": 6,
 					"name": "pages/index/index",
 					"pathName": "pages/index/index",
-					"query": "type=paycontinue&EndDate=2021-06-01",
+					"query": "type=print&PrintID=30",
 					"scene": null
 				},
 				{

utils/constant.js

@@ -108,13 +108,13 @@ module.exports = {
   ],
   arrStudyPlay: [{
       CardType: 0,
-      Name: "日常练习",
-      Remark: "常规，锻炼长期记忆，首选方式"
+      Name: "日常练习方案",
+      Remark: "常规练习，锻炼长期记忆，首选方式"
     },
     {
       CardType: 1,
-      Name: "紧急练习",
-      Remark: "临时，短期记忆，容量200张"
+      Name: "紧急练习方案",
+      Remark: "临时练习，短期强记，容量200张"
     },
     {
       CardType: -1,