1.0.5

app.js

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

app.json

@@ -7,6 +7,7 @@
     "pages/main/detail",
     "pages/main/list",
     "pages/main/errorlist",
+    "pages/about/share",
     "pages/about/payfinished",
     "pages/main/default"
   ],

pages/about/share.js

@@ -0,0 +1,76 @@
+import common from '../../utils/util';
+import server from '../../utils/main';
+
+const app = getApp();
+var imageIndex = 0;
+var arrBuildImageSource = [];
+var arrBuildImageTarget = [];
+
+Page({
+  data: {
+  },
+  onLoad: function (options) {
+    this.setData({
+      Height: common.getSystemHeight(),
+    });
+  },
+  onUnload: function () {
+    wx.setStorageSync("IsShare", true);
+  },
+  buildShareImage: function () {
+    imageIndex = 0;
+    arrBuildImageSource = [];
+    for (var i = 2; i < 6; i++)
+      arrBuildImageSource.push("../../images/programsystem_screenshot_pic0" + i + ".png");
+    arrBuildImageTarget = [];
+
+    this.buildImage();
+  },
+  buildImage: function () {
+    var that = this;
+    var ctx = wx.createCanvasContext("MyCanvas", this);
+    ctx.drawImage(arrBuildImageSource[imageIndex], 0, 0, 400, 300);
+    var avatar = wx.getStorageSync("Avatar");
+    if (avatar) {
+      ctx.drawImage(avatar, 15, 250, 40, 40);
+      ctx.drawImage("../../images/universalpic_mask_face_size01.png", 13, 248, 44, 44);
+
+      ctx.fillStyle = "#ffffff";
+      ctx.setFontSize(14);
+      ctx.fillText(app.globalData.userInfo.NickName, 65, 264);
+    }
+    ctx.draw(true, function (n) {
+      wx.canvasToTempFilePath({
+        x: 0,
+        y: 0,
+        width: 400,
+        height: 300,
+        canvasId: 'MyCanvas',
+        success: function (res2) {
+          console.log(res2.tempFilePath);
+
+          arrBuildImageTarget.push(res2.tempFilePath);
+
+          if (arrBuildImageTarget.length < arrBuildImageSource.length) {
+            imageIndex++;
+            that.buildImage();
+          }
+          else {
+            wx.previewImage({
+              current: arrBuildImageTarget[0], // 当前显示图片的http链接
+              urls: arrBuildImageTarget // 需要预览的图片http链接列表
+            });
+          }
+        }
+      })
+    });
+
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: 'pages/index/index?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImageUrl,
+    }
+  },
+});

pages/about/share.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarBackgroundColor": "#99607C",
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "分享",
+  "backgroundColor": "#99607C"
+}

pages/about/share.wxml

@@ -0,0 +1,36 @@
+<view class="container FlexColumn" style='height:{{Height}}rpx;'>
+  <view class="btn">
+    <view class="btn1 FlexColumn">
+      <view class="panel1 FlexRow">
+        <view class="line"></view>
+        <view class="panel11 FlexColumn">
+          <view class="panel111 FlexColumn">
+            把我
+          </view>
+          <view class="panel112 FlexColumn">
+            分享给您的朋友吧
+          </view>
+        </view>
+      </view>
+      <view class="panel2 FlexRow">
+        <button class="panel2_1 FlexColumn" open-type="share">
+          <view class="textTitle">
+            <view class="textTitle1">转发给朋友</view>
+            <view class="textTitle2">转发给朋友</view>
+          </view>
+          <view class="panel212">直接转发</view>
+        </button>
+        <view class="line2"></view>
+        <view class="panel2_2 FlexColumn" bindtap='buildShareImage'>
+          <view class="textTitle textTitle3">
+            <view class="textTitle1">存图发朋友圈</view>
+            <view class="textTitle2">存图发朋友圈</view>
+          </view>
+          <view class="panel2121 panel212">生成图片 长按存图</view>
+        </view>
+      </view>
+    </view>
+  </view>
+  <image src="../../images/universalpic_share_guide_bg.png" class="universalpic_share_guide_bg" />
+</view>
+<canvas class='Canvas' canvas-id="MyCanvas"></canvas>

pages/about/share.wxss

