1.0.4

app.js

@@ -14,10 +14,10 @@ App({
     this.globalData.systemInfo = wx.getSystemInfoSync();
   },
   globalData: {
-    version: "1.0.0",
-    IsProduction: false,
+    version: "1.0.4",
+    IsProduction: true,
     ProgramID: 105,
-    AppID: "wx313a8f2c0741efe1",
+    AppID: "wx1fef080f74481cbd",
     ShareTitle: "认真练习，告别粗心",
     ShareImageUrl: '../../images/programsystem_screenshot_pic01.png',
 
@@ -25,7 +25,7 @@ App({
     serverUrl: "https://www.kylx365.com/apiData/",
     serverUrlServer: "https://www.kylx365.com/apiData/",
     serverUrlLocalhost: "http://localhost:3020/apiData/",
-    audioUrlBaidu: "https://tsn.baidu.com/text2audio?lan=zh&ctp=1&cuid=abcdxxx&tok=[token]&tex=[word]&vol=9&per=1&spd=6&pit=5",
+    audioUrlBaidu: "https://tsn.baidu.com/text2audio?lan=zh&ctp=1&cuid=abcdxxx&tok=[token]&tex=[word]&vol=9&per=0&spd=6&pit=5",
     Key: "kylx365_chengjie",
     IV: "kylx365hongliren",
     

app.json

@@ -1,11 +1,12 @@
 {
   "pages": [
     "pages/index/index",
+    "pages/index/guide",
     "pages/main/item",
     "pages/main/answer",
     "pages/main/detail",
-    "pages/main/print",
     "pages/main/list",
+    "pages/about/payfinished",
     "pages/main/default"
   ],
   "window": {

pages/about/payfinished.js

@@ -0,0 +1,144 @@
+import common from '../../utils/util';
+import server from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+  },
+  onLoad: function (options) {
+    var text0 = "", text1 = "", text2 = "", text4 = "", text5 = "";
+    text0 = "用户登录";
+    text1 = "需要您的授权";
+    text2 = "去授权";
+    text4 = "提醒：授权仅获取微信头像和昵称，";
+    text5 = "其它信息均受到微信保护。不授权将使个性化功能无法正常运作，特别是解锁、优惠礼品等会员功能。为保障您的消费权益，请尽快授权用户信息。";
+
+    this.setData({
+      Height: common.getSystemHeight(),
+      Text0: text0,
+      Text1: text1,
+      Text2: text2,
+      Text4: text4,
+      Text5: text5,
+    });
+
+    //适配ipad
+    var systemInfo = wx.getSystemInfoSync();
+    if (systemInfo.model) {
+      if (systemInfo.model.indexOf("iPad") >= 0) {
+        this.setData({
+          ipad: "ipad",
+        })
+      }
+    }
+  },
+  onUnload: function () {
+    wx.reLaunch({
+      url: '../main/default'
+    });
+  },
+  deblocking: function () {
+    wx.reLaunch({
+      url: '../index/index'
+    });
+  },
+  goto: function () {
+    var that = this;
+    wx.getSetting({
+      success(res) {
+        if (!res.authSetting['scope.userInfo']) {
+          wx.authorize({
+            scope: 'scope.userInfo',
+            success() {
+              that.getUserInfo();
+            },
+            fail() {
+              wx.openSetting({
+                success(res) {
+                  that.getUserInfo();
+                },
+              });
+            }
+          })
+        }
+        else {
+          that.getUserInfo();
+        }
+      }
+    });
+  },
+  //得到用户信息
+  getUserInfo: function () {
+    var that = this
+    //调用登录接口
+    wx.login({
+      success: function (res0) {
+        wx.getUserInfo({
+          withCredentials: true,
+          success: function (res) {
+            var userID = app.globalData.userInfo.UserID;
+            app.globalData.userInfo = res.userInfo;
+            app.globalData.userInfo.UserID = userID;
+
+            app.globalData.userInfo.NickName = app.globalData.userInfo.nickName;
+            app.globalData.userInfo.AvatarUrl = app.globalData.userInfo.avatarUrl;
+
+            // that.hasGetShareInfo(app.globalData.userInfo);
+            that.setData({
+              IsAccredit: true,
+              NickName: app.globalData.userInfo.NickName,
+              AvatarUrl: app.globalData.userInfo.AvatarUrl
+            });
+
+            app.globalData.userInfo.Code = res0.code;
+            app.globalData.userInfo.iv = res.iv;
+            app.globalData.userInfo.encryptedData = res.encryptedData;
+            that.login(app.globalData.userInfo);
+          },
+          fail: function (res) {
+            wx.reLaunch({
+              url: '../main/default'
+            });
+          }
+        });
+      },
+      fail: function () {
+        wx.reLaunch({
+          url: '../main/default'
+        });
+      }
+    });
+  },
+  login: function (param) {
+    var that = this;
+    server.postData('MathLogin', {
+      Code: param.Code,
+      NickName: param.nickName,
+      Language: param.language,
+      Gender: param.gender,
+      City: param.city,
+      Province: param.province,
+      Country: param.country,
+      AvatarUrl: param.avatarUrl,
+      ProgramVersion: app.globalData.Version,
+      Introducer: app.globalData.introducer,
+      UserSource: app.globalData.userSource,
+      SourceID: app.globalData.SourceID,
+      LastUserSource: app.globalData.userSource,
+      iv: param.iv,
+      encryptedData: param.encryptedData,
+    }, function (data) {
+      wx.reLaunch({
+        url: '../main/default'
+      });
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: 'pages/index/index?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImageUrl,
+    }
+  },
+})

pages/about/payfinished.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarBackgroundColor": "#99607C",
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "登录",
+  "backgroundColor": "#99607C",
+  "enablePullDownRefresh": false
+}

pages/about/payfinished.wxml

@@ -0,0 +1,19 @@
+<view class="container FlexColumn" style='height:{{Height}}rpx;'>
+  <image src="../../images/universalpic_bg_illus01.png" class="bg" />
+  <image src="../../images/universalpic_face_default_blue_size01.png" class="universalpic_face_default_blue_size01" />
+
+  <text class="text0">{{Text0}}</text>
+  <text class="text1">{{Text1}}</text>
+
+  <view class="btn">
+    <view class="btn1">
+      <button open-type="getUserInfo" bindgetuserinfo="goto" class="btn2">{{Text2}}</button>
+    </view>
+  </view>
+
+  <view class="text3">
+    <text class="text4">{{Text4}}</text>
+    <text class="text5">{{Text5}}</text>
+  </view>
+
+</view>

pages/about/payfinished.wxss

@@ -0,0 +1,85 @@
+.container {
+  background-color: #99607C;
+  justify-content: flex-start;
+  color: #FFD48B;
+  font-weight: 500;
+}
+
+.bg{
+  width: 100%;
+  height:490rpx;
+  position: fixed;
+  bottom: 0;
+  left:0;
+}
+
+.universalpic_face_default_blue_size01{
+  width: 160rpx;
+  height:160rpx;
+  border-radius: 50%;
+  margin-top: 80rpx;
+}
+
+.text0{
+  font-size:36rpx;
+  text-align: center;
+  margin-top: 40rpx;
+  z-index: 10;
+}
+
+.text1{
+  font-size:44rpx;
+  text-align: center;
+  margin-top: 10rpx;
+  z-index: 10;
+}
+
+
+.btn {
+  width: 520rpx;
+  height: 118rpx;
+  background-color:rgba(0,0,0,0.2);
+  border-radius: 14rpx;
+  margin-top: 50rpx;
+  z-index: 10;
+}
+
+.btn1 {
+  width: 100%;
+  height: 104rpx;
+  background-color: #D6A665;
+  border-radius: 14rpx;
+  position:relative;
+  top:0;
+}
+
+.btn2 {
+  width: 100%;
+  height: 90rpx;
+  background-color: #FFCD79;
+  border-radius: 14rpx;
+  position:relative;
+  top:0;
+  font-size: 36rpx;
+  text-align: center;
+  line-height: 90rpx;
+  color:#713312;
+}
+
+.ipad{
+  margin-top:140rpx;
+}
+
+.text3{
+  font-size:22rpx;
+  width:470rpx; 
+  margin-top: 40rpx;
+  z-index: 10;
+  font-weight: 400;
+}
+.text4{
+  color:#FFD48B;
+}
+.text5{
+  color:#C8A5C4;
+}

pages/index/guide.js

@@ -0,0 +1,42 @@
+import common from '../../utils/util';
+import server from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+  },
+  onLoad: function (options) {
+    var that = this;
+    this.setData({
+      Containnerheight: server.getWindowHeight(),
+    });
+    common.getStorageValue(this, "HelpHidden0", false, function () {
+      that.showHelp();
+    });
+  },
+  goto:function(){
+    wx.setStorageSync("HelpHidden0", true);
+    this.audioCtx = wx.createAudioContext('myAudio');
+    this.audioCtx.pause();
+
+    wx.setStorageSync("IsStart", true);
+    wx.redirectTo({
+      url: '../main/default',
+    })
+  },
+  showHelp: function () {
+    if (!this.data.HelpHidden1) {
+      this.audioCtx = wx.createAudioContext('myAudio');
+      var str = "欢迎来到数学之星——迈思星球。我是陪你一道练习的小伙伴“算算”。怎么练习？看看上面的介绍吧！";
+      server.playAudio(this.audioCtx, str);
+    }
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: 'pages/index/index?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImageUrl,
+    }
+  },
+});

