0.1.3

app.js

@@ -17,7 +17,10 @@ App({
     version: "0.1.3",
     IsProduction: false,
     ProgramID: 105,
-    StartSecond: 4,
+    AppID: "wx313a8f2c0741efe1",
+    ShareTitle: "认真练习，告别粗心",
+    ShareImageUrl: '../../images/programsystem_screenshot_pic01.png',
+
     fileUrl: "https://math-1253256735.file.myqcloud.com/",
     serverUrl: "https://www.kylx365.com/apiData/",
     serverUrlServer: "https://www.kylx365.com/apiData/",
@@ -25,5 +28,15 @@ App({
     audioUrlBaidu: "https://tsn.baidu.com/text2audio?lan=zh&ctp=1&cuid=abcdxxx&tok=[token]&tex=[word]&vol=9&per=1&spd=8&pit=5",
     Key: "kylx365_chengjie",
     IV: "kylx365hongliren",
+    
+    systemInfo: null,
+    userInfo: null,
+    SourceID: 0,//来源ID
+    DayNumber: 0,//使用天数
+    PayMoney: 9.8,//产品销售价
+    BaiduToken: "",//百度开发平台token
+    IsShow: 0,
+    NewUserNumberMax: 6,//邀请新用户最大值
+    IsSaveCustom: false,//是否保存了定制
   }
 })

app.json

@@ -1,12 +1,12 @@
 {
   "pages": [
+    "pages/index/index",
+    "pages/main/item",
     "pages/main/answer",
     "pages/main/detail",
+    "pages/main/print",
     "pages/main/list",
-    "pages/main/default",
-    "pages/index/index",
-    "pages/index/detail",
-    "pages/index/list"
+    "pages/main/default"
   ],
   "window": {
     "backgroundTextStyle": "light",

pages/index/detail.js

@@ -1,22 +0,0 @@
-import common from '../../utils/util';
-import server from '../../utils/main';
-
-var app = getApp();
-
-Page({
-  data: {
-    List:[],
-  },
-  onLoad: function (options) {
-    var id=options.id;
-    this.gotoDetail(id);
-  },
-  gotoDetail: function (id) {
-    var that=this;
-    server.getData('GetQuestionTypesPrint?ID=' + id, function (data) {
-      that.setData({
-        List:data.QuestionList,
-      })
-    });
-  },
-})

pages/index/detail.wxml

@@ -1,12 +0,0 @@
-<view class="container FlexColumn">
-  <movable-area class="movable">
-    <movable-view class="table FlexColumn" inertia="true" out-of-bounds="true" damping="30" friction="1" scale="true" scale-min="0.05" scale-max="10" scale-value="1" x="{{x}}" y="{{y}}" direction="all">
-      <view class="td FlexRow" wx:for="{{List}}" wx:key="index">
-        <view class="tdIndex">({{index+1}})</view>
-        <view class="tdNumA">{{item.A}}</view>
-        <view class="tdNumAB">{{item.OperateAB}}</view>
-        <view class="tdNumA">{{item.B}}</view>
-      </view>
-    </movable-view>
-  </movable-area>
-</view>

pages/index/detail.wxss

@@ -1,38 +0,0 @@
-.container {
-  background-color: #fff;
-  justify-content: flex-start;
-  align-items: flex-start;
-} 
-
-.movable{
-  width:100%;
-  height:1334rpx;
-}
-
-.table{
-  width:2100rpx;
-  height:2970rpx;
-  font-size:72rpx;
-  justify-content: flex-start;
-  flex-wrap: wrap;
-}
-
-.td{
-  width:800rpx;
-  height:200rpx;
-  text-align: center;
-  line-height: 200rpx;
-}
-
-.tdIndex{
-  width:20rpx;
-  color:#dddddd;
-  margin-right: 60rpx;
-  font-size:40rpx;
-}
-
-.bg{
-  width:2100rpx;
-  height:2970rpx;
-}
-

pages/index/index.js

@@ -1,54 +1,164 @@
 import common from '../../utils/util';
 import server from '../../utils/main';
 
-const app = getApp()
+const app = getApp();
+var timeout2, timeout3;
+
 Page({
   data: {
     version: app.globalData.version,
     FileUrl: app.globalData.fileUrl,
   },
-  onLoad: function () {
+  onLoad: function(options) {
+    if (options) {
+      if (options.UserID) {
+        console.log("UserID:" + options.UserID);
+        app.globalData.introducer = options.UserID;
+      }
+      if (options.SourceID) {
+        console.log("SourceID:" + options.SourceID);
+        app.globalData.SourceID = options.SourceID;
+      }
+      // 扫码介绍人
+      if (options.scene) {
+        var scene = decodeURIComponent(options.scene);
+        console.log("scene:" + scene);
+        var introducer = 0;
+        if (scene.indexOf("UserID") >= 0)
+          introducer = scene.substr(scene.indexOf("UserID") + 7);
+        console.log("introducer:" + introducer);
+        app.globalData.introducer = scene;
+      }
+    }
     this.setData({
       Containnerheight: server.getWindowHeight(),
     });
-    this.updateProgram();
+
+    this.getUserInfo();
   },
-  updateProgram: function () {
-    if (wx.canIUse("getUpdateManager")) {
-      const updateManager = wx.getUpdateManager();
+  //得到用户信息
+  getUserInfo: function(cb) {
+    var that = this
+    //调用登录接口
+    wx.login({
+      success: function(res0) {
+        app.globalData.userInfo = {};
+        app.globalData.userInfo.Code = res0.code;
+        //console.log("Code:" + res0.code);
 
-      updateManager.onCheckForUpdate(function (res) {
-        // 请求完新版本信息的回调
-        console.log(res.hasUpdate)
-      });
+        wx.getSetting({
+          scope: "scope.userInfo",
+          success(res) {
+            if (!res.authSetting['scope.userInfo']) {
+              app.globalData.userInfo.nickName = "陌生用户";
+              app.globalData.userInfo.language = "";
+              app.globalData.userInfo.gender = "0";
+              app.globalData.userInfo.city = "";
+              app.globalData.userInfo.province = "";
+              app.globalData.userInfo.country = "";
+              app.globalData.userInfo.avatarUrl = "";
+              that.login(app.globalData.userInfo);
+            } else {
+              wx.getUserInfo({
+                withCredentials: false,
+                success: function(res) {
+                  app.globalData.userInfo = res.userInfo;
+
+                  app.globalData.userInfo.NickName = app.globalData.userInfo.nickName;
+                  app.globalData.userInfo.AvatarUrl = app.globalData.userInfo.avatarUrl;
+
+                  app.globalData.userInfo.Code = res0.code;
+                  that.login(app.globalData.userInfo);
+
+                },
+                fail: function(res) {
+                  that.login(app.globalData.userInfo);
+                }
+              });
 
-      updateManager.onUpdateReady(function () {
-        wx.showModal({
-          title: '更新提示',
-          content: '新版本已经准备好，是否重启应用？',
-          success: function (res) {
-            if (res.confirm) {
-              // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
-              updateManager.applyUpdate()
             }
           }
         });
+      },
+      fail: function() {
+        timeout2 = setTimeout(function() {
+          that.getUserInfo();
+          console.log("reboot:" + new Date().getTime());
+        }, 2000);
+      }
+    });
+  },
+
+  login: function(param) {
+    var that = this;
 
+    server.getLocalHost(function() {
+      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,
+        Introducer: app.globalData.introducer,
+        UserSource: app.globalData.userSource,
+        SourceID: app.globalData.SourceID,
+        LastUserSource: app.globalData.userSource,
+        Brand: app.globalData.systemInfo.brand,
+        Model: app.globalData.systemInfo.model,
+        PixelRatio: app.globalData.systemInfo.pixelRatio,
+        ScreenWidth: app.globalData.systemInfo.screenWidth,
+        ScreenHeight: app.globalData.systemInfo.screenHeight,
+        WindowWidth: app.globalData.systemInfo.windowWidth,
+        WindowHeight: app.globalData.systemInfo.windowHeight,
+        WXLanguage: app.globalData.systemInfo.language,
+        WXVersion: app.globalData.systemInfo.version,
+        System: app.globalData.systemInfo.system,
+        Platform: app.globalData.systemInfo.platform,
+        SDKVersion: app.globalData.systemInfo.SDKVersion,
+        ProgramVersion: app.globalData.Version,
+      }, function(data) {
+        //console.log("UserInfo:" + data);
+        if (!data) {
+          timeout3 = setTimeout(function() {
+            that.getUserInfo();
+            console.log("reboot:" + new Date().getTime());
+          }, 2000);
+        } else {
+          app.globalData.userInfo = data;
+
+          //app.globalData.userInfo.AvatarUrl = param.avatarUrl;
+          that.getQuestionType(function() {
+            setTimeout(function() {
+              wx.redirectTo({
+                url: '../main/default'
+              })
+            }, 2000);
+          });
+        }
       });
-    }
+
+    });
+
+  },
+  getQuestionType: function(callback) {
+    var that = this;
+    server.getData('GetQuestionTypes?Mode=2', function(data) {
+      if (data) {
+        //var arr = common.Decrypt(data);
+        var arr=data;
+        wx.setStorageSync("QuestionTypeList", arr);
+        callback();
+      }
+    });
   },
   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/index/index.wxss

@@ -11,14 +11,16 @@
 }
 
 .text1 {
-  margin-top: 142rpx;
+  position: fixed;
+  top: 142rpx;
   color: #fff;
   font-size: 48rpx;
   text-shadow: 0 7rpx 0 #112331;
 }
 
 .panel {
-  margin-top: 20rpx;
+  position: fixed;
+  top: 229rpx;
   color: #fff;
   font-size: 24rpx;
   width:281rpx;

pages/index/list.js

@@ -1,109 +0,0 @@
-import common from '../../utils/util';
-import server from '../../utils/main';
-
-var app = getApp();
-var category = 0;
-
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    FileUrl: app.globalData.fileUrl,
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    this.setData({
-      Containnerheight: server.getWindowHeight(),
-    });
-    category = options.id;
-    console.log(category);
-    this.getList();
-  },
-
-  onPullDownRefresh: function () {
-    this.getList();
-  },
-
-  onShow: function () {
-    var that = this;
-    that.getList();
-  },
-
-  getList: function () {
-    this.setData({
-      Level: category,
-    });
-
-    var data = wx.getStorageSync('QuestionTypeList');
-    for (var i = 0; i < data.length; i++) {
-      if (data[i].ID == category) {
-        
-        this.setData({
-          QuestionTypeList: data[i].List,
-        });
-        wx.setNavigationBarTitle({
-          title: data[i].Name,
-        });
-        break;
-      }
-    }
-  },
-  gotoDetail: function (e) {
-    var questionTypeID = e.currentTarget.dataset.id;
-    wx.navigateTo({
-      url: './detail?id=' + questionTypeID
-    });
-  },
-  gotoPrint: function (e) {
-    var that=this;
-    var id = e.currentTarget.dataset.id;
-    server.getData('GetQuestionTypesPrint?ID='+id, function (data) {
-      that.downImage(data);
-    });
-  },
-  downImage:function(filename){
-    var that = this;
-    wx.showLoading({
-      title: '下载中',
-    });
-    setTimeout(function(){
-      wx.downloadFile({
-        url: "https://print-1253256735.file.myqcloud.com/" + filename + ".png",
-        success: function (res) {
-          wx.hideLoading();
-          wx.previewImage({
-            current: res.tempFilePath, // 当前显示图片的http链接
-            urls: [res.tempFilePath] // 需要预览的图片http链接列表
-          })
-        },
-        fail: function () {
-          wx.hideLoading();
-          that.downImage(filename);
-        }
-      });
-    },2000);
-  },
-  onShareAppMessage: function () {
-    var that = this;
-    return {
-      title: '',
-      path: 'pages/index/start?UserID=' + app.globalData.userInfo.UserID,
-      imageUrl: app.globalData.fileUrl + 'images3/Extend/02.png',
-      success: function (res) {
-        
-      },
-      fail: function (err) {
-        console.log(err);
-      },
-      complete: function (res) {
-        console.log("shareComplete:" + res);
-      },
-    }
-  },
-
-})

pages/index/list.json

@@ -1 +0,0 @@
-{}

pages/index/list.wxml

@@ -1,32 +0,0 @@
-<view class="container FlexColumn" style="min-height:{{Containnerheight}}rpx;">
-
-  <view class="ViewContainerTitle1 Width100 FlexRow">
-    <view class="Left FlexRow">
-      题卡
-    </view>
-    <view></view>
-  </view>
-  <view class="ViewContainerContent2 Width100 FlexRow" wx:for="{{QuestionTypeList}}" wx:key="index" bindtap="gotoDetail" data-id="{{item.ID}}">
-    <view class="ViewContainerContent2_1 Left FlexColumn">
-      <view class="FlexRow">
-        <image class="ListIcon" src="{{FileUrl}}images/QuestionLibrary/QuestionTypesIcon1.png?2"  />
-        <view class="Left20">{{item.Name}}</view>
-        <view class="Left20 difficulty">{{item.DifficultyName}}</view>
-      </view>
-      <view class="ExampleContainer FlexRow">
-        <view class="letterSpacing">{{item.Example[0]}}</view>
-        <image class="XieGang" src="{{FileUrl}}images/xiegang.png" />
-        <view class="letterSpacing">{{item.Example[1]}}</view>
-        <image class="XieGang" src="{{FileUrl}}images/xiegang.png" wx:if="{{item.Example[2]}}" />
-        <view class="letterSpacing">{{item.Example[2]}}</view>
-      </view>
-    </view>
-    <view class="Right FlexRow">
-      
-      <image class="PrintIcon" src="../../images/print.png"  />
-        
-    </view>
-  </view>
-  <view class="footerHeight"></view>
-
-</view>

pages/index/list.wxss

@@ -1,59 +0,0 @@
-
-.ViewContainerTitle1 {
-  background-color: #f0f0f0;
-  font-size: 28rpx;
-  font-weight: 500;
-  height: 100rpx;
-  justify-content: space-between;
-}
-
-.ViewContainerContent2 {
-  height: 132rpx;
-  background-color: #fff;
-  justify-content: space-between;
-  border-bottom: 1rpx solid #f0f0f0;
-  font-size: 30rpx;
-}
-
-.ViewContainerContent2_1{
-  justify-content: flex-start;
-  align-items: flex-start;
-}
-
-.ListIcon {
-  width: 36rpx;
-  height: 30rpx;
-}
-
-.Left20{
-  margin-left: 20rpx;
-}
-
-.XieGang {
-  margin: 0 10rpx 0 10rpx;
-  width:14rpx;
-  height:18rpx;
-}
-
-.ExampleContainer {
-  margin: 5rpx 0 0 60rpx;
-  font-size: 24rpx;
-  font-style: italic;
-  font-weight: 200;
-  justify-content: flex-start;
-}
-
-.letterSpacing {
-  letter-spacing: 6rpx;
-}
-
-.difficulty{
-  font-size:22rpx;
-  color:#9B9B9B;
-
-}
-
-.PrintIcon{
-  width:72rpx;
-  height:54rpx;
-}

pages/main/answer.wxml

@@ -21,7 +21,7 @@
 
   <view class="panel0 FlexColumn">
     <view class="panel00 FlexRow">
-      <view class="panel0MainBG panel0Main">
+      <view class="panel0MainBG panel0Main" bindtap='selectItem'>
         <view class="line2"></view>
         <view class="item FlexColumn">
           <view class="itemLine0"></view>
@@ -42,10 +42,13 @@
               <view class="title30">#</view>
               <view class="title31">48</view>
               <image class="universalpic_new_red_size01" src="../../images/universalpic_new_red_size01.png" />
-
             </view>
           </view>
           <view class="itemLine1"></view>
+          <view class="itemLineSelected" wx:if="{{true}}">
+            <image class="universalpic_select_on_orange" src="../../images/universalpic_select_on_orange.png" />
+              
+          </view>
         </view>
 
         <view class="item FlexColumn">

pages/main/answer.wxss

@@ -24,7 +24,6 @@
   z-index: 20;
 }
 
-
 .panelTop {
   width: 710rpx;
   position: absolute;
@@ -32,65 +31,67 @@
   z-index: 30;
   justify-content: space-between;
 }
+
 .panelTop .panelTop0 {
   width: 280rpx;
   height: 90rpx;
   margin-left: 50rpx;
 }
+
 .panelTop .panelTop1 {
   margin-right: 69rpx;
 }
+
 .panelTop .panelTop00 {
   width: 280rpx;
   height: 80rpx;
-
   border-top-left-radius: 20rpx;
   border-top-right-radius: 20rpx;
-  background-color: #D79E59;
+  background-color: #d79e59;
 }
+
 .panelTop .line {
   width: 280rpx;
   height: 10rpx;
-  background-color: #B98043;
+  background-color: #b98043;
 }
 
 .panelTop .text {
   color: #fff;
   font-size: 26rpx;
-  text-shadow: 3rpx 3rpx 3rpx #906A3C, 
-    3rpx -3rpx 3rpx #906A3C, 
-    -3rpx 3rpx 3rpx #906A3C, 
-    -3rpx -3rpx 3rpx #906A3C;
+  text-shadow: 3rpx 3rpx 3rpx #906a3c,
+                 3rpx -3rpx 3rpx #906a3c,
+                 -3rpx 3rpx 3rpx #906a3c,
+                 -3rpx -3rpx 3rpx #906a3c;
 }
 
-
 .panelTop .btn {
   width: 16rpx;
   height: 16rpx;
-  background-color: #9EE74F;
+  background-color: #9ee74f;
   margin-right: 10rpx;
   border-radius: 3rpx;
   box-shadow: 0px 3px 0px rgba(0, 0, 0, 0.10);
 }
 
 .panelTop .btn {
-  background-color: #F0BE7B;
+  background-color: #f0be7b;
 }
 
 .panelTop .text2 {
-  text-shadow: 3rpx 3rpx 6rpx #C34738, 
-  3rpx -3rpx 6rpx #C34738, 
-  -3rpx 3rpx 6rpx #C34738, 
-  -3rpx -3rpx 6rpx #C34738;
+  text-shadow: 3rpx 3rpx 6rpx #c34738,
+                 3rpx -3rpx 6rpx #c34738,
+                 -3rpx 3rpx 6rpx #c34738,
+                 -3rpx -3rpx 6rpx #c34738;
 }
 
-.universalpic_select_on_white{
+.universalpic_select_on_white {
   width: 30rpx;
   height: 30rpx;
   margin-right: 20rpx;
 }
 
-.universalpic_select_on_gray{
+.universalpic_select_on_gray {
   width: 30rpx;
   height: 30rpx;
   margin-right: 12rpx;
@@ -147,6 +148,7 @@
   height: 130rpx;
   background-color: #797c7d;
   justify-content: space-between;
+  position: relative;
 }
 
 .panel0 .itemLine0 {
@@ -177,6 +179,20 @@
   background-color: #5e6164;
 }
 
+.panel0 .itemLineSelected {
+  width: 100%;
+  height: 120rpx;
+  background-color: rgba(0, 0, 0, 0.60);
+  position: absolute;
+  top:0;
+}
+
+.universalpic_select_on_orange{
+  width: 30rpx;
+  height: 30rpx;
+  margin: 50rpx 0 0 42rpx;
+}
+
 .questioncard_icon {
   width: 54rpx;
   height: 60rpx;
@@ -266,7 +282,7 @@
   height: 30rpx;
   position: absolute;
   top: -15rpx;
-  left:40rpx;
+  left: 40rpx;
 }
 
 .textFooter {

pages/main/default.js

@@ -1,32 +1,169 @@
 import common from '../../utils/util';
 import server from '../../utils/main';
 
-const app = getApp()
+const app = getApp();
+var code;
+
 Page({
   data: {
     version: app.globalData.version,
     FileUrl: app.globalData.fileUrl,
+    NickName: "陌生用户",
+    IsMember: 0,
+    AvatarUrl: "",
+    IsAccredit: false,
   },
-  onLoad: function () {
+  onLoad: function() {
     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',
+            });
+          }
+        }
+      }
+    });
+
+    wx.login({
+      success: function (res0) {
+        code = res0.code;
+      }
+    });
+
+
+    this.updateProgram();
+  },
+  gotoList:function(e){
+    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,
+    });
+  },
+  gotoAnswer:function(){
+    wx.navigateTo({
+      url: '../main/answer',
+    });
+  },
+  getBindGetUserInfo(e) {
+    console.log(e.detail);
+    var that = this;
+    var res = e.detail;
+    if (res.errMsg && res.errMsg == "getUserInfo:fail auth deny") {
+      app.globalData.userInfo.NickName = "陌生用户";
+      app.globalData.userInfo.AvatarUrl = "../../images/universalpic_face_default_black_size01.png";
+      app.globalData.userInfo.language = "";
+      app.globalData.userInfo.gender = "0";
+      app.globalData.userInfo.city = "";
+      app.globalData.userInfo.province = "";
+      app.globalData.userInfo.country = "";
+      // that.hasGetShareInfo(app.globalData.userInfo);
+      that.setData({
+        IsAccredit: false,
+      });
+    } else {
+      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.iv = res.iv;
+      app.globalData.userInfo.encryptedData = res.encryptedData;
+
+      app.globalData.userInfo.Code = code;
+      that.login(app.globalData.userInfo);
+      
+    }
+  },
+  login: function(param) {
+    var that = this;
+    server.getLocalHost(function() {
+      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) {
+
+      });
+    });
+  },
+
+  switchProgram: function(e) {
+    wx.navigateToMiniProgram({
+      appId: e.currentTarget.dataset.appid,
+      path: e.currentTarget.dataset.path,
+      extraData: {},
+      success(res) {
+        // 打开成功
+      }
     });
+  },
+  gotoFeedback: function() {
+    server.gotoFeedback();
+  },
+  updateProgram: function() {
+    const updateManager = wx.getUpdateManager();
 
+    updateManager.onCheckForUpdate(function(res) {
+      // 请求完新版本信息的回调
+      console.log(res.hasUpdate)
+    });
+
+    updateManager.onUpdateReady(function() {
+      wx.showModal({
+        title: '更新提示',
+        content: '新版本已经准备好，是否重启应用？',
+        success: function(res) {
+          if (res.confirm) {
+            // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+            updateManager.applyUpdate()
+          }
+        }
+      });
 
+    });
   },
-  onShareAppMessage: function () {
+  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/default.json

@@ -2,7 +2,7 @@
   "navigationBarBackgroundColor": "#B9DC5D",
   "navigationBarTextStyle": "black",
   "navigationBarTitleText": "数学计算题",
-  "backgroundColor": "#B9DC5D",
+  "backgroundColor": "#583027",
   "backgroundTextStyle": "light",
   "enablePullDownRefresh": false
 }

pages/main/default.wxml

@@ -16,10 +16,7 @@
         </view>
         <view class="panel001 FlexRow">
           <view class="panel0010 FlexRow">
-            <image class="homepage_question_illus_grade01" src="../../images/homepage_question_illus_grade01.png" />
-            <image class="homepage_question_illus_grade01" src="../../images/homepage_question_illus_grade02.png" />
-            <image class="homepage_question_illus_grade01" src="../../images/homepage_question_illus_grade03.png" />
-            <image class="homepage_question_illus_grade01" src="../../images/homepage_question_illus_grade04.png" />
+            <image wx:for="{{[1,2,3,4]}}" wx:key="index" bindtap='gotoList' data-id="{{item}}" class="homepage_question_illus_grade01" src="../../images/homepage_question_illus_grade0{{item}}.png" />
           </view>
         </view>
         <image class="universalpic_line_zigzag_brown_down" src="../../images/universalpic_line_zigzag_brown_down.png" />
@@ -40,12 +37,17 @@
               </view>
               <view class="line2 line"></view>
               <view class="panel002000 FlexRow">
-                <view class="btn">
+                <button wx:if="{{!IsAccredit}}" open-type="getUserInfo" class="btn" bindgetuserinfo="getBindGetUserInfo">
                   <view class="btn1">
                     登录
                   </view>
+                </button>
+                <view class="btn" wx:if="{{IsAccredit}}" >
+                  <view class="btn1">
+                    设置
+                  </view>
                 </view>
-                <view class="btn2 btn">
+                <view class="btn2 btn" bindtap='gotoAnswer'>
                   <view class="btn3 btn1">
                     答案
                   </view>
@@ -53,7 +55,8 @@
               </view>
             </view>
             <view class="panel00201 FlexRow">
-              <image class="universalpic_face_default_black_size01" src="../../images/universalpic_face_default_black_size01.png" />
+              <image wx:if="{{!IsAccredit}}" class="universalpic_face_default_black_size01" src="../../images/universalpic_face_default_black_size01.png" />
+              <image wx:if="{{IsAccredit}}" class="universalpic_face_default_black_size01" src="{{AvatarUrl}}" />
             </view>
           </view>
           <image class="homepage_clipboard_illus_clip" src="../../images/homepage_clipboard_illus_clip.png" />
@@ -69,17 +72,18 @@
               <view class="panel003000 FlexRow">
                 <view>帮助</view>
                 <view class="line"></view>
-                <view>反馈</view>
+                <view bindtap='gotoFeedback'>反馈</view>
                 <view class="line"></view>
                 <view>合作</view>
               </view>
             </view>
-            <view class="btn4 btn">
+            <button class="btn4 btn" open-type="share">
               <view class="btn5 btn1 FlexColumn">
                 <image class="universalpic_share_size01" src="../../images/universalpic_share_size01.png" />
                 <view>转发分享</view>
               </view>
-            </view>
+            </button>
+
           </view>
 
           <view class="panel0031 FlexColumn">
@@ -88,7 +92,7 @@
             </view>
             <view class="line"></view>
             <block wx:for="{{ProgramList}}" wx:key="index">
-              <view class="panel00311 FlexRow">
+              <view class="panel00311 FlexRow" bindtap='switchProgram' data-appid='{{item.appId}}' data-path='{{item.path}}'>
                 <view class="panel003110 FlexRow">
                   <image class="universalpic_product_kousuan_icon_size01" src="../../images/{{item.imageName}}.png" />
                   <view class="text">{{item.Name}}</view>

pages/main/default.wxss

@@ -184,6 +184,13 @@
   background-color: #035834;
   border-radius: 8rpx;
   position: relative;
+  padding-left: 0;
+  padding-right: 0;
+}
+
+
+.btn::after {
+  border: 0px;
 }
 
 .btn1 {
@@ -268,6 +275,8 @@
   width: 140rpx;
   height: 154rpx;
   border-radius: 20rpx;
+
+  
 }
 
 .btn5 {

pages/main/detail.js

@@ -1,29 +1,242 @@
 import common from '../../utils/util';
 import server from '../../utils/main';
 
-const app = getApp()
+const app = getApp();
+var times=1;
+
 Page({
   data: {
     version: app.globalData.version,
     FileUrl: app.globalData.fileUrl,
+    IsShowMenu:false,
+    filter:'horizontal',
+    PageNumber:1,
+    IsFinished: false,
   },
-  onLoad: function () {
+  onLoad: function(options) {
+    var id = options.id;
     this.setData({
       Containnerheight: server.getWindowHeight(),
+      ID:id,
+    });
+    var systemInfo = wx.getSystemInfoSync();
+    if (systemInfo.system && systemInfo.system.indexOf("Android") >= 0) {
+      times=2;
+    }
+    this.getDetail(id);
+    
+  },
+  getDetail: function(id) {
+    var item;
+    var data = wx.getStorageSync('QuestionTypeList');
+    for (var i = 0; i < data.length; i++) {
+      for (var k = 0; k < data[i].List.length; k++) {
+        if (id == data[i].List[k].ID) {
+          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("÷", " ÷ ");
+          break;
+        }
+      }
+    }
+    this.setData({
+      QuestionTypeItem: item,
+    });
+  },
+  gotoAnswer: function (e) {
+    wx.navigateTo({
+      url: '../main/answer',
+    });
+  },
+  getFinish:function(){
+    this.setData({
+      IsFinished: true,
+    });
+    this.getList(this.data.ID);
+  },
+
+  getList: function (id) {
+    var that = this;
+
+    server.getLocalHost(function () {
+      server.getData('GetQuestionTypesPrint?ID=' + id, function (data) {
+        //console.log("UserInfo:" + data);
+        if (data) {
+          that.saveImage(data);
+        }
+      });
+
+    });
+  },
+  saveImage: function (item) {
+    var that = this;
+    var ctx = wx.createCanvasContext("Canvas", that);
+    ctx.setFillStyle('white');
+    ctx.fillRect(0, 0, 1050, 1485);
+    ctx.setTextAlign('left');
+    ctx.setTextBaseline('top');
+    ctx.fillStyle = "#000000";
+    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("第 1 / 1 页", 60, 147);
+    ctx.fillText("答案检索号", 768, 60);
+
+    ctx.setTextAlign('right');
+    ctx.fillText("出题时间 " + item.CreateTime, 875, 94);
+    ctx.fillText("微信扫一扫 计时看答案", 875, 111);
+    ctx.fillText("《数学计算题》选题 打印 扫码 批改", 875, 137);
+    ctx.setFontSize(32);
+    ctx.fillText("99", 875, 50);
+    ctx.drawImage("../../images/answer.png", 890, 54, 100, 100);
+
+    ctx.setTextBaseline('middle');
+    var xStart = 60;
+    var yStart = 247;
+    var index = 0;
+    for (var i = 0; i < 3; i++) {
+      for (var j = 0; j < 20; j++) {
+        index++;
+        ctx.setTextAlign('left');
+        ctx.setFontSize(12);
+        ctx.fillText("(", xStart + i * 310, yStart + j * 59);
+        ctx.setTextAlign('center');
+        ctx.fillText(index, xStart + i * 310 + 13, yStart + j * 59);
+        ctx.setTextAlign('left');
+        ctx.fillText(")", xStart + i * 310 + 22, yStart + j * 59);
+
+        ctx.setFontSize(24);
+
+        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;
+        ctx.setTextAlign('center');
+        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);
+          } else {
+            var h = 0;
+            if (equation[n] == "_")
+              h = 8;
+            ctx.fillText(equation[n], num, yStart + j * 59 + h);
+          }
+        }
+      }
+    }
+
+
+    ctx.draw(true, function (n) {
+      var w=1050,h=1485;
+      
+
+      wx.canvasToTempFilePath({
+        x: 0,
+        y: 0,
+        width: w*times,
+        height: h*times,
+        //destWidth: w*times,
+        //destHeight: h*times,
+        canvasId: 'Canvas',
+        success: function (res2) {
+          console.log(res2.tempFilePath);
+          wx.previewImage({
+            current: res2.tempFilePath, // 当前显示图片的http链接
+            urls: [res2.tempFilePath] // 需要预览的图片http链接列表
+          });
+        }
+      })
     });
+
+    function getLength(str) {
+      switch (str) {
+        case "0":
+        case "1":
+        case "2":
+        case "3":
+        case "4":
+        case "5":
+        case "6":
+        case "7":
+        case "8":
+        case "9":
+          return 15;
+        case ".":
+          return 8;
+        default:
+          return 12;
+      }
+    }
+
   },
-  onShareAppMessage: function () {
+  changePageNumber: function (e) {
+    var id = Number(e.currentTarget.dataset.id);
+    this.data.PageNumber+=id;
+    if (this.data.PageNumber<1)
+      this.data.PageNumber=1;
+    else if (this.data.PageNumber > 5)
+      this.data.PageNumber = 5;
+
+    this.setData({
+      PageNumber: this.data.PageNumber,
+    });
+  },
+  menuClick: function (e) {
+    this.data.filter = e.currentTarget.dataset.id;
+    this.setData({
+      filter: this.data.filter,
+      IsShowMenu: false,
+    });
+  },
+  closeMenu: function () {
+    this.setData({
+      IsShowMenu: false,
+    });
+  },
+  openMenu: function () {
+    this.setData({
+      IsShowMenu: true,
+    });
+  },
+  onShareAppMessage: function() {
     return {
       title: '',
       path: 'pages/index/index',
-      success: function (res) {
-      },
-      fail: function (err) {
+      success: function(res) {},
+      fail: function(err) {
         console.log(err);
       },
-      complete: function (res) {
+      complete: function(res) {
         console.log(res);
       },
     }
   },
-})
+})

pages/main/detail.wxml

@@ -3,10 +3,10 @@
   <image class="questioncard_icon desaturate" src="{{FileUrl}}questioncard_icon_grade0606_size01.png" />
   <view class="Example">
     <view class="Example1">
-      34 * 50 + 27
+      {{QuestionTypeItem.Example[0]}}
     </view>
     <view class="Example1">
-      42 * 21 - 12
+      {{QuestionTypeItem.Example[1]}}
     </view>
   </view>
 
@@ -15,7 +15,7 @@
   <view class="line1 FlexColumn">
     <image class="makepaper_headline_illus_board FlexColumn" src="../../images/makepaper_headline_illus_board.png" />
     <view class="text">
-      四则运算a*b+c
+      {{QuestionTypeItem.Name}}
     </view>
   </view>
   <view class="line2"></view>
@@ -25,17 +25,29 @@
   <view class="line4"></view>
   <view class="panel1 FlexColumn">
     <view class="text1">算式类型</view>
-    <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>
 
-    <image class="universalpic_indicator_cell_size01" src="../../images/universalpic_indicator_cell_size01.png" />
-    <view class="panel10 FlexRow">
-      <view class="btnSelect">横式+竖式</view>
-      <view class="btnAddSub"></view>
-    </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="{{filter=='horizontal'}}">横式</block>
+          <block wx:if="{{filter=='vertical'}}">竖式</block>
+          <block wx:if="{{filter=='all'}}">横式+竖式</block>
+
+        </view>
+        <view class="btnAddSub"></view>
+      </view>
+    </block>
 
     <image class="universalpic_line_dashed_size01" src="../../images/universalpic_line_dashed_size01.png" />
 
@@ -43,56 +55,87 @@
 
     <image class="universalpic_value_cell_size01" src="../../images/universalpic_value_cell_size01.png" />
     <view class="panel10 FlexRow">
-      <view class="btnAddSub"></view>
-      <view class="Number">8</view>
-      <view class="btnAddSub"></view>
+      <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="text5">每份含 9道题目</view>
 
     <image class="universalpic_line_dashed_size01" src="../../images/universalpic_line_dashed_size01.png" />
 
-    <view class="btn">
+    <view class="btn" bindtap='getFinish'>
       <view class="btn1">
         出题
       </view>
     </view>
   </view>
   <image class="universalpic_line_zigzag_black_down" src="../../images/universalpic_line_zigzag_black_down.png" />
-  <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">完成了</view>
-    <view class="text7">题目以图片格式保存到手机相册，共 6张</view>
-    <view class="panel21 FlexRow">
-      <view class="panel210"></view>
-      <view class="panel210"></view>
-      <view class="panel210"></view>
-      <view class="panel210"></view>
-      <view class="panel210"></view>
-      <view class="panel210"></view>
-    </view>
+  <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">完成了</view>
+      <view class="text7">题目以图片格式保存到手机相册，共 6张</view>
+      <view class="panel21 FlexRow">
+        <view class="panel210"></view>
+        <view class="panel210"></view>
+        <view class="panel210"></view>
+        <view class="panel210"></view>
+        <view class="panel210"></view>
+        <view class="panel210"></view>
+      </view>
 
-    <image class="universalpic_line_dashed_size01" src="../../images/universalpic_line_dashed_size01.png" />
-    <view class="text8">然后...</view>
-    <view class="panel22 FlexRow">
-      <view class="panel220 FlexColumn">
-        <view class="panel2200 FlexColumn">
-          <image class="universalpic_print_gray_size01" src="../../images/universalpic_print_gray_size01.png" />
+      <image class="universalpic_line_dashed_size01" src="../../images/universalpic_line_dashed_size01.png" />
+      <view class="text8">然后...</view>
+      <view class="panel22 FlexRow">
+        <view class="panel220 FlexColumn">
+          <view class="panel2200 FlexColumn">
+            <image class="universalpic_print_gray_size01" src="../../images/universalpic_print_gray_size01.png" />
+          </view>
+          <text class="text9">请到手机相册打印图片或转存到PC</text>
         </view>
-        <text class="text9">请到手机相册打印图片或转存到PC</text>
-      </view>
-      <view class="panel220 FlexColumn">
-        <view class="panel2200 FlexColumn">
-          <image class="universalpic_write_gray_size01" src="../../images/universalpic_write_gray_size01.png" />
+        <view class="panel220 FlexColumn">
+          <view class="panel2200 FlexColumn">
+            <image class="universalpic_write_gray_size01" src="../../images/universalpic_write_gray_size01.png" />
+          </view>
+          <text class="text9">题目做完后，在首页的批改栏目中看查看答案</text>
+          <text class="text10" bindtap='gotoAnswer'>看答案</text>
         </view>
-        <text class="text9">题目做完后，在首页的批改栏目中看查看答案</text>
-        <text class="text10">看答案</text>
       </view>
     </view>
-  </view>
+  </block>
   <view class="line5"></view>
-</view>
+
+  <view class="menu FlexColumn" wx:if="{{IsShowMenu}}">
+    <view class="text1">算式类型</view>
+    <view class="panel FlexRow" bindtap='menuClick' data-id="horizontal">
+      <view>横式</view>
+      <image wx:if="{{filter=='horizontal'}}" class="universalpic_select_on_black" src="../../images/universalpic_select_on_black.png" />
+
+    </view>
+    <view class="line"></view>
+    <view class="panel FlexRow" bindtap='menuClick' data-id="vertical">
+      <view>竖式</view>
+      <image wx:if="{{filter=='vertical'}}" class="universalpic_select_on_black" src="../../images/universalpic_select_on_black.png" />
+
+    </view>
+    <view class="line"></view>
+    <view class="panel FlexRow" bindtap='menuClick' data-id="all">
+      <view>横式+竖式</view>
+      <image wx:if="{{filter=='all'}}" class="universalpic_select_on_black" src="../../images/universalpic_select_on_black.png" />
+
+    </view>
+    <view class="line"></view>
+    <view class="line2"></view>
+    <view class="line"></view>
+    <view class="panel FlexRow" bindtap='closeMenu'>
+      <view>取消</view>
+    </view>
+
+  </view>
+
+</view>
+<canvas class='Canvas' canvas-id="Canvas"></canvas>

pages/main/detail.wxss

@@ -1,6 +1,7 @@
 .container {
   background-color: #4F4745;
   justify-content: flex-start;
+  width: 100%; 
 }
 
 .makepaper_headline_illus_lab{
@@ -98,6 +99,10 @@
   margin-top: 30rpx;
   color:#d2d2d2;
 }
+.panel1 .text2_1{
+  margin-top: 30rpx;
+  height:100rpx;
+}
 .panel1 .text3{
   font-size:24rpx;
   margin-top: 10rpx;
@@ -305,3 +310,55 @@
 }
 
 
+.menu {
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  background-color: #d2d2d2;
+  z-index: 30;
+}
+
+.menu .text1 {
+  font-size: 24rpx;
+  margin: 30rpx;
+}
+
+.menu .panel {
+  font-size: 36rpx;
+  height: 111rpx;
+  width: 100%;
+  background-color: #fff;
+  position: relative;
+}
+
+.menu .line {
+  height: 2rpx;
+  width: 100%;
+  background-color: #e3e3e3;
+}
+
+.menu .line2 {
+  height: 20rpx;
+  width: 100%;
+  background-color: #d2d2d2;
+}
+
+.universalpic_select_on_black {
+  height: 30rpx;
+  width: 30rpx;
+  position: absolute;
+  left:40rpx;
+  top:40rpx;
+}
+
+
+.Canvas{
+  width: 1050px; 
+  height: 1485px;
+  position: fixed;
+  left:760rpx;
+  top:0rpx;
+}
+
+
+

pages/main/item.js

@@ -0,0 +1,65 @@
+import common from '../../utils/util';
+import server from '../../utils/main';
+
+const app = getApp()
+Page({
+  data: {
+    version: app.globalData.version,
+    FileUrl: app.globalData.fileUrl,
+  },
+  onLoad: function() {
+    this.setData({
+      Containnerheight: server.getWindowHeight(),
+      TestDivEquation1: [{ Type: 'number', Array: ['', '', '', '1', '2', '3'] },
+      {
+        Type: 'number',
+        Array: ['×', '', '', '', '4', '5', '0', '0']
+      },
+      {
+        Type: 'line',
+        Array: ['1', '1', '1', '1', '1', '1', '1', '1']
+      },
+      { Type: 'number', Array: ['', '', '', '6', '1', '5'] },
+      { Type: 'number', Array: ['', '', '4', '9', '2'] },
+      {
+        Type: 'line',
+        Array: ['1', '1', '1', '1', '1', '1', '1', '1']
+      },
+      {
+        Type: 'number',
+        Array: ['', '', '5', '5', '3', '5', '0', '0']
+      }],
+      TestDivEquation2: [{
+        Type: 'number',
+        Array: ['', '', '', '', '0', '.', '6', '2', '5']
+      },
+      {
+        Type: 'line',
+        Array: ['', '', '0.5', '1', '1', '1', '1', '1', '1']
+      },
+      { Type: 'number', Array: ['5', '6', '√', '3', '5', '0'] },
+      { Type: 'number', Array: ['', '', '', '3', '3', '6'] },
+      { Type: 'line', Array: ['', '', '', '1', '1', '1'] },
+      { Type: 'number', Array: ['', '', '', '', '1', '4', '0'] },
+      { Type: 'number', Array: ['', '', '', '', '1', '1', '2'] },
+      { Type: 'line', Array: ['', '', '', '', '1', '1', '1'] },
+      { Type: 'number', Array: ['', '', '', '', '', '2', '8', '0'] },
+      { Type: 'number', Array: ['', '', '', '', '', '2', '8', '0'] },
+      { Type: 'line', Array: ['', '', '', '', '', '1', '1', '1'] },
+      { Type: 'number', Array: ['', '', '', '', '', '', '', '0'] }]
+    });
+  },
+  onShareAppMessage: function() {
+    return {
+      title: '',
+      path: 'pages/index/index',
+      success: function(res) {},
+      fail: function(err) {
+        console.log(err);
+      },
+      complete: function(res) {
+        console.log(res);
+      },
+    }
+  },
+})

pages/main/item.json

@@ -0,0 +1,8 @@
+{
+  "navigationBarBackgroundColor": "#fff",
+  "navigationBarTextStyle": "black",
+  "navigationBarTitleText": "四则运算",
+  "backgroundColor": "#fff",
+  "backgroundTextStyle": "light",
+  "enablePullDownRefresh": false
+}

pages/main/item.wxml

@@ -0,0 +1,116 @@
+<view class="container FlexColumn" style="min-height:{{Containnerheight}}rpx;">
+  <view class="panel0 FlexRow">
+    <view class="panelLeft">快翻</view>
+    <view class="panelRight FlexRow">
+      <view class="btn1 btn">1</view>
+      <view class="btn">4</view>
+      <view class="btn">7</view>
+    </view>
+  </view>
+  <view class="panel1 panel0 FlexRow">
+    <view class="panelLeft">听答案</view>
+    <view class="panelRight FlexRow">
+
+      <view class="btn4 btn2">
+        <view class="btn3 FlexRow">
+          <image class="universalpic_rewind_white_size01" src="../../images/universalpic_rewind_white_size01.png" />
+        </view>
+      </view>
+      <view class="btn2">
+        <view class="btn3 FlexRow">
+          <image class="universalpic_play_white_size01" src="../../images/universalpic_play_white_size01.png" />
+        </view>
+      </view>
+    </view>
+  </view>
+  <view class="panel2 panel1 panel0 FlexRow">
+    <view class="panelLeft">答案</view>
+    <view>
+    </view>
+  </view>
+
+  <view class="panelRowTop panel0 FlexRow">
+    <view class="panelLeft1 panelLeft">第一列</view>
+    <view>
+    </view>
+  </view>
+  <view class="panelRowBody panel0 FlexRow">
+    <view class="panelLeft FlexRow">
+      <view class="number">1</view>
+      <view class="answer">7</view>
+    </view>
+    <view class="panelRight FlexRow">
+      <view class="equation">1 + 6 =</view>
+      <image class="formula_btn_show" src="../../images/formula_btn_show.png" />
+    </view>
+  </view>
+  <view class="line FlexRow">
+    <view class="line1"></view>
+  </view>
+  <view class="panelRowBody panel0 FlexRow">
+    <view class="panelLeft FlexRow">
+      <view class="number">2</view>
+      <view class="answer">28</view>
+    </view>
+    <view class="panelRight FlexRow">
+      <view class="equation">159 -131 =</view>
+      <image class="formula_btn_show" src="../../images/formula_btn_show.png" />
+    </view>
+  </view>
+  <view class="line FlexRow">
+    <view class="line1"></view>
+  </view>
+  <view class="panelRowBody panel0 FlexRow">
+    <view class="panelLeft FlexRow">
+      <view class="number">3</view>
+      <view class="answer">553500</view>
+    </view>
+    <view class="panelRight FlexRow">
+      <view class="equation">123 × 4500 =</view>
+      <image class="formula_btn_show" src="../../images/formula_btn_hide.png" />
+    </view>
+  </view>
+
+  <view class="panelRowBody panel0 FlexColumn">
+    <view class="panelAnswer FlexColumn">
+      <view class="panelAnswerRow FlexRow" wx:for='{{TestDivEquation1}}' wx:key="index">
+        <view class="panelAnswerCol FlexRow" wx:for='{{item.Array}}' wx:key="i" wx:for-item="col" wx:for-index="i">
+          <view class="colNumber" wx:if="{{item.Type=='number' && col!='√' && col!='.'}}">{{col}}</view>
+          <view class="colDot" wx:if="{{item.Type=='number' && col=='.'}}">{{col}}</view>
+          <image wx:if="{{item.Type=='number' && col=='√'}}" class="formula_division_size01" src="../../images/formula_division_size01.png" />
+          <view class="colLine" wx:if="{{item.Type=='line' && col=='1'}}"></view>
+          <view class="colLineHalf" wx:if="{{item.Type=='line' && col=='0.5'}}"></view>
+          <view class="colLineNull" wx:if="{{item.Type=='line' && col==''}}"></view>
+        </view>
+      </view>
+    </view>
+  </view>
+  <view class="line FlexRow">
+    <view class="line1"></view>
+  </view>
+  <view class="panelRowBody panel0 FlexRow">
+    <view class="panelLeft FlexRow">
+      <view class="number">4</view>
+      <view class="answer">0.625</view>
+    </view>
+    <view class="panelRight FlexRow">
+      <view class="equation">35 ÷ 56 =</view>
+      <image class="formula_btn_show" src="../../images/formula_btn_hide.png" />
+    </view>
+  </view>
+
+  <view class="panelRowBody panel0 FlexColumn">
+    <view class="panelAnswer FlexColumn">
+      <view class="panelAnswerRow FlexRow" wx:for='{{TestDivEquation2}}' wx:key="index">
+        <view class="panelAnswerCol FlexRow" wx:for='{{item.Array}}' wx:key="i" wx:for-item="col" wx:for-index="i">
+          <view class="colNumber" wx:if="{{item.Type=='number' && col!='√' && col!='.'}}">{{col}}</view>
+          <view class="colDot" wx:if="{{item.Type=='number' && col=='.'}}">{{col}}</view>
+          <image wx:if="{{item.Type=='number' && col=='√'}}" class="formula_division_size01" src="../../images/formula_division_size01.png" />
+          <view class="colLine" wx:if="{{item.Type=='line' && col=='1'}}"></view>
+          <view class="colLineHalf" wx:if="{{item.Type=='line' && col=='0.5'}}"></view>
+          <view class="colLineNull" wx:if="{{item.Type=='line' && col==''}}"></view>
+        </view>
+      </view>
+    </view>
+  </view>
+</view>

pages/main/item.wxss

@@ -0,0 +1,185 @@
+.container {
+  background-color: #F0F0F0;
+  justify-content: flex-start;
+}
+
+.panel0 {
+  background-color: #fff;
+  width:100%;
+  min-height:110rpx;
+  justify-content: space-between;
+}
+
+.panelLeft{
+  margin-left: 30rpx;
+  font-size: 28rpx;
+}
+
+.panelRight{
+  margin-right: 30rpx;
+  font-size: 24rpx;
+  font-family: 'Roboto-Bold';
+}
+.panelRight .btn{
+  margin-left: 30rpx;
+  width:60rpx;
+  height:50rpx;
+  text-align: center;
+  line-height: 50rpx;
+}
+.panelRight .btn1{
+  border-radius: 4rpx;
+  color:#fff;
+  background-color: #2E2E2E;
+}
+
+.panel1 {
+  background-color: #F8F8F8;
+  height:120rpx;
+}
+
+
+.panelRight .btn2 {
+  width: 200rpx;
+  height: 70rpx;
+  background-color: #146392;
+  border-radius: 8rpx;
+  position: relative;
+  margin-left: 30rpx;
+}
+
+.panelRight .btn3 {
+  width: 100%;
+  height: 60rpx;
+  background-color: #169DED;
+  border-radius: 8rpx;
+}
+
+.panelRight .btn4 {
+  width: 130rpx;
+}
+
+.universalpic_play_white_size01{
+  width: 25rpx;
+  height: 30rpx;
+}
+
+.universalpic_rewind_white_size01{
+  width: 50rpx;
+  height: 30rpx;
+}
+
+.panel2 {
+  background-color: #F0F0F0;
+}
+
+.panelRowTop{
+  background-color: #D2D2D2;
+  height:50rpx;
+}
+
+.panelRowTop .panelLeft1{
+  font-size: 22rpx;
+}
+
+.panelRowBody{
+  background-color: #F0F0F0;
+}
+
+.panelRowBody .number{
+  text-align: center;
+  width:46rpx;
+  height:36rpx;
+  line-height: 36rpx;
+  border-radius: 4rpx;
+  color:#fff;
+  background-color: #2E2E2E;
+  font-family: 'Roboto-Bold';
+  font-size:22rpx;
+}
+.panelRowBody .answer{
+  font-size:48rpx;
+  margin-left: 40rpx;
+  font-family: 'Roboto-Regular';
+}
+
+.panelRowBody .equation{
+  font-size:26rpx;
+  margin-right: 20rpx;
+  color:#8C8C8C;
+  font-family: 'Roboto-Regular';
+}
+
+
+.panelRowBody{
+  background-color: #F0F0F0;
+}
+
+.line{
+  width:100%;
+  height:1rpx;
+  justify-content: flex-end;
+}
+
+.line .line1{
+  width:720rpx;
+  height:1rpx;
+  background-color: #D2D2D2;
+}
+
+.formula_btn_show{
+  width: 30rpx;
+  height: 34rpx;
+}
+
+.panelAnswer{
+  margin: 53rpx 0 41rpx 0;
+  align-items: flex-start;
+}
+
+.panelAnswer .panelAnswerRow{
+}
+
+.panelAnswer .panelAnswerCol{
+  justify-content: flex-start;
+}
+
+.formula_division_size01{
+  width:27rpx;
+  height:77rpx;
+  margin: -20rpx 25rpx 0 5rpx;
+}
+
+.panelAnswer .colNumber{
+  font-size:48rpx;
+  margin: 10rpx 15rpx;
+  font-family: 'Roboto-Regular';
+  width:27rpx;
+  height:57rpx;
+  text-align: center;
+}
+.panelAnswer .colDot{
+  font-size:48rpx;
+  margin: 10rpx -8rpx 0 -5rpx;
+  font-family: 'Roboto-Regular';
+  width:13rpx;
+  height:57rpx;
+  text-align: center;
+}
+.panelAnswer .colLine{
+  height: 2rpx;
+  background-color: #000;
+  width:55rpx;
+  margin: 10rpx 0rpx;
+}
+.panelAnswer .colLineNull{
+  width:27rpx;
+  height:2rpx;
+  margin: 10rpx 15rpx;
+}
+.panelAnswer .colLineHalf{
+  width:14rpx;
+  height:2rpx;
+  margin: 0rpx 0 0 28rpx;
+  background-color: #000;
+}

pages/main/list.js

@@ -1,29 +1,122 @@
 import common from '../../utils/util';
 import server from '../../utils/main';
 
-const app = getApp()
+const app = getApp();
+var categoryID = "";
+var categoryName = "";
+var categoryNum = "";
+var SelectID = 0;
+
 Page({
   data: {
     version: app.globalData.version,
     FileUrl: app.globalData.fileUrl,
+    filter:'all',
+    IsShowMenu:false,
+    CategoryID:1,
   },
-  onLoad: function () {
+  onLoad: function(options) {
+    categoryID = options.id;
+    categoryName = options.name;
+    categoryNum = options.num;
+    //console.log(category);
+    this.getList();
     this.setData({
+      CategoryNum:categoryNum,
+      CategoryID: categoryID,
       Containnerheight: server.getWindowHeight(),
     });
   },
-  onShareAppMessage: function () {
+  getList: function() {
+    this.buildList();
+    wx.setNavigationBarTitle({
+      title: categoryName + " 题卡仓库",
+    });
+  },
+  gotoDetail:function(e){
+    SelectID = e.currentTarget.dataset.id;
+    var arr = wx.getStorageSync('SelectIDArray');
+    if (!arr)
+      arr=[];
+    for(var i=0;i<arr.length;i++){
+      if (arr[i] == SelectID){
+        arr.splice(i,0);
+        break;
+      }
+    }
+
+    arr.push(SelectID);
+    wx.setStorageSync('SelectIDArray', arr);
+    this.buildList();
+
+    wx.navigateTo({
+      url: '../main/detail?id=' + SelectID,
+    });
+  },
+  buildList:function(){
+    var arrID = categoryID.split(",");
+    var list = [];
+
+    var data = wx.getStorageSync('QuestionTypeList');
+    var arr = wx.getStorageSync('SelectIDArray');
+    for (var i = 0; i < data.length; i++) {
+      for (var j = 0; j < arrID.length; j++) {
+        if (data[i].ID == arrID[j]) {
+          for (var k = 0; k < data[i].List.length; k++) {
+            data[i].List[k].CategoryLevel = data[i].Name;
+
+            
+            for (var n = 0; n < arr.length; n++) {
+              //data[i].List[k].SelectItem = "";
+              if (arr[n] == data[i].List[k].ID){
+                data[i].List[k].SelectItem ="boxLeft";
+              }
+            }
+
+            data[i].List[k].Select = false;
+            if (SelectID == data[i].List[k].ID)
+              data[i].List[k].Select = true;
+
+            if (this.data.filter == "vertical"){
+              if (data[i].List[k].QuestionNumber3>0)
+                list.push(data[i].List[k]);
+            }
+            else{
+                list.push(data[i].List[k]);
+            }
+          }
+          break;
+        }
+      }
+    }
+
+    this.setData({
+      QuestionTypeList: list,
+    });
+  },
+  menuClick:function(e){
+    this.data.filter = e.currentTarget.dataset.id;
+    this.setData({
+      filter: this.data.filter,
+      IsShowMenu: false,
+    });
+    this.buildList();
+  },
+  closeMenu: function () {
+    this.setData({
+      IsShowMenu: false,
+    });
+  },
+  openMenu: function () {
+    this.setData({
+      IsShowMenu: true,
+    });
+  },
+  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/list.wxml

@@ -4,64 +4,41 @@
   <view class="line2"></view>
   <view class="line3"></view>
   <image class="questioncollection_headline_root" src="../../images/questioncollection_headline_root.png" />
-  <image class="questioncollection_headline_light" src="../../images/questioncollection_headline_light.png" />
-
-  <image class="questioncollection_headline_shelf_illus_grade01" src="../../images/questioncollection_headline_shelf_illus_grade01.png" /> 
-  
-  <image class="questioncollection_headline_plate" src="../../images/questioncollection_headline_plate.png" /> 
   
+  <image class="questioncollection_headline_light" src="../../images/questioncollection_headline_light.png" bindtap='openMenu'/>
+  <image class="questioncollection_headline_shelf_illus_grade0{{CategoryNum}}" src="../../images/questioncollection_headline_shelf_illus_grade0{{CategoryNum}}.png"  bindtap='openMenu' />
+  <image class="questioncollection_headline_plate" src="../../images/questioncollection_headline_plate.png" wx:if="{{filter=='vertical'}}"/>
 
-  
-  <image class="questioncollection_shelf_board" src="../../images/questioncollection_shelf_board.png" />
-  <view class="boxLeft questioncard FlexRow">
-    <image class=" questioncollection_shelf_box" src="../../images/questioncollection_shelf_box.png" />
-    <image class="questioncard_icon" src="{{FileUrl}}questioncard_icon_grade0602_size01.png" />
-    <view class="title FlexColumn">
-      <view class="title1">
-        四则运算a+b+c
-      </view>
-      <view class="title2 FlexRow">
-        <view class="title20 FlexRow">
-          四则运算
+
+  <block wx:for="{{QuestionTypeList}}" wx:key="index">
+    <image class="questioncollection_shelf_board" src="../../images/questioncollection_shelf_board.png" bindtap='gotoDetail' data-id="{{item.ID}}" />
+    <view class="{{item.SelectItem}} questioncard FlexRow" bindtap='gotoDetail' data-id="{{item.ID}}">
+      <image class=" questioncollection_shelf_box" src="../../images/questioncollection_shelf_box.png" />
+      <image class="questioncard_icon" src="{{FileUrl}}questioncard_icon_grade0602_size01.png" />
+      <view class="title FlexColumn">
+        <view class="title1">
+          {{item.Name}}
         </view>
-        <view class="line"></view>
-        <view class="title21 FlexRow">
-          简单
+        <view class="title2 FlexRow">
+          <view class="title20 FlexRow">
+            {{item.CategoryLevel}}
+          </view>
+          <view class="line"></view>
+          <view class="title21 FlexRow">
+            {{item.DifficultyName}}
+          </view>
         </view>
       </view>
-    </view>
-    <image class="questioncollection_shelf_box_tape" src="../../images/questioncollection_shelf_box_tape.png" />
-    <view class="title3">有竖式</view>
+      <image wx:if="{{item.SelectItem!='boxLeft'}}" class="questioncollection_shelf_box_tape" src="../../images/questioncollection_shelf_box_tape.png" />
+      <view class="title3" wx:if="{{item.QuestionNumber3>0}}">有竖式</view>
 
-    <image class="questioncollection_shelf_here" src="../../images/questioncollection_shelf_here.png" />
-    
-  </view>
+      <image wx:if="{{item.Select}}" class="questioncollection_shelf_here" src="../../images/questioncollection_shelf_here.png" />
 
-  <image class="questioncollection_shelf_board" src="../../images/questioncollection_shelf_board.png" />
-  <view class="boxRight questioncard FlexRow">
-    <image class=" questioncollection_shelf_box" src="../../images/questioncollection_shelf_box.png" />
-    <image class="questioncard_icon" src="{{FileUrl}}questioncard_icon_grade0602_size01.png" />
-    <view class="title FlexColumn">
-      <view class="title1">
-        四则运算a+b+c
-      </view>
-      <view class="title2 FlexRow">
-        <view class="title20 FlexRow">
-          四则运算
-        </view>
-        <view class="line"></view>
-        <view class="title21 FlexRow">
-          简单
-        </view>
-      </view>
     </view>
-    <image class="questioncollection_shelf_box_tape" src="../../images/questioncollection_shelf_box_tape.png" />
-    <!-- <view class="title3">有竖式</view> -->
-    <!-- <image class="questioncollection_shelf_here" src="../../images/questioncollection_shelf_here.png" /> -->
-    
-  </view>
 
-  <image class="questioncollection_shelf_board" src="../../images/questioncollection_shelf_board.png" />
+  </block>
+
+  <!-- <image class="questioncollection_shelf_board" src="../../images/questioncollection_shelf_board.png" />
   <view class="boxRight questioncard FlexRow desaturate">
     <image class=" questioncollection_shelf_box" src="../../images/questioncollection_shelf_box.png" />
     <image class="questioncard_icon" src="{{FileUrl}}questioncard_icon_grade0602_size01.png" />
@@ -80,25 +57,45 @@
       </view>
     </view>
     <image class="questioncollection_shelf_box_tape" src="../../images/questioncollection_shelf_box_tape.png" />
-    <!-- <view class="title3">有竖式</view> -->
-    <!-- <image class="questioncollection_shelf_here" src="../../images/questioncollection_shelf_here.png" /> -->
     
     <image class="universalpic_lock_locked_black_size01" src="../../images/universalpic_lock_locked_black_size01.png" />
 
-  </view>
+  </view> -->
 
   <image class="questioncollection_shelf_footer_illus" src="../../images/questioncollection_shelf_footer_illus.png" />
   <view class="line4"></view>
 
   <view class="line5"></view>
 
-  <view class="lineLeft lineLong FlexRow">
+  <view class="lineLeft lineLong FlexRow" style="height:{{ (540+QuestionTypeList.length*190) }}rpx;">
     <view class="lineLong1">
     </view>
   </view>
-  <view class="lineRight lineLong FlexRow">
+  <view class="lineRight lineLong FlexRow" style="height:{{ (540+QuestionTypeList.length*190) }}rpx;">
     <view class="lineLong2">
     </view>
   </view>
 
+  <view class="menu FlexColumn" wx:if="{{IsShowMenu}}">
+    <view class="text1">筛选题卡</view>
+    <view class="panel FlexRow" bindtap='menuClick' data-id="all">
+      <view>全部</view>
+      <image wx:if="{{filter=='all'}}" class="universalpic_select_on_black" src="../../images/universalpic_select_on_black.png" />
+
+    </view>
+    <view class="line"></view>
+    <view class="panel FlexRow" bindtap='menuClick' data-id="vertical">
+      <view>仅竖式</view>
+      <image wx:if="{{filter=='vertical'}}" class="universalpic_select_on_black" src="../../images/universalpic_select_on_black.png" />
+
+    </view>
+    <view class="line"></view>
+    <view class="line2"></view>
+    <view class="line"></view>
+    <view class="panel FlexRow" bindtap='closeMenu'>
+      <view>取消</view>
+    </view>
+
+  </view>
+
 </view>

pages/main/list.wxss

@@ -48,13 +48,28 @@
   height: 160rpx;
   margin-top: 10rpx;
 }
+.questioncollection_headline_shelf_illus_grade02 {
+  width: 545rpx;
+  height: 140rpx;
+  margin-top: 10rpx;
+}
+.questioncollection_headline_shelf_illus_grade03 {
+  width: 580rpx;
+  height: 140rpx;
+  margin-top: 10rpx;
+}
+.questioncollection_headline_shelf_illus_grade04 {
+  width: 529rpx;
+  height: 130rpx;
+  margin-top: 10rpx;
+}
 
-.questioncollection_headline_plate{
+.questioncollection_headline_plate {
   width: 112rpx;
   height: 70rpx;
   position: absolute;
-  top:240rpx;
-  left:60rpx;
+  top: 240rpx;
+  left: 60rpx;
 }
 
 .questioncollection_shelf_board {
@@ -141,12 +156,11 @@
   top: 70rpx;
 }
 
-
-.questioncollection_shelf_here{
+.questioncollection_shelf_here {
   width: 130rpx;
   height: 60rpx;
   position: absolute;
-  left:-16rpx;
+  left: -16rpx;
   bottom: 0rpx;
   z-index: 20;
 }
@@ -158,14 +172,13 @@
   right: 34rpx;
 }
 
-.questioncollection_shelf_footer_illus{
+.questioncollection_shelf_footer_illus {
   width: 630rpx;
   height: 318rpx;
   margin-top: 0rpx;
   z-index: 10;
 }
 
-
 .line4 {
   width: 100%;
   height: 100rpx;
@@ -176,39 +189,83 @@
 .line5 {
   width: 100%;
   height: 50rpx;
-  background-color: #514A47;
+  background-color: #514a47;
 }
 
 .lineLong {
   width: 30rpx;
-  height: 1100rpx;
+  height: 540rpx;
   border-radius: 8rpx;
-  background-color: #4D4D4D;
+  background-color: #4d4d4d;
 }
 
 .lineLeft {
   position: absolute;
-  top:168rpx;
-  left:30rpx;
+  top: 168rpx;
+  left: 30rpx;
   justify-content: flex-end;
 }
+
 .lineRight {
   position: absolute;
-  top:168rpx;
-  right:30rpx;
+  top: 168rpx;
+  right: 30rpx;
   justify-content: flex-start;
 }
-.lineLong1{
-  background-color: #6B6B6B;
-  height:100%;
-  width:10rpx;
+
+.lineLong1 {
+  background-color: #6b6b6b;
+  height: 100%;
+  width: 10rpx;
   border-top-right-radius: 8rpx;
   border-bottom-right-radius: 8rpx;
 }
-.lineLong2{
-  background-color: #6B6B6B;
-  height:100%;
-  width:10rpx;
+
+.lineLong2 {
+  background-color: #6b6b6b;
+  height: 100%;
+  width: 10rpx;
   border-top-left-radius: 8rpx;
   border-bottom-left-radius: 8rpx;
-}
+}
+
+.menu {
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  background-color: #d2d2d2;
+  z-index: 30;
+}
+
+.menu .text1 {
+  font-size: 24rpx;
+  margin: 30rpx;
+}
+
+.menu .panel {
+  font-size: 36rpx;
+  height: 111rpx;
+  width: 100%;
+  background-color: #fff;
+  position: relative;
+}
+
+.menu .line {
+  height: 2rpx;
+  width: 100%;
+  background-color: #e3e3e3;
+}
+
+.menu .line2 {
+  height: 20rpx;
+  width: 100%;
+  background-color: #d2d2d2;
+}
+
+.universalpic_select_on_black {
+  height: 30rpx;
+  width: 30rpx;
+  position: absolute;
+  left:40rpx;
+  top:40rpx;
+}

pages/main/print.js

@@ -0,0 +1,164 @@
+import common from '../../utils/util';
+import server from '../../utils/main';
+
+const app = getApp()
+Page({
+  data: {
+    Left: 0,
+  },
+  onLoad: function(options) {
+    var id = options.id;
+    id = 179;
+    this.getList(id);
+  },
+  getList: function(id) {
+    var that = this;
+
+    server.getLocalHost(function() {
+      server.getData('GetQuestionTypesPrint?ID=' + id, function(data) {
+        //console.log("UserInfo:" + data);
+        if (data) {
+          that.saveImage(data);
+        }
+      });
+
+    });
+  },
+  saveImage: function(item) {
+    var that = this;
+    var ctx = wx.createCanvasContext("Canvas", that);
+    ctx.setFillStyle('white');
+    ctx.fillRect(0, 0, 1050, 1485);
+    ctx.setTextAlign('left');
+    ctx.setTextBaseline('top');
+    ctx.fillStyle = "#000000";
+    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("第 1 / 1 页", 60, 147);
+    ctx.fillText("答案检索号", 768, 60);
+
+    ctx.setTextAlign('right');
+    ctx.fillText("出题时间 " + item.CreateTime, 875, 94);
+    ctx.fillText("微信扫一扫 计时看答案", 875, 111);
+    ctx.fillText("《数学计算题》选题 打印 扫码 批改", 875, 137);
+    ctx.setFontSize(32);
+    ctx.fillText("99", 875, 50);
+    ctx.drawImage("../../images/answer.png", 890, 54, 100, 100);
+
+    ctx.setTextBaseline('middle');
+    var xStart = 60;
+    var yStart = 247;
+    var index = 0;
+    for (var i = 0; i < 3; i++) {
+      for (var j = 0; j < 20; j++) {
+        index++;
+        ctx.setTextAlign('left');
+        ctx.setFontSize(12);
+        ctx.fillText("(", xStart + i * 310, yStart + j * 59);
+        ctx.setTextAlign('center');
+        ctx.fillText(index, xStart + i * 310 + 13, yStart + j * 59);
+        ctx.setTextAlign('left');
+        ctx.fillText(")", xStart + i * 310 + 22, yStart + j * 59);
+
+        ctx.setFontSize(24);
+
+        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;
+        ctx.setTextAlign('center');
+        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);
+          } else {
+            var h=0;
+            if (equation[n]=="_")
+              h=8;
+            ctx.fillText(equation[n], num, yStart + j * 59+h);
+          }
+        }
+      }
+    }
+
+
+    ctx.draw(true, function(n) {
+      wx.canvasToTempFilePath({
+        x: 0,
+        y: 0,
+        width: 2100,
+        height: 2970,
+        destWidth: 2100,
+        destHeight: 2970,
+        canvasId: 'Canvas',
+        success: function (res2) {
+          console.log(res2.tempFilePath);
+          wx.previewImage({
+            current: res2.tempFilePath, // 当前显示图片的http链接
+            urls: [res2.tempFilePath] // 需要预览的图片http链接列表
+          });
+        }
+      })
+    });
+
+    function getLength(str) {
+      switch (str) {
+        case "0":
+        case "1":
+        case "2":
+        case "3":
+        case "4":
+        case "5":
+        case "6":
+        case "7":
+        case "8":
+        case "9":
+          return 15;
+        case ".":
+          return 8;
+        default:
+          return 12;
+      }
+    }
+
+  },
+  moveLeft: function() {
+    this.setData({
+      Left: this.data.Left + 375,
+    });
+  },
+  moveRight: function() {
+    this.setData({
+      Left: this.data.Left - 375,
+    });
+  }
+});
+

pages/main/print.wxml

@@ -0,0 +1,6 @@
+<view class="panel">
+<canvas class='Canvas' style='left:{{Left}}rpx;' canvas-id="Canvas"></canvas>
+<view class="btnLeft" bindtap='moveLeft'>左</view>
+<view class="btnRight" bindtap='moveRight'>右</view>
+
+</view>

pages/main/print.wxss

@@ -0,0 +1,28 @@
+.panel{
+  width: 2100rpx; 
+  height: 2970rpx;
+}
+.Canvas{
+  width: 2100rpx; 
+  height: 2970rpx;
+  background-color:#f2f2f2;
+  /* z-index: 50; */
+  position: absolute;
+  left:0rpx;
+  top:0rpx;
+}
+
+.btnLeft{
+  position: fixed;
+  bottom: 30rpx;
+  left:30rpx;
+  background-color: #ddd;
+}
+
+.btnRight{
+  position: fixed;
+  bottom: 30rpx;
+  right:30rpx;
+  background-color: #ddd;
+}
+

project.config.json

@@ -8,7 +8,7 @@
 		"newFeature": true
 	},
 	"compileType": "miniprogram",
-	"libVersion": "1.9.93",
+	"libVersion": "2.0.9",
 	"appid": "wx1fef080f74481cbd",
 	"projectname": "%E6%95%B0%E5%AD%A6%E8%AE%A1%E7%AE%97%E9%A2%98",
 	"isGameTourist": false,
@@ -30,8 +30,27 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": -1,
-			"list": []
+			"current": 2,
+			"list": [
+				{
+					"id": 0,
+					"name": "list",
+					"pathName": "pages/main/list",
+					"query": "id=3&name=三年级"
+				},
+				{
+					"id": 1,
+					"name": "detail",
+					"pathName": "pages/main/detail",
+					"query": "id=101"
+				},
+				{
+					"id": 2,
+					"name": "print",
+					"pathName": "pages/main/print",
+					"query": "id=172"
+				}
+			]
 		}
 	}
 }

utils/main.js

@@ -305,6 +305,7 @@ function gotoFeedback() {
   });
 }
 
