1.0.0

pages/main/answer.js

@@ -8,6 +8,7 @@ Page({
     FileUrl: app.globalData.fileUrl,
     IsEdit: false,
     ListHeight: 1320,
+    ListHeight2: 1490,
     SelectedCount: 0,
   },
   onLoad: function () {

pages/main/answer.wxml

@@ -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:{{ListHeight2}}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/detail.js

@@ -5,8 +5,10 @@ const app = getApp();
 var times = 1;
 var pageIndex = 0;
 var QuestionItem = [];
+var tempAnswerList=[];
+var arrAnswerID=[];
 var isAndroid = false;
-const waitTime = ["", "10秒钟", "15秒钟", "20秒钟", "25秒钟", "半分钟", "35秒钟", "40秒钟", "45秒钟"];
+const waitTime = ["", "10秒钟", "15秒钟", "20秒钟", "25秒钟"];
 
 Page({
   data: {
@@ -20,6 +22,7 @@ Page({
     IsFinished: false,
     arrPage: [],
     ShowLoading: false,
+    IsDistabled: "",
   },
   onLoad: function (options) {
     var id = options.id;
@@ -61,9 +64,8 @@ Page({
     });
   },
   getFinish: function () {
-    this.setData({
-      IsFinished: true,
-    });
+    arrAnswerID = [];
+    this.getAnswerID();
     this.getList(this.data.ID);
   },
 
@@ -80,7 +82,9 @@ Page({
       if (data) {
         that.setData({
           ShowLoading: true,
+          IsFinished: true,
           arrPage: [],
+          IsDistabled: "",
           WaitTime: waitTime[that.data.PageNumber],
         });
 
@@ -109,41 +113,22 @@ Page({
     });
 
   },
-  saveLocalData: function (data) {
+  getAnswerID: function () {
     var list = wx.getStorageSync("AnswerList");
+    var id=1;
     if (list && list.length > 0) {
       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) {
-          list.splice(i, 1);
-        }
-      }
-      data.AnswerID = id;
-      list.unshift(data);
-    }
-    else {
-      data.AnswerID = 1;
-      list = [];
-      list.push(data);
+      id = list[0].AnswerID + 1;
     }
-    
-    wx.setStorageSync("AnswerList", list);
-    return data;
+    for (var i = 0; i < this.data.PageNumber;i++)
+      arrAnswerID.push(id+i);
   },
   saveImage: function () {
     var that = this;
     var item = QuestionItem;
-    item = that.saveLocalData(item);
+    item.AnswerID = arrAnswerID.pop();
 
     var ctx = wx.createCanvasContext("Canvas", that);
     ctx.setFillStyle('white');
@@ -197,7 +182,7 @@ Page({
     }
 
     //算式
-    index = that.data.arrPage.length*item.PageCount;
+    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++) {
@@ -335,8 +320,6 @@ Page({
     ctx.draw(true, function (n) {
       var w = 1050,
         h = 1485;
-
-
       wx.canvasToTempFilePath({
         x: 0,
         y: 0,
@@ -347,37 +330,32 @@ Page({
         canvasId: 'Canvas',
         success: function (res2) {
           console.log(res2.tempFilePath);
+          that.data.arrPage.push(res2.tempFilePath);
 
-          wx.saveImageToPhotosAlbum({
-            filePath: res2.tempFilePath,
-            success(res3) {
-              console.log("save:" + res3.savedFilePath);
-              that.data.arrPage.push(res2.tempFilePath);
+          tempAnswerList.push(item);
 
-              that.setData({
-                arrPage: that.data.arrPage,
-              });
-
-              if (that.data.arrPage.length < that.data.PageNumber) {
-                pageIndex++;
-                that.saveImage();
-              } else {
-                that.setData({
-                  ShowLoading: false,
-                });
-
-                wx.previewImage({
-                  current: that.data.arrPage[0], // 当前显示图片的http链接
-                  urls: that.data.arrPage // 需要预览的图片http链接列表
-                });
-              }
-            },
-            fail(err3) {
-              console.log(err3);
-
-            },
-          })
+          that.setData({
+            arrPage: that.data.arrPage,
+          });
 
+          if (that.data.arrPage.length < that.data.PageNumber) {
+            pageIndex++;
+            that.saveImage();
+          } else {
+            that.setData({
+              ShowLoading: false,
+            });
+
+            wx.pageScrollTo({
+              scrollTop: 710,
+              duration: 300
+            });
+
+            wx.previewImage({
+              current: that.data.arrPage[0], // 当前显示图片的http链接
+              urls: that.data.arrPage // 需要预览的图片http链接列表
+            });
+          }
         }
       })
     });
@@ -403,13 +381,53 @@ Page({
     }
 
   },
+  //保存图片文件
+  saveImageFile: function () {
+    if (this.data.IsDistabled == "") {
+      wx.showLoading({ title: "保存中..." });
+      var that = this;
+      var count = 0;
+      for (var i = 0; i < that.data.arrPage.length; i++) {
+        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) {
+              wx.hideLoading();
+              wx.showModal({
+                title: "保存完成",
+                showCancel: false,
+                content: "请打开手机相册查看图片！",
+              });
+              that.setData({
+                IsDistabled: "Distabled",
+              });
+
+              wx.pageScrollTo({
+                scrollTop: 1010,
+                duration: 300
+              });
+
+            }
+          },
+          fail(err3) {
+            console.log(err3);
+          },
+        })
+      }
+    }
+  },
   changePageNumber: function (e) {
     var id = Number(e.currentTarget.dataset.id);
     this.data.PageNumber += id;
     if (this.data.PageNumber < 1)
       this.data.PageNumber = 1;
-    else if (this.data.PageNumber > 8)
-      this.data.PageNumber = 8;
+    else if (this.data.PageNumber > 4)
+      this.data.PageNumber = 4;
 
     this.setData({
       PageNumber: this.data.PageNumber,

pages/main/detail.wxml

@@ -51,7 +51,7 @@
 
     <image class="universalpic_line_dashed_size01" src="../../images/universalpic_line_dashed_size01.png" />
 
-    <view class="text4">制作几份</view>
+    <view class="text4">制作几张</view>
 
     <image class="universalpic_value_cell_size01" src="../../images/universalpic_value_cell_size01.png" />
     <view class="panel10 FlexRow">
@@ -60,7 +60,7 @@
       <view class="btnAddSub" bindtap='changePageNumber' data-id="1"></view>
     </view>
 
-    <view class="text5">每份含 {{PageCount}} 道题目，至多 8 份</view>
+    <view class="text5">每张含 {{PageCount}} 道题目</view>
 
     <image class="universalpic_line_dashed_size01" src="../../images/universalpic_line_dashed_size01.png" />
 
@@ -77,27 +77,31 @@
       <view class="panel20 FlexRow">
         <image class="universalpic_right_white_size01" src="../../images/universalpic_right_white_size01.png" />
       </view>
-      <view class="text6">完成了</view>
-      <view class="text7">题目以图片格式保存到手机相册，共 {{arrPage.length}} 张</view>
+      <view class="text6">题目出好了，共有 {{arrPage.length}} 张卷子图片</view>
       <view class="panel21 FlexRow">
         <image class="panel210" wx:for="{{arrPage}}" wx:key="index" src="{{item}}" data-id='{{index}}' bindtap='showImage' />
       </view>
-
+      <view class="btn2{{IsDistabled}} btn" bindtap='saveImageFile'>
+        <view class="btn1{{IsDistabled}} btn1">
+          全部保存到相册
+        </view>
+      </view>
       <image class="universalpic_line_dashed_size01" src="../../images/universalpic_line_dashed_size01.png" />
-      <view class="text8">然后...</view>
+      <view class="text8">保存之后...</view>
       <view class="panel22 FlexRow">
         <view class="panel220 FlexColumn">
           <view class="panel2200 FlexColumn">
             <image class="universalpic_print_gray_size01" src="../../images/universalpic_print_gray_size01.png" />
           </view>
-          <text class="text9">请到手机相册打印图片或转存到PC</text>
+          <text class="text9">1. 请到手机相册打印图片或转存到PC</text>
         </view>
         <view class="panel220 FlexColumn">
           <view class="panel2200 FlexColumn">
             <image class="universalpic_write_gray_size01" src="../../images/universalpic_write_gray_size01.png" />
           </view>
-          <text class="text9">题目做完后，在首页的批改栏目中看查看答案</text>
-          <text class="text10" bindtap='gotoAnswer'>看答案</text>
+          <view class="text9" bindtap="gotoAnswer">2. 题目做完后，在首页 的批改栏目中
+            <text class="text10">对答案</text>
+          </view>
         </view>
       </view>
     </view>
@@ -138,8 +142,8 @@
   <view class="loading1 FlexColumn">
     <view class="line1"></view>
     <view class="line2 FlexColumn">
-      <view class="text">共 {{PageNumber}} 张图片</view>
-      <view class="text2">正在保存第 {{arrPage.length}} 张... 可能需要{{WaitTime}}</view>
+      <view class="text">正在生成第 {{arrPage.length}} 张图片</view>
+      <view class="text2">共有 {{PageNumber}} 张图片，可能需要{{WaitTime}}</view>
     </view>
     <view class="line3 FlexColumn">
       <view class="text3">使用建议</view>
@@ -148,11 +152,11 @@
     <view class="line4"></view>
     <image class="universalpic_attention_light_red_bg" src="../../images/universalpic_attention_light_red_bg.png" />
     <image class="universalpic_attention_light_red" src="../../images/universalpic_attention_light_red.gif" />
-    
+
   </view>
   <view class="close FlexRow">
     <view class="close1 FlexRow" bindtap='closeLoading'>
-    <image class="universalpic_close_white_size01" src="../../images/universalpic_close_white_size01.png" />
+      <image class="universalpic_close_white_size01" src="../../images/universalpic_close_white_size01.png" />
     </view>
   </view>
 

pages/main/detail.wxss

@@ -177,6 +177,7 @@
   border-radius: 10rpx;
   position: relative;
   margin-top: 80rpx;
+  margin-bottom: 60rpx;
 }
 
 .btn1 {
@@ -190,6 +191,16 @@
   font-size: 48rpx;
 }
 
+.btn2Distabled {
+  background-color: #1E1E1E;
+  margin-top: 60rpx;
+}
+
+.btn1Distabled {
+  background-color: #2E2E2E;
+  color: #4D4D4D;
+}
+
 .universalpic_line_zigzag_black_down{
   width: 680rpx;
   height: 49rpx;
@@ -198,6 +209,7 @@
 .universalpic_line_zigzag_black_up{
   width: 680rpx;
   height: 79rpx;
+  margin-top: 10rpx;
 }
 
 
@@ -218,27 +230,25 @@
   width: 100rpx;
   height: 100rpx;
   background-color: #19C575;
-  margin-top: 50rpx;
+  margin-top: 80rpx;
   border-radius: 50%;
 }
 
 .panel2 .text6{
   font-size:32rpx;
-  margin-top: 30rpx;
+  margin-top: 50rpx;
   color:#9B9B9B;
 }
-.panel2 .text7{
-  font-size:24rpx;
-  margin-top: 50rpx;
-  color:#868686;
-  font-weight: 400;
+
+.btn2 {
+  margin-top: 60rpx;
 }
+
 .panel2 .panel21{
   width: 600rpx;
   margin-top: 40rpx;
   flex-wrap: wrap;
   justify-content: flex-start;
-  margin-bottom: 40rpx;
 }
 .panel2 .panel210{
   width: 130rpx;
@@ -296,11 +306,7 @@
 }
 
 .panel2 .text10{
-  width:260rpx;
-  font-size:24rpx;
-  margin-top: 40rpx;
-  color:#F0F0F0;
-  text-align: center;
+  color:#fff;
   text-decoration:underline;
 }
 

pages/main/item.js

@@ -44,6 +44,15 @@ Page({
           break;
         }
       }
+      
+      var list = item.QuestionList;
+      for (var i = 0; i < list.length; i++) {
+        if (i==0 && list[i].Vertical) {
+          list[i].IsShowVertical = true;
+          break;
+        }
+      }
+      
       that.setData({
         AnswerItem: item,
       });

pages/main/item.wxml

@@ -42,7 +42,7 @@
         </view>
       </view>
     </block>
-    <view class="panelRowBody panel0 FlexRow">
+    <view class="panelRowBody panel0 FlexRow" bindtap='selectedItem' data-id="{{item.ID}}">
       <view class="panelLeft FlexRow">
         <view class="number">{{index+1}}</view>
         <view class="answer">{{item.Result}}</view>
@@ -58,11 +58,11 @@
           <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}}"/>
+        <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 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">
@@ -77,7 +77,7 @@
         </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">

pages/main/item.wxss

@@ -178,7 +178,7 @@
   margin: 10rpx 15rpx;
 }
 .panelAnswer .colLineHalf{
-  width:14rpx;
+  width:34rpx;
   height:2rpx;
   margin: 0rpx 0 0 28rpx;
   background-color: #000;

pages/main/list.js

@@ -11,36 +11,36 @@ Page({
   data: {
     version: app.globalData.version,
     FileUrl: app.globalData.fileUrl,
-    filter:'all',
-    IsShowMenu:false,
-    CategoryID:1,
+    filter: 'all',
+    IsShowMenu: false,
+    CategoryID: 1,
   },
-  onLoad: function(options) {
+  onLoad: function (options) {
     categoryID = options.id;
     categoryName = options.name;
     categoryNum = options.num;
     //console.log(category);
-    this.getList();
     this.setData({
-      CategoryNum:categoryNum,
+      CategoryNum: categoryNum,
       CategoryID: categoryID,
       Containnerheight: server.getWindowHeight(),
     });
+    this.getList();
   },
-  getList: function() {
+  getList: function () {
     this.buildList();
     wx.setNavigationBarTitle({
       title: categoryName + " 题卡仓库",
     });
   },
-  gotoDetail:function(e){
+  gotoDetail: function (e) {
     SelectID = e.currentTarget.dataset.id;
     var arr = wx.getStorageSync('SelectIDArray');
     if (!arr)
-      arr=[];
-    for(var i=0;i<arr.length;i++){
-      if (arr[i] == SelectID){
-        arr.splice(i,0);
+      arr = [];
+    for (var i = 0; i < arr.length; i++) {
+      if (arr[i] == SelectID) {
+        arr.splice(i, 0);
         break;
       }
     }
@@ -53,8 +53,8 @@ Page({
       url: '../main/detail?id=' + SelectID,
     });
   },
-  buildList:function(){
-    var that=this;
+  buildList: function () {
+    var that = this;
 
     var arrID = categoryID.split(",");
     var list = [];
@@ -67,11 +67,11 @@ Page({
           for (var k = 0; k < data[i].List.length; k++) {
             data[i].List[k].CategoryLevel = data[i].Name;
 
-            
+
             for (var n = 0; n < arr.length; n++) {
               //data[i].List[k].SelectItem = "";
-              if (arr[n] == data[i].List[k].ID){
-                data[i].List[k].SelectItem ="boxLeft";
+              if (arr[n] == data[i].List[k].ID) {
+                data[i].List[k].SelectItem = "boxLeft";
               }
             }
 
@@ -79,46 +79,27 @@ Page({
             if (SelectID == data[i].List[k].ID)
               data[i].List[k].Select = true;
 
-            if (this.data.filter == "vertical"){
-              if (data[i].List[k].QuestionNumber3>0)
+            if (this.data.filter == "vertical") {
+              if (data[i].List[k].QuestionNumber3 > 0)
                 list.push(data[i].List[k]);
             }
-            else{
-                list.push(data[i].List[k]);
+            else {
+              list.push(data[i].List[k]);
             }
           }
           break;
         }
       }
     }
-
+    var LineLongHeight = (list.length+1) * 190;
+    
     this.setData({
       QuestionTypeList: list,
+      LineLongHeight: LineLongHeight,
     });
 
-    setTimeout(function(){
-      var query = wx.createSelectorQuery();
-      query.select('.line4').boundingClientRect();
-      query.exec(function (res) {
-        //console.log("top2:" + (res[0].top));
-        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,
-        });
-      });
-    },200);
-    
   },
-  menuClick:function(e){
+  menuClick: function (e) {
     this.data.filter = e.currentTarget.dataset.id;
     this.setData({
       filter: this.data.filter,
@@ -136,7 +117,7 @@ Page({
       IsShowMenu: true,
     });
   },
-  onShareAppMessage: function() {
+  onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,
       path: 'pages/index/index?UserID=' + app.globalData.userInfo.UserID,

pages/main/list.wxml

@@ -37,7 +37,7 @@
     </view>
 
   </block>
-
+  <!-- 锁住 -->
   <!-- <image class="questioncollection_shelf_board" src="../../images/questioncollection_shelf_board.png" />
   <view class="boxRight questioncard FlexRow desaturate">
     <image class=" questioncollection_shelf_box" src="../../images/questioncollection_shelf_box.png" />

project.config.json

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