1.0.0

pages/main/answer.js

@@ -6,16 +6,59 @@ Page({
   data: {
     version: app.globalData.version,
     FileUrl: app.globalData.fileUrl,
-    IsEdit:false,
+    IsEdit: false,
+    ListHeight: 1320,
   },
   onLoad: function () {
     this.setData({
       Containnerheight: server.getWindowHeight(),
     });
+    this.getList();
   },
-  btnEdit:function(){
-    var that=this;
-    that.data.IsEdit=!that.data.IsEdit;
+  getList: function () {
+    var that = this;
+    var list = wx.getStorageSync("QuestionList");
+    if (list && list.length > 0) {
+      var arr = [];
+      for (var i = list.length - 1; i >= 0; i--) {
+        list[i].Selected = false;
+        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,
+      });
+    }
+  },
+  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;
+      }
+      this.setData({
+        AnswerList: list,
+      });
+    }
+  },
+  btnEdit: function () {
+    var that = this;
+    that.data.IsEdit = !that.data.IsEdit;
     that.setData({
       IsEdit: that.data.IsEdit,
     });

pages/main/answer.wxml

@@ -20,67 +20,8 @@
   </view>
 
   <view class="panel0 FlexColumn">
-    <view class="panel00 FlexRow">
-      <view class="panel0MainBG panel0Main" bindtap='selectItem'>
-        <view class="line2"></view>
-        <view class="item FlexColumn">
-          <view class="itemLine0"></view>
-          <view class="itemChild FlexRow">
-            <view class="FlexRow">
-              <image wx:if="{{IsEdit}}" class="universalpic_select_on_gray" src="../../images/universalpic_select_on_gray.png" />
-              <image wx:if="{{!IsEdit}}" class="questioncard_icon" src="{{FileUrl}}questioncard_icon_grade0602_size01.png" />
-              <view class="title FlexColumn">
-                <view class="title1">
-                  2018年12月23日 23:14
-                </view>
-                <view class="title2 FlexRow">
-                  四则运算a+b+c
-                </view>
-              </view>
-            </view>
-            <view class="title3 FlexRow">
-              <view class="title30">#</view>
-              <view class="title31">48</view>
-              <image class="universalpic_new_red_size01" src="../../images/universalpic_new_red_size01.png" />
-            </view>
-          </view>
-          <view class="itemLine1"></view>
-          <view class="itemLineSelected" wx:if="{{true}}">
-            <image class="universalpic_select_on_orange" src="../../images/universalpic_select_on_orange.png" />
-              
-          </view>
-        </view>
-
-        <view class="item FlexColumn">
-          <view class="itemLine00 itemLine0"></view>
-          <view class="itemChild0 itemChild FlexRow">
-            <view class="FlexRow">
-              <image wx:if="{{IsEdit}}" class="universalpic_select_on_gray" src="../../images/universalpic_select_on_gray.png" />
-              <image wx:if="{{!IsEdit}}" class="questioncard_icon" src="{{FileUrl}}questioncard_icon_grade0602_size01.png" />
-              <view class="title FlexColumn">
-                <view class="title1">
-                  2018年12月23日 23:14
-                </view>
-                <view class="title2 FlexRow">
-                  四则运算a+b+c
-                </view>
-              </view>
-            </view>
-            <view class="title3 FlexRow">
-              <view class="title30">#</view>
-              <view class="title31">13</view>
+    <view class="panel00 FlexRow" style='height:{{ListHeight3}}rpx;'>
 
-            </view>
-          </view>
-          <view class="itemLine1"></view>
-        </view>
-
-        <view class="item FlexColumn">
-          <view class="itemLine0"></view>
-          <view class="itemChild"></view>
-          <view class="itemLine1"></view>
-        </view>
-      </view>
     </view>
     <image class="answerroom_list_conveyer_footer_illus" src="../../images/answerroom_list_conveyer_footer_illus.png" />
 
@@ -89,24 +30,52 @@
       <view class="textFooter1">删除小程序时，答案也会被删除。</view>
     </view>
 
-    <view class="panel01 panel00 FlexRow">
+    <view class="panel01 panel00 FlexRow" bindtap='selectItem'>
 
-      <view class="panel000 FlexColumn">
+      <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" />
       </view>
-      <view class="panel001"></view>
+      <view class="panel001" style='min-height:{{ListHeight2}}rpx;'></view>
       <view class="line2"></view>
-      <view class="panel001"></view>
-      <view class="panel000 FlexColumn">
+      <view class="panel001" style='min-height:{{ListHeight2}}rpx;'></view>
+      <view class="panel000 FlexColumn" style='min-height:{{ListHeight2}}rpx;'>
         <image class="answerroom_list_conveyer_part_right" src="../../images/answerroom_list_conveyer_part_right.png" />
         <image class="answerroom_list_conveyer_part_right" src="../../images/answerroom_list_conveyer_part_right.png" />
       </view>
     </view>
-
     <view class="line21 line2"></view>
-  </view>
 
+    <!-- 列表 -->
+    <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>
+        <view class="itemChild0 itemChild FlexRow">
+          <view class="FlexRow">
+            <image wx:if="{{IsEdit}}" class="universalpic_select_on_gray" src="../../images/universalpic_select_on_gray.png" />
+            <image wx:if="{{!IsEdit}}" class="questioncard_icon" src="{{FileUrl}}questioncard_icon_grade0602_size01.png" />
+            <view class="title FlexColumn">
+              <view class="title1">
+                {{item.CreateTime}}
+              </view>
+              <view class="title2 FlexRow">
+                {{item.Name}}
+              </view>
+            </view>
+          </view>
+          <view class="title3 FlexRow">
+            <view class="title30">#</view>
+            <view class="title31">{{item.AnswerID}}</view>
 
+          </view>
+        </view>
+        <view class="itemLine1"></view>
+        <view class="itemLineSelected" wx:if="{{item.Selected}}">
+          <image class="universalpic_select_on_orange" src="../../images/universalpic_select_on_orange.png" />
 
+        </view>
+      </view>
+    </view>
+  </view>
 </view>

pages/main/answer.wxss

@@ -141,6 +141,9 @@
 
 .panel0 .panel0MainBG {
   background-color: #6a6d6f;
+  position: absolute;
+  z-index: 200;
+  top:0rpx;
 }
 
 .panel0 .item {

pages/main/detail.js

@@ -4,7 +4,7 @@ import server from '../../utils/main';
 const app = getApp();
 var times = 1;
 var pageIndex = 0;
-var QuestionList = [];
+var QuestionItem = [];
 var isAndroid=false;
 const waitTime = ["", "10秒钟", "15秒钟", "20秒钟", "25秒钟", "半分钟", "35秒钟", "40秒钟", "45秒钟"];
 
@@ -83,8 +83,8 @@ Page({
             arrPage: [],
             WaitTime: waitTime[that.data.PageNumber],
           });
-          QuestionList = data;
-          
+
+          QuestionItem = data;
 
           if (isAndroid) {
             var ctx = wx.createCanvasContext("Canvas", that);
@@ -109,10 +109,34 @@ Page({
       });
     });
   },