+
 module.exports = {
   getData: getData,
   postData: postData,

utils/util.js

@@ -14,6 +14,17 @@ function formatTime(date) {
   return [year, month, day].map(formatNumber).join('.') + ' ' + [hour, minute, second].map(formatNumber).join(':')
 }
 
+
+function formatDateCHS(date) {
+  var year = date.getFullYear()
+  var month = addZero(date.getMonth() + 1, 2);
+  var day = addZero(date.getDate(), 2);
+  var hour = addZero(date.getHours(), 2);
+  var minute = addZero(date.getMinutes(), 2);
+
+  return year + "年" + month + "月" + day + "日 "+hour+":"+minute;
+}
+
 function formatNumber(n) {
   n = n.toString()
   return n[1] ? n : '0' + n
@@ -21,6 +32,7 @@ function formatNumber(n) {
 
 //给字符串左侧补零
 function addZero(str, length) {
+  str=str.toString();
   while (str.length < length) {
     str = "0" + str;
   }
@@ -288,6 +300,7 @@ function getStorageValue(obj, name, defaultStatus, callback) {
 
 module.exports = {
   formatTime: formatTime,
+  formatDateCHS: formatDateCHS,
   getMinuteSecond: getMinuteSecond,
   random: Random,
   randomArray: RandomArray,