pages/index/guide.json

@@ -0,0 +1,8 @@
+{
+  "navigationBarBackgroundColor": "#99607C",
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "新手指南",
+  "backgroundColor": "#99607C",
+  "backgroundTextStyle": "light",
+  "enablePullDownRefresh": false
+}

pages/index/guide.wxml

@@ -0,0 +1,9 @@
+<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" />
+  </view>
+  <view class="btn" bindtap='goto'>开始</view>
+</view>
+<audio hidden='true' id="myAudio"></audio>

pages/index/guide.wxss

@@ -0,0 +1,39 @@
+.container {
+  background-color: #99607C;
+  justify-content: flex-start;
+}
+
+.welcomeguide_bg {
+  width: 100%;
+  height: 1206rpx;
+  position: fixed;
+  top: 0;
+}
+
+.panel{
+  width:100%;
+  position: fixed;
+  top: 0;
+}
+.welcomeguide_info {
+  width: 630rpx;
+  height: 816rpx;
+  margin-top: 40rpx;
+}
+.welcomeguide_dialogue {
+  width: 593rpx;
+  height: 132rpx;
+  margin-top: 72rpx;
+}
+
+.btn {
+  width: 100%;
+  height: 130rpx;
+  position: fixed;
+  bottom: 0;
+  background-color: #FFCD79;
+  text-align: center;
+  line-height: 130rpx;
+  color:#713312;
+  font-size: 48rpx;
+}

pages/index/index.js

