1.0.5

app.js

@@ -14,7 +14,7 @@ App({
     this.globalData.systemInfo = wx.getSystemInfoSync();
   },
   globalData: {
-    version: "1.0.4",
+    version: "1.0.6",
     IsProduction: true,
     ProgramID: 105,
     AppID: "wx1fef080f74481cbd",

app.json

@@ -6,6 +6,7 @@
     "pages/main/answer",
     "pages/main/detail",
     "pages/main/list",
+    "pages/main/errorlist",
     "pages/about/payfinished",
     "pages/main/default"
   ],
@@ -14,6 +15,7 @@
     "navigationBarBackgroundColor": "#fff",
     "navigationBarTitleText": "数学计算题",
     "navigationBarTextStyle": "black",
-    "backgroundColor":"#000000"
+    "backgroundColor": "#000000",
+    "enablePullDownRefresh": false
   }
 }

pages/about/payfinished.json

@@ -2,6 +2,5 @@
   "navigationBarBackgroundColor": "#99607C",
   "navigationBarTextStyle": "white",
   "navigationBarTitleText": "登录",
-  "backgroundColor": "#99607C",
-  "enablePullDownRefresh": false
+  "backgroundColor": "#99607C"
 }

pages/main/answer.js

@@ -6,8 +6,7 @@ Page({
   data: {
     version: app.globalData.version,
     IsEdit: false,
-    ListHeight: 1320,
-    ListHeight2: 1490,
+    ListHeight2: 600,
     SelectedCount: 0,
   },
   onLoad: function () {
@@ -32,20 +31,12 @@ Page({
         arr.push(list[i]);
       }
 
-      var ListHeight = 1320;
-      var ListHeight2 = 1490;
-      var ListHeight3 = arr.length * 130 + 20;
-      if (arr.length > 10) {
-        ListHeight = 1320 + (arr.length - 10) * 130;
-        ListHeight2 = 1490 + (arr.length - 10) * 130;
-      }
       that.setData({
         AnswerList: arr,
-        ListHeight: ListHeight,
-        ListHeight2: ListHeight2,
-        ListHeight3: ListHeight3,
       });
-      //console.log(new Date().getTime());
+      
+      this.setListHeight();
+
       if (arr.length>10){
         wx.showToast({
           title:"请删除不用试卷！",
@@ -91,6 +82,7 @@ Page({
         list.splice(i, 1);
       }
     }
+    
     list.sort(function (a, b) {
       if (a.CreateTime == b.CreateTime) {
         return b.AnswerID - b.AnswerID;
@@ -102,8 +94,18 @@ Page({
       AnswerList: list,
       SelectedCount: 0,
     });
+    this.setListHeight();
     wx.setStorageSync("AnswerList", list);
   },
+  setListHeight:function(){
+    var ListHeight2 = 600;
+    if (this.data.AnswerList.length > 3) {
+      ListHeight2 = 570 + (this.data.AnswerList.length - 3) * 130;
+    }
+    this.setData({
+      ListHeight2: ListHeight2,
+    });
+  },
   btnEdit: function () {
     var that = this;
     that.data.IsEdit = !that.data.IsEdit;

pages/main/answer.json

@@ -2,7 +2,5 @@
   "navigationBarBackgroundColor": "#326FAE",
   "navigationBarTextStyle": "white",
   "navigationBarTitleText": "答案资料室",
-  "backgroundColor": "#213a53",
-  "backgroundTextStyle": "light",
-  "enablePullDownRefresh": false
+  "backgroundColor": "#213a53"
 }

pages/main/answer.wxml

@@ -41,7 +41,6 @@
     </view>
 
     <view class="panel01 panel00 FlexRow" bindtap='selectItem'>
-
       <view class="panel000 FlexColumn" style='min-height:{{ListHeight2}}rpx;'>
         <image class="answerroom_list_conveyer_part_left" src="../../images/answerroom_list_conveyer_part_left.png" />
         <image class="answerroom_list_conveyer_part_left" src="../../images/answerroom_list_conveyer_part_left.png" />
@@ -57,7 +56,7 @@
     <view class="line21 line2"></view>
 
     <!-- 列表 -->
-    <view class="panel0MainBG panel0Main" style='min-height:{{ListHeight2}}rpx;'>
+    <view class="panel0MainBG panel0Main" style='min-height:{{ListHeight2-155}}rpx;'>
       <view class="line2"></view>
       <view class="item FlexColumn" wx:for="{{AnswerList}}" wx:key="index" bindtap='selectItem' data-id='{{item.AnswerID}}'>
         <view class="itemLine00 itemLine0"></view>
@@ -77,7 +76,8 @@
           <view class="title3 FlexRow">
             <view class="title30">#</view>
             <view class="title31">{{item.AnswerID}}</view>
-
+<image wx:if="{{item.IsNew==1}}" class="universalpic_new_red_size01" src="../../images/universalpic_new_red_size01.png" />
+            
           </view>
         </view>
         <view class="itemLine1"></view>
@@ -87,6 +87,8 @@
         </view>
       </view>
     </view>
+
+    <view class="line3"></view>
   </view>
 </view>
 <image hidden="{{HelpHidden5}}" bindtap='closeHelp' class="Help_aside_answerroom_list" src="../../images/Help_aside_answerroom_list.png" />

pages/main/answer.wxss

@@ -136,7 +136,7 @@
 
 .panel0 .panel000 {
   width: 10rpx;
-  height: 1490rpx;
+  height: 140rpx;
   background-color: #929292;
   z-index: 30;
   justify-content: space-between;
@@ -144,14 +144,14 @@
 
 .panel0 .panel001 {
   width: 20rpx;
-  height: 1490rpx;
+  height: 140rpx;
   background-color: #4d4d4d;
   z-index: 30;
 }
 
 .panel0 .panel0Main {
   width: 610rpx;
-  height: 1320rpx;
+  height: 130rpx;
 }
 
 .panel0 .panel0MainBG {
@@ -244,6 +244,15 @@
   position: relative;
 }
 
+
+.universalpic_new_red_size01{
+  width: 70rpx;
+  height: 30rpx;
+  position: absolute;
+  left:40rpx;
+  top:-20rpx;
+}
+
 .itemChild .title30 {
   font-size: 20rpx;
   font-family: 'Roboto-Bold';
@@ -254,7 +263,7 @@
 
 .itemChild .title31 {
   font-size: 38rpx;
-  font-family: 'Roboto-Black';
+  font-family: 'Roboto-Bold';
   margin-top: 7rpx;
 }
 
@@ -269,6 +278,7 @@
   height: 320rpx;
   position: relative;
   z-index: 20;
+  margin-top: -170rpx;
 }
 
 .universalpic_attention_blue_size01 {
@@ -322,3 +332,13 @@
   bottom: 0rpx;
   z-index: 200;
 }
+
+
+.panel0 .line3 {
+  width: 670rpx;
+  height: 20rpx;
+  background-color:rgba(0, 0, 0, 0.2);
+  position: absolute;
+  top:0;
+  z-index: 210;
+}

pages/main/default.js

@@ -38,14 +38,19 @@ Page({
   onShow:function(){
     var list = wx.getStorageSync("AnswerList");
     var answerLength = 0;
-    var answerNewDate = "";
     if (list && list.length > 0) {
       answerLength = list.length;
-      answerNewDate = list[0].CreateTime.substr(0, 11);
     }
+    
+    var errorCount = 0;
+    var listError = wx.getStorageSync("ErrorList");
+    if (listError && listError.length > 0) {
+      errorCount = listError.length;
+    }
+    
     this.setData({
       AnswerLength: answerLength,
-      AnswerNewDate: answerNewDate,
+      ErrorCount: errorCount,
     });
 
     var that = this;
@@ -70,6 +75,8 @@ Page({
     });
   },
   gotoList:function(e){
+    server.playSound("/sounds/click.mp3");
+
     var id=e.currentTarget.dataset.id;
     var categoryArray = [{}, { Num: 1, Name: "一年级", Array: [1, 2] }, { Num: 2, Name: "二年级", Array: [3, 4] }, { Num: 3, Name: "三年级", Array: [5, 6] }, { Num: 4,Name: "四年级及以上", Array: [7] }];
 
@@ -84,70 +91,16 @@ Page({
       url: '../main/answer',
     });
   },
-  getBindGetUserInfo(e) {
-    console.log(e.detail);
-    var that = this;
-    var res = e.detail;
-    if (res.errMsg && res.errMsg == "getUserInfo:fail auth deny") {
-      app.globalData.userInfo.NickName = "陌生用户";
-      app.globalData.userInfo.AvatarUrl = "../../images/universalpic_face_default_black_size01.png";
-      app.globalData.userInfo.language = "";
-      app.globalData.userInfo.gender = "0";
-      app.globalData.userInfo.city = "";
-      app.globalData.userInfo.province = "";
-      app.globalData.userInfo.country = "";
-      // that.hasGetShareInfo(app.globalData.userInfo);
-      that.setData({
-        IsAccredit: false,
-      });
-    } 
-    else {
-      var userID = app.globalData.userInfo.UserID;
-      app.globalData.userInfo = res.userInfo;
-      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,
-        NickName: app.globalData.userInfo.NickName,
-        AvatarUrl: app.globalData.userInfo.AvatarUrl
-      });
-
-      app.globalData.userInfo.iv = res.iv;
-      app.globalData.userInfo.encryptedData = res.encryptedData;
-
-      app.globalData.userInfo.Code = code;
-      that.login(app.globalData.userInfo);
-      
-    }
+  gotoBindGetUserInfo(e) {
+    wx.navigateTo({
+      url: '../about/payfinished',
+    });
   },
-  login: function(param) {
-    var that = this;
-    server.getLocalHost(function() {
-      server.postData('MathLogin', {
-        Code: param.Code,
-        NickName: param.nickName,
-        Language: param.language,
-        Gender: param.gender,
-        City: param.city,
-        Province: param.province,
-        Country: param.country,
-        AvatarUrl: param.avatarUrl,
-        ProgramVersion: app.globalData.version,
-        Introducer: app.globalData.introducer,
-        UserSource: app.globalData.userSource,
-        SourceID: app.globalData.SourceID,
-        LastUserSource: app.globalData.userSource,
-        iv: param.iv,
-        encryptedData: param.encryptedData,
-      }, function(data) {
-
-      });
+  gotoErrorList(e) {
+    wx.navigateTo({
+      url: '../main/detail?id=-1',
     });
   },
-
   switchProgram: function(e) {
     wx.navigateToMiniProgram({
       appId: e.currentTarget.dataset.appid,

pages/main/default.json

@@ -1,8 +1,5 @@
 {
   "navigationBarBackgroundColor": "#B9DC5D",
   "navigationBarTextStyle": "black",
-  "navigationBarTitleText": "数学计算题",
-  "backgroundColor": "#583027",
-  "backgroundTextStyle": "light",
-  "enablePullDownRefresh": false
+  "backgroundColor": "#583027"
 }

pages/main/default.wxml

@@ -30,8 +30,8 @@
           <view class="panel0020 FlexRow">
             <view class="panel00200 FlexColumn">
               <view class="textTitle3">
-                <view class="textTitle4">批改</view>
-                <view class="textTitle5">批改</view>
+                <view class="textTitle4">练习记录</view>
+                <view class="textTitle5">练习记录</view>
               </view>
               <view class="line3"></view>
               <view class="panel002000 FlexRow">
@@ -40,24 +40,18 @@
               </view>
               <view class="line4 line3"></view>
               <view class="panel002000 FlexRow">
-                <view class="text1">制题日期</view>
-                <view class="text">{{AnswerNewDate}}</view>
+                <view class="text1">错题数</view>
+                <view class="text">{{ErrorCount}}</view>
               </view>
               <view class="line4 line3"></view>
-              <view class="panel002000 FlexRow">
-                <button wx:if="{{!IsAccredit}}" open-type="getUserInfo" class="btn" bindgetuserinfo="getBindGetUserInfo">
+              <view class="panel002000 FlexRow" bindtap='gotoErrorList'>
+                <button class="btn">
                   <view class="btn1">
-                    登录
+                    错题集
                   </view>
                 </button>
 
-                <view class="btn2 btn" bindtap='gotoAnswer' wx:if="{{!IsAccredit}}">
-                  <view class="btn3 btn1">
-                    对答案
-                  </view>
-                </view>
-
-                <view class="btn6 btn2 btn' " wx:if="{{IsAccredit}}" bindtap='gotoAnswer'>
+                <view class="btn2 btn" bindtap='gotoAnswer'>
                   <view class="btn3 btn1">
                     对答案
                   </view>
@@ -65,7 +59,7 @@
               </view>
             </view>
             <view class="panel00201 FlexRow">
-              <image wx:if="{{!IsAccredit}}" class="universalpic_face_default_black_size01" src="../../images/universalpic_face_default_black_size01.png" />
+              <image wx:if="{{!IsAccredit}}" class="universalpic_face_default_black_size01" src="../../images/universalpic_face_default_black_size01.png" bindtap='gotoBindGetUserInfo'/>
               <image wx:if="{{IsAccredit}}" class="universalpic_face_default_black_size01" src="{{AvatarUrl}}" />
             </view>
           </view>

pages/main/default.wxss

@@ -163,7 +163,7 @@
   margin-top: 70rpx;
   font-weight: 500;
   position: relative;
-  width: 72rpx;
+  width: 144rpx;
   height:50rpx;
 }
 .panel00200 .textTitle4 {
@@ -190,7 +190,7 @@
 }
 
 .panel002000 {
-  width: 410rpx;
+  width: 430rpx;
   justify-content: space-between;
   margin-top: 20rpx;
 }
@@ -203,7 +203,7 @@
 .btn {
   width: 208rpx;
   height: 90rpx;
-  background-color: #035834;
+  background-color: #98492F;
   border-radius: 8rpx;
   position: relative;
   padding-left: 0;
@@ -218,7 +218,7 @@
 .btn1 {
   width: 100%;
   height: 70rpx;
-  background-color: #03af69;
+  background-color: #D0603B;
   border-radius: 8rpx;
   line-height: 70rpx;
   text-align: center;

pages/main/detail.js

@@ -5,8 +5,8 @@ const app = getApp();
 var times = 1;
 var pageIndex = 0;
 var QuestionItem = [];
-var tempAnswerList=[];
-var arrAnswerID=[];
+var tempAnswerList = [];
+var arrAnswerID = [];
 var isAndroid = false;
 const waitTime = ["", "10秒钟", "15秒钟", "20秒钟", "25秒钟"];
 
@@ -22,11 +22,14 @@ Page({
     arrPage: [],
     ShowLoading: false,
     IsDistabled: "",
-    NameClass:"",
+    NameClass: "",
     AddDisabled: "",
     SubDisabled: "btnAddSubDisabled",
-    HelpHidden7:true,
-    ShowAndroidNotice:false,
+    HelpHidden7: true,
+    HelpHidden3: true,
+    HelpHidden8: true,
+
+    ShowAndroidNotice: false,
   },
   onLoad: function (options) {
     var that = this;
@@ -39,7 +42,7 @@ Page({
     this.setData({
       Containnerheight: server.getWindowHeight(),
       ID: id,
-      ShowAndroidNotice:isAndroid,
+      ShowAndroidNotice: isAndroid,
     });
     var systemInfo = wx.getSystemInfoSync();
     if (systemInfo.system && systemInfo.system.indexOf("Android") >= 0) {
@@ -47,32 +50,50 @@ Page({
     }
     this.getDetail(id);
 
-    
-    common.getStorageValue(this, "HelpHidden3", false, function () { 
-      that.showHelp();
-    });
 
+    if (id > 0) {
+      common.getStorageValue(this, "HelpHidden3", false, function () {
+        that.showHelp();
+      });
+    }
+    else {
+      common.getStorageValue(this, "HelpHidden8", false, function () {
+        that.showHelp8();
+      });
+    }
+
+  },
+  onShow:function(){
+    if (this.data.ID==-1)
+      this.getDetail(this.data.ID);
   },
-  onUnload:function(){
+  onUnload: function () {
     wx.hideLoading();
   },
   getDetail: function (id) {
-    var item;
-    var data = wx.getStorageSync('QuestionTypeList');
-    for (var i = 0; i < data.length; i++) {
-      for (var k = 0; k < data[i].List.length; k++) {
-        if (id == data[i].List[k].ID) {
-          item = data[i].List[k];
-          item.Example[0] = item.Example[0].replace("+", " + ").replace("-", " - ").replace("×", " × ").replace("÷", " ÷ ");
-          item.Example[1] = item.Example[1].replace("+", " + ").replace("-", " - ").replace("×", " × ").replace("÷", " ÷ ");
-          item.IconName = app.globalData.fileUrl+item.IconName;
-          if (item.Name.length>12)
-            item.NameClass="text2";
-          break;
+    var item = {};
+    if (id > 0) {
+      var data = wx.getStorageSync('QuestionTypeList');
+      for (var i = 0; i < data.length; i++) {
+        for (var k = 0; k < data[i].List.length; k++) {
+          if (id == data[i].List[k].ID) {
+            item = data[i].List[k];
+            item.Example[0] = item.Example[0].replace("+", " + ").replace("-", " - ").replace("×", " × ").replace("÷", " ÷ ");
+            item.Example[1] = item.Example[1].replace("+", " + ").replace("-", " - ").replace("×", " × ").replace("÷", " ÷ ");
+            item.IconName = app.globalData.fileUrl + item.IconName;
+            if (item.Name.length > 12)
+              item.NameClass = "text2";
+            break;
+          }
         }
       }
     }
-    
+    else {
+      item.Name = "我的错题集";
+      var list = wx.getStorageSync('ErrorList');
+      item.ErrorList = list;
+    }
+
     this.setData({
       QuestionTypeItem: item,
     });
@@ -82,6 +103,11 @@ Page({
       this.menuClick({ currentTarget: { dataset: { id: "vertical" } } })
     }
   },
+  gotoError: function (e) {
+    wx.navigateTo({
+      url: '../main/errorlist',
+    });
+  },
   gotoAnswer: function (e) {
     wx.navigateTo({
       url: '../main/answer',
@@ -89,24 +115,31 @@ Page({
     this.closeHelp2();
   },
   getFinish: function () {
+    server.playSound("/sounds/click.mp3");
+
     this.setData({
       ShowLoading: true,
       BtnText: "全部保存到相册",
     });
     wx.hideLoading();
     arrAnswerID = [];
-    tempAnswerList=[];
+    tempAnswerList = [];
     this.getAnswerID();
-    this.getList(this.data.ID);
+    if (this.data.ID > 0) {
+      this.getList(this.data.ID);
+    }
+    else{
+      this.getErrorList();
+    }
 
     this.closeHelp();
   },
   //重新生成试卷
-  ResetFinish:function(){
-    var that=this;
+  ResetFinish: function () {
+    var that = this;
     wx.showLoading({
-      title:"正在重置",
-      complete:function(){
+      title: "正在重置",
+      complete: function () {
         var list = that.data.arrPage;
         for (var i = 0; i < list.length; i++) {
           wx.removeSavedFile({
@@ -171,18 +204,53 @@ Page({
       }
     });
 
+  },
+  getErrorList: function () {
+    var that = this;
+    QuestionItem = that.data.QuestionTypeItem;
+    var pageNum = QuestionItem.ErrorList.length > 60 ? 60 : QuestionItem.ErrorList.length;
+    var QuestionTypeCategory = 2;
+    pageIndex = 0;
+    that.setData({
+      IsFinished: true,
+      arrPage: [],
+      IsDistabled: "",
+      WaitTime: waitTime[that.data.PageNumber],
+    });
+    
+    if (isAndroid) {
+      console.log("android");
+      var ctx = wx.createCanvasContext("Canvas", that);
+      ctx.fillRect(0, 0, 1050, 1485);
+      ctx.draw(true, function (n) {
+        wx.canvasToTempFilePath({
+          x: 0,
+          y: 0,
+          width: 2100,
+          height: 2970,
+          canvasId: 'Canvas',
+          success: function (res2) {
+            that.saveImage();
+          }
+        })
+      });
+    }
+    else {
+      that.saveImage();
+    }
+
   },
   getAnswerID: function () {
     var list = wx.getStorageSync("AnswerList");
-    var id=1;
+    var id = 1;
     if (list && list.length > 0) {
       list.sort(function (a, b) {
-          return b.AnswerID - a.AnswerID;
+        return b.AnswerID - a.AnswerID;
       });
       id = list[0].AnswerID + 1;
     }
-    for (var i = 0; i < this.data.PageNumber;i++)
-      arrAnswerID.push(id+i);
+    for (var i = 0; i < this.data.PageNumber; i++)
+      arrAnswerID.push(id + i);
   },
   saveImage: function () {
     var that = this;
@@ -197,7 +265,7 @@ Page({
 
     ctx.fillRect(0, 0, 2100, 2970);
     ctx.fillStyle = "#000000";
-    
+
     var xStart = 60;
     var yStart = 247;
 
@@ -210,7 +278,7 @@ Page({
       height = 250;
     //括号
     var index = 0;
-    
+
     for (var i = 0; i < 3; i++) {
       for (var j = 0; j < item.PageCount / 3; j++) {
         index++;
@@ -273,7 +341,7 @@ Page({
             var len = getLength(equation[n]);
             num += len;
             if (equation[n] == ".") {
-              ctx.fillText(equation[n], num + 3, yStart + j * 59-5);
+              ctx.fillText(equation[n], num + 3, yStart + j * 59 - 5);
             } else {
               var h = -8;
               if (equation[n] == "_")
@@ -294,7 +362,7 @@ Page({
 
           for (var n = 0; n < num1.Vertical.length; n++) {
             var num = xStart + i * 310 + width;
-            var num2=0;
+            var num2 = 0;
             for (var m = num1.Vertical[n].Array.length - 1; m >= 0; m--) {
               var str = "";
               if (num1.Vertical[n].Type == "line") {
@@ -302,7 +370,7 @@ Page({
                   //var lineLength = num1.Vertical[n].Array.length * 30 + 20;
                   var lineLength = 6 * 30 + 20;
                   var lineTop = 4;
-                  
+
                   //console.log(yStart + j * height + n * 30 + lineTop);
                   ctx.moveTo(num, yStart + j * height + n * 30 + lineTop);
                   ctx.lineTo(num - lineLength, yStart + j * height + n * 30 + lineTop);
@@ -320,7 +388,7 @@ Page({
                   var lineLength = num1.A.toString().length;
                   var lineWidth = Math.floor(57 * (1 + num1.A.toString().length) / 2);
 
-                  ctx.drawImage("../../images/formula_division_size0" + lineLength + ".png", num - (num1.Vertical[n].Array.length - m) * 30 - 8, yStart + j * height + n * 30-10, lineWidth, 39);
+                  ctx.drawImage("../../images/formula_division_size0" + lineLength + ".png", num - (num1.Vertical[n].Array.length - m) * 30 - 8, yStart + j * height + n * 30 - 10, lineWidth, 39);
                   //break;
                 }
                 else if (num1.OperateAB == "÷" && n == 0) {
@@ -334,12 +402,12 @@ Page({
                     num2 = 30;
                   }
                   else if (str == "+" || str == "-" || str == "−" || str == "×" || str == "÷") {
-                    var lineLength = 6 * 30 ;
+                    var lineLength = 6 * 30;
                     ctx.fillText(str, num - lineLength, yStart + j * height + n * 30);
                     num2 = 30;
                   }
                   else
-                    ctx.fillText(str, num - (num1.Vertical[n].Array.length - m) * 30+num2, yStart + j * height + n * 30);
+                    ctx.fillText(str, num - (num1.Vertical[n].Array.length - m) * 30 + num2, yStart + j * height + n * 30);
                 }
               }
             }
@@ -379,13 +447,13 @@ Page({
         y: 0,
         width: w * times,
         height: h * times,
-        destWidth: w*times,
-        destHeight: h*times,
+        destWidth: w * times,
+        destHeight: h * times,
         canvasId: 'Canvas',
         success: function (res2) {
           console.log(res2.tempFilePath);
           that.data.arrPage.push(res2.tempFilePath);
-          item.TempImagePath=res2.tempFilePath;
+          item.TempImagePath = res2.tempFilePath;
           tempAnswerList.push(JSON.parse(JSON.stringify(item)));
 
           that.setData({
@@ -395,10 +463,10 @@ Page({
           if (that.data.arrPage.length < that.data.PageNumber) {
             pageIndex++;
             that.saveImage();
-          } 
+          }
           else {
             //生成图片完成
-            setTimeout(function(){
+            setTimeout(function () {
               that.setData({
                 ShowLoading: false,
               });
@@ -415,6 +483,9 @@ Page({
               var tempList = wx.getStorageSync("AnswerList");
               if (!tempList)
                 tempList = [];
+              for (var x = 0; x < tempList.length; x++) {
+                tempList[x].IsNew = 0;
+              }
               for (var x = 0; x < tempAnswerList.length; x++) {
                 var tempItem = tempAnswerList[x];
                 var id = x * tempItem.PageCount;
@@ -425,6 +496,7 @@ Page({
                   }
                 }
                 tempItem.QuestionList = arr;
+                tempItem.IsNew = 1;
                 tempList.unshift(tempItem);
               }
               wx.setStorageSync("AnswerList", tempList);
@@ -433,10 +505,10 @@ Page({
                 that.showHelp2();
               });
 
-            },3000);
-            
+            }, 3000);
+
+
 
-            
           }
         }
       })
@@ -473,7 +545,7 @@ Page({
         wx.saveImageToPhotosAlbum({
           filePath: that.data.arrPage[i],
           success(res3) {
-            
+
             console.log("save:" + res3.savedFilePath);
             count++
             if (count == that.data.arrPage.length) {
@@ -497,7 +569,7 @@ Page({
             console.log(err3);
             wx.openSetting();
           },
-          complete(){
+          complete() {
             wx.hideLoading();
           }
         })
@@ -507,12 +579,12 @@ Page({
   changePageNumber: function (e) {
     var id = Number(e.currentTarget.dataset.id);
     this.data.PageNumber += id;
-    var addDisabled="",subDisabled="";
-    if (this.data.PageNumber <= 1){
+    var addDisabled = "", subDisabled = "";
+    if (this.data.PageNumber <= 1) {
       this.data.PageNumber = 1;
-      subDisabled ="btnAddSubDisabled";
+      subDisabled = "btnAddSubDisabled";
     }
-    else if (this.data.PageNumber >= 4){
+    else if (this.data.PageNumber >= 4) {
       this.data.PageNumber = 4;
       addDisabled = "btnAddSubDisabled";
     }
@@ -577,7 +649,6 @@ Page({
     this.audioCtx = wx.createAudioContext('myAudio');
     this.audioCtx.pause();
   },
-
   showHelp2: function () {
     if (!this.data.HelpHidden7) {
       this.audioCtx = wx.createAudioContext('myAudio');
@@ -593,6 +664,23 @@ Page({
     this.audioCtx = wx.createAudioContext('myAudio');
     this.audioCtx.pause();
   },
+
+  showHelp8: function () {
+    if (!this.data.HelpHidden8) {
+      this.audioCtx = wx.createAudioContext('myAudio');
+      var str = "发现错误是提高成绩的第一步。点一下题目数量右侧的图标，当有错题后，能查看和整理错题清单。";
+      server.playAudio(this.audioCtx, str);
+    }
+  },
+  closeHelp8: function () {
+    this.setData({
+      HelpHidden8: true,
+    });
+    wx.setStorageSync("HelpHidden8", true);
+    this.audioCtx = wx.createAudioContext('myAudio');
+    this.audioCtx.pause();
+  },
+
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/detail.json

@@ -2,7 +2,5 @@
   "navigationBarBackgroundColor": "#E5A744",
   "navigationBarTextStyle": "black",
   "navigationBarTitleText": "制作车间",
-  "backgroundColor": "#4F4745",
-  "backgroundTextStyle": "light",
-  "enablePullDownRefresh": false
+  "backgroundColor": "#4F4745"
 }

pages/main/detail.wxml

@@ -1,8 +1,9 @@
 <view class="container FlexColumn" style="min-height:{{Containnerheight}}rpx;">
   <block wx:if="{{!IsFinished}}">
-    <image class="makepaper_headline_illus_lab" src="../../images/makepaper_headline_illus_lab.png" />
-    <image class="questioncard_icon desaturate" src="{{QuestionTypeItem.IconName}}" />
-    <view class="Example">
+    <image class="makepaper_headline_illus_lab" src="../../images/makepaper_headline_illus_lab.png" wx:if="{{ID>0}}" />
+    <image class="makepaper_headline_illus_lab" src="../../images/makepaper_headline_illus_wrong.png" wx:if="{{ID==-1}}" />
+    <image class="questioncard_icon desaturate" src="{{QuestionTypeItem.IconName}}" wx:if="{{ID>0}}" />
+    <view class="Example" wx:if="{{ID>0}}">
       <view class="Example1">
         {{QuestionTypeItem.Example[0]}}
       </view>
@@ -20,11 +21,9 @@
       </view>
     </view>
     <view class="line2"></view>
-    <view class="line3">
-
-    </view>
+    <view class="line3"></view>
     <view class="line4"></view>
-    <view class="panel1 FlexColumn">
+    <view class="panel1 FlexColumn" wx:if="{{ID>0}}">
       <view class="text1">算式类型</view>
 
       <block wx:if="{{QuestionTypeItem.QuestionNumber3==0}}">
@@ -40,11 +39,8 @@
         <image class="universalpic_indicator_cell_size01" src="../../images/universalpic_indicator_cell_size01.png" />
         <view class="panel10 FlexRow" bindtap='openMenu'>
           <view class="btnSelect">
-
             <block wx:if="{{filter=='horizontal'}}">横式</block>
             <block wx:if="{{filter=='vertical'}}">竖式</block>
-            <!-- <block wx:if="{{filter=='all'}}">横式+竖式</block> -->
-
           </view>
           <view class="btnAddSub"></view>
         </view>
@@ -69,6 +65,24 @@
         </view>
       </view>
     </view>
+
+    <view class="error4 panel1 FlexColumn" wx:if="{{ID==-1}}">
+      <view class="error1 text4">题目</view>
+
+      <image class="error2 universalpic_indicator_cell_size01" src="../../images/universalpic_indicator_cell_size01.png" />
+      <view class="panel10 FlexRow" bindtap='gotoError'>
+          <view class="error3 btnSelect">
+            {{QuestionTypeItem.ErrorList.length}}道
+          </view>
+          <view class="btnAddSub"></view>
+        </view>
+      
+      <view class="btnStart" bindtap='getFinish'>
+        <view class="btnStart1">
+          出题
+        </view>
+      </view>
+    </view>
     <view style='height:230rpx'></view>
   </block>
 
@@ -114,28 +128,29 @@
   </block>
   <view class="line5"></view>
 
-  <view class="menu FlexColumn" wx:if="{{IsShowMenu}}">
-    <view class="text1">算式类型</view>
-    <view class="panel FlexRow" bindtap='menuClick' data-id="horizontal">
-      <view>横式</view>
-      <image wx:if="{{filter=='horizontal'}}" class="universalpic_select_on_black" src="../../images/universalpic_select_on_black.png" />
+  <view class="menuPanel" style="min-height:{{Containnerheight}}rpx;" wx:if="{{IsShowMenu}}">
+    <view class="menu FlexColumn">
+      <view class="text1">算式类型</view>
+      <view class="panel FlexRow" bindtap='menuClick' data-id="horizontal">
+        <view>横式</view>
+        <image wx:if="{{filter=='horizontal'}}" class="universalpic_select_on_black" src="../../images/universalpic_select_on_black.png" />
 
-    </view>
-    <view class="line"></view>
-    <view class="panel FlexRow" bindtap='menuClick' data-id="vertical">
-      <view>竖式</view>
-      <image wx:if="{{filter=='vertical'}}" class="universalpic_select_on_black" src="../../images/universalpic_select_on_black.png" />
+      </view>
+      <view class="line"></view>
+      <view class="panel FlexRow" bindtap='menuClick' data-id="vertical">
+        <view>竖式</view>
+        <image wx:if="{{filter=='vertical'}}" class="universalpic_select_on_black" src="../../images/universalpic_select_on_black.png" />
 
-    </view>
-    <view class="line"></view>
-    <view class="line2"></view>
-    <view class="line"></view>
-    <view class="panel FlexRow" bindtap='closeMenu'>
-      <view>取消</view>
-    </view>
+      </view>
+      <view class="line"></view>
+      <view class="line2"></view>
+      <view class="line"></view>
+      <view class="panel FlexRow" bindtap='closeMenu'>
+        <view>取消</view>
+      </view>
 
+    </view>
   </view>
-
 </view>
 
 <view class="loading container FlexColumn" style="min-height:{{Containnerheight}}rpx;" wx:if="{{ShowLoading}}">
@@ -163,5 +178,6 @@
 </view>
 <image hidden="{{HelpHidden3}}" bindtap='closeHelp' class="Help_aside_makepaper" src="../../images/Help_aside_makepaper.png" />
 <image hidden="{{HelpHidden7}}" bindtap='closeHelp2' class="Help_aside_savepaper" src="../../images/Help_aside_savepaper.png" />
+<image hidden="{{HelpHidden8}}" bindtap='closeHelp8' class="Help_aside_makepaper_wrong" src="../../images/Help_aside_makepaper_wrong.png" />
 <audio hidden='true' id="myAudio"></audio>
 <canvas class='Canvas' canvas-id="Canvas"></canvas>

pages/main/detail.wxss

@@ -149,12 +149,27 @@
   margin-top: 40rpx;
   font-weight: 600;
 }
+.panel1 .error1{
+  margin-top: 60rpx;
+}
 
 .universalpic_value_cell_size01{
   width:400rpx;
   height:104rpx;
   margin-top: 30rpx;
 }
+.panel1 .error2{
+  margin-top: 30rpx;
+}
+
+.panel1 .error3{
+  margin-top: 0rpx;
+  text-align: left;
+  margin-left: 50rpx;
+}
+.error4{
+  height:474rpx;
+}
 
 .panel1 .panel10{
   margin-top: -104rpx;
@@ -377,6 +392,13 @@
   height: 100rpx;
 }
 
+.menuPanel{
+  position: fixed;
+  top: 0;
+  width: 100%;
+  background-color:rgba(229, 167, 68, 0.9);
+  z-index: 30;
+}
 
 .menu {
   position: fixed;
@@ -542,3 +564,10 @@
   z-index: 100;
 }
 
+.Help_aside_makepaper_wrong{
+  width: 100%;
+  height: 290rpx;
+  position: fixed;
+  bottom: 0rpx;
+  z-index: 100;
+}

pages/main/errorlist.js

@@ -0,0 +1,57 @@
+import common from '../../utils/util';
+import server from '../../utils/main';
+
+const app = getApp();
+Page({
+  data: {
+    IsShowMenu:false,
+  },
+  onLoad: function (options) {
+    this.setData({
+      Containnerheight: server.getWindowHeight(),
+    });
+    this.getList();
+  },
+  getList: function () {
+    var that = this;
+    var list = wx.getStorageSync("ErrorList");
+    that.setData({
+      ErrorList:list,
+    })
+  },
+  closeMenu: function () {
+    this.setData({
+      IsShowMenu: false,
+    });
+  },
+  openMenu: function (e) {
+    var id = e.currentTarget.dataset.id;
+    var item;
+    var list = this.data.ErrorList;
+    for (var i = 0; i < list.length; i++) {
+      if (id == list[i].ID) {
+        item=list[i];
+        break;
+      }
+    }
+    this.setData({
+      IsShowMenu: true,
+      SelectedItem:item,
+    });
+  },
+  deleteItem:function(){
+    var list = this.data.ErrorList;
+    for (var i = 0; i < list.length; i++) {
+      if (this.data.SelectedItem.ID==list[i].ID) {
+        list.splice(i, 1);
+        break;
+      }
+    }
+    this.setData({
+      ErrorList: list,
+      IsShowMenu: false,
+    });
+    wx.setStorageSync("ErrorList", list);
+
+  },
+});

pages/main/errorlist.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarBackgroundColor": "#fff",
+  "navigationBarTextStyle": "black",
+  "navigationBarTitleText": "错题",
+  "backgroundColor": "#F0F0F0"
+}

pages/main/errorlist.wxml

@@ -0,0 +1,54 @@
+<view class="container FlexColumn" style="min-height:{{Containnerheight}}rpx;">
+  <block wx:if="{{ErrorList.length==0}}">
+    <view class="text1">没有错题</view>
+    <text class="text2">先到“对答案”中给做错的题目打记号\n（点击题目序号）</text>
+  </block>
+
+  <block wx:if="{{ErrorList.length>0}}">
+    <view class="Panel1 FlexRow">
+      <view class="title">点题目可删除
+      </view>
+    </view>
+    <view class="Panel2 FlexRow" wx:for="{{ErrorList}}" wx:key="index" bindtap="openMenu" data-id="{{item.ID}}">
+      <view class="left">
+          <block wx:if="{{item.HiddenColumn=='A'}}">? </block>
+          <block wx:if="{{item.HiddenColumn!='A'}}">{{item.A}} </block>
+          {{item.OperateAB}}
+          <block wx:if="{{item.HiddenColumn=='B'}}">? </block>
+          <block wx:if="{{item.HiddenColumn!='B'}}">{{item.B}} </block>
+          {{item.OperateBC}} {{item.C}} {{item.OperateCD}} {{item.D}} =
+          <block wx:if="{{item.HiddenColumn=='R'}}"> </block>
+          <block wx:if="{{item.HiddenColumn!='R'}}">{{item.R}} </block>
+      </view>
+      <image class="universalpic_indicator_gray" src="../../images/universalpic_indicator_gray2.png" />
+    
+    </view>
+    <view class="footer"></view>
+  </block>
+
+<view class="menuPanel" style="min-height:{{Containnerheight}}rpx;" wx:if="{{IsShowMenu}}">
+    <view class="menu FlexColumn">
+      <view class="text1 FlexRow">
+          <block wx:if="{{SelectedItem.HiddenColumn=='A'}}">? </block>
+          <block wx:if="{{SelectedItem.HiddenColumn!='A'}}">{{SelectedItem.A}} </block>
+          {{SelectedItem.OperateAB}}
+          <block wx:if="{{SelectedItem.HiddenColumn=='B'}}">? </block>
+          <block wx:if="{{SelectedItem.HiddenColumn!='B'}}">{{SelectedItem.B}} </block>
+          {{SelectedItem.OperateBC}} {{SelectedItem.C}} {{SelectedItem.OperateCD}} {{SelectedItem.D}} =
+          <block wx:if="{{SelectedItem.HiddenColumn=='R'}}"> </block>
+          <block wx:if="{{SelectedItem.HiddenColumn!='R'}}">{{SelectedItem.R}} </block>
+      
+      </view>
+      <view class="panel FlexRow" bindtap='deleteItem'>
+        <view>删除记录</view>
+      </view>
+      <view class="line"></view>
+      <view class="line2"></view>
+      <view class="line"></view>
+      <view class="panel FlexRow" bindtap='closeMenu'>
+        <view>取消</view>
+      </view>
+
+    </view>
+  </view>
+</view>

pages/main/errorlist.wxss

@@ -0,0 +1,94 @@
+.container {
+  background-color: #F0F0F0;
+  justify-content: flex-start;
+  width: 100%; 
+  font-weight: 400;
+}
+
+.text1{
+  margin-top: 460rpx;
+  font-size:48rpx;
+  font-weight: 500;
+}
+
+.text2{
+  margin-top: 20rpx;
+  font-size:24rpx;
+  text-align: center;
+  
+}
+
+.Panel1{
+  width: 100%;
+  height:103rpx;
+  justify-content: flex-start;
+  align-items: flex-start;
+}
+.Panel1 .title{
+  color:#787878;
+  font-size:24rpx;
+  margin:40rpx 0 0 30rpx; 
+}
+
+.Panel2{
+  width: 100%;
+  height:101rpx;
+  justify-content: space-between;
+  margin-bottom: 1rpx;
+  background-color: #fff;
+}
+.Panel2 .left{
+  margin-left: 30rpx;
+  font-size:28rpx;
+}
+.universalpic_indicator_gray{
+  width: 16rpx;
+  height:26rpx;
+  margin-right: 30rpx;
+}
+.footer{
+  height:100rpx;
+}
+
+
+.menuPanel{
+  position: fixed;
+  top: 0;
+  width: 100%;
+  background-color:rgba(0, 0, 0, 0.6);
+  z-index: 30;
+}
+
+.menu {
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  background-color: #d2d2d2;
+  z-index: 30;
+  font-weight: 400;
+}
+
+.menu .text1 {
+  font-size: 24rpx;
+  margin: 30rpx;
+}
+
+.menu .panel {
+  font-size: 36rpx;
+  height: 111rpx;
+  width: 100%;
+  background-color: #fff;
+  position: relative;
+}
+
+.menu .line {
+  height: 2rpx;
+  width: 100%;
+  background-color: #e3e3e3;
+}
+
+.menu .line2 {
+  height: 20rpx;
+  width: 100%;
+  background-color: #d2d2d2;
+}

pages/main/item.js

@@ -5,6 +5,7 @@ const app = getApp();
 
 var currentIndex = 0, tempCurrentIndex = -1;
 var audioArray = [];
+var AnswerID=0;
 
 Page({
   data: {
@@ -16,31 +17,42 @@ Page({
     selectTab2: "",
   },
   onLoad: function (options) {
-    var that=this;
+    var that = this;
     this.audioCtxNumber = wx.createAudioContext('numberAudio');
-    
+
     this.setData({
       Containnerheight: server.getWindowHeight(),
       IsPlaying: 0,
     });
     audioArray = [];
-    currentIndex=0;
+    currentIndex = 0;
     tempCurrentIndex = -1;
 
-    var id = options.id;
-    this.getItem(id);
+    AnswerID = options.id;
+    this.getItem();
 
     wx.setNavigationBarTitle({
-      title: "试卷答案 " + id,
+      title: "试卷答案 " + AnswerID,
     });
 
-    common.getStorageValue(this, "HelpHidden6", false, function () { 
+    common.getStorageValue(this, "HelpHidden6", false, function () {
       that.showHelp();
     });
 
   },
-  onUnload:function(){
+  onUnload: function () {
     this.closeHelp();
+
+    var list = wx.getStorageSync("AnswerList");
+    if (list && list.length > 0) {
+      for (var i = 0; i < list.length; i++) {
+        if (AnswerID == list[i].AnswerID) {
+          list[i] = this.data.AnswerItem;
+          wx.setStorageSync("AnswerList", list);
+          break;
+        }
+      }
+    }
   },
   scrollTop: function (e) {
     var id = Number(e.currentTarget.dataset.id);
@@ -72,13 +84,13 @@ Page({
     });
 
   },
-  getItem: function (id) {
+  getItem: function () {
     var that = this;
     var list = wx.getStorageSync("AnswerList");
     if (list && list.length > 0) {
       var item;
       for (var i = 0; i < list.length; i++) {
-        if (id == list[i].AnswerID) {
+        if (AnswerID == list[i].AnswerID) {
           item = list[i];
           break;
         }
@@ -88,9 +100,8 @@ Page({
       for (var i = 0; i < list.length; i++) {
         if (i == 0 && list[i].Vertical) {
           list[i].IsShowVertical = true;
-          break;
         }
-
+        //list[i].ErrorClass = "";
       }
 
       var list = item.QuestionList;
@@ -101,8 +112,8 @@ Page({
             list[i].Vertical[1].Array[k] = "";
           }
           for (var k = 0; k < list[i].Vertical[2].Array.length; k++) {
-            if (list[i].Vertical[2].Array[k] =="√"){
-              list[i].Vertical[2].Array[k]="";
+            if (list[i].Vertical[2].Array[k] == "√") {
+              list[i].Vertical[2].Array[k] = "";
               list[i].Vertical[2].Array.push("√");
               break;
             }
@@ -131,6 +142,62 @@ Page({
     });
 
   },
+  setErrorItem: function (e) {
+    var id = e.currentTarget.dataset.id;
+    var list = this.data.AnswerItem.QuestionList;
+    for (var i = 0; i < list.length; i++) {
+      if (id == list[i].ID) {
+        if (!list[i].ErrorClass || list[i].ErrorClass == "") {
+          list[i].ErrorClass = "ErrorClass";
+          wx.showToast({ title: "记号已保存", duration: 1000 });
+          this.saveErrorList(list[i],"add");
+        }
+        else {
+          list[i].ErrorClass = "";
+          wx.showToast({ title: "记号已消除", duration: 1000 });
+          this.saveErrorList(list[i], "delete");
+        }
+        break;
+      }
+    }
+    this.data.AnswerItem.QuestionList = list;
+    this.setData({
+      AnswerItem: this.data.AnswerItem,
+    });
+    
+  },
+  saveErrorList:function(item,action){
+    var list = wx.getStorageSync("ErrorList");
+    if (!list)
+      list=[];
+    var b=false;
+    for(var i=0;i<list.length;i++){
+      if (item.A == list[i].A && item.B == list[i].B && item.R == list[i].R && item.OperateAB == list[i].OperateAB){
+        if (item.C){
+          if (item.C == list[i].C && item.OperateBC == list[i].OperateBC){
+            if (item.D){
+              if (item.D == list[i].D && item.OperateCD == list[i].OperateCD){
+                b=true;
+              }
+            }
+            else
+              b=true;
+          }
+        }
+        else
+          b=true;
+      } 
+      if (b){
+        list.splice(i, 1);
+        break;
+      }
+    }
+    if (action=="add"){
+      item.ID=new Date().getTime();
+      list.unshift(item);
+    }
+    wx.setStorageSync("ErrorList", list);
+  },
   showImage: function (e) {
     var that = this;
     wx.previewImage({
@@ -147,6 +214,7 @@ Page({
       this.audioCtxNumber.play();
     }
     else if (this.data.IsPlaying == 0) {
+      server.playSound("/sounds/startend.mp3");
       var arr = [];
       var item = this.data.AnswerItem;
       var list = item.QuestionList;
@@ -188,14 +256,16 @@ Page({
       this.setData({
         IsPlaying: true,
       });
+      server.playSound("/sounds/startend.mp3");
       return;
     } else {
-      server.playAudio(this.audioCtxNumber, audioArray[currentIndex].join(","));
+      server.playAudio(this.audioCtxNumber, audioArray[currentIndex].join(","), 1);
     }
   },
   onPlayEnded: function (e) {
     currentIndex++;
     this.playAudioAll();
+
   },
   playPrev: function () {
     var playstr = "本";
@@ -216,7 +286,7 @@ Page({
   showHelp: function () {
     if (!this.data.HelpHidden6) {
       this.audioCtx = wx.createAudioContext('myAudio');
-      var str = "Nice，让我用30秒讲完最后的帮助。答案靠左，题目居右，如果发现题目右侧有图标，说明这是一道竖式题，点击图标可以检查解题步骤，这是独门神器，对找出问题所在非常有效。期待你的好成绩，拜拜！";
+      var str = "对答案可以用听的也可以用看的。答案在左边，题目在右边。想给做错的题目打记号，就点击答案左侧的1、2、3……题目序号，这样就可以去首页的错题集里复习它们了。还有一个特殊功能！在有竖式题目的情况下，题目右侧会有这样的图标      ，点它就能提供完整的解题步骤，这个独门神器是倾力为你准备的，对找出错误所在非常有效。";
       server.playAudio(this.audioCtx, str);
     }
   },

pages/main/item.json

@@ -2,7 +2,5 @@
   "navigationBarBackgroundColor": "#fff",
   "navigationBarTextStyle": "black",
   "navigationBarTitleText": "试卷答案",
-  "backgroundColor": "#F0F0F0",
-  "backgroundTextStyle": "light",
-  "enablePullDownRefresh": false
+  "backgroundColor": "#F0F0F0"
 }

pages/main/item.wxml

@@ -57,13 +57,17 @@
         </view>
       </view>
     </block>
-    <view class="panelRowBody panel0 FlexRow" bindtap='selectedItem' data-id="{{item.ID}}">
-      <view class="panelLeft FlexRow">
-        <view class="number">{{index+1}}</view>
+    <view class="{{item.ErrorClass}} panelRowBody panel0 FlexRow">
+      <view class="FlexRow">
+        <view class="numberPanel FlexRow" bindtap="setErrorItem" data-id="{{item.ID}}">
+          <view class="number">{{index+1}}</view>
+          <image class="universalpic_wrong_red" src="../../images/universalpic_wrong_red.png" wx:if="{{item.ErrorClass=='ErrorClass'}}" />
+        
+        </view>
         <view class="answer">{{item.Result}}</view>
       </view>
-      <view class="panelRight FlexRow">
-        <view class="equation">
+      <view class="panelRight FlexRow" bindtap='selectedItem' data-id="{{item.ID}}">
+        <view class="{{item.ErrorClass}} equation">
           <block wx:if="{{item.HiddenColumn=='A'}}">___ </block>
           <block wx:if="{{item.HiddenColumn!='A'}}">{{item.A}} </block>
           {{item.OperateAB}}

pages/main/item.wxss

@@ -116,6 +116,13 @@
   background-color: #F0F0F0;
 }
 
+
+.panelRowBody .numberPanel{
+  height:110rpx;
+  width:116rpx;
+  position: relative;
+}
+
 .panelRowBody .number{
   text-align: center;
   width:46rpx;
@@ -126,14 +133,14 @@
   background-color: #2E2E2E;
   font-family: 'Roboto-Bold';
   font-size:22rpx;
+  margin: 0 40rpx 0 30rpx;
 }
 .panelRowBody .answer{
   font-size:48rpx;
-  margin-left: 40rpx;
   font-family: 'Roboto-Regular';
 }
 
-.panelRowBody .equation{
+.equation{
   font-size:26rpx;
   margin-right: 20rpx;
   color:#8C8C8C;
@@ -141,8 +148,9 @@
 }
 
 
-.panelRowBody{
-  background-color: #F0F0F0;
+.ErrorClass{
+  color:#fff;
+  background-color: #E95B51;
 }
 
 .line{
@@ -260,8 +268,16 @@
 
 .Help_aside_answerroom_detail{
   width: 100%;
-  height: 377rpx;
+  height: 564rpx;
   position: fixed;
   bottom: 0rpx;
   z-index: 200;
 }
+
+.universalpic_wrong_red{
+  width:36rpx;
+  height:36rpx;
+  position: absolute;
+  left:12rpx;
+  top:23rpx;
+}

pages/main/list.js

@@ -36,6 +36,8 @@ Page({
     this.buildList();
   },
   gotoDetail: function (e) {
+    server.playSound("/sounds/click.mp3");
+    
     SelectID = e.currentTarget.dataset.id;
     var arr = wx.getStorageSync('SelectIDArray');
     if (!arr)

pages/main/list.json

@@ -2,7 +2,5 @@
   "navigationBarBackgroundColor": "#9C5043",
   "navigationBarTextStyle": "white",
   "navigationBarTitleText": "题目仓库",
-  "backgroundColor": "#514a47",
-  "backgroundTextStyle": "light",
-  "enablePullDownRefresh": false
+  "backgroundColor": "#514a47"
 }

pages/main/print.js

@@ -1,301 +0,0 @@
-import common from '../../utils/util';
-import server from '../../utils/main';
-
-const app = getApp();
-var QuestionList = [];
-var isAndroid = false;
-
-Page({
-  data: {
-    Left: 0,
-  },
-  onLoad: function (options) {
-    var id = options.id;
-    id = 130;
-    var QuestionTypeCategory=3;
-    this.getList(id, QuestionTypeCategory);
-
-    isAndroid = false;
-    if (app.globalData.systemInfo.system && app.globalData.systemInfo.system.indexOf("Android") >= 0)
-      isAndroid = true;
-
-  },
-  getList: function (id, QuestionTypeCategory) {
-    var that = this;
-
-    server.getLocalHost(function () {
-      server.getData('GetQuestionTypesPrint?QuestionTypeCategory=' + QuestionTypeCategory+'&ID=' + id, function (data) {
-        //console.log("UserInfo:" + data);
-        if (data) {
-          //var data=wx.getStorageSync("TestPrint");
-          QuestionList = data;
-          var ctx = wx.createCanvasContext("Canvas", that);
-          ctx.setFillStyle('white');
-          ctx.fillRect(0, 0, 1050, 1485);
-          ctx.draw(true, function (n) {
-            wx.canvasToTempFilePath({
-              x: 0,
-              y: 0,
-              width: 2100,
-              height: 2970,
-              destWidth: 2100,
-              destHeight: 2970,
-              canvasId: 'Canvas',
-              success: function (res2) {
-                console.log(res2.tempFilePath);
-                that.saveImage();
-              }
-            })
-          });
-        }
-      });
-
-    });
-  },
-  saveImage: function () {
-    var item = QuestionList;
-
-    var that = this;
-    var ctx = wx.createCanvasContext("Canvas", that);
-    ctx.setFillStyle('white');
-    //ctx.fillRect(0, 0, 1050, 1485);
-    ctx.fillRect(0, 0, 1050, 1485);
-    ctx.fillStyle = "#000000";
-
-    //计算数组最大长度
-    var maxLength = 0;
-    for (var l = 0; l < item.QuestionList.length; l++) {
-      var num1 = item.QuestionList[l];
-      if (num1.Vertical) {
-        for (var n = 0; n < num1.Vertical.length; n++) {
-          if (maxLength < num1.Vertical[n].Array.length)
-            maxLength = num1.Vertical[n].Array.length;
-        }
-      }
-    }
-
-    var xStart = 60;
-    var yStart = 247;
-
-    var height = 150;
-    if (item.QuestionTypeCategory == 2)
-      height = 59;
-    if (item.PageCount == 18)
-      height = 210;
-    else if (item.PageCount == 15)
-      height = 250;
-    //括号
-    var index = 0;
-    ctx.setFontSize(12);
-    for (var i = 0; i < 3; i++) {
-      for (var j = 0; j < item.PageCount / 3; j++) {
-        index++;
-        ctx.fillText("(", xStart + i * 310, yStart + j * height);
-        ctx.fillText(")", xStart + i * 310 + 22, yStart + j * height);
-      }
-    }
-
-    //编号
-    index = 0;
-    ctx.setTextAlign('center');
-    var numberLeft = 12;
-    if (isAndroid)
-      numberLeft = 14;
-    for (var i = 0; i < 3; i++) {
-      for (var j = 0; j < item.PageCount / 3; j++) {
-        index++;
-        ctx.fillText(index, xStart + i * 310 + numberLeft, yStart + j * height);
-      }
-    }
-
-    //算式
-    index = 0;
-    ctx.setFontSize(24);
-    for (var i = 0; i < 3; i++) {
-      for (var j = 0; j < item.PageCount / 3; j++) {
-        index++;
-
-        //横式
-        if (item.QuestionTypeCategory == 2) {
-
-          var A = item.QuestionList[index - 1].A.toString();
-          if (item.QuestionList[index - 1].HiddenColumn == "A")
-            A = "____";
-          var OperateAB = item.QuestionList[index - 1].OperateAB.toString();
-          console.log(OperateAB);
-          var B = item.QuestionList[index - 1].B.toString();
-          if (item.QuestionList[index - 1].HiddenColumn == "B")
-            B = "____";
-          var equation = A + " " + OperateAB + " " + B;
-          if (item.QuestionList[index - 1].C) {
-            var OperateBC = item.QuestionList[index - 1].OperateBC.toString();
-            var C = item.QuestionList[index - 1].C.toString();
-            equation += " " + OperateBC + " " + C;
-            if (item.QuestionList[index - 1].D) {
-              var OperateCD = item.QuestionList[index - 1].OperateCD.toString();
-              var D = item.QuestionList[index - 1].D.toString();
-              equation += " " + OperateCD + " " + D;
-            }
-          }
-          equation += " = ";
-          var R = item.QuestionList[index - 1].R.toString();
-          if (item.QuestionList[index - 1].HiddenColumn == "R")
-            R = "";
-          equation += R;
-
-          var num = xStart + i * 310 + 31;
-          
-          for (var n = 0; n < equation.length; n++) {
-            var len = getLength(equation[n]);
-            num += len;
-            if (equation[n] == ".") {
-              ctx.fillText(equation[n], num + 3, yStart + j * 59);
-            } else {
-              var h = 0;
-              if (equation[n] == "_")
-                h = 8;
-              ctx.fillText(equation[n], num, yStart + j * 59 + h);
-            }
-          }
-        }
-        //竖式
-        else if (item.QuestionTypeCategory == 3) {
-
-          var num1 = item.QuestionList[index - 1];
-          var isAnswer = false;
-
-          var width = 250;
-          if (num1.OperateAB == "÷")
-            width=240;
-
-          //console.log(num1);
-          for (var n = 0; n < num1.Vertical.length; n++) {
-            if (maxLength > num1.Vertical[n].Array.length) {
-              if (num1.OperateAB != "÷")
-                num1.Vertical[n].Array.splice(1, 0, "");
-            }
-          }
-          console.log(num1);
-
-
-          for (var n = 0; n < num1.Vertical.length; n++) {
-            var num = xStart + i * 310 + width;
-            for (var m = num1.Vertical[n].Array.length - 1; m >= 0; m--) {
-              var str = "";
-              if (num1.Vertical[n].Type == "line") {
-                if (num1.OperateAB != "÷") {
-                  var lineLength = num1.Vertical[n].Array.length * 30 + 20;
-                  var lineTop = -15;
-                  if (num1.OperateAB == "÷") {
-                    lineLength = num1.A.toString().length * 30;
-                    lineTop = 0;
-                  }
-
-                  ctx.moveTo(num, yStart + j * height + n * 30 + lineTop);
-                  ctx.lineTo(num - lineLength, yStart + j * height + n * 30 + lineTop);
-                  ctx.stroke();
-
-                  if (num1.OperateAB != "÷")
-                    isAnswer = true;
-                  break;
-                }
-              }
-              else {
-                str = num1.Vertical[n].Array[m];
-
-                if (num1.OperateAB == "÷" && str == "√") {
-                  isAnswer = true;
-                  var lineLength = num1.A.toString().length;
-                  var lineWidth = Math.floor(57 * (1 + num1.A.toString().length) / 2);
-
-                  ctx.drawImage("../../images/formula_division_size0" + lineLength + ".png", num - (num1.Vertical[n].Array.length - m) * 30 - 8, yStart + j * height + n * 30 - 31, lineWidth, 39);
-                  //break;
-                }
-                else if (num1.OperateAB == "÷" && n == 0) {
-                }
-                else if (num1.OperateAB == "÷" && n == 1) {
-                  ctx.fillText(str, num - (num1.Vertical[n].Array.length - m) * 10, yStart + j * height + n * 30);
-                }
-                else {
-                  ctx.fillText(str, num - (num1.Vertical[n].Array.length - m) * 30, yStart + j * height + n * 30);
-                }
-              }
-            }
-            if (isAnswer)
-              break;
-          }
-
-        }
-      }
-    }
-
-    ctx.setTextAlign('left');
-    ctx.setTextBaseline('top');
-    ctx.setFontSize(32);
-    ctx.fillText(item.Name, 60, 45);
-    ctx.fillText("99", 835, 50);
-
-
-    ctx.setFontSize(12);
-    ctx.fillText(item.CagegoryName, 60, 90);
-    ctx.fillText("共" + item.QuestionList.length + "道题", 60, 125);
-    ctx.fillText("第 1 / 1 页", 60, 147);
-    ctx.fillText("答案检索号", 768, 60);
-
-    ctx.setTextAlign('right');
-    ctx.fillText("出题时间 " + item.CreateTime, 875, 94);
-    ctx.fillText("微信扫一扫 计时看答案", 875, 111);
-    ctx.fillText("《数学计算题》选题 打印 扫码 批改", 875, 137);
-    ctx.drawImage("../../images/answer.png", 890, 54, 100, 100);
-
-
-    ctx.draw(true, function (n) {
-      wx.canvasToTempFilePath({
-        x: 0,
-        y: 0,
-        width: 2100,
-        height: 2970,
-        destWidth: 2100,
-        destHeight: 2970,
-        canvasId: 'Canvas',
-        success: function (res2) {
-          console.log(res2.tempFilePath);
-          wx.previewImage({
-            current: res2.tempFilePath, // 当前显示图片的http链接
-            urls: [res2.tempFilePath] // 需要预览的图片http链接列表
-          });
-        }
-      })
-    });
-
-    function getLength(str) {
-      switch (str) {
-        case "0":
-        case "1":
-        case "2":
-        case "3":
-        case "4":
-        case "5":
-        case "6":
-        case "7":
-        case "8":
-        case "9":
-          return 15;
-        case ".":
-          return 8;
-        default:
-          return 12;
-      }
-    }
-  },
-  moveLeft: function () {
-    this.setData({
-      Left: this.data.Left + 375,
-    });
-  },
-  moveRight: function () {
-    this.setData({
-      Left: this.data.Left - 375,
-    });
-  }
-});

pages/main/print.json

@@ -1 +0,0 @@
-{}

pages/main/print.wxml

@@ -1,6 +0,0 @@
-<view class="panel">
-<canvas class='Canvas' style='left:{{Left}}rpx;' canvas-id="Canvas"></canvas>
-<view class="btnLeft" bindtap='moveLeft'>左</view>
-<view class="btnRight" bindtap='moveRight'>右</view>
-
-</view>

pages/main/print.wxss

@@ -1,26 +0,0 @@
-.panel{
-  width: 2100rpx; 
-  height: 2970rpx;
-}
-.Canvas{
-  width: 2100rpx; 
-  height: 2970rpx;
-  position: absolute;
-  left:0rpx;
-  top:0rpx;
-}
-
-.btnLeft{
-  position: fixed;
-  bottom: 30rpx;
-  left:30rpx;
-  background-color: #ddd;
-}
-
-.btnRight{
-  position: fixed;
-  bottom: 30rpx;
-  right:30rpx;
-  background-color: #ddd;
-}
-

project.config.json

@@ -1,7 +1,7 @@
 {
 	"description": "项目配置文件。",
 	"setting": {
-		"urlCheck": false,
+		"urlCheck": true,
 		"es6": true,
 		"postcss": true,
 		"minified": true,
@@ -30,7 +30,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 5,
+			"current": 7,
 			"list": [
 				{
 					"id": 0,
@@ -67,6 +67,17 @@
 					"name": "login",
 					"pathName": "pages/about/payfinished",
 					"query": ""
+				},
+				{
+					"id": -1,
+					"name": "answer",
+					"pathName": "pages/main/answer",
+					"query": ""
+				},
+				{
+					"id": -1,
+					"name": "errorlist",
+					"pathName": "pages/main/errorlist"
 				}
 			]
 		}

utils/cryptojs.js

@@ -1,17 +1,7 @@
 var Crypto = exports.Crypto = require('./lib/Crypto').Crypto;
 
-[ 'CryptoMath'
-, 'BlockModes'
-, 'DES'
+[ 'BlockModes'
 , 'AES'
-, 'HMAC'
-, 'MARC4'
-, 'MD5'
-, 'PBKDF2'
-, 'PBKDF2Async'
-, 'Rabbit'
-, 'SHA1'
-, 'SHA256'
 ].forEach( function (path) {
 	require('./lib/' + path);
 });

utils/lib/CryptoMath.js

@@ -1,37 +0,0 @@
-(function(){
-
-var C = (typeof window === 'undefined') ? require('./Crypto').Crypto : window.Crypto;
-
-// Shortcut
-var util = C.util;
-
-// Convert n to unsigned 32-bit integer
-util.u32 = function (n) {
-	return n >>> 0;
-};
-
-// Unsigned 32-bit addition
-util.add = function () {
-	var result = this.u32(arguments[0]);
-	for (var i = 1; i < arguments.length; i++)
-		result = this.u32(result + this.u32(arguments[i]));
-	return result;
-};
-
-// Unsigned 32-bit multiplication
-util.mult = function (m, n) {
-	return this.add((n & 0xFFFF0000) * m,
-			(n & 0x0000FFFF) * m);
-};
-
-// Unsigned 32-bit greater than (>) comparison
-util.gt = function (m, n) {
-	return this.u32(m) > this.u32(n);
-};
-
-// Unsigned 32-bit less than (<) comparison
-util.lt = function (m, n) {
-	return this.u32(m) < this.u32(n);
-};
-
-})();

utils/lib/HMAC.js

@@ -1,38 +0,0 @@
-(function(){
-
-var C = (typeof window === 'undefined') ? require('./Crypto').Crypto : window.Crypto;
-
-// Shortcuts
-var util = C.util,
-    charenc = C.charenc,
-    UTF8 = charenc.UTF8,
-    Binary = charenc.Binary;
-
-C.HMAC = function (hasher, message, key, options) {
-
-	// Convert to byte arrays
-	if (message.constructor == String) message = UTF8.stringToBytes(message);
-	if (key.constructor == String) key = UTF8.stringToBytes(key);
-	/* else, assume byte arrays already */
-
-	// Allow arbitrary length keys
-	if (key.length > hasher._blocksize * 4)
-		key = hasher(key, { asBytes: true });
-
-	// XOR keys with pad constants
-	var okey = key.slice(0),
-	    ikey = key.slice(0);
-	for (var i = 0; i < hasher._blocksize * 4; i++) {
-		okey[i] ^= 0x5C;
-		ikey[i] ^= 0x36;
-	}
-
-	var hmacbytes = hasher(okey.concat(hasher(ikey.concat(message), { asBytes: true })), { asBytes: true });
-
-	return options && options.asBytes ? hmacbytes :
-	       options && options.asString ? Binary.bytesToString(hmacbytes) :
-	       util.bytesToHex(hmacbytes);
-
-};
-
-})();

utils/lib/MARC4.js

@@ -1,117 +0,0 @@
-(function(){
-
-var C = (typeof window === 'undefined') ? require('./Crypto').Crypto : window.Crypto;
-
-// Shortcuts
-var util = C.util,
-    charenc = C.charenc,
-    UTF8 = charenc.UTF8,
-    Binary = charenc.Binary;
-
-var MARC4 = C.MARC4 = {
-
-	/**
-	 * Public API
-	 */
-
-	encrypt: function (message, password) {
-
-		var
-
-		    // Convert to bytes
-		    m = UTF8.stringToBytes(message),
-
-		    // Generate random IV
-		    iv = util.randomBytes(16),
-
-		    // Generate key
-		    k = password.constructor == String ?
-		        // Derive key from passphrase
-		        C.PBKDF2(password, iv, 32, { asBytes: true }) :
-		        // else, assume byte array representing cryptographic key
-		        password;
-
-		// Encrypt
-		MARC4._marc4(m, k, 1536);
-
-		// Return ciphertext
-		return util.bytesToBase64(iv.concat(m));
-
-	},
-
-	decrypt: function (ciphertext, password) {
-
-		var
-
-		    // Convert to bytes
-		    c = util.base64ToBytes(ciphertext),
-
-		    // Separate IV and message
-		    iv = c.splice(0, 16),
-
-		    // Generate key
-		    k = password.constructor == String ?
-		        // Derive key from passphrase
-		        C.PBKDF2(password, iv, 32, { asBytes: true }) :
-		        // else, assume byte array representing cryptographic key
-		        password;
-
-		// Decrypt
-		MARC4._marc4(c, k, 1536);
-
-		// Return plaintext
-		return UTF8.bytesToString(c);
-
-	},
-
-
-	/**
-	 * Internal methods
-	 */
-
-	// The core
-	_marc4: function (m, k, drop) {
-
-		// State variables
-		var i, j, s, temp;
-
-		// Key setup
-		for (i = 0, s = []; i < 256; i++) s[i] = i;
-		for (i = 0, j = 0;  i < 256; i++) {
-
-			j = (j + s[i] + k[i % k.length]) % 256;
-
-			// Swap
-			temp = s[i];
-			s[i] = s[j];
-			s[j] = temp;
-
-		}
-
-		// Clear counters
-		i = j = 0;
-
-		// Encryption
-		for (var k = -drop; k < m.length; k++) {
-
-			i = (i + 1) % 256;
-			j = (j + s[i]) % 256;
-
-			// Swap
-			temp = s[i];
-			s[i] = s[j];
-			s[j] = temp;
-
-			// Stop here if we're still dropping keystream
-			if (k < 0) continue;
-
-			// Encrypt
-			m[k] ^= s[(s[i] + s[j]) % 256];
-
-		}
-
-	}
-
-};
-
-})();

utils/lib/MD5.js

@@ -1,158 +0,0 @@
-(function(){
-
-var C = (typeof window === 'undefined') ? require('./Crypto').Crypto : window.Crypto;
-
-// Shortcuts
-var util = C.util,
-    charenc = C.charenc,
-    UTF8 = charenc.UTF8,
-    Binary = charenc.Binary;
-
-// Public API
-var MD5 = C.MD5 = function (message, options) {
-	var digestbytes = util.wordsToBytes(MD5._md5(message));
-	return options && options.asBytes ? digestbytes :
-	       options && options.asString ? Binary.bytesToString(digestbytes) :
-	       util.bytesToHex(digestbytes);
-};
-
-// The core
-MD5._md5 = function (message) {
-
-	// Convert to byte array
-	if (message.constructor == String) message = UTF8.stringToBytes(message);
-	/* else, assume byte array already */
-
-	var m = util.bytesToWords(message),
-	    l = message.length * 8,
-	    a =  1732584193,
-	    b = -271733879,
-	    c = -1732584194,
-	    d =  271733878;
-
-	// Swap endian
-	for (var i = 0; i < m.length; i++) {
-		m[i] = ((m[i] <<  8) | (m[i] >>> 24)) & 0x00FF00FF |
-		       ((m[i] << 24) | (m[i] >>>  8)) & 0xFF00FF00;
-	}
-
-	// Padding
-	m[l >>> 5] |= 0x80 << (l % 32);
-	m[(((l + 64) >>> 9) << 4) + 14] = l;
-
-	// Method shortcuts
-	var FF = MD5._ff,
-	    GG = MD5._gg,
-	    HH = MD5._hh,
-	    II = MD5._ii;
-
-	for (var i = 0; i < m.length; i += 16) {
-
-		var aa = a,
-		    bb = b,
-		    cc = c,
-		    dd = d;
-
-		a = FF(a, b, c, d, m[i+ 0],  7, -680876936);
-		d = FF(d, a, b, c, m[i+ 1], 12, -389564586);
-		c = FF(c, d, a, b, m[i+ 2], 17,  606105819);
-		b = FF(b, c, d, a, m[i+ 3], 22, -1044525330);
-		a = FF(a, b, c, d, m[i+ 4],  7, -176418897);
-		d = FF(d, a, b, c, m[i+ 5], 12,  1200080426);
-		c = FF(c, d, a, b, m[i+ 6], 17, -1473231341);
-		b = FF(b, c, d, a, m[i+ 7], 22, -45705983);
-		a = FF(a, b, c, d, m[i+ 8],  7,  1770035416);
-		d = FF(d, a, b, c, m[i+ 9], 12, -1958414417);
-		c = FF(c, d, a, b, m[i+10], 17, -42063);
-		b = FF(b, c, d, a, m[i+11], 22, -1990404162);
-		a = FF(a, b, c, d, m[i+12],  7,  1804603682);
-		d = FF(d, a, b, c, m[i+13], 12, -40341101);
-		c = FF(c, d, a, b, m[i+14], 17, -1502002290);
-		b = FF(b, c, d, a, m[i+15], 22,  1236535329);
-
-		a = GG(a, b, c, d, m[i+ 1],  5, -165796510);
-		d = GG(d, a, b, c, m[i+ 6],  9, -1069501632);
-		c = GG(c, d, a, b, m[i+11], 14,  643717713);
-		b = GG(b, c, d, a, m[i+ 0], 20, -373897302);
-		a = GG(a, b, c, d, m[i+ 5],  5, -701558691);
-		d = GG(d, a, b, c, m[i+10],  9,  38016083);
-		c = GG(c, d, a, b, m[i+15], 14, -660478335);
-		b = GG(b, c, d, a, m[i+ 4], 20, -405537848);
-		a = GG(a, b, c, d, m[i+ 9],  5,  568446438);
-		d = GG(d, a, b, c, m[i+14],  9, -1019803690);
-		c = GG(c, d, a, b, m[i+ 3], 14, -187363961);
-		b = GG(b, c, d, a, m[i+ 8], 20,  1163531501);
-		a = GG(a, b, c, d, m[i+13],  5, -1444681467);
-		d = GG(d, a, b, c, m[i+ 2],  9, -51403784);
-		c = GG(c, d, a, b, m[i+ 7], 14,  1735328473);
-		b = GG(b, c, d, a, m[i+12], 20, -1926607734);
-
-		a = HH(a, b, c, d, m[i+ 5],  4, -378558);
-		d = HH(d, a, b, c, m[i+ 8], 11, -2022574463);
-		c = HH(c, d, a, b, m[i+11], 16,  1839030562);
-		b = HH(b, c, d, a, m[i+14], 23, -35309556);
-		a = HH(a, b, c, d, m[i+ 1],  4, -1530992060);
-		d = HH(d, a, b, c, m[i+ 4], 11,  1272893353);
-		c = HH(c, d, a, b, m[i+ 7], 16, -155497632);
-		b = HH(b, c, d, a, m[i+10], 23, -1094730640);
-		a = HH(a, b, c, d, m[i+13],  4,  681279174);
-		d = HH(d, a, b, c, m[i+ 0], 11, -358537222);
-		c = HH(c, d, a, b, m[i+ 3], 16, -722521979);
-		b = HH(b, c, d, a, m[i+ 6], 23,  76029189);
-		a = HH(a, b, c, d, m[i+ 9],  4, -640364487);
-		d = HH(d, a, b, c, m[i+12], 11, -421815835);
-		c = HH(c, d, a, b, m[i+15], 16,  530742520);
-		b = HH(b, c, d, a, m[i+ 2], 23, -995338651);
-
-		a = II(a, b, c, d, m[i+ 0],  6, -198630844);
-		d = II(d, a, b, c, m[i+ 7], 10,  1126891415);
-		c = II(c, d, a, b, m[i+14], 15, -1416354905);
-		b = II(b, c, d, a, m[i+ 5], 21, -57434055);
-		a = II(a, b, c, d, m[i+12],  6,  1700485571);
-		d = II(d, a, b, c, m[i+ 3], 10, -1894986606);
-		c = II(c, d, a, b, m[i+10], 15, -1051523);
-		b = II(b, c, d, a, m[i+ 1], 21, -2054922799);
-		a = II(a, b, c, d, m[i+ 8],  6,  1873313359);
-		d = II(d, a, b, c, m[i+15], 10, -30611744);
-		c = II(c, d, a, b, m[i+ 6], 15, -1560198380);
-		b = II(b, c, d, a, m[i+13], 21,  1309151649);
-		a = II(a, b, c, d, m[i+ 4],  6, -145523070);
-		d = II(d, a, b, c, m[i+11], 10, -1120210379);
-		c = II(c, d, a, b, m[i+ 2], 15,  718787259);
-		b = II(b, c, d, a, m[i+ 9], 21, -343485551);
-
-		a = (a + aa) >>> 0;
-		b = (b + bb) >>> 0;
-		c = (c + cc) >>> 0;
-		d = (d + dd) >>> 0;
-
-	}
-
-	return util.endian([a, b, c, d]);
-
-};
-
-// Auxiliary functions
-MD5._ff  = function (a, b, c, d, x, s, t) {
-	var n = a + (b & c | ~b & d) + (x >>> 0) + t;
-	return ((n << s) | (n >>> (32 - s))) + b;
-};
-MD5._gg  = function (a, b, c, d, x, s, t) {
-	var n = a + (b & d | c & ~d) + (x >>> 0) + t;
-	return ((n << s) | (n >>> (32 - s))) + b;
-};
-MD5._hh  = function (a, b, c, d, x, s, t) {
-	var n = a + (b ^ c ^ d) + (x >>> 0) + t;
-	return ((n << s) | (n >>> (32 - s))) + b;
-};
-MD5._ii  = function (a, b, c, d, x, s, t) {
-	var n = a + (c ^ (b | ~d)) + (x >>> 0) + t;
-	return ((n << s) | (n >>> (32 - s))) + b;
-};
-
-// Package private blocksize
-MD5._blocksize = 16;
-
-MD5._digestsize = 16;
-
-})();

utils/lib/PBKDF2.js

@@ -1,49 +0,0 @@
-(function(){
-
-var C = (typeof window === 'undefined') ? require('./Crypto').Crypto : window.Crypto;
-
-// Shortcuts
-var util = C.util,
-    charenc = C.charenc,
-    UTF8 = charenc.UTF8,
-    Binary = charenc.Binary;
-
-C.PBKDF2 = function (password, salt, keylen, options) {
-
-	// Convert to byte arrays
-	if (password.constructor == String) password = UTF8.stringToBytes(password);
-	if (salt.constructor == String) salt = UTF8.stringToBytes(salt);
-	/* else, assume byte arrays already */
-
-	// Defaults
-	var hasher = options && options.hasher || C.SHA1,
-	    iterations = options && options.iterations || 1;
-
-	// Pseudo-random function
-	function PRF(password, salt) {
-		return C.HMAC(hasher, salt, password, { asBytes: true });
-	}
-
-	// Generate key
-	var derivedKeyBytes = [],
-	    blockindex = 1;
-	while (derivedKeyBytes.length < keylen) {
-		var block = PRF(password, salt.concat(util.wordsToBytes([blockindex])));
-		for (var u = block, i = 1; i < iterations; i++) {
-			u = PRF(password, u);
-			for (var j = 0; j < block.length; j++) block[j] ^= u[j];
-		}
-		derivedKeyBytes = derivedKeyBytes.concat(block);
-		blockindex++;
-	}
-
-	// Truncate excess bytes
-	derivedKeyBytes.length = keylen;
-
-	return options && options.asBytes ? derivedKeyBytes :
-	       options && options.asString ? Binary.bytesToString(derivedKeyBytes) :
-	       util.bytesToHex(derivedKeyBytes);
-
-};
-
-})();

utils/lib/PBKDF2Async.js

@@ -1,88 +0,0 @@
-(function(){
-
-var C = (typeof window === 'undefined') ? require('./Crypto').Crypto : window.Crypto;
-
-// Shortcuts
-var util = C.util,
-    charenc = C.charenc,
-    UTF8 = charenc.UTF8,
-    Binary = charenc.Binary;
-
-if (!C.nextTick) {
-    // node.js has setTime out but prefer process.nextTick
-    if (typeof process != 'undefined' && typeof process.nextTick !== 'undefined') {
-        C.nextTick = process.nextTick;
-    } else if (typeof setTimeout !== 'undefined') {
-        C.nextTick = function (callback) {
-            setTimeout(callback, 0);
-        };
-    }
-}
-
-C.PBKDF2Async = function (password, salt, keylen, callback, options) {
-
-    // Convert to byte arrays
-    if (password.constructor == String) password = UTF8.stringToBytes(password);
-    if (salt.constructor == String) salt = UTF8.stringToBytes(salt);
-    /* else, assume byte arrays already */
-
-    // Defaults
-    var hasher = options && options.hasher || C.SHA1,
-        iterations = options && options.iterations || 1;
-
-    // Progress callback option
-    var progressChangeHandler = options && options.onProgressChange;
-    var totalIterations = Math.ceil(keylen / hasher._digestsize) * iterations;
-    function fireProgressChange(currentIteration) {
-        if (progressChangeHandler) {
-            var iterationsSoFar = derivedKeyBytes.length / hasher._digestsize * iterations + currentIteration;
-            setTimeout(function () {
-                progressChangeHandler(Math.round(iterationsSoFar / totalIterations * 100));
-            }, 0);
-        }
-    }
-
-    // Pseudo-random function
-    function PRF(password, salt) {
-        return C.HMAC(hasher, salt, password, { asBytes: true });
-    }
-
-    var nextTick = C.nextTick;
-
-    // Generate key
-    var derivedKeyBytes = [],
-        blockindex = 1;
-
-    var outer, inner;
-    nextTick(outer = function () {
-        if (derivedKeyBytes.length < keylen) {
-            var block = PRF(password, salt.concat(util.wordsToBytes([blockindex])));
-            fireProgressChange(1);
-
-            var u = block, i = 1;
-            nextTick(inner = function () {
-                if (i < iterations) {
-                    u = PRF(password, u);
-                    for (var j = 0; j < block.length; j++) block[j] ^= u[j];
-                    i++;
-                    fireProgressChange(i);
-
-                    nextTick(inner);
-                } else {
-                    derivedKeyBytes = derivedKeyBytes.concat(block);
-                    blockindex++;
-                    nextTick(outer);
-                }
-            });
-        } else {
-            // Truncate excess bytes
-            derivedKeyBytes.length = keylen;
-            callback(
-                    options && options.asBytes ? derivedKeyBytes :
-                    options && options.asString ? Binary.bytesToString(derivedKeyBytes) :
-                    util.bytesToHex(derivedKeyBytes));
-        }
-    });
-};
-
-})();

utils/lib/Rabbit.js

@@ -1,221 +0,0 @@
-(function(){
-
-var C = (typeof window === 'undefined') ? require('./Crypto').Crypto : window.Crypto;
-
-// Shortcuts
-var util = C.util,
-    charenc = C.charenc,
-    UTF8 = charenc.UTF8,
-    Binary = charenc.Binary;
-
-// Inner state
-var x = [],
-    c = [],
-    b;
-
-var Rabbit = C.Rabbit = {
-
-	/**
-	 * Public API
-	 */
-
-	encrypt: function (message, password) {
-
-		var
-
-		    // Convert to bytes
-		    m = UTF8.stringToBytes(message),
-
-		    // Generate random IV
-		    iv = util.randomBytes(8),
-
-		    // Generate key
-		    k = password.constructor == String ?
-		        // Derive key from passphrase
-		        C.PBKDF2(password, iv, 32, { asBytes: true }) :
-		        // else, assume byte array representing cryptographic key
-		        password;
-
-		// Encrypt
-		Rabbit._rabbit(m, k, util.bytesToWords(iv));
-
-		// Return ciphertext
-		return util.bytesToBase64(iv.concat(m));
-
-	},
-
-	decrypt: function (ciphertext, password) {
-
-		var
-
-		    // Convert to bytes
-		    c = util.base64ToBytes(ciphertext),
-
-		    // Separate IV and message
-		    iv = c.splice(0, 8),
-
-		    // Generate key
-		    k = password.constructor == String ?
-		        // Derive key from passphrase
-		        C.PBKDF2(password, iv, 32, { asBytes: true }) :
-		        // else, assume byte array representing cryptographic key
-		        password;
-
-		// Decrypt
-		Rabbit._rabbit(c, k, util.bytesToWords(iv));
-
-		// Return plaintext
-		return UTF8.bytesToString(c);
-
-	},
-
-
-	/**
-	 * Internal methods
-	 */
-
-	// Encryption/decryption scheme
-	_rabbit: function (m, k, iv) {
-
-		Rabbit._keysetup(k);
-		if (iv) Rabbit._ivsetup(iv);
-
-		for (var s = [], i = 0; i < m.length; i++) {
-
-			if (i % 16 == 0) {
-
-				// Iterate the system
-				Rabbit._nextstate();
-
-				// Generate 16 bytes of pseudo-random data
-				s[0] = x[0] ^ (x[5] >>> 16) ^ (x[3] << 16);
-				s[1] = x[2] ^ (x[7] >>> 16) ^ (x[5] << 16);
-				s[2] = x[4] ^ (x[1] >>> 16) ^ (x[7] << 16);
-				s[3] = x[6] ^ (x[3] >>> 16) ^ (x[1] << 16);
-
-				// Swap endian
-				for (var j = 0; j < 4; j++) {
-					s[j] = ((s[j] <<  8) | (s[j] >>> 24)) & 0x00FF00FF |
-					       ((s[j] << 24) | (s[j] >>>  8)) & 0xFF00FF00;
-				}
-
-				// Convert words to bytes
-				for (var b = 120; b >= 0; b -= 8)
-					s[b / 8] = (s[b >>> 5] >>> (24 - b % 32)) & 0xFF;
-
-			}
-
-			m[i] ^= s[i % 16];
-
-		}
-
-	},
-
-	// Key setup scheme
-	_keysetup: function (k) {
-
-		// Generate initial state values
-		x[0] = k[0];
-		x[2] = k[1];
-		x[4] = k[2];
-		x[6] = k[3];
-		x[1] = (k[3] << 16) | (k[2] >>> 16);
-		x[3] = (k[0] << 16) | (k[3] >>> 16);
-		x[5] = (k[1] << 16) | (k[0] >>> 16);
-		x[7] = (k[2] << 16) | (k[1] >>> 16);
-
-		// Generate initial counter values
-		c[0] = util.rotl(k[2], 16);
-		c[2] = util.rotl(k[3], 16);
-		c[4] = util.rotl(k[0], 16);
-		c[6] = util.rotl(k[1], 16);
-		c[1] = (k[0] & 0xFFFF0000) | (k[1] & 0xFFFF);
-		c[3] = (k[1] & 0xFFFF0000) | (k[2] & 0xFFFF);
-		c[5] = (k[2] & 0xFFFF0000) | (k[3] & 0xFFFF);
-		c[7] = (k[3] & 0xFFFF0000) | (k[0] & 0xFFFF);
-
-		// Clear carry bit
-		b = 0;
-
-		// Iterate the system four times
-		for (var i = 0; i < 4; i++) Rabbit._nextstate();
-
-		// Modify the counters
-		for (var i = 0; i < 8; i++) c[i] ^= x[(i + 4) & 7];
-
-	},
-
-	// IV setup scheme
-	_ivsetup: function (iv) {
-
-		// Generate four subvectors
-		var i0 = util.endian(iv[0]),
-		    i2 = util.endian(iv[1]),
-		    i1 = (i0 >>> 16) | (i2 & 0xFFFF0000),
-		    i3 = (i2 <<  16) | (i0 & 0x0000FFFF);
-
-		// Modify counter values
-		c[0] ^= i0;
-		c[1] ^= i1;
-		c[2] ^= i2;
-		c[3] ^= i3;
-		c[4] ^= i0;
-		c[5] ^= i1;
-		c[6] ^= i2;
-		c[7] ^= i3;
-
-		// Iterate the system four times
-		for (var i = 0; i < 4; i++) Rabbit._nextstate();
-
-	},
-
-	// Next-state function
-	_nextstate: function () {
-
-		// Save old counter values
-		for (var c_old = [], i = 0; i < 8; i++) c_old[i] = c[i];
-
-		// Calculate new counter values
-		c[0] = (c[0] + 0x4D34D34D + b) >>> 0;
-		c[1] = (c[1] + 0xD34D34D3 + ((c[0] >>> 0) < (c_old[0] >>> 0) ? 1 : 0)) >>> 0;
-		c[2] = (c[2] + 0x34D34D34 + ((c[1] >>> 0) < (c_old[1] >>> 0) ? 1 : 0)) >>> 0;
-		c[3] = (c[3] + 0x4D34D34D + ((c[2] >>> 0) < (c_old[2] >>> 0) ? 1 : 0)) >>> 0;
-		c[4] = (c[4] + 0xD34D34D3 + ((c[3] >>> 0) < (c_old[3] >>> 0) ? 1 : 0)) >>> 0;
-		c[5] = (c[5] + 0x34D34D34 + ((c[4] >>> 0) < (c_old[4] >>> 0) ? 1 : 0)) >>> 0;
-		c[6] = (c[6] + 0x4D34D34D + ((c[5] >>> 0) < (c_old[5] >>> 0) ? 1 : 0)) >>> 0;
-		c[7] = (c[7] + 0xD34D34D3 + ((c[6] >>> 0) < (c_old[6] >>> 0) ? 1 : 0)) >>> 0;
-		b = (c[7] >>> 0) < (c_old[7] >>> 0) ? 1 : 0;
-
-		// Calculate the g-values
-		for (var g = [], i = 0; i < 8; i++) {
-
-			var gx = (x[i] + c[i]) >>> 0;
-
-			// Construct high and low argument for squaring
-			var ga = gx & 0xFFFF,
-			    gb = gx >>> 16;
-
-			// Calculate high and low result of squaring
-			var gh = ((((ga * ga) >>> 17) + ga * gb) >>> 15) + gb * gb,
-			    gl = (((gx & 0xFFFF0000) * gx) >>> 0) + (((gx & 0x0000FFFF) * gx) >>> 0) >>> 0;
-
-			// High XOR low
-			g[i] = gh ^ gl;
-
-		}
-
-		// Calculate new state values
-		x[0] = g[0] + ((g[7] << 16) | (g[7] >>> 16)) + ((g[6] << 16) | (g[6] >>> 16));
-		x[1] = g[1] + ((g[0] <<  8) | (g[0] >>> 24)) + g[7];
-		x[2] = g[2] + ((g[1] << 16) | (g[1] >>> 16)) + ((g[0] << 16) | (g[0] >>> 16));
-		x[3] = g[3] + ((g[2] <<  8) | (g[2] >>> 24)) + g[1];
-		x[4] = g[4] + ((g[3] << 16) | (g[3] >>> 16)) + ((g[2] << 16) | (g[2] >>> 16));
-		x[5] = g[5] + ((g[4] <<  8) | (g[4] >>> 24)) + g[3];
-		x[6] = g[6] + ((g[5] << 16) | (g[5] >>> 16)) + ((g[4] << 16) | (g[4] >>> 16));
-		x[7] = g[7] + ((g[6] <<  8) | (g[6] >>> 24)) + g[5];
-
-	}
-
-};
-
-})();

utils/lib/SHA1.js

@@ -1,86 +0,0 @@
-(function(){
-
-var C = (typeof window === 'undefined') ? require('./Crypto').Crypto : window.Crypto;
-
-// Shortcuts
-var util = C.util,
-    charenc = C.charenc,
-    UTF8 = charenc.UTF8,
-    Binary = charenc.Binary;
-
-// Public API
-var SHA1 = C.SHA1 = function (message, options) {
-	var digestbytes = util.wordsToBytes(SHA1._sha1(message));
-	return options && options.asBytes ? digestbytes :
-	       options && options.asString ? Binary.bytesToString(digestbytes) :
-	       util.bytesToHex(digestbytes);
-};
-
-// The core
-SHA1._sha1 = function (message) {
-
-	// Convert to byte array
-	if (message.constructor == String) message = UTF8.stringToBytes(message);
-	/* else, assume byte array already */
-
-	var m  = util.bytesToWords(message),
-	    l  = message.length * 8,
-	    w  =  [],
-	    H0 =  1732584193,
-	    H1 = -271733879,
-	    H2 = -1732584194,
-	    H3 =  271733878,
-	    H4 = -1009589776;
-
-	// Padding
-	m[l >> 5] |= 0x80 << (24 - l % 32);
-	m[((l + 64 >>> 9) << 4) + 15] = l;
-
-	for (var i = 0; i < m.length; i += 16) {
-
-		var a = H0,
-		    b = H1,
-		    c = H2,
-		    d = H3,
-		    e = H4;
-
-		for (var j = 0; j < 80; j++) {
-
-			if (j < 16) w[j] = m[i + j];
-			else {
-				var n = w[j-3] ^ w[j-8] ^ w[j-14] ^ w[j-16];
-				w[j] = (n << 1) | (n >>> 31);
-			}
-
-			var t = ((H0 << 5) | (H0 >>> 27)) + H4 + (w[j] >>> 0) + (
-			         j < 20 ? (H1 & H2 | ~H1 & H3) + 1518500249 :
-			         j < 40 ? (H1 ^ H2 ^ H3) + 1859775393 :
-			         j < 60 ? (H1 & H2 | H1 & H3 | H2 & H3) - 1894007588 :
-			                  (H1 ^ H2 ^ H3) - 899497514);
-
-			H4 =  H3;
-			H3 =  H2;
-			H2 = (H1 << 30) | (H1 >>> 2);
-			H1 =  H0;
-			H0 =  t;
-
-		}
-
-		H0 += a;
-		H1 += b;
-		H2 += c;
-		H3 += d;
-		H4 += e;
-
-	}
-
-	return [H0, H1, H2, H3, H4];
-
-};
-
-// Package private blocksize
-SHA1._blocksize = 16;
-
-SHA1._digestsize = 20;
-
-})();

utils/lib/SHA256.js

@@ -1,130 +0,0 @@
-(function(){
-
-var C = (typeof window === 'undefined') ? require('./Crypto').Crypto : window.Crypto;
-
-// Shortcuts
-var util = C.util,
-    charenc = C.charenc,
-    UTF8 = charenc.UTF8,
-    Binary = charenc.Binary;
-
-// Constants
-var K = [ 0x428A2F98, 0x71374491, 0xB5C0FBCF, 0xE9B5DBA5,
-          0x3956C25B, 0x59F111F1, 0x923F82A4, 0xAB1C5ED5,
-          0xD807AA98, 0x12835B01, 0x243185BE, 0x550C7DC3,
-          0x72BE5D74, 0x80DEB1FE, 0x9BDC06A7, 0xC19BF174,
-          0xE49B69C1, 0xEFBE4786, 0x0FC19DC6, 0x240CA1CC,
-          0x2DE92C6F, 0x4A7484AA, 0x5CB0A9DC, 0x76F988DA,
-          0x983E5152, 0xA831C66D, 0xB00327C8, 0xBF597FC7,
-          0xC6E00BF3, 0xD5A79147, 0x06CA6351, 0x14292967,
-          0x27B70A85, 0x2E1B2138, 0x4D2C6DFC, 0x53380D13,
-          0x650A7354, 0x766A0ABB, 0x81C2C92E, 0x92722C85,
-          0xA2BFE8A1, 0xA81A664B, 0xC24B8B70, 0xC76C51A3,
-          0xD192E819, 0xD6990624, 0xF40E3585, 0x106AA070,
-          0x19A4C116, 0x1E376C08, 0x2748774C, 0x34B0BCB5,
-          0x391C0CB3, 0x4ED8AA4A, 0x5B9CCA4F, 0x682E6FF3,
-          0x748F82EE, 0x78A5636F, 0x84C87814, 0x8CC70208,
-          0x90BEFFFA, 0xA4506CEB, 0xBEF9A3F7, 0xC67178F2 ];
-
-// Public API
-var SHA256 = C.SHA256 = function (message, options) {
-	var digestbytes = util.wordsToBytes(SHA256._sha256(message));
-	return options && options.asBytes ? digestbytes :
-	       options && options.asString ? Binary.bytesToString(digestbytes) :
-	       util.bytesToHex(digestbytes);
-};
-
-// The core
-SHA256._sha256 = function (message) {
-
-	// Convert to byte array
-	if (message.constructor == String) message = UTF8.stringToBytes(message);
-	/* else, assume byte array already */
-
-	var m = util.bytesToWords(message),
-	    l = message.length * 8,
-	    H = [ 0x6A09E667, 0xBB67AE85, 0x3C6EF372, 0xA54FF53A,
-	          0x510E527F, 0x9B05688C, 0x1F83D9AB, 0x5BE0CD19 ],
-	    w = [],
-	    a, b, c, d, e, f, g, h, i, j,
-	    t1, t2;
-
-	// Padding
-	m[l >> 5] |= 0x80 << (24 - l % 32);
-	m[((l + 64 >> 9) << 4) + 15] = l;
-
-	for (var i = 0; i < m.length; i += 16) {
-
-		a = H[0];
-		b = H[1];
-		c = H[2];
-		d = H[3];
-		e = H[4];
-		f = H[5];
-		g = H[6];
-		h = H[7];
-
-		for (var j = 0; j < 64; j++) {
-
-			if (j < 16) w[j] = m[j + i];
-			else {
-
-				var gamma0x = w[j - 15],
-				    gamma1x = w[j - 2],
-				    gamma0  = ((gamma0x << 25) | (gamma0x >>>  7)) ^
-				              ((gamma0x << 14) | (gamma0x >>> 18)) ^
-				               (gamma0x >>> 3),
-				    gamma1  = ((gamma1x <<  15) | (gamma1x >>> 17)) ^
-				              ((gamma1x <<  13) | (gamma1x >>> 19)) ^
-				               (gamma1x >>> 10);
-
-				w[j] = gamma0 + (w[j - 7] >>> 0) +
-				       gamma1 + (w[j - 16] >>> 0);
-
-			}
-
-			var ch  = e & f ^ ~e & g,
-			    maj = a & b ^ a & c ^ b & c,
-			    sigma0 = ((a << 30) | (a >>>  2)) ^
-			             ((a << 19) | (a >>> 13)) ^
-			             ((a << 10) | (a >>> 22)),
-			    sigma1 = ((e << 26) | (e >>>  6)) ^
-			             ((e << 21) | (e >>> 11)) ^
-			             ((e <<  7) | (e >>> 25));
-
-
-			t1 = (h >>> 0) + sigma1 + ch + (K[j]) + (w[j] >>> 0);
-			t2 = sigma0 + maj;
-
-			h = g;
-			g = f;
-			f = e;
-			e = (d + t1) >>> 0;
-			d = c;
-			c = b;
-			b = a;
-			a = (t1 + t2) >>> 0;
-
-		}
-
-		H[0] += a;
-		H[1] += b;
-		H[2] += c;
-		H[3] += d;
-		H[4] += e;
-		H[5] += f;
-		H[6] += g;
-		H[7] += h;
-
-	}
-
-	return H;
-
-};
-
-// Package private blocksize
-SHA256._blocksize = 16;
-
-SHA256._digestsize = 32;
-
-})();

utils/main.js

@@ -144,37 +144,6 @@ function payMoney(payType, money, callback) {
     }
   });
 }
-function downloadImage(scoreID) {
-  wx.showLoading({
-    title: '下载中_然后长按保存',
-  });
-
-  var that = this;
-  getData('MakeSchulteShare?ScoreID=' + scoreID, function (data) {
-
-    setTimeout(function () {
-      wx.downloadFile({
-        url: "https://schulte-1253256735.file.myqcloud.com/share" + scoreID + ".jpg",
-        success: function (res) {
-          wx.hideLoading();
-          wx.previewImage({
-            current: res.tempFilePath, // 当前显示图片的http链接
-            urls: [res.tempFilePath] // 需要预览的图片http链接列表
-          })
-        },
-        fail: function () {
-          wx.hideLoading();
-          getData('MakeSchulteShare?ScoreID=' + scoreID, function (data) { });
-          wx.showToast({
-            title: '请稍候再试！',
-            duration: 2000
-          });
-        }
-      });
-    }, 2000);
-
-  });
-}
 
 function getTimeFormat(duration) {
   //console.log("duration:" + duration);
@@ -312,22 +281,31 @@ function gotoFeedback() {
   });
 }
 
-function playAudio(ctx, sentence) {
+function playAudio(ctx, sentence, player) {
   var url = app.globalData.audioUrlBaidu;
   url = url.replace("[token]", app.globalData.BaiduToken);
   url = url.replace("[word]", sentence);
+  if (player)
+    url = url.replace("per=4", "per="+player);
   //console.log(url);
   ctx.setSrc(url);
   ctx.play();
 }
 
+function playSound(file){
+  const innerAudioContext = wx.createInnerAudioContext()
+  innerAudioContext.autoplay = true
+  innerAudioContext.src = file
+  innerAudioContext.onPlay(() => {
+    console.log('开始播放')
+  })
+}
 
 module.exports = {
   getData: getData,
   postData: postData,
   shareGroup: shareGroup,
   payMoney: payMoney,
-  downloadImage: downloadImage,
   getLocalHost: getLocalHost,
   getTimeFormat: getTimeFormat,
   getWindowHeight: getWindowHeight,
@@ -336,4 +314,5 @@ module.exports = {
   getProgramList: getProgramList,
   gotoFeedback: gotoFeedback,
   playAudio: playAudio,
+  playSound: playSound,
 }

utils/util.js

@@ -185,29 +185,6 @@ function sort(array, sort_order, obj, objType, obj2, objType2) {
     }
   }
 }
-////测试sort
-// var a = [
-//   {
-//     time: "2017-2-1",
-//     a: 3,
-//   }, {
-//     time: "2017-4-1",
-//     a: 5,
-//   }, {
-//     time: "2017-1-1",
-//     a: 6
-//   },{
-//     time: "2017-2-1",
-//     a: 3
-//   },
-// ];
-// console.log(a);
-// // var a = common.sort(a,"ASC", "time","String");
-// // console.log(a);
-// var a = common.sort(a,"DESC", "time","String");
-// console.log(a);
-// //var a = common.sort(a,"DESC", "a","Number");
-// // console.log(a);
 
 function checkError(err) {
   switch (err) {