1.0.0

app.js

@@ -25,7 +25,7 @@ App({
     serverUrl: "https://www.kylx365.com/apiData/",
     serverUrlServer: "https://www.kylx365.com/apiData/",
     serverUrlLocalhost: "http://localhost:3020/apiData/",
-    audioUrlBaidu: "https://tsn.baidu.com/text2audio?lan=zh&ctp=1&cuid=abcdxxx&tok=[token]&tex=[word]&vol=9&per=1&spd=8&pit=5",
+    audioUrlBaidu: "https://tsn.baidu.com/text2audio?lan=zh&ctp=1&cuid=abcdxxx&tok=[token]&tex=[word]&vol=9&per=1&spd=6&pit=5",
     Key: "kylx365_chengjie",
     IV: "kylx365hongliren",
     

pages/index/index.js

@@ -153,6 +153,12 @@ Page({
         callback();
       }
     });
+
+    server.getData('GetBaiduToken', function (data) {
+      if (data) {
+        app.globalData.BaiduToken=data;
+      }
+    });
   },
   onShareAppMessage: function () {
     return {

pages/main/answer.js

@@ -18,6 +18,7 @@ Page({
     this.getList();
   },
   getList: function () {
+    
     var that = this;
     var list = wx.getStorageSync("AnswerList");
     if (list && list.length > 0) {
@@ -34,7 +35,6 @@ Page({
         ListHeight = 1320 + (arr.length - 10) * 130;
         ListHeight2 = 1490 + (arr.length - 10) * 130;
       }
-
       that.setData({
         AnswerList: arr,
         ListHeight: ListHeight,

pages/main/default.js

@@ -47,6 +47,19 @@ Page({
     
     this.updateProgram();
   },
+  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);
+    }
+    this.setData({
+      AnswerLength: answerLength,
+      AnswerNewDate: answerNewDate,
+    });
+  },
   gotoList:function(e){
     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] }];

pages/main/default.wxml

@@ -27,13 +27,13 @@
               <view class="text0">批改</view>
               <view class="line"></view>
               <view class="panel002000 FlexRow">
-                <view class="text1">制题次数</view>
-                <view class="text2">232</view>
+                <view class="text1">试卷张数</view>
+                <view class="text2">{{AnswerLength}}</view>
               </view>
               <view class="line2 line"></view>
               <view class="panel002000 FlexRow">
                 <view class="text1">制题日期</view>
-                <view class="text">2018年1月13日</view>
+                <view class="text">{{AnswerNewDate}}</view>
               </view>
               <view class="line2 line"></view>
               <view class="panel002000 FlexRow">

pages/main/detail.js

@@ -41,6 +41,9 @@ Page({
       isAndroid = true;
 
   },
+  onUnload:function(){
+    wx.hideLoading();
+  },
   getDetail: function (id) {
     var item;
     var data = wx.getStorageSync('QuestionTypeList');
@@ -64,7 +67,9 @@ Page({
     });
   },
   getFinish: function () {
+    wx.hideLoading();
     arrAnswerID = [];
+    tempAnswerList=[];
     this.getAnswerID();
     this.getList(this.data.ID);
   },
@@ -118,7 +123,7 @@ Page({
     var id=1;
     if (list && list.length > 0) {
       list.sort(function (a, b) {
-          return b.AnswerID - b.AnswerID;
+          return b.AnswerID - a.AnswerID;
       });
       id = list[0].AnswerID + 1;
     }
@@ -128,7 +133,7 @@ Page({
   saveImage: function () {
     var that = this;
     var item = QuestionItem;
-    item.AnswerID = arrAnswerID.pop();
+    item.AnswerID = arrAnswerID.shift();
 
     var ctx = wx.createCanvasContext("Canvas", that);
     ctx.setFillStyle('white');
@@ -331,8 +336,8 @@ Page({
         success: function (res2) {
           console.log(res2.tempFilePath);
           that.data.arrPage.push(res2.tempFilePath);
-
-          tempAnswerList.push(item);
+          item.TempImagePath=res2.tempFilePath;
+          tempAnswerList.push(JSON.parse(JSON.stringify(item)));
 
           that.setData({
             arrPage: that.data.arrPage,
@@ -341,7 +346,9 @@ Page({
           if (that.data.arrPage.length < that.data.PageNumber) {
             pageIndex++;
             that.saveImage();
-          } else {
+          } 
+          else {
+            //生成图片完成
             that.setData({
               ShowLoading: false,
             });
@@ -355,6 +362,25 @@ Page({
               current: that.data.arrPage[0], // 当前显示图片的http链接
               urls: that.data.arrPage // 需要预览的图片http链接列表
             });
+
+            //存列表
+            var tempList = wx.getStorageSync("AnswerList");
+            if (!tempList)
+              tempList=[];
+            for(var x=0;x<tempAnswerList.length;x++){
+              var tempItem = tempAnswerList[x];
+              var id=x*tempItem.PageCount;
+              var arr=[];
+              for(var y=0;y<tempItem.QuestionList.length;y++){
+                if (y >= id && y < id + tempItem.PageCount){
+                  arr.push(tempItem.QuestionList[y]);
+                }
+              }
+              tempItem.QuestionList=arr;
+              tempList.unshift(tempItem);
+            }
+            wx.setStorageSync("AnswerList", tempList);
+
           }
         }
       })
@@ -391,9 +417,7 @@ Page({
         wx.saveImageToPhotosAlbum({
           filePath: that.data.arrPage[i],
           success(res3) {
-            //存列表
-            wx.setStorageSync("AnswerList", tempAnswerList);
-
+            
             console.log("save:" + res3.savedFilePath);
             count++
             if (count == that.data.arrPage.length) {

pages/main/detail.wxml

@@ -95,11 +95,11 @@
           </view>
           <text class="text9">1. 请到手机相册打印图片或转存到PC</text>
         </view>
-        <view class="panel220 FlexColumn">
+        <view class="panel220 FlexColumn" bindtap="gotoAnswer">
           <view class="panel2200 FlexColumn">
             <image class="universalpic_write_gray_size01" src="../../images/universalpic_write_gray_size01.png" />
           </view>
-          <view class="text9" bindtap="gotoAnswer">2. 题目做完后，在首页 的批改栏目中
+          <view class="text9">2. 题目做完后，在首页 的批改栏目中
             <text class="text10">对答案</text>
           </view>
         </view>

pages/main/item.js

@@ -1,19 +1,31 @@
 import common from '../../utils/util';
 import server from '../../utils/main';
 
-const app = getApp()
+const app = getApp();
+
+var currentIndex = 0, tempCurrentIndex = -1;
+var audioArray = [];
+
 Page({
   data: {
     version: app.globalData.version,
     FileUrl: app.globalData.fileUrl,
+    IsPlaying: true,
   },
   onLoad: function (options) {
+    this.audioCtx = wx.createAudioContext('myAudio');
+
     this.setData({
       Containnerheight: server.getWindowHeight(),
     });
-
+    audioArray = [];
     var id = options.id;
     this.getItem(id);
+
+    wx.setNavigationBarTitle({
+      title: "试卷答案 "+id,
+    });
+
   },
   scrollTop: function (e) {
     var id = Number(e.currentTarget.dataset.id);
@@ -23,8 +35,7 @@ Page({
     query.select('#panelRowTop' + id).boundingClientRect();
     query.selectViewport().scrollOffset();
     query.exec(function (res) {
-      top = res[0].top       // #the-id节点的上边界坐标
-      //res[1].scrollTop // 显示区域的竖直滚动位置
+      top = res[0].top + res[1].scrollTop
 
       wx.pageScrollTo({
         scrollTop: top,
@@ -44,15 +55,15 @@ Page({
           break;
         }
       }
-      
+
       var list = item.QuestionList;
       for (var i = 0; i < list.length; i++) {
-        if (i==0 && list[i].Vertical) {
+        if (i == 0 && list[i].Vertical) {
           list[i].IsShowVertical = true;
           break;
         }
       }
-      
+
       that.setData({
         AnswerItem: item,
       });
@@ -64,17 +75,94 @@ Page({
     for (var i = 0; i < list.length; i++) {
       if (id == list[i].ID) {
         list[i].IsShowVertical = !list[i].IsShowVertical;
-      }
-      else {
+      } else {
         list[i].IsShowVertical = false;
       }
     }
-    this.data.AnswerItem.QuestionList=list;
+    this.data.AnswerItem.QuestionList = list;
     this.setData({
       AnswerItem: this.data.AnswerItem,
     });
 
   },
+  showImage: function (e) {
+    var that = this;
+    wx.previewImage({
+      current: that.data.AnswerItem.TempImagePath, // 当前显示图片的http链接
+      urls: [that.data.AnswerItem.TempImagePath] // 需要预览的图片http链接列表
+    });
+  },
+  playAudioStart: function () {
+    this.setData({
+      IsPlaying: !this.data.IsPlaying,
+    });
+
+    if (this.data.IsPlaying) {
+      this.audioCtx.pause();
+    }
+    else {
+      var arr = [];
+      var item = this.data.AnswerItem;
+      var list = item.QuestionList;
+      for (var i = 0; i < list.length; i++) {
+        if ((i % (list.length / 3)) == 0) {
+          if (i > 0) {
+            arr.push("");
+            audioArray.push(arr);
+            arr = [];
+          }
+          arr.push("第" + (1 + i / (list.length / 3)) + "列");
+
+        }
+        var str = list[i].Result;
+        if (str.toString().indexOf("......") > 0) {
+          str = str.toString().replace("......", "”余数");
+          str = "商“" + str;
+        }
+        arr.push(str);
+      }
+      arr.push("");
+      audioArray.push(arr);
+
+      this.playAudioAll();
+    }
+
+  },
+  playAudioAll: function () {
+    if (currentIndex >= 3) {
+      currentIndex = 0;
+      this.setData({
+        IsPlaying: true,
+      });
+      return;
+    } else {
+      var url = app.globalData.audioUrlBaidu;
+      url = url.replace("[token]", app.globalData.BaiduToken);
+      url = url.replace("[word]", audioArray[currentIndex].join(","));
+      console.log(url);
+      this.audioCtx.setSrc(url);
+      this.audioCtx.play();
+      this.scrollTop({
+        currentTarget: {
+          dataset: {
+            id: currentIndex
+          }
+        }
+      });
+    }
+  },
+  onPlayEnded: function (e) {
+    currentIndex++;
+    this.playAudioAll();
+  },
+  playPrev: function () {
+    if (currentIndex > 0 && tempCurrentIndex == currentIndex)
+      currentIndex--;
+    else {
+      tempCurrentIndex = currentIndex;
+    }
+    this.playAudioAll();
+  },
   onShareAppMessage: function () {
     return {
       title: '',

pages/main/item.json

@@ -1,7 +1,7 @@
 {
   "navigationBarBackgroundColor": "#fff",
   "navigationBarTextStyle": "black",
-  "navigationBarTitleText": "四则运算",
+  "navigationBarTitleText": "试卷答案",
   "backgroundColor": "#fff",
   "backgroundTextStyle": "light",
   "enablePullDownRefresh": false

pages/main/item.wxml

@@ -1,38 +1,46 @@
 <view class="container FlexColumn" style="min-height:{{Containnerheight}}rpx;">
-  <view class="panel0 FlexRow">
-    <view class="panelLeft">快翻</view>
-    <view class="panelRight FlexRow">
-      <view class="btn1 btn" bindtap="scrollTop" data-id="0">1</view>
-      <view class="btn" bindtap="scrollTop" data-id="1">{{AnswerItem.QuestionList.length/3+1}}</view>
-      <view class="btn" bindtap="scrollTop" data-id="2">{{AnswerItem.QuestionList.length*2/3+1}}</view>
+  <view class="panel3 panel0 FlexRow" bindtap='showImage'>
+    <view class="panelLeft">试卷预览</view>
+    <view>
+      <image class="universalpic_indicator_pink" src="../../images/universalpic_indicator_pink.png" />
     </view>
   </view>
-  <view class="panel1 panel0 FlexRow">
+  <view class="panel4 panel0 FlexRow">
     <view class="panelLeft">听答案</view>
     <view class="panelRight FlexRow">
 
-      <view class="btn4 btn2">
+      <view class="btn4 btn2" bindtap='playPrev'>
         <view class="btn3 FlexRow">
           <image class="universalpic_rewind_white_size01" src="../../images/universalpic_rewind_white_size01.png" />
         </view>
       </view>
-      <view class="btn2">
+      <view class="btn2" bindtap='playAudioStart'>
         <view class="btn3 FlexRow">
-          <image class="universalpic_play_white_size01" src="../../images/universalpic_play_white_size01.png" />
+          <image class="universalpic_play_white_size01" src="../../images/universalpic_play_white_size01.png" wx:if="{{IsPlaying}}" />
+          <image class="pause_white_size01" src="../../images/pause_white_size01.png" wx:if="{{!IsPlaying}}" />
         </view>
       </view>
     </view>
   </view>
+
+
   <view class="panel2 panel1 panel0 FlexRow">
-    <view class="panelLeft">答案</view>
+    <view class="panelLeft2">看答案</view>
     <view>
     </view>
   </view>
-
+  <view class="panel0 FlexRow">
+    <view class="panelLeft">题号快翻</view>
+    <view class="panelRight FlexRow">
+      <view class="btn1 btn" bindtap="scrollTop" data-id="0">1</view>
+      <view class="btn" bindtap="scrollTop" data-id="1">{{AnswerItem.QuestionList.length/3+1}}</view>
+      <view class="btn" bindtap="scrollTop" data-id="2">{{AnswerItem.QuestionList.length*2/3+1}}</view>
+    </view>
+  </view>
 
   <block wx:for="{{AnswerItem.QuestionList}}" wx:key="index">
     <block wx:if="{{(index % (AnswerItem.QuestionList.length/3))==0 }}">
-      <view id="panelRowTop{{index / (AnswerItem.QuestionList.length/3)}}" class="panelRowTop panel0 FlexRow">
+      <view id="panelRowTop{{index / (AnswerItem.QuestionList.length/3)}}" class="panelRowTop FlexRow">
         <view class="panelLeft1 panelLeft">第
           <block wx:if="{{index / (AnswerItem.QuestionList.length/3)==0}}">一</block>
           <block wx:if="{{index / (AnswerItem.QuestionList.length/3)==1}}">二</block>
@@ -60,7 +68,7 @@
         </view>
         <image class="formula_btn_show" src="../../images/formula_btn_show.png" wx:if="{{item.Vertical && !item.IsShowVertical}}" />
         <image class="formula_btn_show" src="../../images/formula_btn_hide.png" wx:if="{{item.Vertical && item.IsShowVertical}}" />
-    </view>
+      </view>
     </view>
     <!-- 算式（加减乘） -->
     <view class="panelRowBody panel0 FlexColumn" wx:if="{{item.Vertical && item.OperateAB!='÷' && item.IsShowVertical}}">
@@ -97,88 +105,7 @@
     </view>
 
   </block>
-
-  <!-- <view class="panelRowBody panel0 FlexRow">
-    <view class="panelLeft FlexRow">
-      <view class="number">1</view>
-      <view class="answer">7</view>
-    </view>
-    <view class="panelRight FlexRow">
-      <view class="equation">1 + 6 =</view>
-      <image class="formula_btn_show" src="../../images/formula_btn_show.png" />
-    </view>
-  </view>
-  <view class="line FlexRow">
-    <view class="line1"></view>
-  </view>
-  <view class="panelRowBody panel0 FlexRow">
-    <view class="panelLeft FlexRow">
-      <view class="number">2</view>
-      <view class="answer">28</view>
-    </view>
-    <view class="panelRight FlexRow">
-      <view class="equation">159 -131 =</view>
-      <image class="formula_btn_show" src="../../images/formula_btn_show.png" />
-    </view>
-  </view>
-  <view class="line FlexRow">
-    <view class="line1"></view>
-  </view>
-  <view class="panelRowBody panel0 FlexRow">
-    <view class="panelLeft FlexRow">
-      <view class="number">3</view>
-      <view class="answer">553500</view>
-    </view>
-    <view class="panelRight FlexRow">
-      <view class="equation">123 × 4500 =</view>
-      <image class="formula_btn_show" src="../../images/formula_btn_hide.png" />
-    </view>
-  </view>
-
-  <view class="panelRowBody panel0 FlexColumn">
-    <view class="panelAnswer FlexColumn">
-      <view class="panelAnswerRow FlexRow" wx:for='{{TestDivEquation1}}' wx:key="index">
-        <view class="panelAnswerCol FlexRow" wx:for='{{item.Array}}' wx:key="i" wx:for-item="col" wx:for-index="i">
-          <view class="colNumber" wx:if="{{item.Type=='number' && col!='√' && col!='.'}}">{{col}}</view>
-          <view class="colDot" wx:if="{{item.Type=='number' && col=='.'}}">{{col}}</view>
-          <image wx:if="{{item.Type=='number' && col=='√'}}" class="formula_division_size01" src="../../images/formula_division_size01.png" />
-          <view class="colLine" wx:if="{{item.Type=='line' && col=='1'}}"></view>
-          <view class="colLineHalf" wx:if="{{item.Type=='line' && col=='0.5'}}"></view>
-          <view class="colLineNull" wx:if="{{item.Type=='line' && col==''}}"></view>
-        </view>
-      </view>
-    </view>
-  </view>
-  <view class="line FlexRow">
-    <view class="line1"></view>
-  </view>
-  <view class="panelRowBody panel0 FlexRow">
-    <view class="panelLeft FlexRow">
-      <view class="number">4</view>
-      <view class="answer">0.625</view>
-    </view>
-    <view class="panelRight FlexRow">
-      <view class="equation">35 ÷ 56 =</view>
-      <image class="formula_btn_show" src="../../images/formula_btn_hide.png" />
-    </view>
-  </view> 
-  <view class="panelRowBody panel0 FlexColumn">
-    <view class="panelAnswer FlexColumn">
-      <view class="panelAnswerRow FlexRow" wx:for='{{TestDivEquation2}}' wx:key="index">
-        <view class="panelAnswerCol FlexRow" wx:for='{{item.Array}}' wx:key="i" wx:for-item="col" wx:for-index="i">
-          <view class="colNumber" wx:if="{{item.Type=='number' && col!='√' && col!='.'}}">{{col}}</view>
-          <view class="colDot" wx:if="{{item.Type=='number' && col=='.'}}">{{col}}</view>
-          <image wx:if="{{item.Type=='number' && col=='√'}}" class="formula_division_size01" src="../../images/formula_division_size01.png" />
-          <view class="colLine" wx:if="{{item.Type=='line' && col=='1'}}"></view>
-          <view class="colLineHalf" wx:if="{{item.Type=='line' && col=='0.5'}}"></view>
-          <view class="colLineNull" wx:if="{{item.Type=='line' && col==''}}"></view>
-        </view>
-      </view>
-    </view>
-  </view>
-  -->
-
-
-
-
-</view>
+  <view wx:if="{{AnswerItem.PageCount<60}}" class="panelRowBody panel0 FlexRow" wx:for="{{[1,2,3]}}" wx:key="i"></view>
+  
+</view>
+<audio hidden='true' id="myAudio" bindended='onPlayEnded'></audio>

pages/main/item.wxss

@@ -14,6 +14,10 @@
   margin-left: 30rpx;
   font-size: 28rpx;
 }
+.panelLeft2{
+  margin-left: 30rpx;
+  font-size: 32rpx;
+}
 
 .panelRight{
   margin-right: 30rpx;
@@ -69,13 +73,30 @@
   height: 30rpx;
 }
 
+.pause_white_size01{
+  width: 30rpx;
+  height: 30rpx;
+}
 .panel2 {
   background-color: #F0F0F0;
 }
 
+.panel3 {
+  margin:20rpx 0 20rpx 0;
+  border-bottom: 1rpx solid #D2D2D2;
+}
+
+
+.panel4 {
+  height:120rpx;
+  border-bottom: 1rpx solid #D2D2D2;
+}
+
 .panelRowTop{
   background-color: #D2D2D2;
   height:50rpx;
+  width:100%;
+  justify-content: space-between;
 }
 
 .panelRowTop .panelLeft1{
@@ -137,9 +158,6 @@
   align-items: flex-start;
 }
 
-.panelAnswer .panelAnswerRow{
-}
-
 .panelAnswer .panelAnswerCol{
   justify-content: flex-start;
 }
@@ -182,4 +200,18 @@
   height:2rpx;
   margin: 0rpx 0 0 28rpx;
   background-color: #000;
+}
+
+.imageShow{
+  width: 65rpx;
+  height:92rpx;
+  border-radius: 2rpx;
+  background-color: #dddddd;
+  margin: 10rpx 60rpx 0 0;
+}
+
+.universalpic_indicator_pink{
+  width: 16rpx;
+  height:26rpx;
+  margin-right: 30rpx;
 }

project.config.json

@@ -30,7 +30,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 1,
+			"current": 3,
 			"list": [
 				{
 					"id": 0,
@@ -49,6 +49,12 @@
 					"name": "print",
 					"pathName": "pages/main/print",
 					"query": "id=172"
+				},
+				{
+					"id": -1,
+					"name": "item",
+					"pathName": "pages/main/item",
+					"query": "id=46"
 				}
 			]
 		}