@@ -7,9 +7,8 @@ var timeout2, timeout3;
 Page({
   data: {
     version: app.globalData.version,
-    FileUrl: app.globalData.fileUrl,
   },
-  onLoad: function(options) {
+  onLoad: function (options) {
     if (options) {
       if (options.UserID) {
         console.log("UserID:" + options.UserID);
@@ -37,11 +36,11 @@ Page({
     this.getUserInfo();
   },
   //得到用户信息
-  getUserInfo: function(cb) {
+  getUserInfo: function (cb) {
     var that = this
     //调用登录接口
     wx.login({
-      success: function(res0) {
+      success: function (res0) {
         app.globalData.userInfo = {};
         app.globalData.userInfo.Code = res0.code;
         //console.log("Code:" + res0.code);
@@ -61,7 +60,7 @@ Page({
             } else {
               wx.getUserInfo({
                 withCredentials: false,
-                success: function(res) {
+                success: function (res) {
                   app.globalData.userInfo = res.userInfo;
 
                   app.globalData.userInfo.NickName = app.globalData.userInfo.nickName;
@@ -71,7 +70,7 @@ Page({
                   that.login(app.globalData.userInfo);
 
                 },
-                fail: function(res) {
+                fail: function (res) {
                   that.login(app.globalData.userInfo);
                 }
               });
@@ -80,8 +79,8 @@ Page({
           }
         });
       },
-      fail: function() {
-        timeout2 = setTimeout(function() {
+      fail: function () {
+        timeout2 = setTimeout(function () {
           that.getUserInfo();
           console.log("reboot:" + new Date().getTime());
         }, 2000);
@@ -89,10 +88,10 @@ Page({
     });
   },
 
-  login: function(param) {
+  login: function (param) {
     var that = this;
 
-    server.getLocalHost(function() {
+    server.getLocalHost(function () {
       server.postData('MathLogin', {
         Code: param.Code,
         NickName: param.nickName,
@@ -118,11 +117,11 @@ Page({
         System: app.globalData.systemInfo.system,
         Platform: app.globalData.systemInfo.platform,
         SDKVersion: app.globalData.systemInfo.SDKVersion,
-        ProgramVersion: app.globalData.Version,
-      }, function(data) {
+        ProgramVersion: app.globalData.version,
+      }, function (data) {
         //console.log("UserInfo:" + data);
         if (!data) {
-          timeout3 = setTimeout(function() {
+          timeout3 = setTimeout(function () {
             that.getUserInfo();
             console.log("reboot:" + new Date().getTime());
           }, 2000);
@@ -130,12 +129,24 @@ Page({
           app.globalData.userInfo = data;
 
           //app.globalData.userInfo.AvatarUrl = param.avatarUrl;
-          that.getQuestionType(function() {
-            setTimeout(function() {
-              wx.redirectTo({
-                url: '../main/default'
-              })
+          that.getQuestionType(function () {
+            setTimeout(function () {
+              common.getStorageValue(that, "IsStart", false, function () {
+                if (that.data.IsStart) {
+
+                  wx.redirectTo({
+                    url: '../main/default'
+                  })
+
+                }
+                else {
+                  wx.redirectTo({
+                    url: '../index/guide'
+                  })
+                }
+              });
             }, 2000);
+
           });
         }
       });
@@ -143,12 +154,12 @@ Page({
     });
 
   },
-  getQuestionType: function(callback) {
+  getQuestionType: function (callback) {
     var that = this;
-    server.getData('GetQuestionTypes?Mode=2', function(data) {
+    server.getData('GetQuestionTypes?Mode=2', function (data) {
       if (data) {
         //var arr = common.Decrypt(data);
-        var arr=data;
+        var arr = data;
         wx.setStorageSync("QuestionTypeList", arr);
         callback();
       }
@@ -156,7 +167,7 @@ Page({
 
     server.getData('GetBaiduToken', function (data) {
       if (data) {
-        app.globalData.BaiduToken=data;
+        app.globalData.BaiduToken = data;
       }
     });
   },

pages/main/answer.js

@@ -5,20 +5,24 @@ const app = getApp()
 Page({
   data: {
     version: app.globalData.version,
-    FileUrl: app.globalData.fileUrl,
     IsEdit: false,
     ListHeight: 1320,
     ListHeight2: 1490,
     SelectedCount: 0,
   },
   onLoad: function () {
+    var that = this;
     this.setData({
       Containnerheight: server.getWindowHeight(),
     });
     this.getList();
+    common.getStorageValue(this, "HelpHidden5", false, function () { 
+      that.showHelp();
+    });
+
   },
   getList: function () {
-    
+    //console.log(new Date().getTime());
     var that = this;
     var list = wx.getStorageSync("AnswerList");
     if (list && list.length > 0) {
@@ -41,6 +45,13 @@ Page({
         ListHeight2: ListHeight2,
         ListHeight3: ListHeight3,
       });
+      //console.log(new Date().getTime());
+      if (arr.length>10){
+        wx.showToast({
+          title:"请删除不用试卷！",
+          duration:2000,
+        });
+      }
     }
   },
   selectItem: function (e) {
@@ -65,6 +76,8 @@ Page({
         wx.navigateTo({
           url: '../main/item?id=' + id,
         });
+
+        this.closeHelp();
       }
     }
   },
@@ -72,6 +85,9 @@ Page({
     var list = this.data.AnswerList;
     for (var i = list.length - 1; i >= 0; i--) {
       if (list[i].Selected) {
+        wx.removeSavedFile({
+          filePath:list[i].TempImagePath
+        });
         list.splice(i, 1);
       }
     }
@@ -99,18 +115,26 @@ Page({
       AnswerList: that.data.AnswerList,
     });
   },
+  showHelp: function () {
+    if (!this.data.HelpHidden5) {
+      this.audioCtx = wx.createAudioContext('myAudio');
+      var str = "哇哦，已经做完了呀。接下来，根据卷子右上角的编号，从传送带上选择答案吧。";
+      server.playAudio(this.audioCtx, str);
+    }
+  },
+  closeHelp: function () {
+    this.setData({
+      HelpHidden5: true,
+    });
+    wx.setStorageSync("HelpHidden5", true);
+    this.audioCtx = wx.createAudioContext('myAudio');
+    this.audioCtx.pause();
+  },
   onShareAppMessage: function () {
     return {
-      title: '',
-      path: 'pages/index/index',
-      success: function (res) {
-      },
-      fail: function (err) {
-        console.log(err);
-      },
-      complete: function (res) {
-        console.log(res);
-      },
+      title: app.globalData.ShareTitle,
+      path: 'pages/index/index?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImageUrl,
     }
   },
 })

pages/main/answer.wxml

@@ -54,7 +54,7 @@
         <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" />
+            <image wx:if="{{!IsEdit}}" class="questioncard_icon" src="{{item.IconName}}" />
             <view class="title FlexColumn">
               <view class="title1">
                 {{item.CreateTime}}
@@ -78,4 +78,6 @@
       </view>
     </view>
   </view>
-</view>
+</view>
+<image hidden="{{HelpHidden5}}" bindtap='closeHelp' class="Help_aside_answerroom_list" src="../../images/Help_aside_answerroom_list.png" />
+<audio hidden='true' id="myAudio"></audio>

pages/main/answer.wxss

@@ -297,3 +297,11 @@
   color: #4f92ba;
   font-size: 22rpx;
 }
+
+.Help_aside_answerroom_list{
+  width: 100%;
+  height: 270rpx;
+  position: fixed;
+  bottom: 0rpx;
+  z-index: 200;
+}

pages/main/default.js

@@ -14,29 +14,15 @@ Page({
     IsAccredit: false,
   },
   onLoad: function() {
+    var that=this;
     this.setData({
       Containnerheight: server.getWindowHeight(),
       ProgramList: server.getProgramList(),
       NickName: app.globalData.userInfo.NickName,
       AvatarUrl: app.globalData.userInfo.AvatarUrl,
     });
-
-    var that = this;
-    wx.getSetting({
-      success(res) {
-        if (res.authSetting['scope.userInfo']) {
-          that.setData({
-            IsAccredit: true,
-          });
-        } else {
-          //付费用户请去授权
-          if (app.globalData.userInfo.IsMember == 1) {
-            wx.navigateTo({
-              url: '../about/payfinished?type=accredit',
-            });
-          }
-        }
-      }
+    common.getStorageValue(this, "HelpHidden1", false, function () { 
+      that.showHelp();
     });
 
     wx.login({
@@ -46,6 +32,8 @@ Page({
     });
     
     this.updateProgram();
+
+    
   },
   onShow:function(){
     var list = wx.getStorageSync("AnswerList");
@@ -59,6 +47,27 @@ Page({
       AnswerLength: answerLength,
       AnswerNewDate: answerNewDate,
     });
+
+    var that = this;
+    wx.getSetting({
+      success(res) {
+        if (res.authSetting['scope.userInfo']) {
+          that.setData({
+            IsAccredit: true,
+          });
+        } else {
+          //付费用户请去授权
+
+          common.getStorageValue(that, "HelpHidden3", false, function () {
+            if (that.data.HelpHidden3) {
+              wx.navigateTo({
+                url: '../about/payfinished',
+              });
+            }
+          });
+        }
+      }
+    });
   },
   gotoList:function(e){
     var id=e.currentTarget.dataset.id;
@@ -67,6 +76,8 @@ Page({
     wx.navigateTo({
       url: '../main/list?id=' + categoryArray[id].Array.join(",") + "&name=" + categoryArray[id].Name + "&num=" + categoryArray[id].Num,
     });
+
+    this.closeHelp();
   },
   gotoAnswer:function(){
     wx.navigateTo({
@@ -124,7 +135,7 @@ Page({
         Province: param.province,
         Country: param.country,
         AvatarUrl: param.avatarUrl,
-        ProgramVersion: app.globalData.Version,
+        ProgramVersion: app.globalData.version,
         Introducer: app.globalData.introducer,
         UserSource: app.globalData.userSource,
         SourceID: app.globalData.SourceID,
@@ -150,6 +161,21 @@ Page({
   gotoFeedback: function() {
     server.gotoFeedback();
   },
+  showHelp:function(){
+    if (!this.data.HelpHidden1){
+      this.audioCtx = wx.createAudioContext('myAudio');
+      var str ="那么，就从选题目开始吧。在计算题工厂里包括了小学数学全年级最重要的知识点。其中“四年级及以上”，这个栏目囊括了四到六年级的题型。请选一个年级继续。";
+      server.playAudio(this.audioCtx, str);
+    }
+  },
+  closeHelp:function(){
+    this.setData({
+      HelpHidden1:true,
+    });
+    wx.setStorageSync("HelpHidden1", true);
+    this.audioCtx = wx.createAudioContext('myAudio');
+    this.audioCtx.pause();
+  },
   updateProgram: function() {
     const updateManager = wx.getUpdateManager();
 

pages/main/default.wxml

@@ -1,6 +1,9 @@
 <view class="container FlexColumn" style="min-height:{{Containnerheight}}rpx;">
   <scroll-view class="scroll-view_H" scroll-x>
     <image class="homepage_headline_illus" src="../../images/homepage_headline_illus.png" />
+    <scroll-view scroll-y class="scrollview">
+    <image class="homepage_headline_info" src="../../images/homepage_headline_info.png" />
+    </scroll-view>
   </scroll-view>
 
   <view class="panel FlexColumn">
@@ -26,17 +29,17 @@
           <view class="panel0020 FlexRow">
             <view class="panel00200 FlexColumn">
               <view class="text0">批改</view>
-              <view class="line"></view>
+              <view class="line3"></view>
               <view class="panel002000 FlexRow">
                 <view class="text1">试卷张数</view>
                 <view class="text2">{{AnswerLength}}</view>
               </view>
-              <view class="line2 line"></view>
+              <view class="line4 line3"></view>
               <view class="panel002000 FlexRow">
                 <view class="text1">制题日期</view>
                 <view class="text">{{AnswerNewDate}}</view>
               </view>
-              <view class="line2 line"></view>
+              <view class="line4 line3"></view>
               <view class="panel002000 FlexRow">
                 <button wx:if="{{!IsAccredit}}" open-type="getUserInfo" class="btn" bindgetuserinfo="getBindGetUserInfo">
                   <view class="btn1">
@@ -71,7 +74,7 @@
         <view class="panel003 circularBottom FlexColumn">
           <view class="panel0030 FlexRow">
             <view class="panel00300 FlexColumn">
-              <text class="text">©2018 唱意教育 - 数学计算题\n微信小程序 版本 1.0.0</text>
+              <text class="text">©2018 唱意教育 - 数学计算题\n微信小程序 版本 {{version}}</text>
               <view class="panel003000 FlexRow">
                 <view>帮助</view>
                 <view class="line"></view>
@@ -109,4 +112,7 @@
       </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>
+              

pages/main/default.wxss

@@ -6,6 +6,7 @@
 .scroll-view_H {
   width: 100%;
   height: 460rpx;
+  position: relative;
 }
 
 .homepage_headline_illus {
@@ -13,6 +14,19 @@
   height: 460rpx;
 }
 
+.scrollview{
+  width: 514rpx;
+  height: 312rpx;
+  position: absolute;
+  left:910rpx;
+  top:34rpx;
+}
+
+.homepage_headline_info{
+  width: 445rpx;
+  height: 455rpx;
+}
+
 .panel {
   width: 100%;
   background-color: #583027;
@@ -21,12 +35,19 @@
 }
 
 
-.line1 {
+.panel .line1 {
   width: 100%;
   height: 120rpx;
   background-color: #291112;
 }
 
+.panel .line2 {
+  width: 100%;
+  height: 10rpx;
+  background-color: rgba(0, 0, 0, 0.30);
+  position: absolute;
+  top:0;
+}
 
 .panel0 {
   width: 100%;
@@ -48,13 +69,6 @@
   position: relative;
 }
 
-.line2 {
-  width: 100%;
-  height: 10rpx;
-  background-color: rgba(0, 0, 0, 0.30);
-  position: absolute;
-  top:0;
-}
 
 .panel000 .text {
   margin: 0 6rpx;
@@ -118,7 +132,7 @@
   height: 57rpx;
   position: absolute;
   right: 77rpx;
-  bottom: 14rpx;
+  bottom: -5rpx;
 }
 
 .panel00200 {
@@ -143,7 +157,7 @@
                  3rpx 3rpx 4rpx #bd682d;
 }
 
-.panel00200 .line {
+.panel00200 .line3 {
   margin-top: 50rpx;
   width: 430rpx;
   height: 4rpx;
@@ -151,7 +165,7 @@
   border-radius: 2rpx;
 }
 
-.panel00200 .line2 {
+.panel00200 .line4 {
   margin-top: 20rpx;
 }
 
@@ -329,3 +343,11 @@
   height: 26rpx;
   margin-right: 30rpx;
 }
+
+.Help_aside_homepage{
+  width: 100%;
+  height: 310rpx;
+  position: fixed;
+  bottom: 0rpx;
+  z-index: 100;
+}

pages/main/detail.js

@@ -13,7 +13,6 @@ const waitTime = ["", "10秒钟", "15秒钟", "20秒钟", "25秒钟"];
 Page({
   data: {
     version: app.globalData.version,
-    FileUrl: app.globalData.fileUrl,
     IsShowMenu: false,
     filter: 'horizontal',
     //filter: 'vertical',
@@ -24,12 +23,23 @@ Page({
     ShowLoading: false,
     IsDistabled: "",
     NameClass:"",
+    AddDisabled: "",
+    SubDisabled: "btnAddSubDisabled",
+    HelpHidden7:true,
+    ShowAndroidNotice:false,
   },
   onLoad: function (options) {
+    var that = this;
     var id = options.id;
+
+    isAndroid = false;
+    if (app.globalData.systemInfo.system && app.globalData.systemInfo.system.indexOf("Android") >= 0)
+      isAndroid = true;
+
     this.setData({
       Containnerheight: server.getWindowHeight(),
       ID: id,
+      ShowAndroidNotice:isAndroid,
     });
     var systemInfo = wx.getSystemInfoSync();
     if (systemInfo.system && systemInfo.system.indexOf("Android") >= 0) {
@@ -37,9 +47,10 @@ Page({
     }
     this.getDetail(id);
 
-    isAndroid = false;
-    if (app.globalData.systemInfo.system && app.globalData.systemInfo.system.indexOf("Android") >= 0)
-      isAndroid = true;
+    
+    common.getStorageValue(this, "HelpHidden3", false, function () { 
+      that.showHelp();
+    });
 
   },
   onUnload:function(){
@@ -54,6 +65,7 @@ Page({
           item = data[i].List[k];
           item.Example[0] = item.Example[0].replace("+", " + ").replace("-", " - ").replace("×", " × ").replace("÷", " ÷ ");
           item.Example[1] = item.Example[1].replace("+", " + ").replace("-", " - ").replace("×", " × ").replace("÷", " ÷ ");
+          item.IconName = app.globalData.fileUrl+item.IconName;
           if (item.Name.length>12)
             item.NameClass="text2";
           break;
@@ -74,15 +86,46 @@ Page({
     wx.navigateTo({
       url: '../main/answer',
     });
+    this.closeHelp2();
   },
   getFinish: function () {
+    this.setData({
+      ShowLoading: true,
+    });
     wx.hideLoading();
     arrAnswerID = [];
     tempAnswerList=[];
     this.getAnswerID();
     this.getList(this.data.ID);
-  },
 
+    this.closeHelp();
+  },
+  //重新生成试卷
+  ResetFinish:function(){
+    var that=this;
+    wx.showLoading({
+      title:"正在重置",
+      complete:function(){
+        var list = that.data.arrPage;
+        for (var i = 0; i < list.length; i++) {
+          wx.removeSavedFile({
+            filePath: list[i].TempImagePath
+          });
+        }
+        that.setData({
+          arrPage: [],
+          PageNumber: 1,
+        });
+        var tempList = wx.getStorageSync("AnswerList");
+        for (var i = 0; i < list.length; i++) {
+          tempList.shift();
+        }
+        wx.setStorageSync("AnswerList", tempList);
+        wx.hideLoading();
+        that.getFinish();
+      }
+    });
+  },
   getList: function (id) {
     var that = this;
     var pageNum = that.data.PageNumber;
@@ -95,7 +138,6 @@ Page({
       //console.log("UserInfo:" + data);
       if (data) {
         that.setData({
-          ShowLoading: true,
           IsFinished: true,
           arrPage: [],
           IsDistabled: "",
@@ -103,8 +145,10 @@ Page({
         });
 
         QuestionItem = data;
+        QuestionItem.IconName = that.data.QuestionTypeItem.IconName;
 
         if (isAndroid) {
+          console.log("android");
           var ctx = wx.createCanvasContext("Canvas", that);
           ctx.fillRect(0, 0, 1050, 1485);
           ctx.draw(true, function (n) {
@@ -145,22 +189,14 @@ Page({
     item.AnswerID = arrAnswerID.shift();
 
     var ctx = wx.createCanvasContext("Canvas", that);
+    ctx.setTextAlign('left');
+    ctx.setTextBaseline('top');
+    ctx.setFontSize(12);
     ctx.setFillStyle('white');
+
     ctx.fillRect(0, 0, 2100, 2970);
     ctx.fillStyle = "#000000";
-
-    //计算数组最大长度
-    var maxLength = 0;
-    for (var l = 0; l < item.QuestionList.length; l++) {
-      var num1 = item.QuestionList[l];
-      if (num1.Vertical) {
-        for (var n = 0; n < num1.Vertical.length; n++) {
-          if (maxLength < num1.Vertical[n].Array.length)
-            maxLength = num1.Vertical[n].Array.length;
-        }
-      }
-    }
-
+    
     var xStart = 60;
     var yStart = 247;
 
@@ -173,7 +209,7 @@ Page({
       height = 250;
     //括号
     var index = 0;
-    ctx.setFontSize(12);
+    
     for (var i = 0; i < 3; i++) {
       for (var j = 0; j < item.PageCount / 3; j++) {
         index++;
@@ -236,11 +272,11 @@ Page({
             var len = getLength(equation[n]);
             num += len;
             if (equation[n] == ".") {
-              ctx.fillText(equation[n], num + 3, yStart + j * 59);
+              ctx.fillText(equation[n], num + 3, yStart + j * 59-5);
             } else {
-              var h = 0;
+              var h = -8;
               if (equation[n] == "_")
-                h = 8;
+                h = 0;
               ctx.fillText(equation[n], num, yStart + j * 59 + h);
             }
           }
@@ -255,44 +291,35 @@ Page({
           if (num1.OperateAB == "÷")
             width = 240;
 
-          //console.log(num1);
-          for (var n = 0; n < num1.Vertical.length; n++) {
-            if (maxLength > num1.Vertical[n].Array.length) {
-              if (num1.OperateAB != "÷"){
-                var str="";
-                if (num1.Vertical[n].Type=="line")
-                  str="1"
-                num1.Vertical[n].Array.splice(1, 0, str);
-              }
-            }
-          }
-          console.log(num1);
-
-
           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();
 
-                var lineLength = num1.Vertical[n].Array.length * 30 + 20;
-                if (num1.OperateAB == "÷") {
-                  lineLength = num1.A.toString().length * 30;
-                }
-                ctx.moveTo(num, yStart + j * height + n * 30);
-                ctx.lineTo(num - lineLength, yStart + j * height + n * 30);
-                ctx.stroke();
-
-                if (num1.OperateAB != "÷")
                   isAnswer = true;
-                break;
+                  break;
+                }
               }
               else {
                 str = num1.Vertical[n].Array[m];
 
                 if (num1.OperateAB == "÷" && str == "√") {
                   isAnswer = true;
-                  ctx.drawImage("../../images/formula_division_size02.png", num - (num1.Vertical[n].Array.length - m) * 30 - 20, yStart + j * height + n * 30 - 31, 56, 76);
+                  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) {
@@ -301,10 +328,19 @@ Page({
                   ctx.fillText(str, num - (num1.Vertical[n].Array.length - m) * 10, yStart + j * height + n * 30);
                 }
                 else {
-                  ctx.fillText(str, num - (num1.Vertical[n].Array.length - m) * 30, yStart + j * height + n * 30);
+                  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);
                 }
               }
-
             }
             if (isAnswer)
               break;
@@ -315,14 +351,13 @@ Page({
     }
 
     ctx.setTextAlign('left');
-    ctx.setTextBaseline('top');
     ctx.setFontSize(32);
     ctx.fillText(item.Name, 60, 45);
 
 
     ctx.setFontSize(12);
     ctx.fillText(item.CagegoryName, 60, 90);
-    ctx.fillText("共" + item.QuestionList.length + "道题", 60, 125);
+    ctx.fillText("共" + item.PageCount + "道题", 60, 125);
     ctx.fillText("第 1 / 1 页", 60, 147);
     ctx.fillText("答案检索号", 768, 60);
 
@@ -343,8 +378,8 @@ Page({
         y: 0,
         width: w * times,
         height: h * times,
-        //destWidth: w*times,
-        //destHeight: h*times,
+        destWidth: w*times,
+        destHeight: h*times,
         canvasId: 'Canvas',
         success: function (res2) {
           console.log(res2.tempFilePath);
@@ -367,10 +402,9 @@ Page({
             });
 
             wx.pageScrollTo({
-              scrollTop: 710,
+              scrollTop: 0,
               duration: 300
             });
-
             // wx.previewImage({
             //   current: that.data.arrPage[0], // 当前显示图片的http链接
             //   urls: that.data.arrPage // 需要预览的图片http链接列表
@@ -394,6 +428,10 @@ Page({
             }
             wx.setStorageSync("AnswerList", tempList);
 
+            common.getStorageValue(that, "HelpHidden7", false, function () {
+              that.showHelp2();
+            });
+            
           }
         }
       })
@@ -443,17 +481,19 @@ Page({
               that.setData({
                 IsDistabled: "Distabled",
               });
-
               wx.pageScrollTo({
-                scrollTop: 1010,
+                scrollTop: 400,
                 duration: 300
               });
-
             }
           },
           fail(err3) {
             console.log(err3);
+            wx.openSetting();
           },
+          complete(){
+            wx.hideLoading();
+          }
         })
       }
     }
@@ -461,13 +501,20 @@ Page({
   changePageNumber: function (e) {
     var id = Number(e.currentTarget.dataset.id);
     this.data.PageNumber += id;
-    if (this.data.PageNumber < 1)
+    var addDisabled="",subDisabled="";
+    if (this.data.PageNumber < 1){
       this.data.PageNumber = 1;
-    else if (this.data.PageNumber > 4)
+      subDisabled ="btnAddSubDisabled";
+    }
+    else if (this.data.PageNumber > 4){
       this.data.PageNumber = 4;
+      addDisabled = "btnAddSubDisabled";
+    }
 
     this.setData({
       PageNumber: this.data.PageNumber,
+      AddDisabled: addDisabled,
+      SubDisabled: subDisabled,
     });
   },
   showImage: function (e) {
@@ -509,17 +556,42 @@ Page({
       IsShowMenu: true,
     });
   },
+  showHelp: function () {
+    if (!this.data.HelpHidden3) {
+      this.audioCtx = wx.createAudioContext('myAudio');
+      var str = "嘿嘿，找到我了吗？我在车间的窗户里制作例题呢。如果这是你要的题型，去点“出题”按钮就对了。还要告诉你，一张卷子就是一张图片，题目数量请看提示。";
+      server.playAudio(this.audioCtx, str);
+    }
+  },
+  closeHelp: function () {
+    this.setData({
+      HelpHidden3: true,
+    });
+    wx.setStorageSync("HelpHidden3", true);
+    this.audioCtx = wx.createAudioContext('myAudio');
+    this.audioCtx.pause();
+  },
+
+  showHelp2: function () {
+    if (!this.data.HelpHidden7) {
+      this.audioCtx = wx.createAudioContext('myAudio');
+      var str = "卷子出炉咯，棒棒哒！快去手机相册打印吧。我会等在首页上的答案资料室为你继续带路的。";
+      server.playAudio(this.audioCtx, str);
+    }
+  },
+  closeHelp2: function () {
+    this.setData({
+      HelpHidden7: true,
+    });
+    wx.setStorageSync("HelpHidden7", true);
+    this.audioCtx = wx.createAudioContext('myAudio');
+    this.audioCtx.pause();
+  },
   onShareAppMessage: function () {
     return {
-      title: '',
-      path: 'pages/index/index',
-      success: function (res) { },
-      fail: function (err) {
-        console.log(err);
-      },
-      complete: function (res) {
-        console.log(res);
-      },
+      title: app.globalData.ShareTitle,
+      path: 'pages/index/index?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImageUrl,
     }
   },
 })

pages/main/detail.wxml

@@ -1,83 +1,87 @@
 <view class="container FlexColumn" style="min-height:{{Containnerheight}}rpx;">
-  <image class="makepaper_headline_illus_lab" src="../../images/makepaper_headline_illus_lab.png" />
-  <image class="questioncard_icon desaturate" src="{{FileUrl}}questioncard_icon_grade0606_size01.png" />
-  <view class="Example">
-    <view class="Example1">
-      {{QuestionTypeItem.Example[0]}}
-    </view>
-    <view class="Example1">
-      {{QuestionTypeItem.Example[1]}}
+  <block wx:if="{{!IsFinished}}">
+    <image class="makepaper_headline_illus_lab" src="../../images/makepaper_headline_illus_lab.png" />
+    <image class="questioncard_icon desaturate" src="{{QuestionTypeItem.IconName}}" />
+    <view class="Example">
+      <view class="Example1">
+        {{QuestionTypeItem.Example[0]}}
+      </view>
+      <view class="Example1">
+        {{QuestionTypeItem.Example[1]}}
+      </view>
     </view>
-  </view>
 
-  <image class="makepaper_headline_illus_windows" src="../../images/makepaper_headline_illus_windows.png" />
-  <view class="line0"></view>
-  <view class="line1 FlexColumn">
-    <image class="makepaper_headline_illus_board FlexColumn" src="../../images/makepaper_headline_illus_board.png" />
-    <view class="{{QuestionTypeItem.NameClass}} text">
-      {{QuestionTypeItem.Name}}
+    <image class="makepaper_headline_illus_windows" src="../../images/makepaper_headline_illus_windows.png" />
+    <view class="line0"></view>
+    <view class="line1 FlexColumn">
+      <image class="makepaper_headline_illus_board FlexColumn" src="../../images/makepaper_headline_illus_board.png" />
+      <view class="{{QuestionTypeItem.NameClass}} text">
+        {{QuestionTypeItem.Name}}
+      </view>
     </view>
-  </view>
-  <view class="line2"></view>
-  <view class="line3">
-
-  </view>
-  <view class="line4"></view>
-  <view class="panel1 FlexColumn">
-    <view class="text1">算式类型</view>
+    <view class="line2"></view>
+    <view class="line3">
 
-    <block wx:if="{{QuestionTypeItem.QuestionNumber3==0}}">
-      <view class="text2">横式</view>
-      <view class="text3 FlexRow">
-        <image class="universalpic_attention_black_size01" src="../../images/universalpic_attention_black_size01.png" />
-        <view class="text31">本知识点不适用竖式运算</view>
-      </view>
-    </block>
+    </view>
+    <view class="line4"></view>
+    <view class="panel1 FlexColumn">
+      <view class="text1">算式类型</view>
+
+      <block wx:if="{{QuestionTypeItem.QuestionNumber3==0}}">
+        <view class="text2">横式</view>
+        <view class="text3 FlexRow">
+          <image class="universalpic_attention_black_size01" src="../../images/universalpic_attention_black_size01.png" />
+          <view class="text31">本知识点不适用竖式运算</view>
+        </view>
+      </block>
 
-    <block wx:if="{{QuestionTypeItem.QuestionNumber3>0}}">
-      <view class="text2_1"></view>
-      <image class="universalpic_indicator_cell_size01" src="../../images/universalpic_indicator_cell_size01.png" />
-      <view class="panel10 FlexRow" bindtap='openMenu'>
-        <view class="btnSelect">
+      <block wx:if="{{QuestionTypeItem.QuestionNumber3>0}}">
+        <view class="text2_1"></view>
+        <image class="universalpic_indicator_cell_size01" src="../../images/universalpic_indicator_cell_size01.png" />
+        <view class="panel10 FlexRow" bindtap='openMenu'>
+          <view class="btnSelect">
 
-          <block wx:if="{{filter=='horizontal'}}">横式</block>
-          <block wx:if="{{filter=='vertical'}}">竖式</block>
-          <!-- <block wx:if="{{filter=='all'}}">横式+竖式</block> -->
+            <block wx:if="{{filter=='horizontal'}}">横式</block>
+            <block wx:if="{{filter=='vertical'}}">竖式</block>
+            <!-- <block wx:if="{{filter=='all'}}">横式+竖式</block> -->
 
+          </view>
+          <view class="btnAddSub"></view>
         </view>
-        <view class="btnAddSub"></view>
-      </view>
-    </block>
+      </block>
 
-    <image class="universalpic_line_dashed_size01" src="../../images/universalpic_line_dashed_size01.png" />
-
-    <view class="text4">制作几张</view>
+      <image class="universalpic_line_dashed_size01" src="../../images/universalpic_line_dashed_size01.png" />
 
-    <image class="universalpic_value_cell_size01" src="../../images/universalpic_value_cell_size01.png" />
-    <view class="panel10 FlexRow">
-      <view class="btnAddSub" bindtap='changePageNumber' data-id="-1"></view>
-      <view class="Number">{{PageNumber}}</view>
-      <view class="btnAddSub" bindtap='changePageNumber' data-id="1"></view>
-    </view>
+      <view class="text4">制作几张卷子</view>
 
-    <view class="text5">每张含 {{PageCount}} 道题目</view>
+      <image class="universalpic_value_cell_size01" src="../../images/universalpic_value_cell_size01.png" />
+      <view class="panel10 FlexRow">
+        <view class="{{SubDisabled}} btnAddSub" bindtap='changePageNumber' data-id="-1"></view>
+        <view class="Number">{{PageNumber}}</view>
+        <view class="{{AddDisabled}} btnAddSub" bindtap='changePageNumber' data-id="1"></view>
+      </view>
 
-    <image class="universalpic_line_dashed_size01" src="../../images/universalpic_line_dashed_size01.png" />
+      <view class="text5">每张含 {{PageCount}} 道题目</view>
 
-    <view class="btn" bindtap='getFinish'>
-      <view class="btn1">
-        出题
+      <view class="btnStart" bindtap='getFinish'>
+        <view class="btnStart1">
+          出题
+        </view>
       </view>
     </view>
-  </view>
-  <image class="universalpic_line_zigzag_black_down" src="../../images/universalpic_line_zigzag_black_down.png" />
+  </block>
+
   <block wx:if="{{IsFinished}}">
-    <image class="universalpic_line_zigzag_black_up" src="../../images/universalpic_line_zigzag_black_up.png" />
     <view class="panel2 FlexColumn">
       <view class="panel20 FlexRow">
         <image class="universalpic_right_white_size01" src="../../images/universalpic_right_white_size01.png" />
       </view>
       <view class="text6">题目出好了，共有 {{arrPage.length}} 张卷子图片</view>
+      <view class="androidPanel FlexRow" wx:if="{{ShowAndroidNotice}}" bindtap='ResetFinish'>
+        <image class="universalpic_attention_blue_size01" src="../../images/universalpic_attention_blue_size01.png" />
+        <view class="text">由于微信BUG，安卓用户如遇卷面紊乱请</view>
+        <view class="text2">重新出题</view>
+      </view>
       <view class="panel21 FlexRow">
         <image class="panel210" wx:for="{{arrPage}}" wx:key="index" src="{{item}}" data-id='{{index}}' bindtap='showImage' />
       </view>
@@ -161,4 +165,7 @@
   </view>
 
 </view>
+<image hidden="{{HelpHidden3}}" bindtap='closeHelp' class="Help_aside_makepaper" src="../../images/Help_aside_makepaper.png" />
+<image hidden="{{HelpHidden7}}" bindtap='closeHelp2' class="Help_aside_savepaper" src="../../images/Help_aside_savepaper.png" />
+<audio hidden='true' id="myAudio"></audio>
 <canvas class='Canvas' canvas-id="Canvas"></canvas>

pages/main/detail.wxss

@@ -87,15 +87,18 @@
 
 .panel1 {
   width: 680rpx;
-  height: 854rpx;
+  height: 782rpx;
   background-color: #262626;
   margin-top: -30rpx;
   z-index: 10;
   color:#9B9B9B;
   justify-content: flex-start;
+
+  border-bottom-left-radius: 40rpx;
+  border-bottom-right-radius: 40rpx;
 }
 .panel1 .text1{
-  font-size:32rpx;
+  font-size:36rpx;
   margin-top: 60rpx;
 }
 .panel1 .text2{
@@ -131,22 +134,23 @@
   color:#D2D2D2;
   text-align: center;
   line-height: 90rpx;
+  margin-top: 15rpx;
 }
 .universalpic_line_dashed_size01{
   width:634rpx;
   height:4rpx;
-  margin-top: 40rpx;
+  margin-top: 52rpx;
 }
 
 .panel1 .text4{
-  font-size:32rpx;
+  font-size:36rpx;
   margin-top: 40rpx;
 }
 
 .universalpic_value_cell_size01{
   width:400rpx;
   height:104rpx;
-  margin-top: 20rpx;
+  margin-top: 30rpx;
 }
 
 .panel1 .panel10{
@@ -158,22 +162,50 @@
 
 .panel1 .btnAddSub{
   width:90rpx;
-  height:104rpx;
+  height:84rpx;
+  margin-top: 5rpx;
+  border-radius: 8rpx;
+}
+.panel1 .btnAddSubDisabled{
+  background-color: rgba(46, 46, 46, 0.7);
 }
 
 .panel1 .Number{
   color:#D2D2D2;
   font-size: 36rpx;
-  margin-top: -14rpx;
+  margin-top: 0rpx;
 }
 
 .panel1 .text5{
   font-size:24rpx;
-  margin-top: 20rpx;
+  margin-top: 30rpx;
   color:#868686;
   font-weight: 400;
 }
 
+
+.btnStart {
+  width: 680rpx;
+  height: 160rpx;
+  background-color: #7D2B25;
+  border-bottom-left-radius: 40rpx;
+  border-bottom-right-radius: 40rpx;
+  position: relative;
+  margin-top: 80rpx;
+}
+
+.btnStart1 {
+  width: 100%;
+  height: 130rpx;
+  background-color: #B3443B;
+  border-bottom-left-radius: 40rpx;
+  border-bottom-right-radius: 40rpx;
+  line-height: 130rpx;
+  text-align: center;
+  color: #DEC2B8;
+  font-size: 56rpx;
+}
+
 .btn {
   width: 600rpx;
   height: 130rpx;
@@ -221,7 +253,7 @@
   width: 680rpx;
   height: 1384rpx;
   background-color: #262626;
-  margin-top: -30rpx;
+  margin-top: 40rpx;
   z-index: 10;
   border-bottom-left-radius: 20rpx;
   border-bottom-right-radius: 20rpx;
@@ -234,7 +266,7 @@
   width: 100rpx;
   height: 100rpx;
   background-color: #19C575;
-  margin-top: 80rpx;
+  margin-top: 140rpx;
   border-radius: 50%;
 }
 
@@ -244,6 +276,28 @@
   color:#9B9B9B;
 }
 
+.panel2 .androidPanel{
+  width: 100%;
+  height: 70rpx;
+  background-color: #2E2E2E;
+  margin: 30rpx 0 0 0;
+}
+
+.universalpic_attention_blue_size01{
+  width: 20rpx;
+  height: 20rpx;
+  margin-right: 10rpx;
+}
+.panel2 .androidPanel .text{
+  color:#787878;
+  font-size:24rpx;
+}
+.panel2 .androidPanel .text2{
+  color:#fff;
+  font-size:24rpx;
+  text-decoration:underline;
+}
+
 .btn2 {
   margin-top: 60rpx;
 }
@@ -252,7 +306,7 @@
   width: 600rpx;
   margin-top: 40rpx;
   flex-wrap: wrap;
-  justify-content: flex-start;
+  justify-content: center;
 }
 .panel2 .panel210{
   width: 130rpx;
@@ -466,5 +520,19 @@
   height:26rpx;
 }
 
+.Help_aside_makepaper{
+  width: 100%;
+  height: 320rpx;
+  position: fixed;
+  bottom: 0rpx;
+  z-index: 100;
+}
 
+.Help_aside_savepaper{
+  width: 100%;
+  height: 270rpx;
+  position: fixed;
+  bottom: 0rpx;
+  z-index: 100;
+}
 

pages/main/item.js

@@ -9,7 +9,6 @@ var audioArray = [];
 Page({
   data: {
     version: app.globalData.version,
-    FileUrl: app.globalData.fileUrl,
     IsPlaying: 0,
     PlayStr: "本",
     selectTab0: "btn1",
@@ -17,13 +16,17 @@ Page({
     selectTab2: "",
   },
   onLoad: function (options) {
-    this.audioCtx = wx.createAudioContext('myAudio');
-
+    var that=this;
+    this.audioCtxNumber = wx.createAudioContext('numberAudio');
+    
     this.setData({
       Containnerheight: server.getWindowHeight(),
       IsPlaying: 0,
     });
     audioArray = [];
+    currentIndex=0;
+    tempCurrentIndex = -1;
+
     var id = options.id;
     this.getItem(id);
 
@@ -31,6 +34,13 @@ Page({
       title: "试卷答案 " + id,
     });
 
+    common.getStorageValue(this, "HelpHidden6", false, function () { 
+      that.showHelp();
+    });
+
+  },
+  onUnload:function(){
+    this.closeHelp();
   },
   scrollTop: function (e) {
     var id = Number(e.currentTarget.dataset.id);
@@ -131,10 +141,10 @@ Page({
   playAudioStart: function () {
 
     if (this.data.IsPlaying == 1) {
-      this.audioCtx.pause();
+      this.audioCtxNumber.pause();
     }
     else if (this.data.IsPlaying == -1) {
-      this.audioCtx.play();
+      this.audioCtxNumber.play();
     }
     else if (this.data.IsPlaying == 0) {
       var arr = [];
@@ -180,12 +190,7 @@ Page({
       });
       return;
     } else {
-      var url = app.globalData.audioUrlBaidu;
-      url = url.replace("[token]", app.globalData.BaiduToken);
-      url = url.replace("[word]", audioArray[currentIndex].join(","));
-      console.log(url);
-      this.audioCtx.setSrc(url);
-      this.audioCtx.play();
+      server.playAudio(this.audioCtxNumber, audioArray[currentIndex].join(","));
     }
   },
   onPlayEnded: function (e) {
@@ -208,17 +213,26 @@ Page({
       PlayStr: playstr,
     });
   },
+  showHelp: function () {
+    if (!this.data.HelpHidden6) {
+      this.audioCtx = wx.createAudioContext('myAudio');
+      var str = "Nice，让我用30秒讲完最后的帮助。答案靠左，题目居右，如果发现题目右侧有图标，说明这是一道竖式题，点击图标可以检查解题步骤，这是独门神器，对找出问题所在非常有效。期待你的好成绩，拜拜！";
+      server.playAudio(this.audioCtx, str);
+    }
+  },
+  closeHelp: function () {
+    this.setData({
+      HelpHidden6: true,
+    });
+    wx.setStorageSync("HelpHidden6", true);
+    this.audioCtx = wx.createAudioContext('myAudio');
+    this.audioCtx.pause();
+  },
   onShareAppMessage: function () {
     return {
-      title: '',
-      path: 'pages/index/index',
-      success: function (res) { },
-      fail: function (err) {
-        console.log(err);
-      },
-      complete: function (res) {
-        console.log(res);
-      },
+      title: app.globalData.ShareTitle,
+      path: 'pages/index/index?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImageUrl,
     }
   },
 })

pages/main/item.wxml

@@ -80,13 +80,13 @@
     <!-- 算式（加减乘） -->
     <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>
-            <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 class="panelAnswerRow FlexRow" wx:for='{{item.Vertical}}' wx:key="rowI" wx:for-item="itemChild" >
+          <view class="panelAnswerCol FlexRow" wx:for='{{itemChild.Array}}' wx:key="i" wx:for-item="col" wx:for-index="i">
+            <view class="colNumber" wx:if="{{itemChild.Type=='number' && col!='√' && col!='.'}}">{{col}}</view>
+            <view class="colDot" wx:if="{{itemChild.Type=='number' && col=='.'}}">{{col}}</view>
+            <view class="colLine" wx:if="{{itemChild.Type=='line' && col=='1'}}"></view>
+            <view class="colLineHalf" wx:if="{{itemChild.Type=='line' && col=='0.5'}}"></view>
+            <view class="colLineNull" wx:if="{{itemChild.Type=='line' && col==''}}"></view>
           </view>
         </view>
       </view>
@@ -117,4 +117,6 @@
   <view wx:if="{{AnswerItem.PageCount<60}}" class="panelRowBody panel0 FlexRow" wx:for="{{[1,2,3]}}" wx:key="i"></view>
 
 </view>
-<audio hidden='true' id="myAudio" bindended='onPlayEnded'></audio>
+<audio hidden='true' id="numberAudio" bindended='onPlayEnded'></audio>
+<audio hidden='true' id="myAudio"></audio>
+<image hidden="{{HelpHidden6}}" bindtap='closeHelp' class="Help_aside_answerroom_detail" src="../../images/Help_aside_answerroom_detail.png" />

pages/main/item.wxss

@@ -235,7 +235,6 @@
   margin: 0rpx 0 0 28rpx;
   background-color: #000;
 }
-
 .imageShow{
   width: 65rpx;
   height:92rpx;
@@ -248,4 +247,20 @@
   width: 16rpx;
   height:26rpx;
   margin-right: 30rpx;
-}
+}
+
+.Help_aside_questioncollection{
+  width: 100%;
+  height: 377rpx;
+  position: fixed;
+  bottom: 0rpx;
+  z-index: 100;
+}
+
+.Help_aside_answerroom_detail{
+  width: 100%;
+  height: 377rpx;
+  position: fixed;
+  bottom: 0rpx;
+  z-index: 200;
+}

pages/main/list.js

@@ -10,21 +10,26 @@ var SelectID = 0;
 Page({
   data: {
     version: app.globalData.version,
-    FileUrl: app.globalData.fileUrl,
     filter: 'all',
     CategoryID: 1,
   },
   onLoad: function (options) {
+    var that=this;
     categoryID = options.id;
     categoryName = options.name;
     categoryNum = options.num;
     //console.log(category);
+    common.getStorageValue(this, "HelpHidden2", false, function () { 
+      that.showHelp();
+    });
+
     this.setData({
       CategoryNum: categoryNum,
       CategoryID: categoryID,
       Containnerheight: server.getWindowHeight(),
     });
     this.getList();
+    
   },
   getList: function () {
     this.buildList();
@@ -51,6 +56,8 @@ Page({
     wx.navigateTo({
       url: '../main/detail?id=' + SelectID,
     });
+
+    this.closeHelp();
   },
   buildList: function () {
     var that = this;
@@ -65,10 +72,9 @@ Page({
         if (data[i].ID == arrID[j]) {
           for (var k = 0; k < data[i].List.length; k++) {
             data[i].List[k].CategoryLevel = data[i].Name;
-
-
+            data[i].List[k].IconName = app.globalData.fileUrl + data[i].List[k].IconName;
+            data[i].List[k].SelectItem = "boxCenter";
             for (var n = 0; n < arr.length; n++) {
-              data[i].List[k].SelectItem = "boxCenter";
               if (arr[n] == data[i].List[k].ID) {
                 data[i].List[k].SelectItem = "boxLeft";
               }
@@ -102,6 +108,22 @@ Page({
     });
     this.buildList();
   },
+  showHelp: function () {
+    if (!this.data.HelpHidden2) {
+      this.audioCtx = wx.createAudioContext('myAudio');
+      var str = "这里是仓库，每一层货架的箱子里都有一个知识点，很有意思吧！如果看到一个叫“有竖式”的标签，说明该题型可以打印竖式计算题，想要快速定位所有竖式题目的话，点击顶层货架就能帮你筛选。请选一只箱子继续。";
+      server.playAudio(this.audioCtx, str);
+    }
+  },
+  closeHelp: function () {
+    this.setData({
+      HelpHidden2: true,
+    });
+    wx.setStorageSync("HelpHidden2", true);
+    this.audioCtx = wx.createAudioContext('myAudio');
+    this.audioCtx.pause();
+  },
+  
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/list.wxml

@@ -34,7 +34,7 @@
       </view>
       <view class="{{item.SelectItem}} cardCenter FlexRow">
         <image class="questioncollection_shelf_box" src="../../images/questioncollection_shelf_box.png" />
-        <image class="questioncard_icon" src="{{FileUrl}}questioncard_icon_grade0602_size01.png" />
+        <image class="questioncard_icon" src="{{item.IconName}}" />
         <view class="title FlexColumn">
           <view class="title1">
             {{item.Name}}
@@ -106,4 +106,6 @@
   <view class="line5"></view>
   <view class="line6" hidden="{{QuestionTypeList.length>0}}"></view>
 
-</view>
+</view>
+<image hidden='{{HelpHidden2}}' bindtap='closeHelp' class="Help_aside_questioncollection" src="../../images/Help_aside_questioncollection.png" />
+<audio hidden='true' id="myAudio"></audio>

pages/main/list.wxss

@@ -124,6 +124,7 @@
   width: 580rpx;
   height: 130rpx;
   position: absolute;
+  z-index: 10;
 }
 
 .boxLeft {
@@ -141,8 +142,9 @@
 .questioncard_icon {
   width: 86rpx;
   height: 96rpx;
-  z-index: 10;
+  z-index: 20;
   margin-left: 30rpx;
+  position: relative;
 }
 
 .questioncard .title {
@@ -176,6 +178,7 @@
   position: absolute;
   left: 474rpx;
   top: 0;
+  z-index: 20;
 }
 
 .questioncard .title3 {
@@ -295,4 +298,12 @@
   width: 100%;
   height: 550rpx;
   background-color: #514a47;
+}
+
+.Help_aside_questioncollection{
+  width: 100%;
+  height: 377rpx;
+  position: fixed;
+  bottom: 0rpx;
+  z-index: 100;
 }

pages/main/print.js

@@ -11,7 +11,7 @@ Page({
   },
   onLoad: function (options) {
     var id = options.id;
-    id = 183;
+    id = 130;
     var QuestionTypeCategory=3;
     this.getList(id, QuestionTypeCategory);
 
@@ -183,28 +183,32 @@ Page({
             for (var m = num1.Vertical[n].Array.length - 1; m >= 0; m--) {
               var str = "";
               if (num1.Vertical[n].Type == "line") {
-
-                var lineLength = num1.Vertical[n].Array.length * 30+20;
-                var lineTop=-15;
-                if (num1.OperateAB == "÷") {
-                  lineLength = num1.A.toString().length * 30;
-                  lineTop=0;
+                if (num1.OperateAB != "÷") {
+                  var lineLength = num1.Vertical[n].Array.length * 30 + 20;
+                  var lineTop = -15;
+                  if (num1.OperateAB == "÷") {
+                    lineLength = num1.A.toString().length * 30;
+                    lineTop = 0;
+                  }
+
+                  ctx.moveTo(num, yStart + j * height + n * 30 + lineTop);
+                  ctx.lineTo(num - lineLength, yStart + j * height + n * 30 + lineTop);
+                  ctx.stroke();
+
+                  if (num1.OperateAB != "÷")
+                    isAnswer = true;
+                  break;
                 }
-                
-                ctx.moveTo(num, yStart + j * height + n * 30 + lineTop);
-                ctx.lineTo(num - lineLength, yStart + j * height + n * 30 + lineTop);
-                ctx.stroke();
-
-                if (num1.OperateAB != "÷")
-                  isAnswer = true;
-                break;
               }
               else {
                 str = num1.Vertical[n].Array[m];
 
                 if (num1.OperateAB == "÷" && str == "√") {
                   isAnswer = true;
-                  ctx.drawImage("../../images/formula_division_size02.png", num - (num1.Vertical[n].Array.length - m) * 30 - 20, yStart + j * height + n * 30 - 31, 56, 76);
+                  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 - 31, lineWidth, 39);
                   //break;
                 }
                 else if (num1.OperateAB == "÷" && n == 0) {
@@ -216,7 +220,6 @@ Page({
                   ctx.fillText(str, num - (num1.Vertical[n].Array.length - m) * 30, yStart + j * height + n * 30);
                 }
               }
-
             }
             if (isAnswer)
               break;

project.config.json

@@ -30,7 +30,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": -1,
+			"current": 5,
 			"list": [
 				{
 					"id": 0,
@@ -42,19 +42,31 @@
 					"id": 1,
 					"name": "detail",
 					"pathName": "pages/main/detail",
-					"query": "id=101"
+					"query": "id=24"
 				},
 				{
 					"id": 2,
 					"name": "print",
 					"pathName": "pages/main/print",
-					"query": "id=172"
+					"query": "id=183"
 				},
 				{
 					"id": -1,
 					"name": "item",
 					"pathName": "pages/main/item",
 					"query": "id=46"
+				},
+				{
+					"id": -1,
+					"name": "guide",
+					"pathName": "pages/index/guide",
+					"query": ""
+				},
+				{
+					"id": -1,
+					"name": "login",
+					"pathName": "pages/about/payfinished",
+					"query": ""
 				}
 			]
 		}

utils/main.js

@@ -312,6 +312,15 @@ function gotoFeedback() {
   });
 }
 
+function playAudio(ctx, sentence) {
+  var url = app.globalData.audioUrlBaidu;
+  url = url.replace("[token]", app.globalData.BaiduToken);
+  url = url.replace("[word]", sentence);
+  //console.log(url);
+  ctx.setSrc(url);
+  ctx.play();
+}
+
 
 module.exports = {
   getData: getData,
@@ -326,4 +335,5 @@ module.exports = {
   getDifficulty: getDifficulty,
   getProgramList: getProgramList,
   gotoFeedback: gotoFeedback,
+  playAudio: playAudio,
 }