@@ -0,0 +1,132 @@
+.container {
+  background-color: #99607c;
+  justify-content: flex-start;
+}
+
+.btn {
+  width: 610rpx;
+  height: 422rpx;
+  background-color: #67453c;
+  margin-top: 212rpx;
+  border-radius: 14rpx;
+  z-index: 10;
+}
+
+.btn1 {
+  width: 100%;
+  height: 402rpx;
+  background-color: #ffd48b;
+  position: relative;
+  border-radius: 14rpx;
+  top: 0;
+}
+
+.panel1 {
+  width: 100%;
+  height: 260rpx;
+  border-bottom: 2rpx solid #e4b06c;
+  justify-content: flex-start;
+}
+
+.line {
+  width: 16rpx;
+  height:140rpx;
+  background-color: #EC4C56;
+  margin-left: 50rpx;
+}
+
+.panel11{
+  align-items: flex-start;
+  margin-left: 30rpx;
+}
+.panel111{
+  font-size:64rpx;
+  font-weight: 500;
+}
+.panel112{
+  font-size:48rpx;
+  font-weight: 500;
+}
+
+.panel2 {
+  width: 100%;
+  height: 140rpx;
+  background-color: #fec579;
+  border-bottom-left-radius: 14rpx;
+  border-bottom-right-radius: 14rpx;
+}
+
+.line2 {
+  width: 2rpx;
+  height: 90rpx;
+  background-color: #e4b06c;
+}
+
+.panel2_1 {
+  width: 305rpx;
+  height: 140rpx;
+  background-color: #fec579;
+  border-bottom-left-radius: 14rpx;
+  justify-content: flex-start;
+  padding-left: 0;
+  padding-right: 0;
+}
+
+.panel2_1::after {
+  border: 0px;
+}
+
+.panel2_2 {
+  width: 305rpx;
+  height: 140rpx;
+  background-color: #fec579;
+  border-bottom-right-radius: 14rpx;
+  justify-content: flex-start;
+}
+
+.textTitle {
+  font-size: 36rpx;
+  font-weight: 500;
+  width: 180rpx;
+  height:50rpx;
+  margin-top: 30rpx;
+}
+.textTitle3 {
+  width: 216rpx;
+}
+.textTitle1 {
+  -webkit-text-stroke:8rpx #8B4C28;
+  position: absolute;
+  text-align: center;
+  line-height: 50rpx;
+}
+.textTitle2 {
+  color: #FFFFFF;
+  position: absolute;
+  text-align: center;
+  line-height: 50rpx;
+}
+.panel212{
+  font-size: 22rpx;
+  font-weight: 500;
+  color:#8B4C28;
+  margin-top: -2rpx;
+}
+.panel2121{
+  margin-top: 8rpx;
+}
+
+.universalpic_share_guide_bg {
+  width: 100%;
+  height: 440rpx;
+  position: fixed;
+  bottom: 0;
+}
+
+.Canvas{
+  width: 400px; 
+  height: 300px;
+  position: fixed;
+  left:760rpx;
+  top:0rpx;
+}

pages/index/guide.wxml

@@ -1,5 +1,4 @@
 <view class="container FlexColumn" style="height:{{Containnerheight}}rpx;">
-  <image class="welcomeguide_bg" src="../../images/welcomeguide_bg.png" />
   <view class="panel FlexColumn">
     <image class="welcomeguide_info" src="../../images/welcomeguide_info.png" />
     <image class="welcomeguide_dialogue" src="../../images/welcomeguide_dialogue.png" />

pages/index/guide.wxss

@@ -3,13 +3,6 @@
   justify-content: flex-start;
 }
 
-.welcomeguide_bg {
-  width: 100%;
-  height: 1206rpx;
-  position: fixed;
-  top:0;
-}
-
 .panel{
   width:100%;
   position: fixed;

pages/main/answer.js

@@ -20,6 +20,9 @@ Page({
     });
 
   },
