1.0.0

pages/main/answer.js

@@ -8,6 +8,7 @@ Page({
     FileUrl: app.globalData.fileUrl,
     IsEdit: false,
     ListHeight: 1320,
+    SelectedCount: 0,
   },
   onLoad: function () {
     this.setData({
@@ -17,17 +18,17 @@ Page({
   },
   getList: function () {
     var that = this;
-    var list = wx.getStorageSync("QuestionList");
+    var list = wx.getStorageSync("AnswerList");
     if (list && list.length > 0) {
       var arr = [];
-      for (var i = list.length - 1; i >= 0; i--) {
+      for (var i = 0; i < list.length; i++) {
         list[i].Selected = false;
         arr.push(list[i]);
       }
 
       var ListHeight = 1320;
       var ListHeight2 = 1490;
-      var ListHeight3 = arr.length * 130+20;
+      var ListHeight3 = arr.length * 130 + 20;
       if (arr.length > 10) {
         ListHeight = 1320 + (arr.length - 10) * 130;
         ListHeight2 = 1490 + (arr.length - 10) * 130;
@@ -44,23 +45,57 @@ Page({
   selectItem: function (e) {
     if (e.currentTarget.dataset.id) {
       var id = e.currentTarget.dataset.id;
-      var list = this.data.AnswerList;
-      for (var i = list.length - 1; i >= 0; i--) {
-        if (id == list[i].AnswerID)
-          list[i].Selected = true;
-        else
-          list[i].Selected = false;
+      if (this.data.IsEdit) {
+        var count = 0;
+        var list = this.data.AnswerList;
+        for (var i = 0; i < list.length; i++) {
+          if (id == list[i].AnswerID) {
+            list[i].Selected = !list[i].Selected;
+          }
+          if (list[i].Selected)
+            count++;
+        }
+        this.setData({
+          AnswerList: list,
+          SelectedCount: count,
+        });
+      }
+      else {
+        wx.navigateTo({
+          url: '../main/item?id=' + id,
+        });
+      }
+    }
+  },
+  deleteItem: function () {
+    var list = this.data.AnswerList;
+    for (var i = list.length - 1; i >= 0; i--) {
+      if (list[i].Selected) {
+        list.splice(i, 1);
       }
-      this.setData({
-        AnswerList: list,
-      });
     }
+    list.sort(function (a, b) {
+      if (a.CreateTime == b.CreateTime) {
+        return b.AnswerID - b.AnswerID;
+      } else {
+        return b.CreateTime > a.CreateTime;
+      }
+    });
+    this.setData({
+      AnswerList: list,
+      SelectedCount: 0,
+    });
+    wx.setStorageSync("AnswerList", list);
   },
   btnEdit: function () {
     var that = this;
     that.data.IsEdit = !that.data.IsEdit;
+    for (var i = 0; i < that.data.AnswerList.length; i++) {
+      that.data.AnswerList[i].Selected = false;
+    }
     that.setData({
       IsEdit: that.data.IsEdit,
+      AnswerList: that.data.AnswerList,
     });
   },
   onShareAppMessage: function () {

pages/main/answer.wxml

@@ -5,9 +5,9 @@
   <image class="answerroom_list_conveyer_headline_illus" src="../../images/answerroom_list_conveyer_headline_illus.png" />
   <view class="panelTop FlexRow">
     <view class="panelTop0 FlexColumn">
-      <view class="panelTop00 FlexRow" wx:if="{{IsEdit}}">
+      <view class="panelTop00 FlexRow" wx:if="{{IsEdit}}" bindtap="deleteItem">
         <image class="universalpic_select_on_white" src="../../images/universalpic_select_on_white.png" />
-        <view class="text">删除选中 0个</view>
+        <view class="text">删除选中 {{SelectedCount}} 个</view>
       </view>
       <view class="line" wx:if="{{IsEdit}}"></view>
     </view>
@@ -20,7 +20,7 @@
   </view>
 
   <view class="panel0 FlexColumn">
-    <view class="panel00 FlexRow" style='height:{{ListHeight3}}rpx;'>
+    <view class="panel00 FlexRow" style='min-height:{{ListHeight2}}rpx;'>
 
     </view>
     <image class="answerroom_list_conveyer_footer_illus" src="../../images/answerroom_list_conveyer_footer_illus.png" />
@@ -47,7 +47,7 @@
     <view class="line21 line2"></view>
 
     <!-- 列表 -->
-    <view class="panel0MainBG panel0Main" style='min-height:{{ListHeight}}rpx;'>
+     <view class="panel0MainBG panel0Main" style='min-height:{{ListHeight}}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>
@@ -76,6 +76,6 @@
 
         </view>
       </view>
-    </view>
+    </view> 
   </view>
 </view>

pages/main/default.js

@@ -44,8 +44,7 @@ Page({
         code = res0.code;
       }
     });
-
-
+    
     this.updateProgram();
   },
   gotoList:function(e){
@@ -77,7 +76,8 @@ Page({
       that.setData({
         IsAccredit: false,
       });
-    } else {
+    } 
+    else {
       var userID = app.globalData.userInfo.UserID;
       app.globalData.userInfo = res.userInfo;
       app.globalData.userInfo.UserID = userID;

pages/main/detail.js

@@ -5,7 +5,7 @@ const app = getApp();
 var times = 1;
 var pageIndex = 0;
 var QuestionItem = [];
-var isAndroid=false;
+var isAndroid = false;
 const waitTime = ["", "10秒钟", "15秒钟", "20秒钟", "25秒钟", "半分钟", "35秒钟", "40秒钟", "45秒钟"];
 
 Page({
@@ -18,10 +18,10 @@ Page({
     PageNumber: 1,
     PageCount: 60,
     IsFinished: false,
-    arrPage:[],
-    ShowLoading:false,
+    arrPage: [],
+    ShowLoading: false,
   },
-  onLoad: function(options) {
+  onLoad: function (options) {
     var id = options.id;
     this.setData({
       Containnerheight: server.getWindowHeight(),
@@ -35,10 +35,10 @@ Page({
 
     isAndroid = false;
     if (app.globalData.systemInfo.system && app.globalData.systemInfo.system.indexOf("Android") >= 0)
-      isAndroid=true;
+      isAndroid = true;
 
   },
-  getDetail: function(id) {
+  getDetail: function (id) {
     var item;
     var data = wx.getStorageSync('QuestionTypeList');
     for (var i = 0; i < data.length; i++) {
@@ -55,66 +55,73 @@ Page({
       QuestionTypeItem: item,
     });
   },
-  gotoAnswer: function(e) {
+  gotoAnswer: function (e) {
     wx.navigateTo({
       url: '../main/answer',
     });
   },
-  getFinish: function() {
+  getFinish: function () {
     this.setData({
       IsFinished: true,
     });
     this.getList(this.data.ID);
   },
 
-  getList: function(id) {
+  getList: function (id) {
     var that = this;
     var pageNum = that.data.PageNumber;
     var QuestionTypeCategory = 3;
     if (that.data.filter == "horizontal")
       QuestionTypeCategory = 2;
     pageIndex = 0;
-    server.getLocalHost(function() {
-      server.getData('GetQuestionTypesPrint?ID=' + id + '&QuestionTypeCategory=' + QuestionTypeCategory + '&PageNum=' + pageNum, function(data) {
-        //console.log("UserInfo:" + data);
-        if (data) {
-          that.setData({
-            ShowLoading:true,
-            arrPage: [],
-            WaitTime: waitTime[that.data.PageNumber],
-          });
 
-          QuestionItem = data;
-
-          if (isAndroid) {
-            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();
-          }
+    server.getData('GetQuestionTypesPrint?ID=' + id + '&QuestionTypeCategory=' + QuestionTypeCategory + '&PageNum=' + pageNum, function (data) {
+      //console.log("UserInfo:" + data);
+      if (data) {
+        that.setData({
+          ShowLoading: true,
+          arrPage: [],
+          WaitTime: waitTime[that.data.PageNumber],
+        });
+
+        QuestionItem = data;
+
+        if (isAndroid) {
+          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();
+        }
+      }
     });
+
   },
-  saveLocalData:function(data){
-    var list = wx.getStorageSync("QuestionList");
+  saveLocalData: function (data) {
+    var list = wx.getStorageSync("AnswerList");
     if (list && list.length > 0) {
-      var id = list[list.length - 1].AnswerID + 1;
-      if (id >= 100) {
-        id = 1;
+      list.sort(function (a, b) {
+        if (a.CreateTime == b.CreateTime) {
+          return b.AnswerID - b.AnswerID;
+        } else {
+          return b.CreateTime > a.CreateTime;
+        }
+      });
+      var id = list[0].AnswerID + 1;
+      if (list.length >= 100) {
+        id = list[list.length-1].AnswerID;
       }
       for (var i = 0; i < list.length; i++) {
         if (list[i].AnswerID == id) {
@@ -122,17 +129,18 @@ Page({
         }
       }
       data.AnswerID = id;
-      list.push(data);
+      list.unshift(data);
     }
     else {
       data.AnswerID = 1;
       list = [];
       list.push(data);
     }
-    wx.setStorageSync("QuestionList", list);
+    
+    wx.setStorageSync("AnswerList", list);
     return data;
   },
-  saveImage: function() {
+  saveImage: function () {
     var that = this;
     var item = QuestionItem;
     item = that.saveLocalData(item);
@@ -189,7 +197,7 @@ Page({
     }
 
     //算式
-    index = 0;
+    index = that.data.arrPage.length*item.PageCount;
     ctx.setFontSize(24);
     for (var i = 0; i < 3; i++) {
       for (var j = 0; j < item.PageCount / 3; j++) {
@@ -202,7 +210,7 @@ Page({
           if (item.QuestionList[index - 1].HiddenColumn == "A")
             A = "____";
           var OperateAB = item.QuestionList[index - 1].OperateAB.toString();
-          console.log(OperateAB);
+          //console.log(OperateAB);
           var B = item.QuestionList[index - 1].B.toString();
           if (item.QuestionList[index - 1].HiddenColumn == "B")
             B = "____";
@@ -307,7 +315,7 @@ Page({
     ctx.setTextBaseline('top');
     ctx.setFontSize(32);
     ctx.fillText(item.Name, 60, 45);
-    
+
 
     ctx.setFontSize(12);
     ctx.fillText(item.CagegoryName, 60, 90);
@@ -324,7 +332,7 @@ Page({
 
     ctx.drawImage("../../images/answer.png", 890, 54, 100, 100);
 
-    ctx.draw(true, function(n) {
+    ctx.draw(true, function (n) {
       var w = 1050,
         h = 1485;
 
@@ -337,7 +345,7 @@ Page({
         //destWidth: w*times,
         //destHeight: h*times,
         canvasId: 'Canvas',
-        success: function(res2) {
+        success: function (res2) {
           console.log(res2.tempFilePath);
 
           wx.saveImageToPhotosAlbum({
@@ -366,10 +374,10 @@ Page({
             },
             fail(err3) {
               console.log(err3);
-              
+
             },
           })
-                    
+
         }
       })
     });
@@ -395,7 +403,7 @@ Page({
     }
 
   },
-  changePageNumber: function(e) {
+  changePageNumber: function (e) {
     var id = Number(e.currentTarget.dataset.id);
     this.data.PageNumber += id;
     if (this.data.PageNumber < 1)
@@ -407,22 +415,22 @@ Page({
       PageNumber: this.data.PageNumber,
     });
   },
-  showImage:function(e){
+  showImage: function (e) {
     var that = this;
-    var id=e.currentTarget.dataset.id;
+    var id = e.currentTarget.dataset.id;
     wx.previewImage({
       current: that.data.arrPage[id], // 当前显示图片的http链接
       urls: that.data.arrPage // 需要预览的图片http链接列表
     });
   },
-  closeLoading:function(){
-    var that=this;
+  closeLoading: function () {
+    var that = this;
     that.setData({
       ShowLoading: false,
-      IsFinished:false,
+      IsFinished: false,
     });
   },
-  menuClick: function(e) {
+  menuClick: function (e) {
     this.data.filter = e.currentTarget.dataset.id;
     if (this.data.filter == "horizontal") {
       this.data.PageCount = this.data.QuestionTypeItem.QuestionNumber2;
@@ -436,25 +444,25 @@ Page({
       PageCount: this.data.PageCount,
     });
   },
-  closeMenu: function() {
+  closeMenu: function () {
     this.setData({
       IsShowMenu: false,
     });
   },
-  openMenu: function() {
+  openMenu: function () {
     this.setData({
       IsShowMenu: true,
     });
   },
-  onShareAppMessage: function() {
+  onShareAppMessage: function () {
     return {
       title: '',
       path: 'pages/index/index',
-      success: function(res) {},
-      fail: function(err) {
+      success: function (res) { },
+      fail: function (err) {
         console.log(err);
       },
-      complete: function(res) {
+      complete: function (res) {
         console.log(res);
       },
     }

pages/main/item.js

@@ -7,57 +7,74 @@ Page({
     version: app.globalData.version,
     FileUrl: app.globalData.fileUrl,
   },
-  onLoad: function() {
+  onLoad: function (options) {
     this.setData({
       Containnerheight: server.getWindowHeight(),
-      TestDivEquation1: [{ Type: 'number', Array: ['', '', '', '1', '2', '3'] },
-      {
-        Type: 'number',
-        Array: ['×', '', '', '', '4', '5', '0', '0']
-      },
-      {
-        Type: 'line',
-        Array: ['1', '1', '1', '1', '1', '1', '1', '1']
-      },
-      { Type: 'number', Array: ['', '', '', '6', '1', '5'] },
-      { Type: 'number', Array: ['', '', '4', '9', '2'] },
-      {
-        Type: 'line',
-        Array: ['1', '1', '1', '1', '1', '1', '1', '1']
-      },
-      {
-        Type: 'number',
-        Array: ['', '', '5', '5', '3', '5', '0', '0']
-      }],
-      TestDivEquation2: [{
-        Type: 'number',
-        Array: ['', '', '', '', '0', '.', '6', '2', '5']
-      },
-      {
-        Type: 'line',
-        Array: ['', '', '0.5', '1', '1', '1', '1', '1', '1']
-      },
-      { Type: 'number', Array: ['5', '6', '√', '3', '5', '0'] },
-      { Type: 'number', Array: ['', '', '', '3', '3', '6'] },
-      { Type: 'line', Array: ['', '', '', '1', '1', '1'] },
-      { Type: 'number', Array: ['', '', '', '', '1', '4', '0'] },
-      { Type: 'number', Array: ['', '', '', '', '1', '1', '2'] },
-      { Type: 'line', Array: ['', '', '', '', '1', '1', '1'] },
-      { Type: 'number', Array: ['', '', '', '', '', '2', '8', '0'] },
-      { Type: 'number', Array: ['', '', '', '', '', '2', '8', '0'] },
-      { Type: 'line', Array: ['', '', '', '', '', '1', '1', '1'] },
-      { Type: 'number', Array: ['', '', '', '', '', '', '', '0'] }]
     });
+
+    var id = options.id;
+    this.getItem(id);
+  },
+  scrollTop: function (e) {
+    var id = Number(e.currentTarget.dataset.id);
+    var top = 0;
+
+    var query = wx.createSelectorQuery();
+    query.select('#panelRowTop' + id).boundingClientRect();
+    query.selectViewport().scrollOffset();
+    query.exec(function (res) {
+      top = res[0].top       // #the-id节点的上边界坐标
+      //res[1].scrollTop // 显示区域的竖直滚动位置
+
+      wx.pageScrollTo({
+        scrollTop: top,
+        duration: 500
+      });
+    });
+
+  },
+  getItem: function (id) {
+    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) {
+          item = list[i];
+          break;
+        }
+      }
+      that.setData({
+        AnswerItem: item,
+      });
+    }
+  },
+  selectedItem: 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) {
+        list[i].IsShowVertical = !list[i].IsShowVertical;
+      }
+      else {
+        list[i].IsShowVertical = false;
+      }
+    }
+    this.data.AnswerItem.QuestionList=list;
+    this.setData({
+      AnswerItem: this.data.AnswerItem,
+    });
+
   },
-  onShareAppMessage: function() {
+  onShareAppMessage: function () {
     return {
       title: '',
       path: 'pages/index/index',
-      success: function(res) {},
-      fail: function(err) {
+      success: function (res) { },
+      fail: function (err) {
         console.log(err);
       },
-      complete: function(res) {
+      complete: function (res) {
         console.log(res);
       },
     }

pages/main/item.wxml

@@ -2,9 +2,9 @@
   <view class="panel0 FlexRow">
     <view class="panelLeft">快翻</view>
     <view class="panelRight FlexRow">
-      <view class="btn1 btn">1</view>
-      <view class="btn">4</view>
-      <view class="btn">7</view>
+      <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>
   <view class="panel1 panel0 FlexRow">
@@ -29,12 +29,76 @@
     </view>
   </view>
 
-  <view class="panelRowTop panel0 FlexRow">
-    <view class="panelLeft1 panelLeft">第一列</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 class="panelLeft1 panelLeft">第
+          <block wx:if="{{index / (AnswerItem.QuestionList.length/3)==0}}">一</block>
+          <block wx:if="{{index / (AnswerItem.QuestionList.length/3)==1}}">二</block>
+          <block wx:if="{{index / (AnswerItem.QuestionList.length/3)==2}}">三</block>
+          列</view>
+        <view>
+        </view>
+      </view>
+    </block>
+    <view class="panelRowBody panel0 FlexRow">
+      <view class="panelLeft FlexRow">
+        <view class="number">{{index+1}}</view>
+        <view class="answer">{{item.Result}}</view>
+      </view>
+      <view class="panelRight FlexRow">
+        <view class="equation">
+          <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="formula_btn_show" src="../../images/formula_btn_show.png" wx:if="{{item.Vertical && !item.IsShowVertical}}" bindtap='selectedItem' data-id="{{item.ID}}" />
+        <image class="formula_btn_show" src="../../images/formula_btn_hide.png" wx:if="{{item.Vertical && item.IsShowVertical}}" bindtap='selectedItem' data-id="{{item.ID}}"/>
     </view>
-  </view>
-  <view class="panelRowBody panel0 FlexRow">
+    </view>
+    <!-- 算式一 -->
+    <view class="panelRowBody panel0 FlexColumn" wx:if="{{item.Vertical && item.OperateAB!='÷' && item.IsShowVertical}}">
+      <view class="panelAnswer FlexColumn">
+        <view class="panelAnswerRow FlexRow" wx:for='{{item.Vertical}}' 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="panelRowBody panel0 FlexColumn" wx:if="{{item.Vertical && item.OperateAB=='÷' && item.IsShowVertical}}">
+      <view class="panelAnswer FlexColumn">
+        <view class="panelAnswerRow FlexRow" wx:for='{{item.Vertical}}' 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>
+
+  </block>
+
+  <!-- <view class="panelRowBody panel0 FlexRow">
     <view class="panelLeft FlexRow">
       <view class="number">1</view>
       <view class="answer">7</view>
@@ -97,8 +161,7 @@
       <view class="equation">35 ÷ 56 =</view>
       <image class="formula_btn_show" src="../../images/formula_btn_hide.png" />
     </view>
-  </view>
-
+  </view> 
   <view class="panelRowBody panel0 FlexColumn">
     <view class="panelAnswer FlexColumn">
       <view class="panelAnswerRow FlexRow" wx:for='{{TestDivEquation2}}' wx:key="index">
@@ -113,4 +176,9 @@
       </view>
     </view>
   </view>
+  -->
+
+
+
+
 </view>