1.1.7

app.js

@@ -11,7 +11,7 @@ App({
     this.globalData.systemInfo = wx.getSystemInfoSync();
   },
   globalData: {
-    Version: "1.1.6",
+    Version: "1.1.8",
     IsProduction: true,
     ProgramID: 106,
     AppID: "wx313a8f2c0741efe1",

app.json

@@ -6,8 +6,7 @@
     "pages/main/detail",
     "pages/main/search",
     "pages/main/setcombine",
-    "pages/about/about",
-    "pages/about/cooperation",
+    "pages/main/review",
     "pages/about/payfinished",
     "pages/about/paylist",
     "pages/about/newuserlist",

pages/about/about.js

@@ -1,45 +0,0 @@
-import common from '../../utils/util';
-import server from '../../utils/main';
-
-const app = getApp();
-
-Page({
-  data: {
-    ListProgram: [],
-  },
-  onLoad: function (options) {
-    this.setData({
-      ListProgram: server.getProgramList(),
-    });
-
-    if (options.id == "Cooperation") {
-      wx.pageScrollTo({
-        scrollTop: 905
-      });
-    }
-
-  },
-  switchProgram: function (e) {
-    wx.navigateToMiniProgram({
-      appId: e.currentTarget.dataset.appid,
-      path: e.currentTarget.dataset.path,
-      extraData: {
-      },
-      success(res) {
-        // 打开成功
-      }
-    });
-  },
-  getAppID: function (e) {
-    wx.navigateTo({
-      url: "../about/cooperation"
-    });
-  },
-  onShareAppMessage: function () {
-    return {
-      title: app.globalData.ShareTitle,
-      path: 'pages/index/index?UserID=' + app.globalData.userInfo.UserID,
-      imageUrl: '../../images/07001.png',
-    }
-  },
-})

pages/about/about.wxml

@@ -1,7 +0,0 @@
-<view class="container FlexColumn">
-  <image src="../../images/06001.png" class="bg" />
-  <view style='height:100rpx;'></view>
-
-  <view class="btn" wx:for="{{ListProgram}}" wx:key="index" style='left:{{item.left}}rpx;top:{{item.top}}rpx;' bindtap='switchProgram' data-appid="{{item.appId}}" data-path="{{item.path}}"></view>
-  <view class="getAppID" bindtap='getAppID' ></view>
-</view>

pages/about/about.wxss

@@ -1,24 +0,0 @@
-.container {
-  background-color: #F5E2BE;
-  justify-content: flex-start;
-  color: #872439;
-}
-
-.bg{
-  width:630rpx;
-  height:2683rpx;
-  margin-top: 40rpx;
-}
-
-.btn{
-  width:216rpx;
-  height:284rpx;
-  position: absolute;
-}
-.getAppID{
-  width:630rpx;
-  height:130rpx;
-  position: absolute;
-  top:2163rpx;
-  left:60rpx;
-}

pages/about/cooperation.js

@@ -1,88 +0,0 @@
-import common from '../../utils/util';
-import server from '../../utils/main';
-
-const app = getApp();
-
-Page({
-  data: {
-    IsInput: true,
-    Name: "",
-    Contact: "",
-    ChannelID: 0,
-  },
-  onLoad: function (options) {
-    this.setData({
-      IsInput: true,
-      Name: "",
-      Contact: "",
-      AppID: app.globalData.AppID,
-      Height: common.getSystemHeight(),
-    });
-  },
-  bindKeyInput1: function (e) {
-    this.setData({
-      Name: e.detail.value
-    })
-  },
-  bindKeyInput2: function (e) {
-    this.setData({
-      Contact: e.detail.value
-    })
-  },
-  save: function () {
-    if (this.data.Name.length > 0 && this.data.Contact.length > 0) {
-      if (common.IsChinese(this.data.Contact)) {
-        wx.showToast({
-          title: '请输入有效信息',
-          icon: 'success',
-          duration: 2000
-        })
-      }
-      else {
-        var that = this;
-        server.getData('AddChannel?Name='
-          + this.data.Name + '&Contact='
-          + this.data.Contact + '&ProgramID='
-          + app.globalData.ProgramID + '&UserID='
-          + app.globalData.userInfo.UserID, function (data) {
-            if (data) {
-              that.setData({
-                IsInput: false,
-                ChannelID: data.insertId,
-              });
-            }
-          });
-      }
-    }
-    else {
-      wx.showToast({
-        title: '请输入有效信息',
-        icon: 'success',
-        duration: 2000
-      })
-    }
-  },
-  setClipboardData: function () {
-    wx.setClipboardData({
-      data: '小程序AppID:' + app.globalData.AppID + ' 小程序启动Path:pages/index/index?SourceID=' + this.data.ChannelID,
-      success: function (res) {
-        wx.getClipboardData({
-          success: function (res) {
-            wx.showToast({
-              title: '存入剪贴板',
-              icon: 'success',
-              duration: 2000
-            })
-          }
-        })
-      }
-    })
-  },
-  onShareAppMessage: function () {
-    return {
-      title: app.globalData.ShareTitle,
-      path: 'pages/index/index?UserID=' + app.globalData.userInfo.UserID,
-      imageUrl: '../../images/07001.png',
-    }
-  },
-});

pages/about/cooperation.json

@@ -1,6 +0,0 @@
-{
-  "navigationBarBackgroundColor": "#F5E2BE",
-  "navigationBarTitleText": "业务合作",
-  "backgroundColor": "#F5E2BE",
-  "enablePullDownRefresh": false
-}

pages/about/cooperation.wxml

@@ -1,54 +0,0 @@
-<view class="container FlexColumn" style='height:{{Height}}rpx;'>
-  <view class="panel1"></view>
-  <view class="panel4 FlexRow">
-    <image class="image06002" src="../../images/06002.png" />
-  </view>
-
-
-  <view class="text1">关联你的公众号</view>
-  <view class="line"></view>
-  <view class="panel2 FlexColumn" wx:if="{{IsInput}}">
-    <view class="text2">请登记</view>
-    <view class="panel3 FlexColumn">
-      <view class="text3">您的公众号名称</view>
-      <view class="input1 FlexRow">
-        <input class="input1_1" placeholder="" maxlength="30" focus="true" bindinput='bindKeyInput1' />
-      </view>
-    </view>
-    <view class="panel3 FlexColumn">
-      <view class="text3">能够联络到您的微信号</view>
-      <view class="input1 FlexRow">
-        <input class="input1_1" placeholder="" maxlength="30" bindinput='bindKeyInput2' />
-      </view>
-    </view>
-    <view class="text4">请完整、正确填写，非公众号经营者请勿登记。</view>
-    <view class="btn" bindtap="save">
-      <view class="btn1">登记</view>
-    </view>
-    <view class="text5">以上信息保密，仅供合作联系之用。</view>
-
-  </view>
-
-  <view class="panel2 FlexColumn" wx:if="{{!IsInput}}">
-    <view class="text2">请记录</view>
-    <view class="panel3 FlexColumn">
-      <view class="text3">小程序APPID</view>
-      <text class="input2" bindtap='setClipboardData'>{{AppID}}</text>
-    </view>
-    <view class="panel3 FlexColumn">
-      <view class="text3">在path中填写</view>
-      <view class="input3 input2 FlexRow" bindtap='setClipboardData'>
-        <text>pages/index/index</text>
-        <text class="red">?SourceID={{ChannelID}}</text>
-      </view>
-    </view>
-
-    <view class="text6">红色部分请勿遗漏，便于了解相互转化</view>
-    <view class="text8" bindtap='setClipboardData'>复制到剪贴板</view>
-    <view class="line2"></view>
-    <text class="text7">由于微信规则限制，在满500个名额后，将为具有优质内容的或提供教育相关资源的公众号优先保留关联席位，敬请海涵。</text>
-
-  </view>
-
-
-</view>

pages/about/cooperation.wxss

@@ -1,157 +0,0 @@
-.container {
-  background-color: #DFC7A4;
-  justify-content: flex-start;
-  color: #1E1E1E;
-  font-weight: 500;
-}
-
-.panel1{
-  width: 100%;
-  height:163rpx;
-  background-color: #F5E2BE;
-}
-
-.panel4{
-  width: 100%;
-  height:263rpx;
-  position: absolute;
-  top:0;
-}
-
-.image06002{
-  width:310rpx;
-  height:263rpx;
-}
-
-.text1{
-  font-size:36rpx;
-  margin-top:160rpx;
-  font-weight: 600;
-}
-
-.line{
-  width: 252rpx;
-  height:12rpx;
-  background-color: #1E1E1E;
-  margin-top:16rpx;
-}
-
-.panel2{
-  width: 100%;
-  margin-top:16rpx;
-  justify-content: flex-start;
-}
-
-.text2{
-  font-size:28rpx;
-  margin-top:0rpx;
-}
-
-.panel3{
-  width: 600rpx;
-  height:132rpx;
-  margin-top:40rpx;
-  justify-content: flex-start;
-  align-items: flex-start;
-}
-
-.text3{
-  font-size:24rpx;
-  margin-left:20rpx;
-  font-weight: 400;
-}
-.input1{
-  background-color: #fff;
-  border-radius: 14rpx;
-  width: 600rpx;
-  height:90rpx;
-  margin-top: 10rpx;
-}
-.input1_1{
-  font-size:36rpx;
-  font-weight: 400;
-  width: 540rpx;
-  height:90rpx;
-  line-height: 90rpx;
-}
-
-.text4{
-  font-size:24rpx;
-  color:#A20602;
-  margin-top:88rpx;
-}
-
-
-.btn {
-  width: 600rpx;
-  height: 104rpx;
-  background-color: #035834;
-  border-radius: 14rpx;
-  margin-top: 20rpx;
-}
-
-.btn1 {
-  width: 100%;
-  height: 90rpx;
-  background-color: #03AF69;
-  border-radius: 14rpx;
-  position:relative;
-  top:0;
-  font-size: 36rpx;
-  text-align: center;
-  line-height: 90rpx;
-  color:#fff;
-}
-
-.text5{
-  font-size:24rpx;
-  margin-top:20rpx;
-  font-weight: 400;
-}
-
-.input2{
-  background-color: #CDB797;
-  border-radius: 14rpx;
-  font-size:36rpx;
-  width: 600rpx;
-  height:90rpx;
-  line-height: 90rpx;
-  margin-top: 10rpx;
-  text-align: center;
-}
-
-.input3{
-  font-size:30rpx;
-}
-
-.red{
-  color:#A20602;
-}
-
-
-.text6{
-  font-size:20rpx;
-  margin-top:10rpx;
-  margin-left: 230rpx;
-}
-
-
-.text8{
-  font-size:28rpx;
-  margin-top:70rpx;
-  color:#A20602;
-}
-
-.line2{
-  width: 600rpx;
-  height:3rpx;
-  background-color: #593613;
-  margin-top:30rpx;
-}
-
-.text7{
-  font-size:24rpx;
-  margin-top:40rpx;
-  font-weight: 400;
-  width: 560rpx;
-}

pages/about/payfinished.wxml

@@ -4,8 +4,8 @@
   <text class="text1">{{Text1}}</text>
 
   <block wx:if="{{OrderType=='accredit'}}">
-    <view class="btn" bindtap="goto">
-      <button open-type="getUserInfo" class="btn1">{{Text2}}</button>
+    <view class="btn">
+      <button open-type="getUserInfo" class="btn1" bindgetuserinfo='goto'>{{Text2}}</button>
     </view>
   </block>
   <block wx:if="{{OrderType!='accredit'}}">

pages/main/detail.js

@@ -21,12 +21,13 @@ Page({
     IntervalSecondIndex: 2,//播放间隔秒数索引
     IsImageError: false,
     SpeakerArray: [{ name: "温柔姐姐(推荐)", value: "woman", isShow: true }, { name: "爽朗哥哥", value: "man", isShow: false }, { name: "古韵叔叔", value: "oldman", isShow: false }, { name: "可爱妹妹", value: "sister", isShow: false }],
-    pinyinCss:"",
+    pinyinCss: "",
   },
   onLoad: function (options) {
     var bookID = options.bookid || 0;
     var unitID = options.unitid || 0;
     var wordID = options.wordid || 0;
+    var indexID = options.indexID || 0;
 
     this.audioCtx = wx.createAudioContext('myAudio');
     hanziNumber = 0;
@@ -81,7 +82,7 @@ Page({
                     if (that.data.WordType == "normal")
                       that.init();
                     else if (that.data.WordType == "review")
-                      that.initReview();
+                      that.initReview(indexID);
                     else if (that.data.WordType == "search")
                       that.initSearch();
                   });
@@ -102,7 +103,7 @@ Page({
     if (systemInfo.model) {
       if (systemInfo.model.indexOf("iPad") >= 0) {
         this.setData({
-          pinyinCss:"pinyinCssIpad",
+          pinyinCss: "pinyinCssIpad",
         })
       }
     }
@@ -111,7 +112,7 @@ Page({
   onShow: function (e) {
     if (app.globalData.IsSaveCustom) {
       isEditSetting.push("saveCustom");
-      app.globalData.IsSaveCustom=false;
+      app.globalData.IsSaveCustom = false;
     }
   },
   onUnload: function () {
@@ -211,7 +212,7 @@ Page({
       title: "练习"
     });
   },
-  initReview: function () {
+  initReview: function (indexID) {
     var arrReview = wx.getStorageSync("ReviewList");
     for (var l = 0; l < arrReview.length; l++) {
       var item = arrReview[l];
@@ -232,9 +233,9 @@ Page({
     if (wordArr) {
       for (var k = 0; k < wordArr.length; k++) {
         for (var n = 0; n < wordArr[k].List.length; n++) {
-          for (var i = 0; i < result.length;i++){
+          for (var i = 0; i < result.length; i++) {
             if (wordArr[k].List[n].ID == result[i].ID) {
-              result[i].CombineWords=wordArr[k].List[n].CombineWords;
+              result[i].CombineWords = wordArr[k].List[n].CombineWords;
               break;
             }
           }
@@ -251,6 +252,7 @@ Page({
 
     this.setData({
       List: result,
+      CurrentIndex: indexID,
     });
 
     this.restart(this.data.CurrentIndex);
@@ -807,13 +809,9 @@ Page({
           WordID: this.data.List[this.data.CurrentIndex].ID,
           Status: status,
         }, function (data) {
-
-          server.getData('GetHanziReviewList?UserID=' + app.globalData.userInfo.UserID, function (data) {
-            if (data) {
-              wx.setStorageSync("ReviewList", data);
-            }
-          });
-
+          if (data) {
+            wx.setStorageSync("ReviewList", data);
+          }
         });
       }
     }

pages/main/index.js

@@ -41,7 +41,7 @@ Page({
             IsAccredit: true,
           });
         }
-        else{
+        else {
           //付费用户请去授权
           if (app.globalData.userInfo.IsMember == 1) {
             wx.navigateTo({
@@ -108,7 +108,7 @@ Page({
               }
             })
           }
-          else{
+          else {
             that.getUserInfo();
           }
         }
@@ -126,10 +126,10 @@ Page({
           success: function (res) {
             var userID = app.globalData.userInfo.UserID;
             app.globalData.userInfo = res.userInfo;
-            app.globalData.userInfo.UserID=userID;
+            app.globalData.userInfo.UserID = userID;
             app.globalData.userInfo.NickName = app.globalData.userInfo.nickName;
             app.globalData.userInfo.AvatarUrl = app.globalData.userInfo.avatarUrl;
-            
+
             // that.hasGetShareInfo(app.globalData.userInfo);
             that.setData({
               IsAccredit: true,
@@ -140,7 +140,7 @@ Page({
             app.globalData.userInfo.Code = res0.code;
             app.globalData.userInfo.iv = res.iv;
             app.globalData.userInfo.encryptedData = res.encryptedData;
-            
+
             that.login(app.globalData.userInfo);
           },
           fail: function (res) {
@@ -183,7 +183,7 @@ Page({
         UserSource: app.globalData.userSource,
         SourceID: app.globalData.SourceID,
         LastUserSource: app.globalData.userSource,
-        iv:param.iv,
+        iv: param.iv,
         encryptedData: param.encryptedData,
       }, function (data) {
 
@@ -193,7 +193,7 @@ Page({
   getData: function () {
     var that = this;
     server.getData('GetHanziRecordData?UserID=' + app.globalData.userInfo.UserID + "&Version=" + app.globalData.Version, function (data) {
-      
+
       if (data) {
 
         if (!data.DayNumber)
@@ -204,7 +204,7 @@ Page({
         var reviewCount = 0;
         if (data.ReviewList)
           reviewCount = data.ReviewList.length;
-        
+
         hanziNumber = 0;
         var arr = JSON.parse(wx.getStorageSync("HanziAll"));
         for (var k = 0; k < data.FinishedList.length; k++) {
@@ -232,8 +232,8 @@ Page({
               break;
           }
         }
-        if (!hanziNumber){
-          hanziNumber=0;
+        if (!hanziNumber) {
+          hanziNumber = 0;
         }
         that.setData({
           DayNumber: data.DayNumber,
@@ -251,9 +251,9 @@ Page({
         wx.setStorageSync("ReviewList", data.ReviewList);
 
         common.getStorageValue(that, "IsMemberForeverRemind", 0, function () {
-          if (that.data.IsMemberForeverRemind == 0 
-            && that.data.NewUserNumber >= app.globalData.NewUserNumberMax 
-            && that.data.NewUserNumber<999999) {
+          if (that.data.IsMemberForeverRemind == 0
+            && that.data.NewUserNumber >= app.globalData.NewUserNumberMax
+            && that.data.NewUserNumber < 999999) {
             that.setData({
               IsMemberForeverRemind: 1,
             });
@@ -280,7 +280,7 @@ Page({
     if (!UnitCustom) {
       var that = this;
       server.getData('GetHanziCustomList?UserID=' + app.globalData.userInfo.UserID, function (data) {
-        if (data && data.length>0) {
+        if (data && data.length > 0) {
           for (var n = 0; n < data.length; n++) {
             if (data[n].List)
               data[n].List = JSON.parse(data[n].List);
@@ -322,17 +322,25 @@ Page({
       url: "../main/search",
     });
   },
-  gotoAbout: function (e) {
-    var id = e.currentTarget.dataset.id;
-    wx.navigateTo({
-      url: "../about/about?id=" + id
-    });
-  },
   gotoReview: function () {
-    var id = "review";
-    wx.navigateTo({
-      url: '../main/detail?Type=' + id,
-    });
+    if (this.data.IsShow == 1 && this.data.IsMember == 0) {
+      var query = wx.createSelectorQuery();
+      query.select('.payInfo').boundingClientRect();
+      query.selectViewport().scrollOffset();
+      query.exec(function (res) {
+        var top = res[0].top + res[1].scrollTop
+
+        wx.pageScrollTo({
+          scrollTop: top,
+          duration: 500
+        });
+      });
+    }
+    else {
+      wx.navigateTo({
+        url: '../main/review',
+      });
+    }
   },
   gotoNewUser: function () {
     wx.navigateTo({
@@ -340,7 +348,7 @@ Page({
     });
   },
   gotoPayList: function () {
-    if (this.data.IsMember == 0 && !this.data.IsFirstDay && this.data.NewUserNumber >= this.data.NewUserNumberMax){
+    if (this.data.IsMember == 0 && !this.data.IsFirstDay && this.data.NewUserNumber >= this.data.NewUserNumberMax) {
       this.setData({
         IsMemberForeverRemind: 0,
       });
@@ -348,7 +356,7 @@ Page({
         scrollTop: 1380,
       });
     }
-    else{
+    else {
       this.gotoMemberCenter();
     }
   },
@@ -370,7 +378,7 @@ Page({
       isPaying = true;
       var that = this;
       var money = app.globalData.PayMoney;
-      server.payMoney(3, money,null, function () {
+      server.payMoney(3, money, null, function () {
         wx.navigateTo({
           url: '../about/payfinished?type=single',
         });

pages/main/index.wxml

@@ -114,7 +114,7 @@
         <button open-type="getUserInfo" class="btn1">开启统计</button>
       </view>
 
-      <view class="btn5 btn3 btn" wx:if="{{ReviewCount==0}}">
+      <view class="btn5 btn3 btn" wx:if="{{ReviewCount==0}}" bindtap="gotoReview">
         <view class="btn4 btn1">复习</view>
       </view>
       <view class="btn8 btn6 btn" wx:if="{{ReviewCount>0}}" bindtap="gotoReview">
@@ -178,9 +178,7 @@
     <view class="index5_1 FlexRow">
       <view class="feedback" bindtap='gotoFeedback'>意见反馈</view>
       <view class="line"></view>
-      <view class="feedback1 feedback" bindtap='gotoAbout' data-id='Cooperation'>关联您的公众号</view>
-      <view class="line"></view>
-      <view class="feedback" bindtap='gotoAbout'>业务合作</view>
+      <view class="feedback" bindtap='gotoFeedback'>业务合作</view>
     </view>
     <view class="index5_2">唱意教育旗下产品
     </view>

pages/main/list.js

@@ -6,7 +6,6 @@ var isPaying = false;
 
 Page({
   data: {
-
   },
   onLoad: function (options) {
     var bookID = options.id;
@@ -19,6 +18,9 @@ Page({
       IsShowPayInfo: false,
       IsShow: app.globalData.IsShow,
     });
+
+    common.getStorageValue(this, "IsRemind", true, function () { });
+
   },
   onShow: function () {
     this.init();
@@ -54,7 +56,7 @@ Page({
           for (var k = 0; k < item.Words.length; k++) {
             item.Words[k].ReviewCss = "";
             for (var l = 0; l < arrReview.length; l++) {
-              if (arrReview[l].WordID == item.Words[k].ID) {
+              if (arrReview[l].ID == item.Words[k].ID) {
                 item.Words[k].ReviewCss = "boxSelect";
                 break;
               }
@@ -77,10 +79,10 @@ Page({
       }
     }
     var imgNum = this.data.BookID;
-    if (imgNum==5)
-      imgNum="11";
+    if (imgNum == 5)
+      imgNum = "11";
     else
-      imgNum="0"+imgNum;
+      imgNum = "0" + imgNum;
     this.setData({
       List: result.Units,
       topImage: "../../images/040" + imgNum + ".png"
@@ -105,7 +107,9 @@ Page({
         NavClass1: "nav2",
         NavClass2: "nav1",
         IsShowNav1: false,
-      })
+        IsRemind:false
+      });
+      wx.setStorageSync('IsRemind', false);
     }
   },
   goto: function (e) {
@@ -172,7 +176,7 @@ Page({
       isPaying = true;
       var that = this;
       var money = app.globalData.PayMoney;
-      server.payMoney(3, money,null, function () {
+      server.payMoney(3, money, null, function () {
         wx.navigateTo({
           url: '../about/payfinished?type=single',
         });
@@ -192,7 +196,7 @@ Page({
       IsShowPayInfo: false,
     });
   },
-  gotoIndex:function(){
+  gotoIndex: function () {
     wx.setStorageSync("indexNav", 2);
     wx.navigateBack({
       delta: 1

pages/main/list.wxml

@@ -63,7 +63,8 @@
   </block>
 
 </view>
-
+<image src='../../images/02004.gif' class="hand" wx:if="{{IsRemind}}" />
+  
 <view class="PayInfo container FlexColumn" style='height:{{Height}}rpx;' wx:if="{{IsShowPayInfo}}">
   <view class="btn">
     <view class="btn1 FlexColumn" catchtap="getPay">
@@ -84,4 +85,4 @@
   <view class="close FlexColumn" catchtap='close'>
     <image src='../../images/02024.png' class="closeImage" />
   </view>
-</view>
+</view>

pages/main/list.wxss

@@ -258,3 +258,11 @@
   margin-top: 30rpx;
 }
 
+.hand{
+  width:60rpx;
+  height:90rpx;
+  position: fixed;
+  right:158rpx;
+  top:405rpx;
+  z-index: 100;
+}

pages/main/review.js

@@ -0,0 +1,74 @@
+import common from '../../utils/util';
+import server from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    IsEdit: false,
+    SelectedCount: 0,
+  },
+  onLoad: function (options) {
+    this.setData({
+      Height: common.getSystemHeight(),
+    });
+  },
+  onShow:function(){
+    this.initReview();
+  },
+  initReview: function () {
+    var arrReview = wx.getStorageSync("ReviewList");
+    if (!arrReview)
+      arrReview = [];
+    this.setData({
+      IsEdit: false,
+      List: arrReview,
+    });
+  },
+  startEdit: function () {
+    this.setData({
+      IsEdit: true,
+    });
+  },
+  gotoReview: function (e) {
+    var id = e.currentTarget.dataset.id;
+    var cotegory = "review";
+    wx.navigateTo({
+      url: '../main/detail?Type=' + cotegory + '&indexID=' + id,
+    });
+  },
+  selectedHanzi: function (e) {
+    var id = e.currentTarget.dataset.id;
+    this.data.List[id].IsSelected = !this.data.List[id].IsSelected;
+    var SelectedCount = 0;
+    for (var i = 0; i < this.data.List.length; i++) {
+      if (this.data.List[i].IsSelected)
+        SelectedCount++;
+    }
+    this.setData({
+      List: this.data.List,
+      SelectedCount: SelectedCount,
+    });
+  },
+  cancelHanzi: function () {
+    var that = this;
+    var arr = [];
+    for (var i = 0; i < this.data.List.length; i++) {
+      if (this.data.List[i].IsSelected)
+        arr.push(this.data.List[i].ID);
+    }
+    server.postData('UpdateHanziReview', {
+      UserID: app.globalData.userInfo.UserID,
+      WordID: arr.join(","),
+      Status: "deleteAll",
+    }, function (data) {
+      if (data) {
+        wx.setStorageSync("ReviewList", data);
+        that.initReview();
+        wx.showToast({
+          title: '删除成功',
+        })
+      }
+    });
+  },
+});

pages/about/about.json

@@ -1,6 +1,6 @@
 {
   "navigationBarBackgroundColor": "#F5E2BE",
-  "navigationBarTitleText": "关于",
-  "backgroundColor": "#F5E2BE",
+  "navigationBarTitleText": "复习",
+  "backgroundColor": "#f0f0f0",
   "enablePullDownRefresh": false
 }

pages/main/review.wxml

@@ -0,0 +1,41 @@
+<!-- 有数据 -->
+<view class="container FlexColumn" wx:if="{{!IsEdit && List.length>0}}" style='min-height:{{Height}}rpx;'>
+  <view class="panel FlexRow">
+    <view class="title">复习内容</view>
+    <view class="btn" bindtap='startEdit'>整理</view>
+  </view>
+  <view class="panel2 panel FlexRow" wx:for="{{List}}" wx:key="index" bindtap='gotoReview' data-id="{{index}}">
+    <view class="Name">{{item.Name}}</view>
+    <image src='../../images/Arrow.png' class="Arrow" />
+  </view>
+  <view style='height:150rpx'></view>
+  <view class="bottom" bindtap='gotoReview' data-id="0">复习全部</view>
+</view>
+
+<!-- 无数据 -->
+<view class="container FlexColumn" wx:if="{{!IsEdit && List.length==0}}" style='min-height:{{Height}}rpx;'>
+  <view class="FlexColumn">
+    <view class="panelNull1">没有内容</view>
+    <text class="panelNull2">练习时给需要复习的汉字打记号\n点击这个图标</text>
+    <image src='../../images/0521.png' class="img0521" />
+  </view>
+</view>
+
+<!-- 整理 -->
+<view class="container FlexColumn" wx:if="{{IsEdit}}" style='min-height:{{Height}}rpx;'>
+  <view class="panel FlexRow">
+    <view class="title">选择要取消复习的内容</view>
+    <view></view>
+  </view>
+  <view class="panel3 panel2 panel FlexRow" wx:for="{{List}}" wx:key="index" bindtap='selectedHanzi' data-id="{{index}}">
+    <image src='../../images/SelectNo.png' wx:if="{{!item.IsSelected}}" class="universalpic_select_on_black" />
+    <image src='../../images/SelectYes.png' wx:if="{{item.IsSelected}}" class="universalpic_select_on_black" />
+  
+    <view class="Name">{{item.Name}}</view>
+  </view>
+  <view style='height:150rpx'></view>
+  <view class="bottom2 bottom FlexColumn" bindtap='cancelHanzi'>
+    <view>取消复习</view>
+    <view class="text1">已选 {{SelectedCount}} 个汉字</view>
+  </view>
+</view>

pages/main/review.wxss

@@ -0,0 +1,93 @@
+.container {
+  background-color: #f0f0f0;
+  justify-content: flex-start;
+  font-weight: 500;
+}
+
+.panel{
+  width:100%;
+  justify-content: space-between;
+}
+
+.title{
+  margin: 50rpx 0 30rpx 30rpx;
+  font-size:32rpx;
+}
+
+.btn{
+  margin: 50rpx 30rpx 25rpx 0;
+  font-size:24rpx;
+  color:#fff;
+  background-color: #0792E4;
+  border-radius: 8rpx;
+  text-align: center;
+  line-height: 50rpx;
+  width: 108rpx;
+}
+
+.panel2{
+  background-color: #fff;
+  margin-bottom: 1rpx;
+  height:100rpx;
+}
+
+.Name{
+  margin-left: 30rpx;
+  font-size:28rpx;
+  font-weight: 400;
+}
+
+.Arrow{
+  width:16rpx;
+  height:26rpx;
+  margin-right: 30rpx;
+}
+
+.bottom{
+  position: fixed;
+  bottom:0;
+  font-size:48rpx;
+  color:#fff;
+  background-color: #FF7245;
+  text-align: center;
+  line-height: 120rpx;
+  width: 100%;
+}
+
+
+.panelNull1{
+  font-size: 48rpx;
+  margin-top: 422rpx;
+}
+.panelNull2{
+  font-size: 24rpx;
+  margin: 20rpx 0 30rpx 0;
+  font-weight: 400;
+  text-align: center;
+}
+.img0521{
+  width:64rpx;
+  height:68rpx;
+}
+
+
+.panel3{
+  justify-content: flex-start;
+}
+
+.universalpic_select_on_black{
+  width:30rpx;
+  height:30rpx;
+  margin-left: 30rpx;
+}
+
+.bottom2{
+  background-color: #E5321C;
+  justify-content: center;
+  height:140rpx;
+  line-height: 46rpx;
+}
+
+.text1{
+  font-size:24rpx;
+}

project.config.json

@@ -8,7 +8,7 @@
 		"newFeature": true
 	},
 	"compileType": "miniprogram",
-	"libVersion": "1.9.93",
+	"libVersion": "2.0.1",
 	"appid": "wx313a8f2c0741efe1",
 	"projectname": "%E8%AF%86%E5%AD%97",
 	"isGameTourist": false,
@@ -30,7 +30,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": -1,
+			"current": 12,
 			"list": [
 				{
 					"id": -1,
@@ -91,6 +91,23 @@
 					"name": "新用户",
 					"pathName": "pages/about/newuserlist",
 					"query": ""
+				},
+				{
+					"id": -1,
+					"name": "复习",
+					"pathName": "pages/main/review",
+					"query": ""
+				},
+				{
+					"id": -1,
+					"name": "复习",
+					"pathName": "pages/main/index",
+					"query": ""
+				},
+				{
+					"id": -1,
+					"name": "复习",
+					"pathName": "pages/main/review"
 				}
 			]
 		}