+  onUnload: function () {
+    this.closeHelp();
+  },
   getList: function () {
     //console.log(new Date().getTime());
     var that = this;

pages/main/answer.wxml

@@ -37,7 +37,7 @@
 
     <view class="textFooter FlexRow">
       <image class="universalpic_attention_blue_size01" src="../../images/universalpic_attention_blue_size01.png" />
-      <view class="textFooter1">删除小程序时，答案也会被删除。</view>
+      <view class="textFooter1">小程序被删除后，出题记录和答案也会被删除。</view>
     </view>
 
     <view class="panel01 panel00 FlexRow" bindtap='selectItem'>

pages/main/default.js

@@ -3,6 +3,9 @@ import server from '../../utils/main';
 
 const app = getApp();
 var code;
+var imageIndex = 0;
+var arrBuildImageSource = [];
+var arrBuildImageTarget = [];
 
 Page({
   data: {
@@ -13,41 +16,41 @@ Page({
     AvatarUrl: "",
     IsAccredit: false,
   },
-  onLoad: function() {
-    var that=this;
+  onLoad: function () {
+    var that = this;
     this.setData({
       Containnerheight: server.getWindowHeight(),
       ProgramList: server.getProgramList(),
       NickName: app.globalData.userInfo.NickName,
       AvatarUrl: app.globalData.userInfo.AvatarUrl,
     });
-    common.getStorageValue(this, "HelpHidden1", false, function () { 
+    common.getStorageValue(this, "HelpHidden1", false, function () {
       that.showHelp();
     });
-
     wx.login({
       success: function (res0) {
         code = res0.code;
       }
     });
-    
+    this.downloadUserAvatar();
     this.updateProgram();
-
-    
   },
-  onShow:function(){
+  onUnload:function(){
+    this.closeHelp();
+  },
+  onShow: function () {
     var list = wx.getStorageSync("AnswerList");
     var answerLength = 0;
     if (list && list.length > 0) {
       answerLength = list.length;
     }
-    
+
     var errorCount = 0;
     var listError = wx.getStorageSync("ErrorList");
     if (listError && listError.length > 0) {
       errorCount = listError.length;
     }
-    
+
     this.setData({
       AnswerLength: answerLength,
       ErrorCount: errorCount,
@@ -73,12 +76,36 @@ Page({
         }
       }
     });
+
+    if (list && list.length >= 2) {
+      common.getStorageValue(that, "IsShare", false, function () {
+        if (!that.data.IsShare) {
+          wx.navigateTo({
+            url: '../about/share',
+          });
+        }
+      });
+    }
+  },
+  downloadUserAvatar: function () {
+    var avatar = wx.getStorageSync("Avatar");
+    if (!avatar) {
+      var that = this;
+      wx.downloadFile({
+        url: app.globalData.userInfo.AvatarUrl,
+        success(res) {
+          if (res.statusCode === 200) {
+            wx.setStorageSync("Avatar", res.tempFilePath);
+          }
+        }
+      });
+    }
   },
-  gotoList:function(e){
+  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] }];
+    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] }];
 
     wx.navigateTo({
       url: '../main/list?id=' + categoryArray[id].Array.join(",") + "&name=" + categoryArray[id].Name + "&num=" + categoryArray[id].Num,
@@ -86,7 +113,24 @@ Page({
 
     this.closeHelp();
   },
-  gotoAnswer:function(){
+  closeMenu: function () {
+    this.setData({
+      IsShowMenu: false,
+    });
+  },
+  openMenu: function () {
+    this.setData({
+      IsShowMenu: true,
+    });
+  },
+  gotoHelp: function () {
+    for (var i = 0; i < 9; i++)
+      wx.removeStorageSync("HelpHidden" + i);
+    wx.redirectTo({
+      url: '../index/guide',
+    });
+  },
+  gotoAnswer: function () {
     wx.navigateTo({
       url: '../main/answer',
     });
@@ -101,7 +145,7 @@ Page({
       url: '../main/detail?id=-1',
     });
   },
-  switchProgram: function(e) {
+  switchProgram: function (e) {
     wx.navigateToMiniProgram({
       appId: e.currentTarget.dataset.appid,
       path: e.currentTarget.dataset.path,
@@ -111,37 +155,89 @@ Page({
       }
     });
   },
-  gotoFeedback: function() {
+  gotoFeedback: function () {
     server.gotoFeedback();
   },
-  showHelp:function(){
-    if (!this.data.HelpHidden1){
+  showHelp: function () {
+    if (!this.data.HelpHidden1) {
       this.audioCtx = wx.createAudioContext('myAudio');
-      var str ="那么，就从选题目开始吧。在计算题工厂里包括了小学数学全年级最重要的知识点。其中“四年级及以上”，这个栏目囊括了四到六年级的题型。请选一个年级继续。";
+      var str = "那么，就从选题目开始吧。在计算题工厂里包括了小学数学全年级最重要的知识点。其中“四年级及以上”，这个栏目囊括了四到六年级的题型。请选一个年级继续。";
       server.playAudio(this.audioCtx, str);
     }
   },
-  closeHelp:function(){
+  closeHelp: function () {
     this.setData({
-      HelpHidden1:true,
+      HelpHidden1: true,
     });
     wx.setStorageSync("HelpHidden1", true);
     this.audioCtx = wx.createAudioContext('myAudio');
     this.audioCtx.pause();
   },
-  updateProgram: function() {
+  buildShareImage: function () {
+    this.closeMenu();
+    imageIndex = 0;
+    arrBuildImageSource = [];
+    for (var i = 2; i < 6; i++)
+      arrBuildImageSource.push("../../images/programsystem_screenshot_pic0" + i + ".png");
+    arrBuildImageTarget = [];
+
+    this.buildImage();
+  },
+  buildImage: function () {
+    var that = this;
+    var ctx = wx.createCanvasContext("MyCanvas", this);
+    ctx.drawImage(arrBuildImageSource[imageIndex], 0, 0, 400, 300);
+
+    var avatar = wx.getStorageSync("Avatar");
+    if (avatar) {
+      ctx.drawImage(avatar, 15, 250, 40, 40);
+      ctx.drawImage("../../images/universalpic_mask_face_size01.png", 13, 248, 44, 44);
+
+      ctx.fillStyle = "#ffffff";
+      ctx.setFontSize(14);
+      ctx.fillText(app.globalData.userInfo.NickName, 65, 264);
+    }
+
+    ctx.draw(true, function (n) {
+      wx.canvasToTempFilePath({
+        x: 0,
+        y: 0,
+        width: 400,
+        height: 300,
+        canvasId: 'MyCanvas',
+        success: function (res2) {
+          console.log(res2.tempFilePath);
+
+          arrBuildImageTarget.push(res2.tempFilePath);
+
+          if (arrBuildImageTarget.length < arrBuildImageSource.length) {
+            imageIndex++;
+            that.buildImage();
+          }
+          else {
+            wx.previewImage({
+              current: arrBuildImageTarget[0], // 当前显示图片的http链接
+              urls: arrBuildImageTarget // 需要预览的图片http链接列表
+            });
+          }
+        }
+      })
+    });
+
+  },
+  updateProgram: function () {
     const updateManager = wx.getUpdateManager();
 
-    updateManager.onCheckForUpdate(function(res) {
+    updateManager.onCheckForUpdate(function (res) {
       // 请求完新版本信息的回调
       //console.log(res.hasUpdate)
     });
 
-    updateManager.onUpdateReady(function() {
+    updateManager.onUpdateReady(function () {
       wx.showModal({
         title: '更新提示',
         content: '新版本已经准备好，是否重启应用？',
-        success: function(res) {
+        success: function (res) {
           if (res.confirm) {
             // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
             updateManager.applyUpdate()
@@ -151,7 +247,7 @@ Page({
 
     });
   },
-  onShareAppMessage: function() {
+  onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,
       path: 'pages/index/index?UserID=' + app.globalData.userInfo.UserID,

pages/main/default.wxml

@@ -44,12 +44,12 @@
                 <view class="text">{{ErrorCount}}</view>
               </view>
               <view class="line4 line3"></view>
-              <view class="panel002000 FlexRow" bindtap='gotoErrorList'>
-                <button class="btn">
+              <view class="panel002000 FlexRow" >
+                <view class="btn" bindtap='gotoErrorList'>
                   <view class="btn1">
                     错题集
                   </view>
-                </button>
+                </view>
 
                 <view class="btn2 btn" bindtap='gotoAnswer'>
                   <view class="btn3 btn1">
@@ -74,19 +74,19 @@
             <view class="panel00300 FlexColumn">
               <text class="text">©2018 唱意教育 - 数学计算题\n微信小程序 版本 {{version}}</text>
               <view class="panel003000 FlexRow">
-                <view>帮助</view>
+                <view bindtap='gotoHelp'>帮助</view>
                 <view class="line"></view>
                 <view bindtap='gotoFeedback'>反馈</view>
                 <view class="line"></view>
-                <view>合作</view>
+                <view bindtap='gotoFeedback'>合作</view>
               </view>
             </view>
-            <button class="btn4 btn" open-type="share">
+            <view class="btn4 btn" bindtap='openMenu'>
               <view class="btn5 btn1 FlexColumn">
                 <image class="universalpic_share_size01" src="../../images/universalpic_share_size01.png" />
-                <view>转发分享</view>
+                <view>分享朋友</view>
               </view>
-            </button>
+            </view>
 
           </view>
 
@@ -110,6 +110,29 @@
       </view>
     </view>
   </view>
+
+  <view class="menuPanel" style="min-height:{{Containnerheight}}rpx;" wx:if="{{IsShowMenu}}">
+    <view class="menu FlexColumn">
+      <view class="text1">选择分享方式</view>
+      <button class="panel FlexRow" open-type="share">
+        <view>转发给朋友</view>
+      </button>
+      <view class="line"></view>
+      <view class="panel2 panel FlexColumn" bindtap='buildShareImage' >
+        <view>存图发到朋友圈</view>
+        <view class="text3">点击后生成图片，长按图片选择保存到相册</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>
 <image hidden="{{HelpHidden1}}" bindtap='closeHelp' class="Help_aside_homepage" src="../../images/Help_aside_homepage.png" />
-<audio hidden='true' id="myAudio"></audio>
+
+<audio hidden='true' id="myAudio"></audio>
+<canvas class='Canvas' canvas-id="MyCanvas"></canvas>

pages/main/default.wxss

@@ -371,4 +371,66 @@
   position: fixed;
   bottom: 0rpx;
   z-index: 100;
+}
+
+
+.menuPanel{
+  position: fixed;
+  top: 0;
+  width: 100%;
+  background-color:rgba(185, 220, 93, 0.9);
+  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;
+  justify-content: center;
+}
+
+.menu .panel2 {
+  height: 143rpx;
+}
+
+.menu .text3 {
+  font-size:24rpx;
+  font-weight: 400;
+}
+
+.menu .line {
+  height: 2rpx;
+  width: 100%;
+  background-color: #e3e3e3;
+}
+
+.menu .line2 {
+  height: 20rpx;
+  width: 100%;
+  background-color: #d2d2d2;
+}
+
+
+.Canvas{
+  width: 400px; 
+  height: 300px;
+  position: fixed;
+  left:760rpx;
+  top:0rpx;
 }

pages/main/detail.js

@@ -31,7 +31,7 @@ Page({
 
     ShowAndroidNotice: false,
   },
-  onLoad: function (options) {
+  onLoad: function(options) {
     var that = this;
     var id = options.id;
 
@@ -52,25 +52,25 @@ Page({
 
 
     if (id > 0) {
-      common.getStorageValue(this, "HelpHidden3", false, function () {
+      common.getStorageValue(this, "HelpHidden3", false, function() {
         that.showHelp();
       });
-    }
-    else {
-      common.getStorageValue(this, "HelpHidden8", false, function () {
+    } else {
+      common.getStorageValue(this, "HelpHidden8", false, function() {
         that.showHelp8();
       });
     }
 
   },
-  onShow:function(){
-    if (this.data.ID==-1)
+  onShow: function() {
+    if (this.data.ID == -1)
       this.getDetail(this.data.ID);
   },
-  onUnload: function () {
+  onUnload: function() {
     wx.hideLoading();
+    this.closeHelp();
   },
-  getDetail: function (id) {
+  getDetail: function(id) {
     var item = {};
     if (id > 0) {
       var data = wx.getStorageSync('QuestionTypeList');
@@ -87,8 +87,7 @@ Page({
           }
         }
       }
-    }
-    else {
+    } else {
       item.Name = "我的错题集";
       var list = wx.getStorageSync('ErrorList');
       item.ErrorList = list;
@@ -100,21 +99,27 @@ Page({
 
     //有竖式则缺省竖式
     if (item.QuestionNumber3 > 0) {
-      this.menuClick({ currentTarget: { dataset: { id: "vertical" } } })
+      this.menuClick({
+        currentTarget: {
+          dataset: {
+            id: "vertical"
+          }
+        }
+      })
     }
   },
-  gotoError: function (e) {
+  gotoError: function(e) {
     wx.navigateTo({
       url: '../main/errorlist',
     });
   },
-  gotoAnswer: function (e) {
+  gotoAnswer: function(e) {
     wx.navigateTo({
       url: '../main/answer',
     });
     this.closeHelp2();
   },
-  getFinish: function () {
+  getFinish: function() {
     server.playSound("/sounds/click.mp3");
 
     this.setData({
@@ -127,19 +132,18 @@ Page({
     this.getAnswerID();
     if (this.data.ID > 0) {
       this.getList(this.data.ID);
-    }
-    else{
+    } else {
       this.getErrorList();
     }
 
     this.closeHelp();
   },
   //重新生成试卷
-  ResetFinish: function () {
+  ResetFinish: function() {
     var that = this;
     wx.showLoading({
       title: "正在重置",
-      complete: function () {
+      complete: function() {
         var list = that.data.arrPage;
         for (var i = 0; i < list.length; i++) {
           wx.removeSavedFile({
@@ -160,7 +164,8 @@ Page({
       }
     });
   },
-  getList: function (id) {
+  //题卡数据列表
+  getList: function(id) {
     var that = this;
     var pageNum = that.data.PageNumber;
     var QuestionTypeCategory = 3;
@@ -168,7 +173,7 @@ Page({
       QuestionTypeCategory = 2;
     pageIndex = 0;
 
-    server.getData('GetQuestionTypesPrint?ID=' + id + '&QuestionTypeCategory=' + QuestionTypeCategory + '&PageNum=' + pageNum, function (data) {
+    server.getData('GetQuestionTypesPrint?ID=' + id + '&QuestionTypeCategory=' + QuestionTypeCategory + '&PageNum=' + pageNum, function(data) {
       //console.log("UserInfo:" + data);
       if (data) {
         that.setData({
@@ -185,66 +190,88 @@ Page({
           console.log("android");
           var ctx = wx.createCanvasContext("Canvas", that);
           ctx.fillRect(0, 0, 1050, 1485);
-          ctx.draw(true, function (n) {
+          ctx.draw(true, function(n) {
             wx.canvasToTempFilePath({
               x: 0,
               y: 0,
               width: 2100,
               height: 2970,
               canvasId: 'Canvas',
-              success: function (res2) {
+              success: function(res2) {
                 that.saveImage();
               }
             })
           });
-        }
-        else {
+        } else {
           that.saveImage();
         }
       }
     });
 
   },
-  getErrorList: function () {
+  //错题列表
+  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();
-          }
-        })
+    if (QuestionItem.ErrorList.length > 0) {
+      QuestionItem.Category = -1; //错题集类别
+      QuestionItem.QuestionTypeCategory = 2;
+      QuestionItem.CategoryName = "";
+      QuestionItem.Name = "我的错题集";
+      QuestionItem.QuestionTypeLevel = "";
+      QuestionItem.PageCount = QuestionItem.ErrorList.length > 60 ? 60 : QuestionItem.ErrorList.length;
+      QuestionItem.QuestionList = QuestionItem.ErrorList;
+      QuestionItem.CreateTime = common.formatDateCHS(new Date());
+      QuestionItem.IconName = app.globalData.fileUrl + "questioncard_icon_grade0102_size01.png";
+
+      QuestionItem.QuestionList = common.randomArray(QuestionItem.QuestionList);
+
+      delete QuestionItem.ErrorList;
+      pageIndex = 0;
+
+      that.setData({
+        IsFinished: true,
+        arrPage: [],
+        IsDistabled: "",
+        WaitTime: waitTime[that.data.PageNumber],
       });
-    }
-    else {
-      that.saveImage();
-    }
 
+      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();
+      }
+    } else {
+      this.setData({
+        ShowLoading: false,
+      });
+      wx.showModal({
+        title: "没有错题",
+        showCancel: false,
+        content: "先到“对答案”中给做错的题目打记号（点击题目序号）",
+      });
+    }
   },
-  getAnswerID: function () {
+  getAnswerID: function() {
     var list = wx.getStorageSync("AnswerList");
     var id = 1;
     if (list && list.length > 0) {
-      list.sort(function (a, b) {
+      list.sort(function(a, b) {
         return b.AnswerID - a.AnswerID;
       });
       id = list[0].AnswerID + 1;
@@ -252,7 +279,7 @@ Page({
     for (var i = 0; i < this.data.PageNumber; i++)
       arrAnswerID.push(id + i);
   },
-  saveImage: function () {
+  saveImage: function() {
     var that = this;
     var item = QuestionItem;
     item.AnswerID = arrAnswerID.shift();
@@ -272,18 +299,22 @@ Page({
     var height = 150;
     if (item.QuestionTypeCategory == 2)
       height = 59;
-    if (item.PageCount == 18)
-      height = 210;
-    else if (item.PageCount == 15)
-      height = 250;
+    if (item.Category > 0) {
+      if (item.PageCount == 18)
+        height = 210;
+      else if (item.PageCount == 15)
+        height = 250;
+    }
     //括号
     var index = 0;
 
     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);
+        if (index <= item.QuestionList.length) {
+          ctx.fillText("(", xStart + i * 310, yStart + j * height);
+          ctx.fillText(")", xStart + i * 310 + 22, yStart + j * height);
+        }
       }
     }
 
@@ -296,7 +327,9 @@ Page({
     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);
+        if (index <= item.QuestionList.length) {
+          ctx.fillText(index, xStart + i * 310 + numberLeft, yStart + j * height);
+        }
       }
     }
 
@@ -307,114 +340,111 @@ Page({
       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;
+        if (index <= item.QuestionList.length) {
+          //横式
+          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 - 5);
-            } else {
-              var h = -8;
-              if (equation[n] == "_")
-                h = 0;
-              ctx.fillText(equation[n], num, yStart + j * 59 + h);
+            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 - 5);
+              } else {
+                var h = -8;
+                if (equation[n] == "_")
+                  h = 0;
+                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;
-
-          for (var n = 0; n < num1.Vertical.length; n++) {
-            var num = xStart + i * 310 + width;
-            var num2 = 0;
-            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 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);
-                  ctx.stroke();
-
-                  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 - 10, 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 {
-                  if (str == ".") {
-                    ctx.fillText(str, num - (num1.Vertical[n].Array.length - m) * 30 + 15, yStart + j * height + n * 30);
-                    num2 = 30;
+          //竖式
+          else if (item.QuestionTypeCategory == 3) {
+
+            var num1 = item.QuestionList[index - 1];
+            var isAnswer = false;
+
+            var width = 250;
+            if (num1.OperateAB == "÷")
+              width = 240;
+
+            for (var n = 0; n < num1.Vertical.length; n++) {
+              var num = xStart + i * 310 + width;
+              var num2 = 0;
+              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 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);
+                    ctx.stroke();
+
+                    isAnswer = true;
+                    break;
                   }
-                  else if (str == "+" || str == "-" || str == "−" || str == "×" || str == "÷") {
-                    var lineLength = 6 * 30;
-                    ctx.fillText(str, num - lineLength, yStart + j * height + n * 30);
-                    num2 = 30;
+                } 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 - 10, 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 {
+                    if (str == ".") {
+                      ctx.fillText(str, num - (num1.Vertical[n].Array.length - m) * 30 + 15, yStart + j * height + n * 30);
+                      num2 = 30;
+                    } 
+                    else if (str == "+" || str == "-" || str == "−" || str == "×" || str == "÷") {
+                      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);
                   }
-                  else
-                    ctx.fillText(str, num - (num1.Vertical[n].Array.length - m) * 30 + num2, yStart + j * height + n * 30);
                 }
               }
+              if (isAnswer)
+                break;
             }
-            if (isAnswer)
-              break;
-          }
 
+          }
         }
       }
     }
@@ -425,7 +455,7 @@ Page({
 
 
     ctx.setFontSize(12);
-    ctx.fillText(item.CagegoryName, 60, 90);
+    ctx.fillText(item.CategoryName, 60, 90);
     ctx.fillText("共" + item.PageCount + "道题", 60, 125);
     ctx.fillText("第 1 / 1 页", 60, 147);
     ctx.fillText("答案检索号", 768, 60);
@@ -439,7 +469,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;
       wx.canvasToTempFilePath({
@@ -450,8 +480,8 @@ Page({
         destWidth: w * times,
         destHeight: h * times,
         canvasId: 'Canvas',
-        success: function (res2) {
-          console.log(res2.tempFilePath);
+        success: function(res2) {
+          //console.log(res2.tempFilePath);
           that.data.arrPage.push(res2.tempFilePath);
           item.TempImagePath = res2.tempFilePath;
           tempAnswerList.push(JSON.parse(JSON.stringify(item)));
@@ -463,10 +493,9 @@ Page({
           if (that.data.arrPage.length < that.data.PageNumber) {
             pageIndex++;
             that.saveImage();
-          }
-          else {
+          } else {
             //生成图片完成
-            setTimeout(function () {
+            setTimeout(function() {
               that.setData({
                 ShowLoading: false,
               });
@@ -501,7 +530,7 @@ Page({
               }
               wx.setStorageSync("AnswerList", tempList);
 
-              common.getStorageValue(that, "HelpHidden7", false, function () {
+              common.getStorageValue(that, "HelpHidden7", false, function() {
                 that.showHelp2();
               });
 
@@ -536,9 +565,11 @@ Page({
 
   },
   //保存图片文件
-  saveImageFile: function () {
+  saveImageFile: function() {
     if (this.data.IsDistabled == "") {
-      wx.showLoading({ title: "保存中..." });
+      wx.showLoading({
+        title: "保存中..."
+      });
       var that = this;
       var count = 0;
       for (var i = 0; i < that.data.arrPage.length; i++) {
@@ -576,15 +607,15 @@ Page({
       }
     }
   },
-  changePageNumber: function (e) {
+  changePageNumber: function(e) {
     var id = Number(e.currentTarget.dataset.id);
     this.data.PageNumber += id;
-    var addDisabled = "", subDisabled = "";
+    var addDisabled = "",
+      subDisabled = "";
     if (this.data.PageNumber <= 1) {
       this.data.PageNumber = 1;
       subDisabled = "btnAddSubDisabled";
-    }
-    else if (this.data.PageNumber >= 4) {
+    } else if (this.data.PageNumber >= 4) {
       this.data.PageNumber = 4;
       addDisabled = "btnAddSubDisabled";
     }
@@ -595,7 +626,7 @@ Page({
       SubDisabled: subDisabled,
     });
   },
-  showImage: function (e) {
+  showImage: function(e) {
     var that = this;
     var id = e.currentTarget.dataset.id;
     wx.previewImage({
@@ -603,14 +634,14 @@ Page({
       urls: that.data.arrPage // 需要预览的图片http链接列表
     });
   },
-  closeLoading: function () {
+  closeLoading: function() {
     var that = this;
     that.setData({
       ShowLoading: 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;
@@ -624,24 +655,24 @@ Page({
       PageCount: this.data.PageCount,
     });
   },
-  closeMenu: function () {
+  closeMenu: function() {
     this.setData({
       IsShowMenu: false,
     });
   },
-  openMenu: function () {
+  openMenu: function() {
     this.setData({
       IsShowMenu: true,
     });
   },
-  showHelp: function () {
+  showHelp: function() {
     if (!this.data.HelpHidden3) {
       this.audioCtx = wx.createAudioContext('myAudio');
       var str = "嘿嘿，找到我了吗？我在车间的窗户里制作例题呢。如果这是你要的题型，去点“出题”按钮就对了。还要告诉你，一张卷子就是一张图片，题目数量请看提示。";
       server.playAudio(this.audioCtx, str);
     }
   },
-  closeHelp: function () {
+  closeHelp: function() {
     this.setData({
       HelpHidden3: true,
     });
@@ -649,14 +680,14 @@ Page({
     this.audioCtx = wx.createAudioContext('myAudio');
     this.audioCtx.pause();
   },
-  showHelp2: function () {
+  showHelp2: function() {
     if (!this.data.HelpHidden7) {
       this.audioCtx = wx.createAudioContext('myAudio');
       var str = "卷子出炉咯，棒棒哒！快去手机相册打印吧。我会等在首页上的答案资料室为你继续带路的。";
       server.playAudio(this.audioCtx, str);
     }
   },
-  closeHelp2: function () {
+  closeHelp2: function() {
     this.setData({
       HelpHidden7: true,
     });
@@ -665,14 +696,14 @@ Page({
     this.audioCtx.pause();
   },
 
-  showHelp8: function () {
+  showHelp8: function() {
     if (!this.data.HelpHidden8) {
       this.audioCtx = wx.createAudioContext('myAudio');
       var str = "发现错误是提高成绩的第一步。点一下题目数量右侧的图标，当有错题后，能查看和整理错题清单。";
       server.playAudio(this.audioCtx, str);
     }
   },
-  closeHelp8: function () {
+  closeHelp8: function() {
     this.setData({
       HelpHidden8: true,
     });
@@ -681,7 +712,7 @@ Page({
     this.audioCtx.pause();
   },
 
-  onShareAppMessage: function () {
+  onShareAppMessage: function() {
     return {
       title: app.globalData.ShareTitle,
       path: 'pages/index/index?UserID=' + app.globalData.userInfo.UserID,

pages/main/item.js

@@ -5,7 +5,7 @@ const app = getApp();
 
 var currentIndex = 0, tempCurrentIndex = -1;
 var audioArray = [];
-var AnswerID=0;
+var AnswerID = 0;
 
 Page({
   data: {
@@ -98,10 +98,11 @@ Page({
 
       var list = item.QuestionList;
       for (var i = 0; i < list.length; i++) {
-        if (i == 0 && list[i].Vertical) {
+        if (i == 0 && list[i].Vertical && item.Category > 0) {
           list[i].IsShowVertical = true;
         }
-        //list[i].ErrorClass = "";
+        if (item.Category == -1)
+          list[i].ErrorClass = "";
       }
 
       var list = item.QuestionList;
@@ -112,7 +113,7 @@ 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] == "√") {
+            if (list[i].Vertical[2].Array[k] == "√" && list[i].Vertical[2].Array[list[i].Vertical[2].Array.length - 1] != "√") {
               list[i].Vertical[2].Array[k] = "";
               list[i].Vertical[2].Array.push("√");
               break;
@@ -121,8 +122,17 @@ Page({
         }
       }
 
+      var pageNum = 0;
+      if (item.QuestionList.length % 3 == 0)
+        pageNum = item.QuestionList.length / 3;
+      else if (item.QuestionList.length % 3 == 1)
+        pageNum = (item.QuestionList.length + 2) / 3;
+      else if (item.QuestionList.length % 3 == 2)
+        pageNum = (item.QuestionList.length + 1) / 3;
+
       that.setData({
         AnswerItem: item,
+        PageColumnNum: pageNum,
       });
     }
   },
@@ -143,6 +153,7 @@ Page({
 
   },
   setErrorItem: function (e) {
+
     var id = e.currentTarget.dataset.id;
     var list = this.data.AnswerItem.QuestionList;
     for (var i = 0; i < list.length; i++) {
@@ -150,7 +161,7 @@ Page({
         if (!list[i].ErrorClass || list[i].ErrorClass == "") {
           list[i].ErrorClass = "ErrorClass";
           wx.showToast({ title: "记号已保存", duration: 1000 });
-          this.saveErrorList(list[i],"add");
+          this.saveErrorList(list[i], "add");
         }
         else {
           list[i].ErrorClass = "";
@@ -164,36 +175,36 @@ Page({
     this.setData({
       AnswerItem: this.data.AnswerItem,
     });
-    
+
   },
-  saveErrorList:function(item,action){
+  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;
+      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;
+              b = true;
           }
         }
         else
-          b=true;
-      } 
-      if (b){
+          b = true;
+      }
+      if (b) {
         list.splice(i, 1);
         break;
       }
     }
-    if (action=="add"){
-      item.ID=new Date().getTime();
+    if (action == "add") {
+      item.ID = new Date().getTime();
       list.unshift(item);
     }
     wx.setStorageSync("ErrorList", list);
@@ -219,13 +230,13 @@ Page({
       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 % this.data.PageColumnNum == 0) {
           if (i > 0) {
             arr.push("");
             audioArray.push(arr);
             arr = [];
           }
-          arr.push("第" + (1 + i / (list.length / 3)) + "列");
+          arr.push("第" + (1 + Math.floor(i / this.data.PageColumnNum)) + "列");
 
         }
         var str = list[i].Result;

pages/main/item.wxml

@@ -40,18 +40,18 @@
     <view class="panelLeft">题号快翻</view>
     <view class="panelRight FlexRow">
       <view class="{{selectTab0}} btn" bindtap="scrollTop" data-id="0">1</view>
-      <view class="{{selectTab1}} btn" bindtap="scrollTop" data-id="1">{{AnswerItem.QuestionList.length/3+1}}</view>
-      <view class="{{selectTab2}} btn" bindtap="scrollTop" data-id="2">{{AnswerItem.QuestionList.length*2/3+1}}</view>
+      <view class="{{selectTab1}} btn" bindtap="scrollTop" data-id="1">{{PageColumnNum+1}}</view>
+      <view class="{{selectTab2}} btn" bindtap="scrollTop" data-id="2">{{PageColumnNum*2+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 FlexRow">
+    <block wx:if="{{(index % (PageColumnNum))==0 }}">
+      <view id="panelRowTop{{index / (PageColumnNum)}}" 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>
-          <block wx:if="{{index / (AnswerItem.QuestionList.length/3)==2}}">三</block>
+          <block wx:if="{{index==0}}">一</block>
+          <block wx:if="{{index==PageColumnNum}}">二</block>
+          <block wx:if="{{index==PageColumnNum*2}}">三</block>
           列</view>
         <view>
         </view>

pages/main/item.wxss

@@ -195,9 +195,6 @@
 .formula_division_size04{
   width:285rpx;
 }
-.formula_division_size04{
-  width:285rpx;
-}
 .formula_division_size05{
   width:342rpx;
 }

pages/main/list.js

@@ -32,6 +32,9 @@ Page({
     this.getList();
     
   },
+  onUnload: function () {
+    this.closeHelp();
+  },
   getList: function () {
     this.buildList();
   },

project.config.json

@@ -30,7 +30,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 7,
+			"current": 1,
 			"list": [
 				{
 					"id": 0,
@@ -42,7 +42,7 @@
 					"id": 1,
 					"name": "detail",
 					"pathName": "pages/main/detail",
-					"query": "id=24"
+					"query": "id=187"
 				},
 				{
 					"id": 2,
@@ -77,7 +77,14 @@
 				{
 					"id": -1,
 					"name": "errorlist",
-					"pathName": "pages/main/errorlist"
+					"pathName": "pages/main/errorlist",
+					"query": ""
+				},
+				{
+					"id": -1,
+					"name": "share",
+					"pathName": "pages/about/share",
+					"query": ""
 				}
 			]
 		}

utils/main.js

@@ -297,7 +297,7 @@ function playSound(file){
   innerAudioContext.autoplay = true
   innerAudioContext.src = file
   innerAudioContext.onPlay(() => {
-    console.log('开始播放')
+    //console.log('开始播放')
   })
 }