1.6.5

app.js

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

app.json

@@ -1,6 +1,5 @@
 {
   "pages": [
-
     "pages/index/index",
     "pages/main/preview",
     "pages/plan/pattern",
@@ -41,12 +40,15 @@
     "pages/marketing/award",
     "pages/marketing/index",
     
+    "pages/other/video",
+    "pages/other/menu",
     "pages/other/lessonlist",
     "pages/other/userlist",
     "pages/other/binding",
     "pages/other/homework",
     "pages/other/lesson",
     "pages/other/webview",
+    "pages/other/webviewInterior",
     "pages/other/newuser",
     "pages/other/userbook",
     "pages/other/activity",

app.wxss

@@ -26,7 +26,10 @@
   font-weight: 500;
   background-color: #f0f0f0;
 } 
-
+.footerHeight{
+  width: 100%;
+  height: 100rpx;
+}
 .lineFooter{
   width: 100%;
   height: 1rpx;

pages/index/index.js

@@ -20,7 +20,7 @@ const arrSentence = [
   "孟子曰:\n故天将降大任于是人也\n必先苦其心志，劳其筋骨\n饿其体肤……",
 ];
 
-var timeout1 = 0;
+var timeout1 = 0, timeout3=0;
 var timeoutRedirect=0;
 
 Page({
@@ -67,7 +67,7 @@ Page({
           gotoUrl: "../other/binding?type=bebound&ParentUserID=" + options.ParentUserID + "&NickName=" + options.NickName + "&AvatarUrl=" + options.AvatarUrl + "&BindTime=" + options.BindTime,
         });
       }
-      else if (options.type == "lesson") {
+      else if (options.type == "lesson" || options.type == "video") {
         //console.log("Lesson:" + options.LessonID);
         app.globalData.LessonID = options.LessonID;
         if (options.LessonPage)
@@ -76,11 +76,16 @@ Page({
           app.globalData.LessonPage = 1;
 
         var url="";
-        if (app.globalData.LessonID === "all") {
-          url = '../other/lessonlist';
+        if (options.type == "video"){
+          url = '../other/video?LessonID=' + app.globalData.LessonID + '&LessonPage=' + app.globalData.LessonPage
         }
-        else if (app.globalData.LessonID > 0) {
-          url = '../other/lesson?LessonID=' + app.globalData.LessonID + '&LessonPage=' + app.globalData.LessonPage
+        else{
+          if (app.globalData.LessonID === "all") {
+            url = '../other/lessonlist';
+          }
+          else if (app.globalData.LessonID > 0) {
+            url = '../other/lesson?LessonID=' + app.globalData.LessonID + '&LessonPage=' + app.globalData.LessonPage
+          }
         }
         this.setData({
           gotoType: "other",

pages/main/add.js

@@ -333,7 +333,7 @@ Page({
 
     for (var i = 1; i <= 3; i++) {
       result["Field" + i] = "";
-      if (field[i]) {
+      if (field.length>0 && field[i]) {
         for (var key in field[i]) {
           var item = field[i][key];
           var str = "";
@@ -625,7 +625,7 @@ Page({
             UpdateType: "add",
           });
           wx.navigateTo({
-            url: './searchCardList?type=2&Count=' + data.Count,
+            url: './searchCardList?type=3&Count=' + data.Count,
           })
         }
       });

pages/main/default.js

@@ -174,17 +174,17 @@ Page({
       clickType = 0;
     app.globalData.ClickType = clickType;
 
+    //选择建议
+    var SecondConfigArray = wx.getStorageSync("SecondConfigArray");
+    if (SecondConfigArray)
+      app.globalData.SecondConfigArray = SecondConfigArray;
+
     //显示命名方式
     var MemoryLevel = wx.getStorageSync("MemoryLevel");
     if (!MemoryLevel)
       MemoryLevel = 0;
     app.globalData.MemoryLevel = MemoryLevel;
 
-    //选择建议
-    var SecondConfigArray = wx.getStorageSync("SecondConfigArray");
-    if (SecondConfigArray)
-      app.globalData.SecondConfigArray = SecondConfigArray;
-
   },
   goto: function (e) {
     var url = e.currentTarget.dataset.url;
@@ -216,6 +216,16 @@ Page({
             TodayTaskNumber: TodayTaskNumber,
             IsStart: data.IsStart,
           });
+
+          if(app.globalData.MemoryLevel==0 && data.DayNumber>=8){
+            var IsShowPatternMenu = wx.getStorageSync("IsShowPatternMenu");
+            if (!IsShowPatternMenu){
+              wx.navigateTo({
+                url: '../other/menu?Type=1',
+              });
+              wx.setStorageSync('IsShowPatternMenu', 1);
+            }
+          }
         }
       });
     });
@@ -280,12 +290,15 @@ Page({
   showUserID:function(){
     var that = this;
     if (app.globalData.userInfo.UserID == 1
-      || app.globalData.userInfo.UserID == 2 
       || app.globalData.userInfo.UserID == 3 
       || app.globalData.userInfo.UserID == 4) {
+        var userid=2;
+        if (app.globalData.userInfo.UserID>=3)
+          userid = app.globalData.userInfo.UserID;
+
       that.setData({
         IsShowUserID: true,
-        ChangeuUserID:2,
+        ChangeuUserID:userid,
       });
     }
   },

pages/main/default.wxml

@@ -75,5 +75,10 @@
 <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>
+    <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>
 

pages/main/detail.js

@@ -53,6 +53,10 @@ Page({
       that.audioCtx.setSrc(tempPlayUrl);
       that.audioCtx.play();
     });
+
+    common.getStorageValue(that, "HasSound", true, function () {
+      wx.setStorageSync("HasSound", that.data.HasSound);
+    });
   },
   onLoad: function () {
     var that = this;
@@ -90,8 +94,7 @@ Page({
     this.getColor();
 
     this.getMemoryLevel();
-
-    
+ 
 
     if (app.globalData.BaiduToken === "")
       main.getBaiduToken();
@@ -114,7 +117,7 @@ Page({
       var list = app.globalData.CardList;
       if (list && list.length > 0) {
         for (var i = 0; i < list.length; i++) {
-          if (TaskList[0].MiaoguoCardID == list[i].MiaoguoCardID) {
+          if (TaskList && TaskList[0] && TaskList[0].MiaoguoCardID == list[i].MiaoguoCardID) {
             TaskList[0].Content = list[i].Content;
             TaskList[0].ContentNew = main.changeStringToView(list[i].Content);
             that.setData({
@@ -174,21 +177,24 @@ Page({
     });
     wx.stopPullDownRefresh();
   },
-  setSoundFile: function (isFinish) { //isFinish=3搁置 =2撤退 =1结束 =0正常 =-1开始
+  setSoundFile: function (isFinish) { 
+    //isFinish=3搁置 =2撤退 =1结束 =0正常 =-1开始
     var that = this;
-    var url = "/pages/sounds/";
-    if (isFinish == 1) {
-      url += "end.mp3";
-    } else if (isFinish == 2) {
-      url += "short3.mp3";
-    } else if (isFinish == 3) {
-      url += "short1.mp3";
-    } else {
-      url += "short2.mp3";
-    }
-    if (isFinish >= 0) {
-      innerAudioContext1.src = url;
-      innerAudioContext1.play();
+    if (that.data.HasSound){
+      var url = "/pages/sounds/";
+      if (isFinish == 1) {
+        url += "end.mp3";
+      } else if (isFinish == 2) {
+        url += "short3.mp3";
+      } else if (isFinish == 3) {
+        url += "short1.mp3";
+      } else {
+        url += "short2.mp3";
+      }
+      if (isFinish >= 0) {
+        innerAudioContext1.src = url;
+        innerAudioContext1.play();
+      }
     }
 
     wx.pageScrollTo({
@@ -337,7 +343,9 @@ Page({
           that.data.IsShowAnswer[0] = 0;
           that.data.IsShowAnswer[1] = 0;
         } else {
-          if (!that.data.IsShowAnswer[0] && !that.data.IsShowAnswer[1]) {
+          if (!that.data.IsShowAnswer)
+            that.data.IsShowAnswer=[0,0];
+          if (that.data.IsShowAnswer[0]==0 && that.data.IsShowAnswer[1]==0) {
             that.data.IsShowAnswer[0] = 1;
             if (TaskList[0].ContentNew.Field[3].length == 0) {
               that.data.IsShowAnswer[1] = 1;
@@ -976,6 +984,9 @@ Page({
           canvas.fillText("见证成长", 390, 120);
 
           canvas.setFontSize(68);
+          if (!that.data.TodayTime)
+            that.data.TodayTime=0;
+            
           canvas.fillText(that.data.TodayTime, 390, 148);
 
           canvas.font = "normal 500 68px caption";

pages/main/preview.js

@@ -444,13 +444,14 @@ Page({
         title: '音频下载中',
         mask: true,
       });
-      setTimeout(function () {
+      var timeout=setTimeout(function () {
         wx.hideLoading();
       }, 30000);
       console.log(url);
       wx.downloadFile({
         url: url,
         success(res) {
+          clearTimeout(timeout);
           wx.hideLoading();
           if (res.statusCode === 200) {
             tempPlayUrlLocal = res.tempFilePath;
@@ -458,9 +459,12 @@ Page({
             that.audioCtx.play();
             tempPlayUrl = url;
           }
+          //console.log("res.statusCode:" + res.statusCode);
         },
         fail(err) {
           wx.hideLoading();
+          console.log("downling err:"+err);
+          clearTimeout(timeout);
         }
       });
     }

pages/main/previewMenu.js

@@ -55,13 +55,24 @@ Page({
           list[i].CardType = that.data.CardType;
       }
       app.globalData.CardList = list;
+      app.globalData.IsUpdateStudyPlan = 1;
+      
       if (that.data.CardType==1){
         app.globalData.TaskToday.CardNumberUrgent++;
-      }
 
-      app.globalData.IsUpdateStudyPlan = 1;
-      
-      that.close();
+        var cardType=wx.getStorageSync('CardType');
+        if (cardType==0 && app.globalData.TaskToday.CardNumberUrgent==1){
+          wx.redirectTo({
+            url: "../other/menu?Type=0",
+          });
+        }
+        else{
+          that.close();
+        }
+      }
+      else{
+        that.close();
+      }
       
     });
     

pages/main/searchCard1.js

@@ -40,7 +40,13 @@ Page({
       if (search)
         url += "&Key=" + search;
 
+      var timeoutGetData=0;
+      wx.showLoading({
+        title: '请稍后...',
+      });
       main.getData(url, function (data) {
+        wx.hideLoading();
+        clearTimeout(timeoutGetData);
         if (data) {
           app.globalData.CardList= data.List;
           wx.navigateTo({
@@ -48,6 +54,11 @@ Page({
           })
         }
       });
+      timeoutGetData=setTimeout(function(){
+        wx.hideLoading();
+      },10000);
+
+
 
       setTimeout(function () {
         var arr = that.data.SearchTextList;

pages/main/searchCardList.js

@@ -128,14 +128,14 @@ Page({
       }
     }
 
-    if (!that.data.IsCollect && !that.data.IsToday && !that.data.Search) {
-      main.getData("GetUserCardCount?UserID=" + app.globalData.userInfo.UserID+"&CardType="+that.data.CardType, function (data) {
+    if (!that.data.IsToday && !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({
             Count: data.CardNumber,
           });
           var hasPage = false;
-          if (list.length < that.data.Count && list.length>=20 && that.data.IsToday == 0 && !that.data.IsCollect)
+          if (list.length < that.data.Count && list.length>=20 && that.data.IsToday == 0)
             hasPage = true;
 
           that.setData({
@@ -143,7 +143,7 @@ Page({
             HasPage: hasPage,
           });
 
-          if (that.data.PageType === "2") {
+          if (that.data.PageType === "3") {
             wx.redirectTo({
               url: './preview?type=show&id=' + list[0].MiaoguoCardID,
             })
@@ -164,7 +164,7 @@ Page({
       });
 
       var hasPage = false;
-      if (list.length < that.data.Count && that.data.IsToday == 0 && !that.data.IsCollect)
+      if (list.length < that.data.Count && that.data.IsToday == 0)
         hasPage = true;
 
       that.setData({
@@ -276,6 +276,9 @@ Page({
     var orderType = that.data.OrderType;
     if (orderType)
       url += "&OrderType=" + arrOrder[orderType].Value;
+    
+    if (e.currentTarget.dataset.iscollect==1)
+      url += "&IsCollect=1";
 
 
     main.getData(url, function (data) {

pages/main/searchCardList.wxml

@@ -60,7 +60,7 @@
     <view class="lineWidthAll FlexRow" wx:if="{{HasPage}}">
       <view class="lineWidth750"></view>
     </view>
-    <view class='panelItem3' wx:if="{{HasPage}}" bindtap='gotoNextPage' data-id="{{List[List.length-1].MiaoguoCardID}}">
+    <view class='panelItem3' wx:if="{{HasPage}}" bindtap='gotoNextPage' data-id="{{List[List.length-1].MiaoguoCardID}}" data-iscollect="{{IsCollect}}">
       <view class="more">更多</view>
     </view>
 

pages/main/systemsetting.js

@@ -6,6 +6,7 @@ const app = getApp();
 Page({
   data: {
     IsShow: 0,
+    HasSound: true,
   },
   onLoad: function (options) {
     var that = this;
@@ -16,6 +17,10 @@ Page({
       Version: app.globalData.Version,
       IsShow: app.globalData.userInfo.IsShow,
     });
+
+    common.getStorageValue(this, "HasSound", true, function () {
+      wx.setStorageSync("HasSound", that.data.HasSound);
+    });
   },
   updateMember: function () {
     wx.reLaunch({
@@ -34,6 +39,14 @@ Page({
       });
     }
   },
+  switch1Change(e) {
+    var that = this;
+    that.data.HasSound = e.detail.value;
+    that.setData({
+      HasSound: that.data.HasSound,
+    });
+    wx.setStorageSync("HasSound", that.data.HasSound);
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/systemsetting.wxml

@@ -4,6 +4,12 @@
     <view class="panelTitle1">通用</view>
     <view class="panelTitle2"></view>
   </view>
+  <view class="panelItem FlexRow">
+    <view class="panelItem1">按键音</view>
+    <view class="panelItem2 FlexRow">
+      <switch checked="{{HasSound}}" bindchange="switch1Change" />
+    </view>
+  </view>
   <view class="panelItem FlexRow" bindtap='gotoSymbol'>
     <view class="panelItem1">符号栏</view>
     <view class="panelItem2 FlexRow">

pages/marketing/award.wxml

@@ -17,7 +17,7 @@
 	<view class='lineFooter2'></view>
 	<view class="panelItem FlexColumn">
 		<view class="text5 panelItem1 FlexRow">
-			<view class="panelItem11">累积奖励天数</view>
+			<view class="panelItem11">可奖励天数（含已发放）</view>
 			<view class="panelItem12">{{Award.Total}}天</view>
 		</view>
 	</view>

pages/other/lessonlist.js

@@ -36,9 +36,17 @@ Page({
     var idchild="";
     if (e.currentTarget.dataset.idchild && id>1)
       idchild = '&LessonPage=' +e.currentTarget.dataset.idchild;
-    wx.navigateTo({
-      url: '../other/lesson?LessonID=' + id +idchild,
-    });
+    
+    if (e.currentTarget.dataset.url){
+      wx.navigateTo({
+        url: '../other/video?LessonID=' + id +idchild+"&imageurl="+e.currentTarget.dataset.imageurl+"&url="+e.currentTarget.dataset.url,
+      });
+    }
+    else{
+      wx.navigateTo({
+        url: '../other/lesson?LessonID=' + id +idchild,
+      });
+    }
   },
   onShareAppMessage: function () {
     return {

pages/other/lessonlist.json

@@ -2,5 +2,6 @@
   "navigationBarTitleText": "课程",
   "navigationBarBackgroundColor": "#009942",
   "navigationBarTextStyle": "white",
+  "backgroundColorTop": "#009942",
   "backgroundColor": "#F0F0F0"
 }

pages/other/lessonlist.wxml

@@ -12,7 +12,7 @@
           <view class="lineWidth720"></view>
         </view>
 
-        <view class="panelItem FlexRow" bindtap="gotoLesson" data-id="{{index+1}}" data-idchild="{{indexChild+1}}">
+        <view class="panelItem FlexRow" bindtap="gotoLesson" data-id="{{index+1}}" data-idchild="{{indexChild+1}}" data-url="{{itemChild.VideoUrl}}" data-imageurl="{{itemChild.ImageUrl}}">
           <view class='panelItem1 FlexColumn'>
             <view class="panelTitle10">{{itemChild.Title}}</view>
           </view>

pages/other/menu.js

@@ -0,0 +1,53 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+import constant from '../../utils/constant';
+
+const app = getApp();
+
+Page({
+  data: {
+  },
+  onLoad: function (options) {
+    var that = this;
+
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      Menu:constant.arrMenuText[options.Type],
+    });
+
+    wx.setNavigationBarColor({
+      frontColor: "#ffffff",
+      backgroundColor: "#0B8457",
+    })
+  },
+  goto:function(e){
+    var that = this;
+    var url = e.currentTarget.dataset.url;
+
+    if (url.indexOf("studyplan")>0){
+      var cardType=url.substr(url.length-1);
+      wx.setStorageSync("CardType", Number(cardType));
+  
+      main.UploadUserConfig(function () {
+        that.onClose();
+      });
+    }
+    else{
+      wx.redirectTo({
+        url: url,
+      });
+    }
+  },
+  onClose: function () {
+    wx.navigateBack({
+      delta: 1,
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?LessonID=all&UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/other/menu.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "菜单",
+  "navigationBarBackgroundColor": "#0B8457",
+  "navigationBarTextStyle": "white"
+}

pages/other/menu.wxml

@@ -0,0 +1,31 @@
+<view class="TempContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
+	<image class="Avatar" src='../images/universalpic_logo_200x200.png' />
+	<text class='RemindText'>{{Menu.Text1}}</text>
+  <text class='RemindText2'>{{Menu.Text2}}</text>
+
+	<block wx:for="{{Menu.List}}" wx:key="index">
+		<view class="RemindLine"></view>
+		<view class="RemindButton FlexColumn" bindtap="goto" data-url="{{item.Url}}">
+			<view class='RemindButton1 FlexRow'>
+				<view class="FlexRow" wx:if="{{!item.IsUrl}}">
+					<image class="universalpic_setup_green_30x30" src='../images/universalpic_setup_green_30x30.png' />
+				</view>
+				<view class="RemindButton10" wx:if="{{item.IsUrl}}">
+				</view>
+				<view class='RemindButton11'>{{item.Name}}</view>
+			</view>
+			<text class='RemindButton10 RemindButton12' wx:if="{{item.Name2}}">{{item.Name2}}</text>
+			<view class='RemindButton13'></view>
+			<image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+	
+		</view>
+	</block>
+  <view class="RemindLine"></view>
+	<text class='RemindText3'>{{Menu.Text3}}</text>
+	<text class='RemindText4' space="ensp">{{Menu.Text4}}</text>
+	
+	<view class="footer FlexColumn" bindtap="onClose">
+		<view class="footer1">{{Menu.Text5}}</view>
+		<view class="footer2">{{Menu.Text6}}</view>
+	</view>
+</view>

pages/other/menu.wxss

@@ -0,0 +1,140 @@
+
+.TempContainer{
+  background-color: #0B8457;
+  position: fixed;
+  top:0;
+  z-index: 100;
+}
+.TempContainer .Avatar{
+  width:160rpx;
+  height:160rpx;
+  margin-top: 100rpx;
+  border-radius: 50%;
+}
+.TempContainer .RemindText{
+  font-size:36rpx;
+  color:#F0F0F0;
+  margin-top: 60rpx;
+  text-align: center;
+}
+
+.TempContainer .RemindText2{
+  font-size:24rpx;
+  color:#F0F0F0;
+  width:670rpx;
+  margin-top: 30rpx;
+  margin-bottom: 60rpx;
+  font-weight: 400;
+}
+
+.universalpic_setup_green_30x30{
+  width:30rpx;
+  height:30rpx;
+  margin:0 20rpx 0 40rpx;
+}
+.TempContainer .RemindButton{
+  width:100%;
+  align-items: flex-start;
+  position: relative;
+}
+
+.TempContainer .RemindButton00{
+  justify-content: space-between;
+  width:100%;
+  height:134rpx;
+  margin-top: 30rpx;
+}
+
+
+.TempContainer .RemindButton001{
+  align-items: flex-start;
+}
+
+.TempContainer .RemindButton0{
+  width:80rpx;
+  height:40rpx;
+  text-align: center;
+  color:#1e1e1e;
+  line-height: 40rpx;
+  border-radius: 20rpx;
+  background-color: #19C575;
+  margin-left: 40rpx;
+  font-size:20rpx;
+}
+
+.TempContainer .RemindButton1{
+  justify-content: flex-start;
+  margin: 30rpx 0 0 0;
+}
+
+.TempContainer .RemindButton11{
+  font-size:28rpx;
+  color:#fff;
+}
+.TempContainer .RemindButton12{
+  font-size:20rpx;
+  color:#D2D2D2;
+  margin-left: 90rpx;
+}
+.TempContainer .RemindButton120{
+  margin-left: 0rpx;
+}
+
+.TempContainer .RemindButton13{
+  height:30rpx;
+}
+
+.TempContainer .RemindButton10{
+  margin-left: 40rpx;
+}
+
+.TempContainer .Arrow{
+  width:16rpx;
+  height:26rpx;
+  position: absolute;
+  right:40rpx;
+}
+
+.TempContainer .RemindLine{
+  width:100%;
+  height:1rpx;
+  background-color:rgba(0,0,0,0.25);
+}
+
+.TempContainer .RemindText3{
+  font-size:24rpx;
+  color:#D2D2D2;
+  width:670rpx;
+  margin-top: 31rpx;
+}
+
+.TempContainer .RemindText4{
+  font-size:20rpx;
+  color:#D2D2D2;
+  width:670rpx;
+  margin-top: 20rpx;
+}
+
+.TempContainer .footer{
+  font-size:28rpx;
+  color:#fff;
+  border-top:1rpx solid rgba(0,0,0,0.25);
+  text-align: center;
+  width:100%;
+  min-height: 100rpx;
+  position: fixed;
+  bottom: 0;
+}
+
+.TempContainer .footer1{
+  font-size:28rpx;
+  color:#fff;
+  margin-top: 30rpx;
+}
+
+.TempContainer .footer2{
+  font-size:20rpx;
+  color:#D2D2D2;
+  margin-top: 4rpx;
+  margin-bottom: 30rpx;
+}

pages/other/video.js

@@ -0,0 +1,89 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+  },
+  onReady() {
+    this.videoContext = wx.createVideoContext('myVideo')
+  },
+  onLoad: function (options) {
+    var that = this;
+    var height = app.globalData.systemInfo.windowHeight;
+    that.setData({
+      Containnerheight:height,
+    });
+    wx.setNavigationBarColor({
+      frontColor: "#ffffff",
+      backgroundColor: "#000000",
+    });
+
+    var LessonID = 2;
+    var LessonPage = 1;
+    if (options && options.LessonID) {
+      LessonID = options.LessonID;
+    } 
+    if (options && options.LessonPage) {
+      LessonPage = options.LessonPage;
+    }
+    else
+      LessonPage=1;
+
+    if (options.url){
+      that.setData({
+        LessonID: LessonID,
+        LessonPage: LessonPage,
+        VideoUrl:app.globalData.uploadImageUrl+"web/_lesson/"+options.url,
+        ImageUrl:options.imageurl,
+      });
+      wx.setNavigationBarTitle({
+        title: options.Title,
+      });
+    }
+    else{
+      var userid = app.globalData.userInfo.UserID;
+      main.getData("GetMiaoguoLesson2?UserID=" + userid, function (data) {
+        if (data) {          
+          that.setData({
+            LessonID: LessonID,
+            LessonPage: LessonPage,
+            VideoUrl:app.globalData.uploadImageUrl+"web/_lesson/"+data[LessonID-1].List[LessonPage-1].VideoUrl,
+            ImageUrl:data[LessonID-1].List[LessonPage-1].ImageUrl,
+          });
+          wx.setNavigationBarTitle({
+            title: data[LessonID-1].List[LessonPage-1].Title,
+          });
+        }
+      });
+    }
+
+    
+
+   
+  },
+  onUnload: function () {
+    this.InsertMiaoguoUserLesson();
+  },
+  onHide: function () {
+    this.InsertMiaoguoUserLesson();
+  },
+  InsertMiaoguoUserLesson: function () {
+    
+    var url = "InsertMiaoguoUserLesson?UserID=" + app.globalData.userInfo.UserID;
+    url += "&LessonID=" + this.data.LessonID;
+    url += "&Content=" + this.data.LessonPage;
+
+    main.getData(url, function (data) {});
+  },
+  onShareAppMessage: function () {
+    var title ="《秒过学习法》课程";
+    var imageUrl = app.globalData.uploadImageUrl+"web/"+this.data.ImageUrl;
+    return {
+      title: title,
+      path: app.globalData.SharePath + '?type=video&LessonID=' + this.data.LessonID + '&LessonPage=' + this.data.LessonPage+'&UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: imageUrl,
+    }
+  },
+})

pages/other/video.json

@@ -0,0 +1,8 @@
+{
+  "navigationBarTitleText": "《秒过学习法》课程",
+  "navigationBarBackgroundColor": "#000000",
+  "navigationBarTextStyle": "white",
+  "backgroundColor": "#000000",
+  "backgroundColorTop": "#000000",
+  "backgroundColorBottom": "#000000"
+}

pages/other/video.wxml

@@ -0,0 +1,3 @@
+<video id="myVideo" class="video" style='height:{{Containnerheight}}px;'
+ src="{{VideoUrl}}" controls autoplay="false"></video>
+  

pages/other/video.wxss

@@ -0,0 +1,6 @@
+page{
+  background-color: #000;  
+}
+.video{
+  width:100%;
+}

pages/other/webviewInterior.js

@@ -0,0 +1,13 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+
+  },
+  onLoad: function (options) {
+    var that = this;
+  },
+})

pages/other/webviewInterior.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/other/webviewInterior.wxml

@@ -0,0 +1 @@
+<web-view src="https://www.kylx365.com/20170411"></web-view>

pages/other/webviewInterior.wxss

@@ -0,0 +1 @@
+/* pages/other/webviewInterior.wxss */

pages/plan/setting.wxml

@@ -7,7 +7,7 @@
     <view class="panelItem1">日常练习方案</view>
     <view class="panelItem2 FlexRow">
       <view class="picker" wx:if="{{CardType==0}}">
-        首选
+        当前
       </view>
       <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
@@ -19,7 +19,7 @@
     <view class="panelItem1">紧急练习方案</view>
     <view class="panelItem2 FlexRow">
       <view class="picker" wx:if="{{CardType==1}}">
-        首选
+        当前
       </view>
       <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>

pages/plan/setting.wxss

@@ -1,7 +1,3 @@
-.study_plan_header{
-  width:100%;
-  height: 180rpx;
-}
 .panelTop{
   width:100%;
   justify-content: flex-start;

pages/plan/sortRule.js

@@ -7,17 +7,17 @@ Page({
   data: {
     List: [
       {
-        Name: "自由安排",
+        Name: "智能规划",
         Remark: "对时间早晚没有要求，交由系统根据学习情况安排。",
         SelectedCSS: "",
       },
       {
-        Name: "优先安排到期时间较早的题卡",
+        Name: "最早优先",
         Remark: "想优先做完以往积压的题卡可选此项。从到期时间较早的往较近的安排题卡。",
         SelectedCSS: "",
       },
       {
-        Name: "优先安排到期时间较近的题卡",
+        Name: "今天优先",
         Remark: "想优先做完近期添加的，和最适合当天回想的知识可选此项。从到期时间较近的（如当日）往积压较早的安排题卡。",
         SelectedCSS: "",
       },

pages/plan/studyplan.js

@@ -8,8 +8,21 @@ var cardNumberUrgent = 0;
 
 Page({
   data: {
-    IsChangeStudyPLan:false,
-    BtnArray: [{ Name: "日常练习", Selected: 1 }, { Name: "紧急练习", Selected: 0 }, { Name: "整体练习", Selected: 0 }],
+    IsChangeStudyPLan: false,
+    IsNullCard:false,
+    BtnArray: [{
+      Name: "日常练习",
+      Name2: "",
+      Selected: 1
+    }, {
+      Name: "紧急练习",
+      Name2: "",
+      Selected: 0
+    }, {
+      Name: "整体练习",
+      Name2: "串联将日常练习方案和紧急练习方案的任务量",
+      Selected: 0
+    }],
   },
   onPullDownRefresh: function () {
     var that = this;
@@ -20,14 +33,14 @@ Page({
   },
   onLoad: function (options) {
     var that = this;
-    
+
     that.setData({
       Containnerheight: main.getWindowHeight(),
     });
 
     that.init();
   },
-  onShow:function(){
+  onShow: function () {
     this.init();
   },
   init: function () {
@@ -47,97 +60,86 @@ Page({
     });
     var studyPlan = app.globalData.TaskToday;
     var taskNumber = studyPlan.ListNew.length + studyPlan.ListReview.length + studyPlan.ListHistory.length;
-    var progress=0;
-    if (studyPlan.AlreadyPracticeNumber + taskNumber>0)
-      progress = Math.round(100 * studyPlan.AlreadyPracticeNumber / (taskNumber+studyPlan.AlreadyPracticeNumber));
+    var progress = 0;
+    if (studyPlan.AlreadyPracticeNumber + taskNumber > 0)
+      progress = Math.round(100 * studyPlan.AlreadyPracticeNumber / (taskNumber + studyPlan.AlreadyPracticeNumber));
     that.setData({
       StudyPlan: studyPlan,
       TaskNumber: taskNumber,
-      Progress:progress,
+      Progress: progress,
     });
 
-    var backColor="#f0f0f0";
+    var backColor = "#f0f0f0";
 
     var rate = 0;
-    if (studyPlan.CommonNewLength>0 || studyPlan.CommonOldLength>0){
+    if (studyPlan.CommonNewLength > 0 || studyPlan.CommonOldLength > 0) {
       rate = studyPlan.CommonNewLength / (studyPlan.CommonNewLength + studyPlan.CommonOldLength);
-      backColor = "#00B6DD";
+      backColor = "#0094EE";
     }
-      
-    fanObj.init(that, rate, 100, 3.0, "#008CAA", backColor, studyPlan.CommonNewLength + studyPlan.CommonOldLength);
-    
+
+    fanObj.init(that, rate, 100, 3.0, "#00C4EE", backColor, null);
+
     var backColor2 = "#f0f0f0";
     var rate2 = 0;
-    if (studyPlan.UrgentNewLength>0 || studyPlan.UrgentOldLength>0){
+    if (studyPlan.UrgentNewLength > 0 || studyPlan.UrgentOldLength > 0) {
       rate2 = studyPlan.UrgentNewLength / (studyPlan.UrgentNewLength + studyPlan.UrgentOldLength);
-      backColor2 = "#FFCC00";
+      backColor2 = "#FF9900";
     }
-    fanObj.init2(that, rate2, 100, 3.0, "#DDB100", backColor2, studyPlan.UrgentNewLength + studyPlan.UrgentOldLength);
+    fanObj.init2(that, rate2, 100, 3.0, "#FFCC00", backColor2, null);
 
   },
-  btnSelected:function(e){
+  btnSelected: function (e) {
     var that = this;
     var id = e.currentTarget.dataset.id;
 
-    if (id!=that.data.CardType){
-      var oldName = "", newName = "";
-      for (var i = 0; i < that.data.BtnArray.length; i++) {
-        if (that.data.BtnArray[i].Selected == 1) {
-          oldName = that.data.BtnArray[i].Name;
-        }
-        if (id == i) {
-          newName = that.data.BtnArray[i].Name;
-        }
-      }
+    that.setData({
+      IsChangeStudyPLan: true,
+    });
 
-      if (((id == 1 || id == 2) && cardNumberUrgent == 0) || ((id == 0 || id == 2) && cardNumberCommon == 0)) {
-        if (cardNumberCommon == 0)
-          newName = "日常练习";
-        if (cardNumberUrgent == 0)
-          newName = "紧急练习";
+    wx.setNavigationBarColor({
+      frontColor: '#ffffff',
+      backgroundColor: '#0B8457',
+    });
+
+  },
+  changePlan: function (e) {
+    var that = this;
+    var id = e.currentTarget.dataset.id;
+
+    if (((id == 1 || id == 2) && cardNumberUrgent == 0) 
+    || ((id == 0 || id == 2) && cardNumberCommon == 0)) {
+      that.setData({
+        IsNullCard: true,
+        IsChangeStudyPLan: false,
+      });
+    } else {
+      if (id!=that.data.CardType){
         that.setData({
-          IsNullCard: true,
-          NewName: newName,
+          CardType: id,
         });
-      }
-      else {
-        that.setData({
-          IsChangeStudyPLan: true,
-          OldName: oldName,
-          NewName: newName,
-          NewCardType: id,
+        wx.setStorageSync("CardType", that.data.CardType);
+  
+        main.UploadUserConfig(function () {
+          main.getTaskTodayList(function (data) {
+            that.init();
+            that.close();
+          });
         });
       }
-
-      wx.setNavigationBarColor({
-        frontColor: '#ffffff',
-        backgroundColor: '#0B8457',
-      });
-    }
-  },
-  changePlan:function(){
-    var that=this;
-    that.setData({
-      CardType: that.data.NewCardType,
-    });
-    wx.setStorageSync("CardType", that.data.CardType);
-
-    main.UploadUserConfig(function(){
-      main.getTaskTodayList(function (data) {
-        that.init();
+      else{
         that.close();
-      });
-    });
+      }
+    }
   },
-  close:function(){
+  close: function () {
     var that = this;
     that.setData({
       IsChangeStudyPLan: false,
       IsNullCard: false,
     });
     wx.setNavigationBarColor({
-      frontColor: '#000000',
-      backgroundColor: '#ffffff',
+      frontColor: '#ffffff',
+      backgroundColor: '#274DAD',
     });
   },
   goto: function (e) {
@@ -146,7 +148,7 @@ Page({
       url: url,
     });
   },
-  gotoTaskList:function(e){
+  gotoTaskList: function (e) {
     wx.showLoading({
       title: '请稍候',
     });
@@ -156,7 +158,7 @@ Page({
 
     var that = this;
     //未练完的题卡
-    if (e.currentTarget.dataset.id==1){
+    if (e.currentTarget.dataset.id == 1) {
       main.getTaskTodayList(function (task) {
         var list = [];
         for (var i = 0; i < task.ListNew.length; i++) {
@@ -173,9 +175,8 @@ Page({
           url: '../main/searchCardList?type=1&Count=' + list.length,
         });
       });
-    }
-    else{
-      var url = 'GetMiaoguoCardList2?UserID=' + app.globalData.userInfo.UserID + "&IsToday=2&CardType="+that.data.CardType;
+    } else {
+      var url = 'GetMiaoguoCardList2?UserID=' + app.globalData.userInfo.UserID + "&IsToday=2&CardType=" + that.data.CardType;
       main.getData(url, function (data) {
         if (data) {
           var list = [];
@@ -192,7 +193,7 @@ Page({
         }
       });
     }
-    
+
   },
   onShareAppMessage: function () {
     return {
@@ -201,4 +202,4 @@ Page({
       imageUrl: app.globalData.ShareImage,
     }
   },
-})
+})

pages/plan/studyplan.json

@@ -1,5 +1,8 @@
 {
   "navigationBarTitleText": "学习计划",
+  "navigationBarBackgroundColor": "#274DAD",
+  "navigationBarTextStyle": "white",
+  "backgroundColorTop": "#274DAD",
   "backgroundColorBottom": "#f0f0f0",
   "enablePullDownRefresh": true
 }

pages/plan/studyplan.wxml

@@ -1,207 +1,241 @@
 <import src="../template/Fan.wxml" />
 
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <view class="panelTop FlexColumn">
-    <view class="panelTitle0 FlexRow">
-      <view class="panelTitle00">当前的学习计划</view>
-    </view>
-    <view class="panelButton FlexRow">
-      <view class="panelButton1{{BtnArray[0].Selected}} FlexRow" bindtap="btnSelected" data-id="0">
-        <view class="text1">{{BtnArray[0].Name}}</view>
-      </view>
-      <view class="line1"></view>
-      <view class="panelButton1{{BtnArray[1].Selected}} FlexRow" bindtap="btnSelected" data-id="1">
-        <view class="text1">{{BtnArray[1].Name}}</view>
-      </view>
-      <view class="line1"></view>
-      <view class="panelButton1{{BtnArray[2].Selected}} FlexRow" bindtap="btnSelected" data-id="2">
-        <view class="text1">{{BtnArray[2].Name}}</view>
-      </view>
-    </view>
-    <view class='lineFooter'></view>
-  </view>
-  <view class="line0 FlexRow">
-    <view class="spot">●</view>
-    <view class="spot">●</view>
-    <view class="spot">●</view>
-  </view>
-  <view class="line"></view>
-  <view class="panelTitle FlexRow">
-    <image class="universalpic_plan_2line_black_30x32" src="../images/universalpic_plan_data_black_30x32.png" />
-    <view class="panelTitle1">参考数据</view>
-  </view>
-  <view class="lineWidthAll FlexRow">
-    <view class="lineWidth690"></view>
-  </view>
-  <view class="panelItem FlexRow">
-    <view class="left FlexColumn">
-      <view class="text2">任务量</view>
-      <view class="text3">今天需要练习的题卡总数</view>
-    </view>
-    <view class="right FlexRow">
-      <view class="Number">{{TaskNumber}}</view>
-      <view class="text4">张</view>
-    </view>
-  </view>
-  <view class="lineWidthAll FlexRow">
-    <view class="lineWidth690"></view>
-  </view>
-  <view class="panelItem FlexColumn">
-    <view class="panelItem FlexRow">
-      <view class="text7">数量组成</view>
-    </view>
-    <view class="panelItem10 panelItem1 FlexRow">
-      <view class="panelItem11 FlexColumn" wx:if="{{CardType==0 || CardType==2}}">
-        <template class="fan" is="fanTemplate" data="{{Angle1,Angle2,BGColor,FanSize,FanScale,Color1,Color2,ShowNumber}}">
-        </template>
-        <view class="list FlexColumn">
-          <view class="item FlexRow">
-            <view class="block1 block"></view>
-            <view class="text6">新题卡</view>
-            <view class="Number1">{{StudyPlan.CommonNewLength}}</view>
-            <view class="text6">张</view>
-          </view>
-          <view class="item FlexRow">
-            <view class="block2 block"></view>
-            <view class="text6">旧题卡</view>
-            <view class="Number1">{{StudyPlan.CommonOldLength}}</view>
-            <view class="text6">张</view>
-          </view>
-        </view>
-      </view>
-      <view class="panelItem11 FlexColumn" wx:if="{{CardType==1 || CardType==2}}">
-        <template class="fan" is="fanTemplate2" data="{{Angle12,Angle22,BGColor2,FanSize2,FanScale2,Color12,Color22,ShowNumber2}}">
-        </template>
-        <view class="list FlexColumn">
-          <view class="item FlexRow">
-            <view class="block3 block"></view>
-            <view class="text6">新题卡</view>
-            <view class="Number1">{{StudyPlan.UrgentNewLength}}</view>
-            <view class="text6">张</view>
-          </view>
-          <view class="item FlexRow">
-            <view class="block4 block"></view>
-            <view class="text6">旧题卡</view>
-            <view class="Number1">{{StudyPlan.UrgentOldLength}}</view>
-            <view class="text6">张</view>
-          </view>
-        </view>
-      </view>
-    </view>
-    <block wx:if="{{StudyPlan.ListReview.length>0}}">
-      <view class="text5">其中还有</view>
-      <view class="panelItem13 FlexRow">
-        <view class="text6">上次练习未练完的题卡</view>
-        <view class="Number1">{{StudyPlan.ListReview.length}}</view>
-        <view class="text6">张</view>
-      </view>
-    </block>
-    <view style="width:100%;height:42rpx;" wx:if="{{StudyPlan.ListReview.length==0}}"></view>
-  </view>
-  <view class="lineWidthAll FlexRow">
-    <view class="lineWidth690"></view>
-  </view>
-  <view class="panelItem FlexRow">
-    <view class="panelItem2 FlexColumn">
-      <view class="panelItem21 FlexRow">
-        <view class="text21">预计回想</view>
-        <view class="right FlexRow">
-          <view class="Number2">{{StudyPlan.PracticeNumber}}</view>
-          <view class="text6">次</view>
-        </view>
-      </view>
-      <view class="text22">新题卡需回想两次</view>
-    </view>
-    <view class="panelItem2 FlexColumn">
-      <view class="panelItem21 FlexRow">
-        <view class="text21">预计用时</view>
-        <view class="right FlexRow">
-          <view class="Number2">{{StudyPlan.PracticeTime}}</view>
-          <view class="text6">分钟</view>
-        </view>
-      </view>
-      <view class="text22">根据近期估算参考</view>
-    </view>
-  </view>
-  <view class="lineWidthAll FlexRow">
-    <view class="lineWidth750"></view>
-  </view>
-  <view class="panelItem FlexRow">
-    <view class="panelItem4 FlexRow" bindtap="gotoTaskList" data-id="1">
-      <view class="text8">未练完的题卡</view>
-    </view>
-  </view>
-  <view class='lineFooter'></view>
-  <view class="line"></view>
-  <view class="panelTitle FlexRow">
-    <image class="universalpic_plan_2line_black_30x32" src="../images/universalpic_plan_done_black_30x32.png" />
-    <view class="panelTitle1">完成情况</view>
-  </view>
-  <view class="lineWidthAll FlexRow">
-    <view class="lineWidth690"></view>
-  </view>
-  <view class="panelItem FlexColumn">
-    <view class="panelItem FlexRow">
-      <view class="text7">当日练完</view>
-      <view class="right FlexRow">
-        <view class="Number2">{{StudyPlan.AlreadyPracticeNumber}}</view>
-        <view class="text6">张</view>
-      </view>
-    </view>
-    <view class="panelItem1 FlexRow">
-      <view class="progress">
-        <view class="progress1" style="width:{{Progress}}%;"></view>
-      </view>
-    </view>
-    <view class="panelItem FlexRow">
-      <view class="text71">进度</view>
-      <view class="right FlexRow">
-        <view class="Number4">{{Progress}}%</view>
-      </view>
-    </view>
-  </view>
 
-  <view class="lineWidthAll FlexRow">
-    <view class="lineWidth750"></view>
-  </view>
-  <view class="panelItem FlexRow">
-    <view class="panelItem4 FlexRow" bindtap="gotoTaskList" data-id="2">
-      <view class="text8">练完的题卡</view>
-    </view>
-  </view>
-  <view class='lineFooter'></view>
-  <view class="panelFooter FlexRow">
-    <view class="btnChange" bindtap="goto" data-url="./setting">设置学习计划</view>
-  </view>
+	<view class="panelTop FlexColumn">
+		<image wx:if="{{BtnArray[0].Selected==1}}" class="study_index_usually" src="../images/study_index_usually.png" bindtap="btnSelected" data-id="0"></image>
+		<image wx:if="{{BtnArray[1].Selected==1}}" class="study_index_usually" src="../images/study_index_urgency.png" bindtap="btnSelected" data-id="1"></image>
+		<image wx:if="{{BtnArray[2].Selected==1}}" class="study_index_usually" src="../images/study_index_overall.png" bindtap="btnSelected" data-id="2"></image>
+
+		<image class="study_plan_header" src="../images/study_plan_header.png"></image>
+		<view class='lineFooter'></view>
+	</view>
+
+	<view class="panelButtonTop FlexRow">
+		<view class="btnChange FlexRow" bindtap="goto" data-url="./setting">
+			<image class="universalpic_setup_black_30x30" src="../images/universalpic_setup_black_30x30.png" />
+			<view>设置学习计划</view>
+		</view>
+	</view>
+	<view class="panelTitle FlexRow">
+		<image class="universalpic_plan_2line_black_30x32" src="../images/universalpic_plan_data_black_30x32.png" />
+		<view class="panelTitle1">参考数据</view>
+	</view>
+	<view class="lineWidthAll FlexRow">
+		<view class="lineWidth690"></view>
+	</view>
+	<view class="panelItem FlexRow">
+		<view class="left FlexColumn">
+			<view class="text2">任务量</view>
+			<view class="text3">今天需要练习的题卡总数</view>
+		</view>
+		<view class="right FlexRow">
+			<view class="Number">{{TaskNumber}}</view>
+			<view class="text4">张</view>
+		</view>
+	</view>
+	<view class="lineWidthAll FlexRow">
+		<view class="lineWidth690"></view>
+	</view>
+	<view class="panelItem FlexColumn">
+		<view class="panelItem FlexRow">
+			<view class="text7">数量组成</view>
+		</view>
+		<view class="panelItem10 panelItem1 FlexRow">
+			<view class="panelItem11 FlexRow" wx:if="{{CardType==0 || CardType==2}}">
+				<view class="Null1" wx:if="{{CardType<2}}"></view>
+				<template class="fan" is="fanTemplate" data="{{Angle1,Angle2,BGColor,FanSize,FanScale,Color1,Color2,ShowNumber}}">
+				</template>
+				<view class="Null2" wx:if="{{CardType<2}}"></view>
+				<view class="list FlexColumn">
+					<block wx:if="{{CardType==2}}">
+						<view class="item FlexRow">
+							<view class="text6">日常题卡</view>
+						</view>
+						<view class="item FlexRow">
+							<view class="Number2">{{StudyPlan.CommonNewLength+StudyPlan.CommonOldLength}}</view>
+							<view class="text6">张</view>
+						</view>
+					</block>
+					<view class="item2 item FlexRow">
+						<view class="block1 block"></view>
+						<view class="text6">新题卡</view>
+						<view class="Number1">{{StudyPlan.CommonNewLength}}</view>
+					</view>
+					<view class="item FlexRow">
+						<view class="block2 block"></view>
+						<view class="text6">旧题卡</view>
+						<view class="Number1">{{StudyPlan.CommonOldLength}}</view>
+					</view>
+				</view>
+			</view>
+			<view class="panelItem11 FlexRow" wx:if="{{CardType==1 || CardType==2}}">
+				<template class="fan" is="fanTemplate2" data="{{Angle12,Angle22,BGColor2,FanSize2,FanScale2,Color12,Color22,ShowNumber2}}">
+				</template>
+				<view class="list FlexColumn">
+					<block wx:if="{{CardType==2}}">
+						<view class="item FlexRow">
+							<view class="text6">紧急题卡</view>
+						</view>
+						<view class="item FlexRow">
+							<view class="Number2">{{StudyPlan.UrgentNewLength+StudyPlan.UrgentOldLength}}</view>
+							<view class="text6">张</view>
+						</view>
+					</block>
+					<view class="item2 item FlexRow">
+						<view class="block3 block"></view>
+						<view class="text6">新题卡</view>
+						<view class="Number1">{{StudyPlan.UrgentNewLength}}</view>
+					</view>
+					<view class="item FlexRow">
+						<view class="block4 block"></view>
+						<view class="text6">旧题卡</view>
+						<view class="Number1">{{StudyPlan.UrgentOldLength}}</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+	<view class="lineWidthAll FlexRow">
+		<view class="lineWidth690"></view>
+	</view>
+	<block wx:if="{{StudyPlan.ListReview.length>0}}">
+		<view class="panelItem FlexColumn">
+			<view class="panelItem21 FlexRow">
+				<view class="text21">补习题卡</view>
+				<view class="right FlexRow">
+					<view class="Number2">{{StudyPlan.ListReview.length}}</view>
+					<view class="text6">张</view>
+				</view>
+			</view>
+			<view class="text22">上次练习未练完的题卡，包含在今天任务量内</view>
+
+		</view>
+		<view class="lineWidthAll FlexRow">
+			<view class="lineWidth690"></view>
+		</view>
+	</block>
+	<view class="panelItem FlexRow">
+		<view class="panelItem2 FlexColumn">
+			<view class="panelItem21 FlexRow">
+				<view class="text21">预计回想</view>
+				<view class="right FlexRow">
+					<view class="Number2">{{StudyPlan.PracticeNumber}}</view>
+					<view class="text6">次</view>
+				</view>
+			</view>
+			<view class="text22">新题卡需回想两次</view>
+		</view>
+		<view class="panelItem2 FlexColumn">
+			<view class="panelItem21 FlexRow">
+				<view class="text21">预计用时</view>
+				<view class="right FlexRow">
+					<view class="Number2">{{StudyPlan.PracticeTime}}</view>
+					<view class="text6">分钟</view>
+				</view>
+			</view>
+			<view class="text22">根据近期估算参考</view>
+		</view>
+	</view>
+	<view class="lineWidthAll FlexRow">
+		<view class="lineWidth750"></view>
+	</view>
+	<view class="panelItem FlexRow">
+		<view class="panelItem4 FlexRow" bindtap="gotoTaskList" data-id="1">
+			<view class="text8">未练完的题卡</view>
+		</view>
+	</view>
+	<view class='lineFooter'></view>
+	<view class="line"></view>
+	<view class="panelTitle FlexRow">
+		<image class="universalpic_plan_2line_black_30x32" src="../images/universalpic_plan_done_black_30x32.png" />
+		<view class="panelTitle1">完成情况</view>
+	</view>
+	<view class="lineWidthAll FlexRow">
+		<view class="lineWidth690"></view>
+	</view>
+	<view class="panelItem FlexColumn">
+		<view class="panelItem FlexRow">
+			<view class="text7">当日练完</view>
+			<view class="right FlexRow">
+				<view class="Number2">{{StudyPlan.AlreadyPracticeNumber}}</view>
+				<view class="text6">张</view>
+			</view>
+		</view>
+		<view class="panelItem1 FlexRow">
+			<view class="progress">
+				<view class="progress1" style="width:{{Progress}}%;"></view>
+			</view>
+		</view>
+		<view class="panelItem FlexRow">
+			<view class="text71">进度</view>
+			<view class="right FlexRow">
+				<view class="Number4">{{Progress}}%</view>
+			</view>
+		</view>
+	</view>
+
+	<view class="lineWidthAll FlexRow">
+		<view class="lineWidth750"></view>
+	</view>
+	<view class="panelItem FlexRow">
+		<view class="panelItem4 FlexRow" bindtap="gotoTaskList" data-id="2">
+			<view class="text8">练完的题卡</view>
+		</view>
+	</view>
+	<view class='lineFooter'></view>
+	<view class="line"></view>
 </view>
 
 <view wx:if="{{IsNullCard}}" class="TempContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
-  <image class="Avatar" src='../images/universalpic_logo_200x200.png' />
-  <text class='RemindText'>没有题卡不能使用</text>
-  <text class='RemindText2'>{{NewName}}方案中没有题卡，\n请登录官网为方案增添题卡后再试。</text>
-  <text class='RemindText3' catchtap="goto" data-url="../other/help?id=0&idchild=1">秒过官网地址</text>
-  <view class='btn1' catchtap="close">知道了</view>
-  <text class='RemindText5 RemindText4'>功能说明</text>
-  <text class='RemindText4' space="ensp">∙ 初次使用前，请先登录官网为方案增添一些题卡。</text>
-  <text class='RemindText4' space="ensp">∙ 整体练习融合了日常练习和紧急练习，需要两个方案都\n  有题卡才能使用。</text>
-  <text class='RemindText4' space="ensp">∙ 日常、紧急练习方案的任务量是各自独立的，请在学习\n  计划页面底部点击“设置学习计划”进行配置。</text>
+
+	<image class="Avatar" src='../images/universalpic_logo_200x200.png' />
+	<text class='RemindText'>没有题卡不能使用</text>
+	<text class='RemindText2'>该练习方案中没有题卡，请增添题卡后再试。</text>
+	<view class="RemindLine"></view>
+	<text class='RemindText3'>解决办法</text>
+	<text class='RemindText4' space="ensp">小程序、官网均可新建紧急练习题卡（新题卡默认为日常练习），相比之下官网建卡更有效率，网址如下帮助。\n\n“整体练习”要求日常、紧急练习中都有题卡才能使用。</text>
+	<view class="RemindLine"></view>
+	<view class="RemindButton00 FlexRow" catchtap="goto" data-url="../other/help?id=0&idchild=1">
+		<view class="FlexRow">
+			<image class="universalpic_tips_green_70x70" src='../images/universalpic_tips_green_70x70.png' />
+			<view class='RemindButton001 FlexColumn'>
+				<view class='RemindButton11'>秒过官网地址</view>
+				<view class='RemindButton120 RemindButton12'>以及Google Chrome浏览器安装步骤</view>
+			</view>
+		</view>
+		<image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+	</view>
+	<view class="RemindLine"></view>
+
+	<view class="footer FlexRow" catchtap="close">
+		知道了
+	</view>
 </view>
 
 <view wx:if="{{IsChangeStudyPLan}}" class="TempContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
-  <image class="Avatar" src='../images/universalpic_logo_200x200.png' />
-  <text class='RemindText'>首选变更</text>
-  <text class='RemindText2 FlexRow'>
-  <text>要从</text>
-  <text class="color2">{{OldName}}</text>
-  <text>更改为</text>
-  <text class="color2">{{NewName}}</text>
-  <text>吗？</text>
-  </text>
-  <view class="FlexRow">
-    <view class='btn2 btn1' catchtap="close">取消</view>
-    <view class='btn2 btn1' catchtap="changePlan">确定</view>
-  </view>
-  <text class='RemindText5 RemindText4'>变更后，会发生什么</text>
-  <text class='RemindText4' space="ensp">∙ 重新规划学习计划并刷新首页大数字；请回到首页重新\n  开始今天的练习。</text>
-  <text class='RemindText4' space="ensp">∙ 系统将保存最终设定作为学习计划的首选模式，下次练\n  习不用重复更改。</text>
+	<image class="Avatar" src='../images/universalpic_logo_200x200.png' />
+	<text class='RemindText'>启用哪种学习计划？</text>
+
+	<block wx:for="{{BtnArray}}" wx:key="index">
+		<view class="RemindLine"></view>
+		<view class="RemindButton FlexColumn" catchtap="changePlan" data-id="{{index}}">
+			<view class='RemindButton1 FlexRow'>
+				<view class="RemindButton10 FlexRow">
+					<view wx:if="{{item.Selected==1}}" class='RemindButton0'>当前</view>
+					<image wx:if="{{item.Selected==0}}" class="universalpic_setup_green_30x30" src='../images/universalpic_setup_green_30x30.png' />
+				</view>
+				<view class='RemindButton11'>{{item.Name}}</view>
+			</view>
+			<view class='RemindButton12' wx:if="{{item.Name2}}">{{item.Name2}}</view>
+			<view class='RemindButton13'></view>
+		</view>
+	</block>
+	<view class="RemindLine"></view>
+	<text class='RemindText3'>切换后您将看到</text>
+	<text class='RemindText4' space="ensp">重新规划今天的任务量。首页、学习计划的参考数据将被更新。请回到首页，重新开始今天的练习（不管之前有无练习）。系统会保存本次选择，无须重复切换。\n\n日常练习、紧急练习的任务量设置是各自独立的。</text>
+
+	<view class="footer FlexRow" catchtap="close">
+		取消
+	</view>
 </view>

pages/plan/studyplan.wxss

@@ -2,6 +2,7 @@
 
 .container{
   font-size:28rpx;
+  color:#4D4D4D;
 }
 
 .lineWidthAll{
@@ -9,16 +10,26 @@
 }
 
 .panelTop{
-  position: fixed;
-  top:0;
   width:100%;
   z-index: 100;
+  background-color: #274DAD;
+  justify-content: flex-end;
+}
+
+.study_index_usually{
+  margin-top: 20rpx;
+  width:476rpx;
+  height:152rpx;
+}
+.study_plan_header{
+  width:100%;
+  height:84rpx;
 }
 
 .line0{
   width:100%;
-  height:217rpx;
-  background-color: #fff;
+  height:260rpx;
+  background-color: #F0F0F0;
   align-items: flex-end;
 }
 .spot{
@@ -29,10 +40,34 @@
 }
 .line{
   width:100%;
-  height:30rpx;
+  height:20rpx;
+  background-color: #F0F0F0;
+}
+
+.panelButtonTop{
+  width:100%;
   background-color: #F0F0F0;
 }
 
+.btnChange{
+  width:710rpx;
+  height:100rpx;
+  border-radius: 20rpx;
+  color: #1e1e1e;
+  background-color: #fff;
+  line-height: 100rpx;
+  font-size:28rpx;
+  text-align: center;
+  margin: 20rpx 0;
+  font-weight: 400;
+}
+
+.universalpic_setup_black_30x30{
+  width:30rpx;
+  height:30rpx;
+  margin-right: 20rpx;
+}
+
 .panelTitle{
   width:100%;
   justify-content: flex-start;
@@ -60,7 +95,6 @@
 
 .panelTitle1{
   margin-left: 20rpx;
-  color:#4D4D4D;
 }
 
 .panelButton{
@@ -77,7 +111,6 @@
   border-radius: 0rpx;
   margin-bottom: 30rpx;
   font-size:32rpx;
-  color:#4D4D4D;
 }
 
 .panelButton11{
@@ -141,7 +174,6 @@
   font-size: 20rpx;
   margin-bottom: -20rpx;
   margin-left:4rpx; 
-  color:#4D4D4D;
 }
 
 .panelItem1{
@@ -152,11 +184,13 @@
 .panelItem10{
   width:100%;
   justify-content: space-around;
+  margin-bottom: 40rpx;
 }
 
 .panelItem11{
-  width:230rpx;
-  height:219rpx;
+  justify-content: space-between;
+  align-items: flex-start;
+  margin-top: 10rpx;
 }
 
 .line2{
@@ -182,7 +216,12 @@
   font-family: Roboto-Black;
 }
 
-
+.Null1{
+  width:300rpx;
+}
+.Null2{
+  width:125rpx;
+}
 .fan{
   width:100rpx;
   height:100rpx;
@@ -196,47 +235,39 @@
 
 .text5{
   font-size:24rpx;
-  color:#4D4D4D;
 }
 
 .list{
-  align-items: flex-start;
-  margin-top:20rpx;
+  align-items: flex-end;
+  margin-left: 25rpx;
 }
 
 .item{
   width:100%;
-  justify-content: flex-start;
+  justify-content: flex-end;
+}
+
+.item2{
+  margin-top: 10rpx;
 }
 
 .block{
-  width:10rpx;
-  height:10rpx;
+  width:16rpx;
+  height:16rpx;
   margin-right: 10rpx;
+  border-radius: 4rpx;
 }
 .block1{
-  background-color: #008CAA;
-  border:1rpx solid #016175;
+  background-color: #00C4EE;
 }
 .block2{
-  background-color: #00B6DD;
-  border:1rpx solid #00829E;
+  background-color: #0094EE;
 }
 .block3{
-  background-color: #DDB100;
-  border:1rpx solid #9D7E01;
+  background-color: #FFCC00;
 }
 .block4{
-  background-color: #FFCC03;
-  border:1rpx solid #AE8B00;
-}
-.block5{
-  background-color: #FF8C83;
-  border:1rpx solid #BF524A;
-}
-.block6{
-  background-color: #fff;
-  border:1rpx solid #fff;
+  background-color: #FF9900;
 }
 .Number1{
   font-size: 24rpx;
@@ -269,6 +300,7 @@
   font-size:20rpx;
   color:#787878;
   margin: 4rpx 0 30rpx 30rpx;
+  align-self: flex-start;
 }
 
 .panelItem3{
@@ -320,7 +352,7 @@
 }
 
 .text8{
-  font-size: 24rpx;
+  font-size: 28rpx;
   color:#0071EF;
 }
 
@@ -330,23 +362,6 @@
   background-color: #D2D2D2;
 }
 
-.panelFooter{
-  width:100%;
-  height:210rpx;
-  background-color: #F0F0F0;
-}
-
-.btnChange{
-  width:710rpx;
-  height:110rpx;
-  border-radius: 20rpx;
-  border:1rpx solid #787878;
-  color: #1e1e1e;
-  background-color: #fff;
-  line-height: 110rpx;
-  font-size:36rpx;
-  text-align: center;
-}
 
 /* 临时页面 */
 
@@ -357,54 +372,127 @@
   z-index: 100;
 }
 .TempContainer .Avatar{
-  width:200rpx;
-  height:200rpx;
-  margin-top: 150rpx;
+  width:160rpx;
+  height:160rpx;
+  margin-top: 100rpx;
   border-radius: 50%;
 }
 .TempContainer .RemindText{
-  font-size:54rpx;
-  color:#fff;
-  margin-top: 170rpx;
+  font-size:36rpx;
+  color:#F0F0F0;
+  margin-top: 60rpx;
   text-align: center;
+  margin-bottom: 60rpx;
 }
+
+
 .TempContainer .RemindText2{
-  font-size:32rpx;
-  color:#fff;
-  text-align: center;
+  font-size:24rpx;
+  color:#F0F0F0;
+  width:670rpx;
+  margin-top: -30rpx;
+  margin-bottom: 60rpx;
 }
-.TempContainer .RemindText3{
-  font-size:28rpx;
-  color:#B6F57F;
-  text-decoration: underline;
-  margin-top: 40rpx;
+
+.universalpic_setup_green_30x30{
+  width:30rpx;
+  height:30rpx;
+  margin:0 0 0 90rpx;
 }
-.TempContainer .btn1{
-  font-size:36rpx;
-  color:#fff;
-  margin-top: 40rpx;
-  border:1rpx solid #fff;
+.universalpic_tips_green_70x70{
+  width:70rpx;
+  height:70rpx;
+  margin:0 30rpx 0 40rpx;
+}
+
+.TempContainer .RemindButton{
+  width:100%;
+  align-items: flex-start;
+}
+
+.TempContainer .RemindButton00{
+  justify-content: space-between;
+  width:100%;
+  height:134rpx;
+}
+
+.TempContainer .RemindButton001{
+  align-items: flex-start;
+}
+
+.Arrow{
+  width:16rpx;
+  height:26rpx;
+  margin-right: 30rpx;
+}
+
+
+.TempContainer .RemindButton0{
+  width:80rpx;
+  height:40rpx;
   text-align: center;
-  width:600rpx;
-  line-height: 90rpx;
-  border-radius: 14rpx;
+  color:#1e1e1e;
+  line-height: 40rpx;
+  border-radius: 20rpx;
+  background-color: #19C575;
+  margin-left: 40rpx;
+  font-size:20rpx;
 }
 
-.TempContainer .RemindText4{
-  font-size:24rpx;
+.TempContainer .RemindButton1{
+  justify-content: flex-start;
+  margin: 30rpx 0 0 0;
+}
+
+.TempContainer .RemindButton10{
+  width:140rpx;
+}
+
+.TempContainer .RemindButton11{
+  font-size:28rpx;
   color:#fff;
-  width:620rpx;
+}
+.TempContainer .RemindButton12{
+  font-size:20rpx;
+  color:#D2D2D2;
+  margin-left: 140rpx;
+}
+.TempContainer .RemindButton120{
+  margin-left: 0rpx;
+}
+.TempContainer .RemindButton13{
+  height:30rpx;
 }
 
-.TempContainer .RemindText5{
-  margin-top: 60rpx;
+.TempContainer .RemindLine{
+  width:100%;
+  height:1rpx;
+  background-color:rgba(0,0,0,0.25);
+}
+
+.TempContainer .RemindText3{
+  font-size:24rpx;
+  color:#D2D2D2;
+  width:670rpx;
+  margin-top: 31rpx;
 }
 
-.TempContainer .color2{
-  color:#B6F57F;
+.TempContainer .RemindText4{
+  font-size:20rpx;
+  color:#D2D2D2;
+  width:670rpx;
+  margin-top: 20rpx;
+  margin-bottom: 30rpx;
 }
 
-.TempContainer .btn2{
-  width:290rpx;
-  margin: 60rpx 15rpx 0 15rpx;
-}
+.TempContainer .footer{
+  font-size:28rpx;
+  color:#fff;
+  border-top:1rpx solid rgba(0,0,0,0.25);
+  text-align: center;
+  width:100%;
+  height: 100rpx;
+  line-height: 100rpx;
+  position: fixed;
+  bottom: 0;
+}

pages/plan/studyplandetail.js

@@ -64,7 +64,7 @@ Page({
 
         if (that.data.CardType == 0) {
           if (info.CardNumber > 0) {
-            limitNumber = data.NewCardNumber + data.LimitCardNumber;
+            limitNumber = data.NewLimitTimeToday + data.HistoryLimitTimeToday;
             cardTotal = info.CardNumberCommon;
             if (cardTotal>0)
               rate = limitNumber / cardTotal;
@@ -74,7 +74,7 @@ Page({
         }
         else if (that.data.CardType == 1) {
           if (info.CardNumber > 0) {
-            limitNumber = data.NewCardNumber + data.LimitCardNumber;
+            limitNumber = data.NewLimitTimeToday + data.HistoryLimitTimeToday;
             cardTotal = info.CardNumberUrgent;
             if (cardTotal>0)
               rate = limitNumber / cardTotal;
@@ -85,16 +85,23 @@ Page({
             title: "紧急练习方案"
           });
         }
-        fanObj.init(that, rate, 100, 3.0, "#FF8C83", "#f0f0f0", limitNumber);
+        fanObj.init(that, rate, 100, 3.0, "#FE6659", "#FFC1A8", null);
 
 
         that.setData({
           LimitCardNumber:limitNumber,
           CardNumberCurrent: cardTotal,
-          NewCardNumber: data.NewCardNumber,
-          NewCardNumberToday: data.NewCardNumberToday,
-          HistoryCardNumber: data.LimitCardNumber,
-          HistoryCardNumberToday: data.LimitCardNumberToday,
+          
+          NewCardAll: data.NewCardAll,
+          HistoryCardAll: data.HistoryCardAll,
+          
+          NewToday: data.NewToday,
+          
+          NewLimitTimeToday: data.NewLimitTimeToday,
+          HistoryLimitTimeToday: data.HistoryLimitTimeToday,
+          
+          NewCardNumberAndLimitToday: data.NewCardNumberAndLimitToday,
+          HistoryCardNumberAndLimitToday: data.HistoryCardNumberAndLimitToday,
         });
       }
     });

pages/plan/studyplandetail.wxml

@@ -1,171 +1,181 @@
 <import src="../template/Fan.wxml" />
 
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <view class="line"></view>
-  <view class="panelTitle FlexRow">
-    <image class="universalpic_plan_2line_black_30x32" src="../images/universalpic_plan_data_black_30x32.png" />
-    <view class="panelTitle1">参考数据</view>
-  </view>
-  <view class="lineWidthAll1 FlexRow">
-    <view class="lineWidth690"></view>
-  </view>
-  <view class="panelItem FlexRow">
-    <view class="panelItem1 FlexColumn">
-      <template class="fan" is="fanTemplate" data="{{Angle1,Angle2,BGColor,FanSize,FanScale,Color1,Color2,ShowNumber}}">
-      </template>
-      <view class="list FlexColumn">
-        <view class="item FlexRow">
-          <view class="block1 block"></view>
-          <view class="text6">已到期题卡</view>
-          <view class="Number1">{{LimitCardNumber}}</view>
-          <view class="text6">张</view>
-        </view>
-        <view class="item FlexRow">
-          <view class="block2 block"></view>
-          <view class="text6">方案有题卡</view>
-          <view class="Number1">{{CardNumberCurrent}}</view>
-          <view class="text6">张</view>
-        </view>
-        <view class="item FlexRow">
-          <view class="block"></view>
-          <view class="text6">其中今天新建</view>
-          <view class="Number1">{{NewCardNumberToday}}</view>
-          <view class="text6">张</view>
-        </view>
-      </view>
-      <view class="cardFull" wx:if="{{CardType==1 && CardNumberCurrent>=200}}">容量已满</view>
-      
-    </view>
-    <view class="line2"></view>
-    <view class="panelItem1 FlexColumn">
-      <view class="panelItem11 FlexColumn">
-        <view class="list1 list FlexColumn">
-          <view class="item FlexRow">
-            <view class="text6">已到期</view>
-            <view style="width:10rpx"></view>
-            <view class="text6">新</view>
-            <view class="Number1">{{NewCardNumber}}</view>
-            <view class="text6">张</view>
-            <view style="width:10rpx"></view>
-            <view class="text6"> 旧</view>
-            <view class="Number1">{{HistoryCardNumber}}</view>
-            <view class="text6">张</view>
-          </view>
-          <view class="item FlexRow">
-            <text class="text9">到期数量较多时请调整任务限量</text>
-          </view>
-          <view class="item FlexRow">
-            <text class="text9">限制当天需要练习的题卡数</text>
-          </view>
-        </view>
-      </view>
-      <view class="panelItem12 panelItem11 FlexColumn">
-        <view class="list1 list FlexColumn" wx:if="{{CardType==0}}">
-          <view class="item FlexRow">
-            <view class="text6">其中今天到期</view>
-          </view>
-          <view class="item FlexRow">
-            <view class="text6">新</view>
-            <view class="Number1">{{NewCardNumberToday}}</view>
-            <view class="text6">张</view>
-            <view style="width:10rpx"></view>
-            <view class="text6">旧</view>
-            <view class="Number1">{{HistoryCardNumberToday}}</view>
-            <view class="text6">张</view>
-          </view>
-          <view class="item FlexRow">
-            <text class="text9">该数量较多时可调整选取规则</text>
-          </view>
-        </view>
-
-        <view class="list1 list FlexColumn" wx:if="{{CardType==1}}">
-          <view class="item FlexRow">
-            <view class="text6">本方案最多容纳</view>
-            <view class="Number11 Number1">200</view>
-            <view class="text6">张</view>
-          </view>
-          <view class="item FlexRow">
-            <text class="text9">使用过程中请适当调配题卡</text>
-          </view>
-          <view class="item FlexRow">
-            <text class="text9">于官网操作更便捷</text>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
-  <view class='lineFooter'></view>
-  <view class="line"></view>
-
-  <view class="panelTitle3 FlexRow">
-    <view class="left">任务限制</view>
-    <view class="right"></view>
-  </view>
-  
-  <picker class="panelItem0" bindchange="bindUpdateCardNumberNewMax" value="{{CardMaxNumberNewIndex}}" range="{{CardNumberNew}}">
-		<view class="panelItem FlexRow">
-			<view class="panelItem3">新题卡数量上限</view>
-			<view class="panelItem4 FlexRow">
-				<view class="picker" wx:if="{{CardType=='0'}}">
-					{{CardMaxNumberNew}}张
-				</view>
-        <view class="picker" wx:if="{{CardType=='1'}}">
-					{{CardMaxNumberNewUrgent}}张
+	<view class="line"></view>
+	<view class="panelTitle FlexRow">
+		<image class="universalpic_plan_2line_black_30x32" src="../images/universalpic_plan_data_black_30x32.png" />
+		<view class="panelTitle1">参考数据</view>
+	</view>
+	<view class="lineWidthAll1 FlexRow">
+		<view class="lineWidth690"></view>
+	</view>
+	<view class="panelItem0 panelItem FlexRow">
+		<template class="fan" is="fanTemplate" data="{{Angle1,Angle2,BGColor,FanSize,FanScale,Color1,Color2,ShowNumber}}">
+		</template>
+	</view>
+	<view class="panelItem FlexColumn">
+		<view class="panelItemSquare FlexRow">
+			<view class="panelItemSquare1 FlexColumn">
+				<view class="panelItemSquare11 FlexRow">
+					<view class="block1 block"></view>
+					<view class="panelItemSquare111">题卡数量</view>
+				</view>
+				<view class="panelItemSquare11 FlexRow">
+					<view class="panelItemSquare112" wx:if="{{CardType=='0'}}">日常练习方案包含题卡总数</view>
+					<text class="panelItemSquare112" wx:if="{{CardType=='1'}}">紧急练习方案最多容纳200张\n使用过程中请适当调配题卡</text>
+				</view>
+			</view>
+			<view class="panelItemSquare2 FlexColumn">
+				<view class="panelItemSquare21 FlexRow">
+					<view class="panelItemSquare210" wx:if="{{CardType=='1' && CardNumberCurrent>=200}}">容量已满</view>
+					<view class="Number61">{{CardNumberCurrent}}</view>
+					<view class="panelItemSquare212">张</view>
+				</view>
+				<view class="panelItemSquare22 FlexRow">
+					<view class="panelItemSquare221">新题卡</view>
+					<view class="Number62">{{NewCardAll}}</view>
+				</view>
+				<view class="panelItemSquare23 FlexRow">
+					<view class="panelItemSquare221">旧题卡</view>
+					<view class="Number62">{{HistoryCardAll}}</view>
 				</view>
-				<image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
 			</view>
 		</view>
-	</picker>
-	<view class="lineWidthAll FlexRow">
-		<view class="lineWidth720"></view>
-	</view>
-	<picker class="panelItem0" bindchange="bindUpdateCardNumberHistoryMax" value="{{CardMaxNumberHistoryIndex}}" range="{{CardNumberOld}}">
-		<view class="panelItem FlexRow">
-			<view class="panelItem3">旧题卡数量上限</view>
-			<view class="panelItem4 FlexRow">
-				<view class="picker" wx:if="{{CardType=='0'}}">
-					{{CardMaxNumberHistory}}张
+		<view class="lineWidthAll1 FlexRow">
+			<view class="lineWidth240"></view>
+		</view>
+		<view class="panelItemSquare0 panelItemSquare FlexRow">
+			<view class="panelItemSquare1 FlexColumn">
+				<view class="panelItemSquare11 FlexRow">
+					<view class="panelItemSquare112">新建属于<block wx:if="{{CardType=='0'}}">日常</block>
+						<block wx:if="{{CardType=='1'}}">紧急</block>练习的题卡
+					</view>
 				</view>
-				<view class="picker" wx:if="{{CardType=='1'}}">
-					{{CardMaxNumberHistoryUrgent}}张
+			</view>
+			<view class="panelItemSquare2 FlexColumn">
+				<view class="panelItemSquare23 FlexRow">
+					<view class="panelItemSquare221">今日新建</view>
+					<view class="panelItemSquare222">{{NewToday}}</view>
 				</view>
-				<image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
 			</view>
 		</view>
-	</picker>
-	<view class='lineFooter'></view>
-  
-  <block wx:if="{{CardType=='0'}}">
-  <view class="panelTitle3 FlexRow">
-    <view class="left">内容组织</view>
-    <view class="right"></view>
-  </view>
-  <view class="panelItem FlexRow" bindtap='setSortType'>
-    <view class="panelItem3">优先规则</view>
-    <view class="panelItem4 FlexRow">
-      <view class="picker">
-        {{SortType}}
-      </view>
-      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
-    </view>
-  </view>
-  </block>
-  <view class='lineFooter'></view>
-  <view class="panelItem5 FlexRow">
-    <image src='../images/universalpic_exmark_black_26x26.png' class="universalpic_exmark_black_26x26" />
-    <view class="text7">如要调整方案中的题卡内容请至官网www.kylx365.com</view>
-  </view>
-  <view style="height:50rpx;"></view>
-  <view class="panelItem FlexColumn">
-		<view class="panelTitle00 panelTitle FlexRow">
-			<view class="panelTitle2">任务限量用途说明</view>
+		<view class="lineWidthAll1 FlexRow">
+			<view class="lineWidth654"></view>
+		</view>
+
+		<view class="panelItemSquare0 panelItemSquare FlexRow">
+			<view class="panelItemSquare1 FlexColumn">
+				<view class="panelItemSquare11 FlexRow">
+					<view class="block2 block"></view>
+					<view class="panelItemSquare111">到期题卡</view>
+				</view>
+				<view class="panelItemSquare11 FlexRow">
+					<text class="panelItemSquare112">题卡到期才能被练习，到期题卡足够多\n才有满额的任务量，太多时设任务限量</text>
+				</view>
+			</view>
+			<view class="panelItemSquare2 FlexColumn">
+				<view class="panelItemSquare21 FlexRow">
+					<view class="Number61">{{LimitCardNumber}}</view>
+					<view class="panelItemSquare212">张</view>
+				</view>
+				<view class="panelItemSquare22 FlexRow">
+					<view class="panelItemSquare221">新题卡</view>
+					<view class="Number62">{{NewLimitTimeToday}}</view>
+				</view>
+				<view class="panelItemSquare23 FlexRow">
+					<view class="panelItemSquare221">旧题卡</view>
+					<view class="Number62">{{HistoryLimitTimeToday}}</view>
+				</view>
+			</view>
 		</view>
-		<text class="text8">限制“今天学习任务”（任务量）的题卡数量。当任务量太多学习时间过长时，通过限制新、旧题卡数量把学习时间和难度控制在可接受范围内。\n
-      通常，新题卡比旧题卡难度较大，练习时间也更长。建议新、旧题卡数量之比维持的1:3到1:5之间。\n
-      常见误区：本功能用于对数量的“限制”，而不是要求任务量必须达到这个数量。假设，数量限制是50张题卡，但到期题卡仅有30张时，则按实际情况练习30张，并不会补足20张题卡。当日最适合回想的知识是根据到期时间来安排的，和数量限制无关。另一方面，要让本功能发挥作用，必须有足够的题卡数量和较多的到期题卡数量。
-    </text>
-		<view style="height:40rpx;"></view>
+		<view style="height:20rpx;" wx:if="{{CardType=='1'}}"></view>
+		<block wx:if="{{CardType=='0'}}">
+			<view class="lineWidthAll1 FlexRow">
+				<view class="lineWidth240"></view>
+			</view>
+			<view class="panelItemSquare01 panelItemSquare0 panelItemSquare FlexRow">
+				<view class="panelItemSquare1 FlexColumn">
+					<view class="panelItemSquare11 FlexRow">
+						<text class="panelItemSquare112">最适合今天回想的题卡数量\n选取规则为今天优先能率先练习它们</text>
+					</view>
+				</view>
+				<view class="panelItemSquare2 FlexColumn">
+					<view class="panelItemSquare21 FlexRow">
+						<view class="panelItemSquare221">今日到期</view>
+					</view>
+					<view class="panelItemSquare22 FlexRow">
+						<view class="panelItemSquare221">新题卡</view>
+						<view class="Number62">{{NewCardNumberAndLimitToday}}</view>
+					</view>
+					<view class="panelItemSquare23 FlexRow">
+						<view class="panelItemSquare221">旧题卡</view>
+						<view class="Number62">{{HistoryCardNumberAndLimitToday}}</view>
+					</view>
+				</view>
+			</view>
+		</block>
 	</view>
 	<view class='lineFooter'></view>
-  <view style="height:100rpx;"></view>
+	<view class="line"></view>
+
+	<view class="panelItemCircle FlexColumn">
+		<view class="panelItemCircleTop panelItemCircle1 FlexRow">
+			<view class="panelItemCircle11 FlexColumn">
+				<view class="panelItemCircle1110 panelItemCircle111">任务限量</view>
+			</view>
+			<view>
+			</view>
+		</view>
+		<view class="line2"></view>
+		<picker class="panelItemCircle1" bindchange="bindUpdateCardNumberNewMax" value="{{CardMaxNumberNewIndex}}" range="{{CardNumberNew}}">
+			<view class="panelItem FlexRow">
+				<view class="panelItemCircle11 FlexColumn">
+					<view class="panelItemCircle111">新题卡数量上限</view>
+				</view>
+				<view class="panelItemCircle12 FlexRow">
+					<view class="picker" wx:if="{{CardType=='0'}}">
+						{{CardMaxNumberNew}}张
+					</view>
+					<view class="picker" wx:if="{{CardType=='1'}}">
+						{{CardMaxNumberNewUrgent}}张
+					</view>
+					<image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+				</view>
+			</view>
+		</picker>
+		<view class="line2"></view>
+		<picker class="panelItemCircleBottom panelItemCircle1" bindchange="bindUpdateCardNumberHistoryMax" value="{{CardMaxNumberHistoryIndex}}" range="{{CardNumberOld}}">
+			<view class="panelItemCircleBottom panelItem FlexRow">
+				<view class="panelItemCircle11 FlexColumn">
+					<view class="panelItemCircle111">旧题卡数量上限</view>
+				</view>
+				<view class="panelItemCircle12 FlexRow">
+					<view class="picker" wx:if="{{CardType=='0'}}">
+						{{CardMaxNumberHistory}}张
+					</view>
+					<view class="picker" wx:if="{{CardType=='1'}}">
+						{{CardMaxNumberHistoryUrgent}}张
+					</view>
+					<image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+				</view>
+			</view>
+		</picker>
+	</view>
+	<view class="line"></view>
+
+	<block wx:if="{{CardType=='0'}}">
+		<view class="panelItemCircle FlexRow" bindtap='setSortType'>
+			<view class="panelItemCircle110 panelItemCircle11 FlexColumn">
+				<view class="panelItemCircle111">选取规则</view>
+				<view class="panelItemCircle112">规定挑选题卡的方法</view>
+			</view>
+			<view class="panelItemCircle12 FlexRow">
+				<view class="picker">
+					{{SortType}}
+				</view>
+				<image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+			</view>
+		</view>
+	</block>
+	<view class="footerHeight"></view>
 </view>

pages/plan/studyplandetail.wxss

@@ -2,19 +2,15 @@
 
 .container{
   font-size:28rpx;
+  color:#4D4D4D;
 }
 
 .line{
   width:100%;
-  height:30rpx;
+  height:20rpx;
   background-color: #F0F0F0;
 }
 
-.lineWidthAll1{
-  width: 100%;
-  background-color: #fff;
-  height: 1rpx;
-}
 .panelTitle{
   width:100%;
   justify-content: flex-start;
@@ -31,50 +27,10 @@
 
 .panelTitle1{
   margin-left: 10rpx;
-  color: #4D4D4D;
-}
-
-.panelItem{
-  width:100%;
-  background-color: #fff;
-  justify-content: space-between;
-}
-
-.panelItem1{
-  width:50%;
-  height:319rpx;
-  position: relative;
-}
-
-.cardFull{
-  position: absolute;
-  width:120rpx;
-  height:40rpx;
-  color:#fff;
-  background-color: #FE6659;
-  border-radius: 20rpx;
-  line-height: 40rpx;
-  font-size:20rpx;
-  text-align: center;
-  top:40rpx;
-  left:30rpx;
-  z-index: 20;
-}
-
-.line2{
-  width:2rpx;
-  height:219rpx;
-  background-color: #E3E3E3;
 }
 
-.panelItem11{
-  margin-left: 40rpx;
-  align-items: flex-start;
-  align-self: flex-start;
-}
-
-.panelItem12{
-  margin-top: 27rpx;
+.lineWidth690{
+  margin-right: 30rpx;
 }
 
 .fan{
@@ -86,131 +42,196 @@
   text-align: center;
   line-height: 100rpx;
   font-size:28;
-  margin-bottom: 20rpx;
+  margin-top: 40rpx;
+  margin-bottom: 30rpx;
+  justify-self: center;
 }
 
-.text5{
-  font-size:24rpx;
-  margin-top:20rpx;
+.lineWidthAll1{
+  width: 100%;
+  background-color: #fff;
+  height: 1rpx;
+  justify-content: flex-end;
+}
+.lineWidth240{
+  width: 240rpx;
+  background-color: #E3E3E3;
+  height: 1rpx;
+  margin-right: 30rpx;
+}
+.lineWidth654{
+  width: 654rpx;
+  background-color: #E3E3E3;
+  height: 1rpx;
+  margin-right: 30rpx;
+}
+.panelItem{
+  width:100%;
+  background-color: #fff;
+  justify-content: space-between;
+}
+.panelItem0{
+  justify-content: center;
 }
 
-.list{
+.panelItemSquare{
+  width:100%;
+  justify-content: space-between;
   align-items: flex-start;
-  font-size:24rpx;
 }
-.list1{
-  align-items: flex-start;
+
+.panelItemSquare0{
+  margin-top: 20rpx;
 }
 
-.item{
-  width:100%;
+.panelItemSquare01{
+  margin-bottom: 20rpx;
+}
+
+.panelItemSquare1{
+  justify-content: flex-start;
+  align-items: flex-start;
+  margin-left: 30rpx;
+}
+.panelItemSquare11{
   justify-content: flex-start;
-  margin-bottom: 5rpx; 
 }
 
 .block{
-  width:10rpx;
-  height:10rpx;
-  margin-right: 10rpx;
+  width:16rpx;
+  height:16rpx;
   background-color: #fff;
+  border-radius: 4rpx;
+  margin:0 20rpx 0 0;
 }
 .block1{
-  background-color: #FF8C83;
-  border:1rpx solid #BF524A;
+  background-color: #FFC1A8;
 }
 .block2{
-  background-color: #F0F0F0;
-  border:1rpx solid #9B9B9B;
+  background-color: #FE6659;
 }
 
-.Number1{
-  font-size: 24rpx;
-  font-family: Roboto-Black;
-  margin: 0 5rpx 0rpx 5rpx;
+.panelItemSquare111{
+  font-size: 28rpx;
 }
-
-.Number11{
+.panelItemSquare112{
+  font-size: 20rpx;
   color:#787878;
+  margin-left: 36rpx;
+  margin-top: 4rpx;
 }
 
-.text6{
-  font-size:24rpx;
-  color:#787878;
-}
 
-.text9{
-  font-size:20rpx;
-  color:#787878;
+.panelItemSquare2{
+  justify-content: flex-start;
+  align-items: flex-end;
+  margin-right: 30rpx;
 }
 
-.Arrow{
-  width:16rpx;
-  height:26rpx;
-  margin-left: 30rpx;
+.panelItemSquare21{
+  justify-content: flex-end;
+  align-items: flex-end;
 }
-
-.panelTitle3{
-  width:100%;
-  background-color:  #F0F0F0;
-  height:75rpx;
-  align-items: flex-start;
-  justify-content: space-between;
-  margin-top: 50rpx;
+.Number61{
+  font-size: 36rpx;
+  font-family: Roboto-Black;
 }
-.left{
-  margin: 0 0 30rpx 30rpx;
-  font-size:32rpx;
+.panelItemSquare210{
+  font-size: 20rpx;
+  text-align: center;
+  width:120rpx;
+  height:40rpx;
+  line-height: 40rpx;
+  background-color: #ffc1a8;
+  border-radius: 20rpx;
+  margin-right: 20rpx;
 }
-
-.panelItem0 {
-  width: 100%;
+.panelItemSquare212{
+  font-size: 20rpx;
+  margin-left: 4rpx;
+  margin-bottom: 4rpx;
 }
-
-.panelItem3{
-  margin-left: 30rpx;
-  line-height: 101rpx;
-  font-weight: 400;
+.panelItemSquare22{
+  margin-top:10rpx;
 }
-.panelItem4{
-  margin-right: 30rpx;
+.panelItemSquare221{
+  font-size: 24rpx;
+  color:#787878;
+  margin-right:10rpx;
 }
 
-.picker{
-  color:#787878;
-  font-weight: 400;
+.Number62{
+  font-size: 24rpx;
+  font-family: Roboto-Black;
 }
 
-.universalpic_exmark_black_26x26{
-  width:26rpx;
-  height:26rpx;
-  margin-right: 10rpx;
+.panelItemSquare23{
+  margin-bottom: 20rpx;
 }
 
+.panelItemCircle{
+  width:710rpx;
+  border-radius: 20rpx;
+  background-color: #fff;
+  justify-content: space-between;
+}
 
-.panelItem5{
+.panelItemCircleTop{
+  border-top-left-radius: 20rpx;
+  border-top-right-radius: 20rpx;
+}
+.panelItemCircleBottom{
+  border-bottom-left-radius: 20rpx;
+  border-bottom-right-radius: 20rpx;
+}
+.panelItemCircle1{
   width:100%;
-  background-color: #F0F0F0;
-  margin-top: 30rpx;
+  height: 100rpx;
+  justify-content: space-between;
 }
-.text7{
-  font-size:24rpx;
+
+.panelItemCircle11{
+  font-size: 28rpx;
+  margin-left:30rpx;
+  height: 100rpx;
   font-weight: 400;
+  align-items: flex-start;
+}
+.panelItemCircle110{
+  height: 132rpx;
+}
+.panelItemCircle111{
+  font-size: 28rpx;
+  color:#1e1e1e;
+}
+.panelItemCircle1110{
+  color:#4D4D4D;
 }
 
+.panelItemCircle112{
+  font-size: 20rpx;
+  color:#787878;
+  margin-top: 4rpx;
+}
 
-.panelTitle00 {
-  margin-top: 20rpx;
+.panelItemCircle12{
+  margin-right: 30rpx;
 }
 
-.panelTitle2 {
-  font-size: 32rpx;
+.Arrow{
+  width:16rpx;
+  height:26rpx;
   margin-left: 30rpx;
-  margin-bottom: 30rpx;
 }
 
 
-.text8{
-  font-size:24rpx;
+.picker{
+  color:#787878;
   font-weight: 400;
-  width:690rpx;
-}
+}
+
+.line2{
+  width: 100%;
+  height:1rpx;
+  background-color: #E3E3E3;
+}

pages/template/Fan.wxml

@@ -7,7 +7,7 @@
       </view>
     </view>
     <view class="shanxingSmall" style="width:{{FanSize-FanSize/FanScale}}rpx;height:{{FanSize-FanSize/FanScale}}rpx;line-height:{{FanSize-FanSize/FanScale}}rpx;left:{{FanSize/(FanScale*2)}}rpx;top:{{FanSize/(FanScale*2)}}rpx;">
-      {{ShowNumber}}
+      <block wx:if="{{ShowNumber}}">{{ShowNumber}}</block>
     </view>
   </view>
 </template>
@@ -21,7 +21,7 @@
       </view>
     </view>
     <view class="shanxingSmall" style="width:{{FanSize2-FanSize2/FanScale2}}rpx;height:{{FanSize2-FanSize2/FanScale2}}rpx;line-height:{{FanSize2-FanSize2/FanScale2}}rpx;left:{{FanSize2/(FanScale2*2)}}rpx;top:{{FanSize2/(FanScale2*2)}}rpx;">
-      {{ShowNumber2}}
+      <block wx:if="{{ShowNumber2}}">{{ShowNumber2}}</block>
     </view>
   </view>
 </template>

pages/template/Fan.wxss

@@ -25,7 +25,6 @@
   left: 14rpx;
   top: 14rpx;
   font-family: 'Roboto-Black';
-  color:#1e1e1e;
 }
 
 .sx1 {

project.config.json

@@ -21,7 +21,9 @@
 			"ignore": [],
 			"disablePlugins": [],
 			"outputPath": ""
-		}
+		},
+		"useCompilerModule": true,
+		"userConfirmedUseCompilerModuleSwitch": false
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.7.3",
@@ -103,7 +105,7 @@
 					"id": 6,
 					"name": "pages/index/index",
 					"pathName": "pages/index/index",
-					"query": "type=paycustom&PayUserID=1&DayNumber=100&Price=258&Remark=123 456",
+					"query": "type=video&LessonID=2&LessonPage=2",
 					"scene": null
 				},
 				{

utils/constant.js

@@ -1,4 +1,44 @@
 module.exports = {
+  arrMenuText:[
+    {
+      Text1:"整体练习可以吗？",
+      Text2:"恭喜您，制作了第一张紧急练习题卡。\n要练习这张题卡必须更改学习计划的模式，现在就切换吗？",
+      List:[
+        {
+          Name:"启用整体练习",
+          Name2:"串联日常练习方案和紧急练习方案的任务量",
+          Url:"../plan/studyplan?CardType=2",
+          IsUrl:false,
+        },{
+          Name:"启用紧急练习",
+          Name2:"单一紧急练习",
+          Url:"../plan/studyplan?CardType=1",
+          IsUrl:false,
+        },
+      ],
+      Text3:"切换后您将看到",
+      Text4:"重新规划今天的任务量。首页、学习计划的参考数据将被更新。请回到首页，重新开始今天的练习（不管之前有无练习）。系统会保存本次选择，无须重复切换。\n\n日常练习、紧急练习的任务量设置是各自独立的。",
+      Text5:"以后再说",
+      Text6:"保持日常练习，日后可在首页打开学习计划手动更改",
+    },
+    {
+      Text1:"高级模式可以吗？",
+      Text2:"恭喜您，已度过秒过入门期。\n想不想试试记忆评价的高级模式呢？79%的家长在用了。",
+      List:[
+        {
+          Name:"去设置",
+          Name2:"按键增加至四色，能更准确地操作记忆评价，\n对长期练习有极大帮助",
+          Url:"../plan/pattern",
+          IsUrl:true,
+        },
+      ],
+      Text3:"",
+      Text4:"",
+      Text5:"以后再说",
+      Text6:"保持基本模式，日后可在学习计划中打开设置手动更改",
+    },
+    
+  ],
   arrMemoryLevelAll: [{
       Name: "基本模式",
       Name2: "三色按键，通俗易懂，容易操作，适合初学者",
@@ -82,7 +122,7 @@ module.exports = {
       Remark: "暂不练习，到期时间留白"
     },
   ],
-  arrSortType: ["自由安排", "到期时间较早的题卡", "到期时间较近的题卡"],
+  arrSortType: ["智能规划", "最早优先", "今天优先"],
   arrFontSize: [{
       Name: "紧凑",
       Value: 36

utils/main.js

@@ -357,20 +357,12 @@ function changeStringToView(field) {
                       value: temp1,
                     });
                   } else {
-                    if (arr[k].indexOf("[线]") > 0) {
+                    if (temp && temp.indexOf("[线]") < 0) {
                       content.push({
                         key: "normal",
                         value: temp,
                       });
                       temp = "";
-                    } else {
-                      if (temp && temp.indexOf("[线]") < 0) {
-                        content.push({
-                          key: "normal",
-                          value: temp,
-                        });
-                        temp = "";
-                      }
                     }
                   }
                 } else if ((num1 > num2 && num1 >= 0 && num2 >= 0) || (num1 < 0 && num2 >= 0)) {
@@ -381,13 +373,6 @@ function changeStringToView(field) {
                       value: temp1,
                     });
                   } else {
-                    if (arr[k].indexOf("[光]") > 0) {
-                      content.push({
-                        key: "normal",
-                        value: temp,
-                      });
-                      temp = "";
-                    } else {
                       if (temp && temp.indexOf("[光]") < 0) {
                         content.push({
                           key: "normal",
@@ -395,7 +380,6 @@ function changeStringToView(field) {
                         });
                         temp = "";
                       }
-                    }
                   }
                 } else {
                   content.push({
@@ -1084,8 +1068,9 @@ function getUserConfig() {
   var that = this;
   postData('UploadUserConfig?Type=getData&UserID=' + app.globalData.userInfo.UserID, {}, function (data) {
 
-    var cardType = wx.getStorageSync("CardType");
-
+    if (!data.CardType)
+      data.CardType=0;
+      
     wx.setStorageSync("CardType", data.CardType);
     wx.setStorageSync("CardMaxNumberNew", data.CardMaxNumberNew);
     wx.setStorageSync("CardMaxNumberHistory", data.CardMaxNumberHistory);