+  saveLocalData:function(data){
+    var list = wx.getStorageSync("QuestionList");
+    if (list && list.length > 0) {
+      var id = list[list.length - 1].AnswerID + 1;
+      if (id >= 100) {
+        id = 1;
+      }
+      for (var i = 0; i < list.length; i++) {
+        if (list[i].AnswerID == id) {
+          list.splice(i, 1);
+        }
+      }
+      data.AnswerID = id;
+      list.push(data);
+    }
+    else {
+      data.AnswerID = 1;
+      list = [];
+      list.push(data);
+    }
+    wx.setStorageSync("QuestionList", list);
+    return data;
+  },
   saveImage: function() {
-    var item = QuestionList;
-
     var that = this;
+    var item = QuestionItem;
+    item = that.saveLocalData(item);
+
     var ctx = wx.createCanvasContext("Canvas", that);
     ctx.setFillStyle('white');
     ctx.fillRect(0, 0, 2100, 2970);
@@ -283,8 +307,7 @@ Page({
     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);
@@ -296,6 +319,9 @@ Page({
     ctx.fillText("出题时间 " + item.CreateTime, 875, 94);
     ctx.fillText("微信扫一扫 计时看答案", 875, 111);
     ctx.fillText("《数学计算题》选题 打印 扫码 批改", 875, 137);
+    ctx.setFontSize(32);
+    ctx.fillText(item.AnswerID, 872, 50);
+
     ctx.drawImage("../../images/answer.png", 890, 54, 100, 100);
 
     ctx.draw(true, function(n) {

pages/main/list.js

@@ -101,15 +101,15 @@ Page({
       query.select('.line4').boundingClientRect();
       query.exec(function (res) {
         //console.log("top2:" + (res[0].top));
-        var LineLongHeight = Number(res[0].top) * 2;
-        if (that.data.CategoryNum == 1 )
-          LineLongHeight+=430;
-        else if (that.data.CategoryNum == 2)
-          LineLongHeight += 320;
-        else if (that.data.CategoryNum == 3)
-          LineLongHeight += 280;
-        else if (that.data.CategoryNum == 4)
-          LineLongHeight += 30;
+        var LineLongHeight = Number(res[0].top) * 2-200;
+        // if (that.data.CategoryNum == 1 )
+        //   LineLongHeight+=430;
+        // else if (that.data.CategoryNum == 2)
+        //   LineLongHeight += 320;
+        // else if (that.data.CategoryNum == 3)
+        //   LineLongHeight += 280;
+        // else if (that.data.CategoryNum == 4)
+        //   LineLongHeight += 30;
         console.log("LineLongHeight:" + LineLongHeight);
         that.setData({
           LineLongHeight: LineLongHeight,

project.config.json

@@ -30,7 +30,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 2,
+			"current": -1,
 			"list": [
 				{
 					"id": 0,