1.5.1

app.json

@@ -32,9 +32,9 @@
     "pages/plan/sortRule",
     "pages/plan/setting",
     
-    "marketing/main/extenduser",
-    "marketing/main/shareuser",
-    "marketing/main/index",
+    "pages/marketing/extenduser",
+    "pages/marketing/shareuser",
+    "pages/marketing/index",
     
     "pages/other/lessonlist",
     "pages/other/userlist",
@@ -56,6 +56,7 @@
     "navigationBarTitleText": "秒过",
     "navigationBarTextStyle": "black",
     "backgroundColor": "#ffffff",
+    "resizable": false,
     "enablePullDownRefresh": false
   },
   "requiredBackgroundModes": [

app.wxss

@@ -18,6 +18,7 @@
   align-items: center;
   justify-content: center;
 }
+
 .container {
   width:100%;
   color: #1e1e1e;

components/navigation-bar/navigation-bar.js

@@ -0,0 +1,250 @@
+/**
+ * 自定义头部导航组件，基于官方组件Navigation开发。
+ * 
+ * <navigation-bar title="会员中心" bindgetBarInfo="getBarInfo"></navigation-bar>
+ * 
+ * 组件属性列表 
+ * bindgetBarInfo {eventhandler}  组件实例载入页面时触发此事件，首参为event对象，event.detail携带当前导航栏信息，如导航栏高度 event.detail.topBarHeight
+ * backImage      {string}  back按钮的图标地址
+ * homeImage      {string}  home按钮的图标地址
+ * bindback	      {eventhandler}	点击back按钮触发此事件响应函数
+ * ext-class	    {string}	添加在组件内部结构的class，可用于修改组件内部的样式
+ * title	        {string}	导航标题，如果不提供为空
+ * background	    {string}	导航背景色，默认#ffffff
+ * color	        {string}	导航字体颜色
+ * dbclickBackTop {boolean}	是否开启双击返回顶部功能，默认true
+ * border         {boolean}	是否显示顶部边框，默认false
+ * loading	      {boolean}	是否显示标题左侧的loading，默认false
+ * show	          {boolean}	显示隐藏导航，隐藏的时候navigation的高度占位还在,默认true
+ * left	          {boolean}	左侧区域是否使用slot内容，默认false
+ * center	        {boolean}	中间区域是否使用slot内容，默认false
+ *  
+ * Slot Name
+ * left	          左侧slot，在back按钮位置显示，当left属性为true的时候有效
+ * center	        标题slot，在标题位置显示，当center属性为true的时候有效
+ * 
+*/
+
+module.exports =
+/******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+/******/
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+/******/
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId]) {
+/******/ 			return installedModules[moduleId].exports;
+/******/ 		}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			i: moduleId,
+/******/ 			l: false,
+/******/ 			exports: {}
+/******/ 		};
+/******/
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+/******/
+/******/ 		// Flag the module as loaded
+/******/ 		module.l = true;
+/******/
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+/******/
+/******/
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+/******/
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+/******/
+/******/ 	// define getter function for harmony exports
+/******/ 	__webpack_require__.d = function(exports, name, getter) {
+/******/ 		if(!__webpack_require__.o(exports, name)) {
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
+/******/ 		}
+/******/ 	};
+/******/
+/******/ 	// define __esModule on exports
+/******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
+/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
+/******/ 	};
+/******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
+/******/ 	__webpack_require__.n = function(module) {
+/******/ 		var getter = module && module.__esModule ?
+/******/ 			function getDefault() { return module['default']; } :
+/******/ 			function getModuleExports() { return module; };
+/******/ 		__webpack_require__.d(getter, 'a', getter);
+/******/ 		return getter;
+/******/ 	};
+/******/
+/******/ 	// Object.prototype.hasOwnProperty.call
+/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+/******/
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "";
+/******/
+/******/
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(__webpack_require__.s = 1);
+/******/ })
+/************************************************************************/
+/******/ ([
+/* 0 */,
+/* 1 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var app = getApp();
+
+Component({
+  options: {
+    multipleSlots: true,
+    addGlobalClass: true
+  },
+  properties: {
+    backImage: {
+      type: String,
+      value: '/static/icon/icon_back.svg'
+    },
+    homeImage: {
+      type: String,
+      value: '/static/icon/icon_home.png'
+    },
+    extClass: {
+      type: String,
+      value: ''
+    },
+    title: {
+      type: String,
+      value: ''
+    },
+    background: {
+      type: String,
+      value: '#ffffff'
+    },
+    color: {
+      type: String,
+      value: '#000000'
+    },
+    dbclickBackTop:{
+      type:Boolean,
+      value:true
+    },
+    border: {
+      type: Boolean,
+      value: false
+    },
+    loading: {
+      type: Boolean,
+      value: false
+    },
+    show: {
+      type: Boolean,
+      value: true,
+      observer: '_showChange'
+    },  
+    left: {
+      type: Boolean,
+      value: false
+    },
+    center: {
+      type: Boolean,
+      value: false
+    },    
+    
+  },
+  data: {
+    displayStyle: '',
+    showBack:false
+  },
+  attached: function attached() {
+    var _this = this;        
+    //动态计算导航栏尺寸
+    var isSupport = !!wx.getMenuButtonBoundingClientRect;
+    var rect = wx.getMenuButtonBoundingClientRect ? wx.getMenuButtonBoundingClientRect() : null;
+    wx.getSystemInfo({
+        success: function success(res) {
+          var ios = !!(res.system.toLowerCase().search('ios') + 1);
+          var statusBarHeight=res.statusBarHeight;
+          var topBarHeight=ios ? (44 + statusBarHeight) : (48 + statusBarHeight);
+
+          _this.setData({
+              ios: ios,
+              topBarHeight:topBarHeight,
+              statusBarHeight:statusBarHeight,
+              innerWidth: isSupport ? 'width:' + rect.left + 'px' : '',
+              innerPaddingRight: isSupport ? 'padding-right:' + (res.windowWidth - rect.left) + 'px' : '',
+              leftWidth: isSupport ? 'width:' + (res.windowWidth - rect.left) + 'px' : ''
+          }); 
+
+          _this.triggerEvent('getBarInfo', {topBarHeight,statusBarHeight});               
+        }
+    });
+
+    //back箭头处理的显示
+    var pages=getCurrentPages()      
+    if(pages.length>1){
+      this.setData({showBack:true})
+    }
+  },
+  methods: {
+    _showChange: function _showChange(show) {           
+      var displayStyle = 'opacity: ' + (show ? '1' : '0') + ';-webkit-transition:opacity 0.5s;transition:opacity 0.5s;';           
+      this.setData({
+          displayStyle: displayStyle
+      });
+    },
+    //点击back事件处理
+    goBack: function () {
+      wx.navigateBack();
+      this.triggerEvent('back');
+    },
+    //返回首页
+    goHome:function(){
+      wx.reLaunch({
+        url: '/pages/index/index'
+      })
+    },
+    //双击返回顶部
+    doubleClick(e) {
+      if (!this.data.dbclickBackTop){return}
+      if (this.timeStamp && (e.timeStamp - this.timeStamp < 300)) {
+        this.timeStamp = 0
+        wx.pageScrollTo({
+          scrollTop: 0,
+          duration: 300
+        })
+      } else {
+        this.timeStamp = e.timeStamp
+      }
+    }
+  }
+});
+
+/***/ })
+/******/ ]);

components/navigation-bar/navigation-bar.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

components/navigation-bar/navigation-bar.wxml

@@ -0,0 +1,30 @@
+<view class="weui-navigation-bar {{extClass}}" bindtouchstart="doubleClick">
+  <view class="weui-navigation-bar__placeholder {{ios ? 'ios' : 'android'}}" style="padding-top: {{statusBarHeight}}px;visibility: hidden;"></view>
+  <view class="weui-navigation-bar__inner {{ios ? 'ios' : 'android'}} {{border?'navigation-bar-border':''}}" style="padding-top: {{statusBarHeight}}px; color: {{color}};background:{{background}};{{displayStyle}};{{innerPaddingRight}};{{innerWidth}};">
+
+    <view class='weui-navigation-bar__left' style="{{leftWidth}}">
+      <block wx:if="{{left}}">
+        <slot name="left"></slot>
+      </block>
+      <block wx:else>
+        <view class="btn-back nice-focus" bindtap="goBack" wx:if="{{showBack}}">
+          <image src="{{backImage}}"></image>
+        </view>      
+        <view class="btn-home nice-focus" bindtap="goHome">
+          <image src="{{homeImage}}"></image>
+        </view>
+      </block>     
+    </view>
+
+    <view class='weui-navigation-bar__center'>
+      <view wx:if="{{loading}}" class="weui-navigation-bar__loading"></view>
+
+      <block wx:if="{{center}}">
+        <slot name="center"></slot>        
+      </block>
+      <block wx:else>
+        <text>{{title}}</text>
+      </block>
+    </view>   
+  </view>
+</view>

pages/index/index.js

@@ -5,7 +5,7 @@ const app = getApp();
 const arrSentence = [
   "荀子曰:\n君子博学而日参省乎己，\n则知明而行无过矣",
   "为什么订正过的题目还会错？\n天天秒过，反复巩固，不再出错",
-  "子曰:\n学而时习之，不亦悦乎。",
+  "子曰:\n学而时习之，不亦说乎。",
   "秒过之前，错字连篇\n秒过之后，错字罕见",
   "子曰:\n学而不思则罔\n思而不学则殆",
   "记忆是思考的残留物\n唯有不断思考才能记住",
@@ -21,6 +21,7 @@ const arrSentence = [
 ];
 
 var timeout1 = 0;
+var timeoutRedirect=0;
 
 Page({
   data: {},
@@ -89,7 +90,7 @@ Page({
       else if (options.type == "marketing") {
         this.setData({
           gotoType: "other",
-          gotoUrl: '../../marketing/main/index',
+          gotoUrl: '../marketing/index',
         });
       }
       else if (options.type == "homework") {
@@ -251,9 +252,7 @@ Page({
           wx.removeStorageSync("UserName");
 
           //测试
-          //var url = '../../package4/main/giftcard?GiftID=89542&UserID=1';
           //var url = '../other/homework';
-          // var url = '../../marketing/main/index';
           // wx.redirectTo({
           //   url: url,
           // });
@@ -279,7 +278,7 @@ Page({
             }
             else{
               var url = '../main/default';
-              setTimeout(function () {
+              timeoutRedirect=setTimeout(function () {
                 console.log("Time5:" + new Date().getTime());
                 clearTimeout(timeout1);
 
@@ -292,6 +291,7 @@ Page({
 
           }
           that.getBaiduToken();
+          
         }
       });
 
@@ -323,17 +323,17 @@ Page({
     });
 
     updateManager.onUpdateReady(function () {
+      clearTimeout(timeoutRedirect);
       wx.showModal({
         title: '更新提示',
-        content: '新版本已经准备好，是否重启应用？',
+        content: '新版本已经准备好，重启应用',
+        showCancel:false,
         success: function (res) {
-          if (res.confirm) {
-            wx.removeStorageSync("UserID");
-            wx.removeStorageSync("UserName");
-            wx.removeStorageSync("SearchWord3");
-            // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
-            updateManager.applyUpdate();
-          }
+          wx.removeStorageSync("UserID");
+          wx.removeStorageSync("UserName");
+          wx.removeStorageSync("SearchWord3");
+          // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+          updateManager.applyUpdate();
         }
       });
 

pages/main/add.js

@@ -3,21 +3,21 @@ import main from '../../utils/main';
 
 const app = getApp();
 const PracticeTimeArr = [{
-    Name: "还原",
-    CSS: "numberContainerFooter1121Select"
-  },
-  {
-    Name: "今天必练",
-  },
-  {
-    Name: "推迟一周",
-  },
-  {
-    Name: "推迟一个月",
-  },
-  {
-    Name: "推迟三个月",
-  }
+  Name: "还原",
+  CSS: "numberContainerFooter1121Select"
+},
+{
+  Name: "今天必练",
+},
+{
+  Name: "推迟一周",
+},
+{
+  Name: "推迟一个月",
+},
+{
+  Name: "推迟三个月",
+}
 ];
 var arrTag = [];
 
@@ -34,7 +34,7 @@ var recorderManager;
 var tempRecorderFile = "";
 var innerAudioContext;
 var isViolate = false; //是否是违禁词
-var isFirstAdd=true;//是第一个填加
+var isFirstAdd = true;//是第一个填加
 
 Page({
   data: {
@@ -48,7 +48,7 @@ Page({
     PracticeTimeArr: PracticeTimeArr,
     IsIPhoneX: app.globalData.IsIPhoneX,
   },
-  onReady: function() {
+  onReady: function () {
     recorderManager = wx.getRecorderManager();
     recorderManager.onStart(() => {
       console.log('recorder start')
@@ -66,7 +66,7 @@ Page({
       // }
     });
   },
-  onLoad: function(options) {
+  onLoad: function (options) {
     var that = this;
 
     var fieldNumber = 0;
@@ -97,7 +97,7 @@ Page({
     isViolate = false;
     isFirstAdd = true;
   },
-  onShow: function() {
+  onShow: function () {
     var that = this;
     if (that.data.UpdateType == "add") {
       that.initAddCard();
@@ -144,9 +144,9 @@ Page({
       }
     }
 
-    common.getStorageValue(that, "SymbolMain", app.globalData.SymbolMain, function() {});
+    common.getStorageValue(that, "SymbolMain", app.globalData.SymbolMain, function () { });
   },
-  onHide: function() {
+  onHide: function () {
     //用于恢复未保存的新题卡
     //console.log("onHide");
     var that = this;
@@ -154,8 +154,8 @@ Page({
       that.updateField();
     }
     if (!(that.data && that.data.Field && that.data.Field[1].length == 0 &&
-        that.data.Field[2].length == 0 &&
-        that.data.Field[3].length == 0)) {
+      that.data.Field[2].length == 0 &&
+      that.data.Field[3].length == 0)) {
       if (!isViolate && (that.data.UpdateType == "add" || that.data.UpdateType == "add2")) {
         var card = {};
         card.MiaoguoCardID = that.data.MiaoguoCardID;
@@ -178,7 +178,7 @@ Page({
     }
 
   },
-  onUnload: function() {
+  onUnload: function () {
     this.onHide();
 
     var card = wx.getStorageSync("TempCardInfo");
@@ -201,14 +201,14 @@ Page({
       this.closeRecorder();
 
   },
-  onClose: function() {
+  onClose: function () {
     wx.navigateBack({
       delta: 1,
     });
 
     clearInterval(intervalRecorder);
   },
-  gotoAddItem: function(e) {
+  gotoAddItem: function (e) {
     var that = this;
     var fieldid = e.currentTarget.dataset.fieldid;
     var content;
@@ -230,13 +230,13 @@ Page({
       title: '编辑 段落' + fieldid,
     });
   },
-  onSearch: function(e) {
+  onSearch: function (e) {
     app.globalData.TempFieldNumber = 0;
     wx.navigateTo({
       url: './searchWeb',
     })
   },
-  onPreview: function(e) {
+  onPreview: function (e) {
     var that = this;
     if (that.data.Field[1] == "") {
       wx.showToast({
@@ -249,7 +249,7 @@ Page({
       });
     }
   },
-  saveCard: function() {
+  saveCard: function () {
     var that = this;
     if (that.data.Field[1] == "") {
       wx.showToast({
@@ -259,12 +259,12 @@ Page({
     } else {
       if (isSave) {
         isSave = false;
-        setTimeout(function() {
+        setTimeout(function () {
           isSave = true;
         }, 5000);
 
         if (that.checkImageCount(that.data.Field)) {
-          that.uploadImageAll(that.data.Field, function(success, field) {
+          that.uploadImageAll(that.data.Field, function (success, field) {
             if (success) {
               that.data.Field = field;
               var userid = app.globalData.userInfo.UserID;
@@ -293,11 +293,11 @@ Page({
                 title: '保存数据请稍候',
                 mask: true,
               });
-              timeoutUploadImage = setTimeout(function() {
+              timeoutUploadImage = setTimeout(function () {
                 wx.hideLoading();
               }, 15000);
 
-              main.postData('AddMiaoguoCard?Type=' + that.data.UpdateType + '&UserID=' + userid, param1, function(data) {
+              main.postData('AddMiaoguoCard?Type=' + that.data.UpdateType + '&UserID=' + userid, param1, function (data) {
                 wx.removeStorageSync("TempCardNoSaved");
 
                 if (that.data.UpdateType == "edit" || that.data.UpdateType == "edit2" || that.data.UpdateType == "edit3") {
@@ -334,7 +334,7 @@ Page({
       }
     }
   },
-  formatField: function(field) {
+  formatField: function (field) {
     var result = {};
 
     for (var i = 1; i <= 3; i++) {
@@ -378,7 +378,7 @@ Page({
     }
     return result;
   },
-  checkImageCount: function(arr) {
+  checkImageCount: function (arr) {
     var count = 0;
     for (var i = 0; i < arr.length; i++) {
       for (var j = 0; j < arr[i].length; j++) {
@@ -396,7 +396,7 @@ Page({
     } else
       return true;
   },
-  uploadImageAll: function(arr, callback) {
+  uploadImageAll: function (arr, callback) {
     var that = this;
     var b = false;
     var arrSource = [],
@@ -415,7 +415,7 @@ Page({
             arrResult.push(result);
           } else {
             var source = arr[i][j].Content;
-            that.uploadFileToServer(source, function(data) {
+            that.uploadFileToServer(source, function (data) {
               if (data) {
                 data = JSON.parse(data);
                 var result = data.result;
@@ -434,12 +434,12 @@ Page({
         title: '上传图片请稍候',
         mask: true,
       });
-      timeoutUploadImage = setTimeout(function() {
+      timeoutUploadImage = setTimeout(function () {
         wx.hideLoading();
       }, 30000);
     }
 
-    interval = setInterval(function() {
+    interval = setInterval(function () {
       //console.log(arrResult.length);
       if (arrResult.length >= arrSource.length) {
         wx.hideLoading();
@@ -481,7 +481,7 @@ Page({
       }
     }, 500);
   },
-  uploadFileToServer: function(file, callback) {
+  uploadFileToServer: function (file, callback) {
     var url = common.Encrypt("MiaoguoUploadFile2");
     wx.uploadFile({
       url: app.globalData.serverUrl + url,
@@ -490,7 +490,7 @@ Page({
       success(res) {
         callback(res.data);
       },
-      fail: function(err) {
+      fail: function (err) {
         wx.hideLoading();
         wx.showModal({
           title: '上传文件失败',
@@ -500,7 +500,7 @@ Page({
       }
     });
   },
-  saveLocalCardList: function(param1) {
+  saveLocalCardList: function (param1) {
     var that = this;
     var list = app.globalData.CardList;
     for (var i = 0; i < list.length; i++) {
@@ -517,14 +517,14 @@ Page({
         if (param1.IsTodayStudy == 1) {
           list[i].LimitTime = common.formatTime(new Date());
 
-          main.getTaskTodayList(function() {});
+          main.getTaskTodayList(function () { });
         }
         app.globalData.CardList = list;
         break;
       }
     }
   },
-  initAddCard: function() {
+  initAddCard: function () {
     var card = {};
     card.MiaoguoCardID = 0;
     card.Content = [];
@@ -547,7 +547,7 @@ Page({
       UpdateType: "add2",
     });
   },
-  onBindError: function(e) {
+  onBindError: function (e) {
     for (var i = 1; i < this.data.Field.length; i++) {
       for (var j = 0; j < this.data.Field[i].length; j++) {
         if (this.data.Field[i][j].Type == "image") {
@@ -559,7 +559,7 @@ Page({
       Field: this.data.Field,
     });
   },
-  deleteItem: function(e) {
+  deleteItem: function (e) {
     var that = this;
     var index = e.currentTarget.dataset.id;
 
@@ -586,7 +586,7 @@ Page({
     });
 
   },
-  onGotoList: function() {
+  onGotoList: function () {
     var that = this;
     if (isFirstAdd == true || !that.data.Field) {
       wx.showModal({
@@ -604,10 +604,13 @@ Page({
         success(res) {
           if (res.confirm) {
             goto();
+            setTimeout(function () {
+              wx.removeStorageSync("TempCardNoSaved");
+            }, 1000);
           }
         }
       });
-    } 
+    }
     else {
       goto();
     }
@@ -616,11 +619,11 @@ Page({
       wx.showLoading({
         title: '请稍候',
       });
-      setTimeout(function() {
+      setTimeout(function () {
         wx.hideLoading();
       }, 5000);
       var url = 'GetMiaoguoCardList?UserID=' + app.globalData.userInfo.UserID;
-      main.getData(url, function(data) {
+      main.getData(url, function (data) {
         wx.hideLoading();
         if (data) {
           app.globalData.CardList = data.List;
@@ -634,7 +637,7 @@ Page({
       });
     }
   },
-  getLimitTimeStr: function() {
+  getLimitTimeStr: function () {
     var that = this;
     if (!that.data.LimitTime)
       that.data.LimitTime = common.formatTime(new Date());
@@ -659,7 +662,7 @@ Page({
   //段落编辑**************************
 
   //字段输入
-  bindinputField: function(e) {
+  bindinputField: function (e) {
     //console.log("bindinputField:" + e.detail.value + " isEdit:" + isEdit);
 
     var that = this;
@@ -673,7 +676,7 @@ Page({
 
   },
   //加符号
-  addSymbol: function(e) {
+  addSymbol: function (e) {
     //console.log("addSymbol");
     isEdit = true;
     var that = this;
@@ -703,28 +706,28 @@ Page({
       this.setData({
         HighlighterSign: "[光]",
       });
-    } 
+    }
 
-    if (btnName=="( )")
-      btnName ="(     )";
+    if (btnName == "( )")
+      btnName = "(     )";
     else if (btnName == "_")
       btnName = "_____";
     //console.log("addSymbol_btnName:" + btnName);
 
     if (!this.data.Focus) {
-      var obj = { detail: {cursor:tempCursor}};
+      var obj = { detail: { cursor: tempCursor } };
       this.onBindblur(obj);
     }
     //console.log("addSymbol:" + this.data.FieldContent);
 
-    setTimeout(function() {
+    setTimeout(function () {
       that.setData({
         Focus: true,
       });
     }, 300);
   },
   //焦点聚焦
-  onBindFocus: function() {
+  onBindFocus: function () {
     //console.log("onBindFocus");
     btnName = "";
     this.setData({
@@ -732,11 +735,11 @@ Page({
     });
   },
   //失焦
-  onBindblur: function(e) {
+  onBindblur: function (e) {
     var that = this;
     //console.log("onBindblur:" + isEdit + " Filed:" + this.data.FieldContent);
     if (app.globalData.IsAndroid && !isEdit) {
-      setTimeout(function() {
+      setTimeout(function () {
         isEdit = true;
         //console.log("onBindblur2:" + isEdit);
       }, 500);
@@ -744,7 +747,7 @@ Page({
     }
     isEdit = false;
     if (app.globalData.IsAndroid && !isEdit) {
-      setTimeout(function() {
+      setTimeout(function () {
         isEdit = true;
         //console.log("onBindblur2:" + isEdit);
       }, 500);
@@ -753,7 +756,7 @@ Page({
 
     this.updateField();
     tempCursor = e.detail.cursor;
-    
+
     //console.log("tempCursor:" + tempCursor);
     if (tempCursor == undefined)
       tempCursor = this.data["FieldContent"].length;
@@ -767,7 +770,7 @@ Page({
     //console.log("btnName:" + btnName);
     //console.log("str2:" + str2);
     var cur = 0;
-    if (btnName){
+    if (btnName) {
       cur = 1;
       if (btnName == "[读]" || btnName == "[线]" || btnName == "[光]") {
         cur = 3;
@@ -779,7 +782,7 @@ Page({
         cur = 5;
       }
     }
-    
+
     this.data.FieldContent = str1 + btnName + str2;
     this.setData({
       FieldContent: this.data.FieldContent,
@@ -790,23 +793,23 @@ Page({
     btnName = "";
 
   },
-  bindscrollHandler: function() {
+  bindscrollHandler: function () {
     //console.log("bindscrollHandler");
     btnName = "";
   },
-  onSearchField: function(e) {
+  onSearchField: function (e) {
     app.globalData.TempFieldNumber = this.data.FieldNumber;
     wx.navigateTo({
       url: './searchWeb',
     });
     this.updateField();
 
-    setTimeout(function() {
+    setTimeout(function () {
       isEdit = true;
       //console.log("onSearchEnd");
     }, 1000);
   },
-  clear: function() {
+  clear: function () {
     var that = this;
     //console.log("clear");
     this.setData({
@@ -819,7 +822,7 @@ Page({
     this.updateField();
 
   },
-  closeAddItem: function(e) {
+  closeAddItem: function (e) {
     var that = this;
     var isSave = e.currentTarget.dataset.idsave;
     if (isSave == "true") {
@@ -827,22 +830,22 @@ Page({
       if (that.data.FieldContent) {
         var content = that.data.FieldContent;
 
-        main.postData("MsgSecCheck2", 
-          { Content: content,},
-          function(data) {
-          if (data && data.errcode == 0) {
-            next(that);
-          } else {
-            if (data.errmsg) {
-              wx.showToast({
-                title: data.errmsg,
-                duration: 2000,
-                image: "../images/universalpic_wrong_white_120x120.png",
-              });
-              isViolate = true;
+        main.postData("MsgSecCheck2",
+          { Content: content, },
+          function (data) {
+            if (data && data.errcode == 0) {
+              next(that);
+            } else {
+              if (data.errmsg) {
+                wx.showToast({
+                  title: data.errmsg,
+                  duration: 2000,
+                  image: "../images/universalpic_wrong_white_120x120.png",
+                });
+                isViolate = true;
+              }
             }
-          }
-        });
+          });
       } else {
         next(that);
       }
@@ -873,7 +876,7 @@ Page({
     }
   },
 
-  updateField: function() {
+  updateField: function () {
     var str = this.data.FieldContent;
     var list = app.globalData.CardList;
     var card = {};
@@ -892,7 +895,7 @@ Page({
     });
   },
   //选择图片上传
-  uploadImageField: function() {
+  uploadImageField: function () {
     //console.log("uploadImageStart");
     var that = this;
 
@@ -913,7 +916,7 @@ Page({
                   title: '请秒候',
                   mask: true,
                 });
-                setTimeout(function() {
+                setTimeout(function () {
                   wx.hideLoading();
                   selectImage(that);
                 }, 2000);
@@ -987,7 +990,7 @@ Page({
                   cancelText: "不再提示",
                   confirmColor: "#0071EF",
                   success(res) {
-                    if (res.confirm) {} else {
+                    if (res.confirm) { } else {
                       wx.setStorageSync("NoRemindImage", true);
                     }
                   },
@@ -997,13 +1000,13 @@ Page({
             }
           });
         },
-        fail: function() {
+        fail: function () {
 
         }
       });
     }
   },
-  onPracticeTime: function(e) {
+  onPracticeTime: function (e) {
     var that = this;
     var value = e.currentTarget.dataset.value;
 
@@ -1022,8 +1025,8 @@ Page({
     if (value != "还原")
       PracticeTimeStr2 = common.formatDateCHS(common.formatTime(that.getLimitTimeStr(value)));
     else
-    if (that.data.UpdateType === "add" || that.data.UpdateType === "add2")
-      PracticeTimeStr2 = "智能安排";
+      if (that.data.UpdateType === "add" || that.data.UpdateType === "add2")
+        PracticeTimeStr2 = "智能安排";
 
     that.setData({
       PracticeTimeStr2: PracticeTimeStr2,
@@ -1031,19 +1034,19 @@ Page({
 
 
   },
-  showPracticeTime: function() {
+  showPracticeTime: function () {
     this.setData({
       IsPracticeTime: true,
     });
   },
-  closePracticeTime: function() {
+  closePracticeTime: function () {
     this.setData({
       IsPracticeTime: false,
     });
   },
 
   //录音授权
-  recorderAccredit: function() {
+  recorderAccredit: function () {
     var that = this;
     if (app.globalData.IsRecorderAccredit == 1)
       that.showRecorder();
@@ -1066,7 +1069,7 @@ Page({
       });
     }
   },
-  showRecorder: function() {
+  showRecorder: function () {
     var that = this;
     if (that.checkRecorderCount()) {
       that.recorderInit();
@@ -1104,7 +1107,7 @@ Page({
       });
     }
   },
-  closeRecorder: function() {
+  closeRecorder: function () {
     var that = this;
     this.recorderInit();
 
@@ -1139,7 +1142,7 @@ Page({
     }
   },
   //录音初始化
-  recorderInit: function() {
+  recorderInit: function () {
     if (innerAudioContext)
       innerAudioContext.stop();
     if (recorderManager)
@@ -1147,7 +1150,7 @@ Page({
 
     clearInterval(intervalRecorder);
   },
-  checkRecorderCount: function(arr) {
+  checkRecorderCount: function (arr) {
     var that = this;
     var count = 0;
     if (that.data.FieldContent.indexOf("[音 url=") >= 0 ||
@@ -1162,7 +1165,7 @@ Page({
     } else
       return true;
   },
-  btnRecorderStart: function() {
+  btnRecorderStart: function () {
     var that = this;
     if (app.globalData.IsRecorderAccredit == 1) {
       that.setData({
@@ -1173,7 +1176,7 @@ Page({
       recorderManager.start();
     }
   },
-  btnRecorderEnd: function() {
+  btnRecorderEnd: function () {
     var that = this;
     if (app.globalData.IsRecorderAccredit == 1) {
       if (that.data.RecorderTime == "00:00") {
@@ -1194,11 +1197,11 @@ Page({
       that.recorderAccredit();
     }
   },
-  showRecorderTime: function() {
+  showRecorderTime: function () {
     var that = this;
     var second = 0;
     clearInterval(intervalRecorder);
-    intervalRecorder = setInterval(function() {
+    intervalRecorder = setInterval(function () {
       second++;
       var secondStr = second.toString();
       if (second < 10)
@@ -1224,7 +1227,7 @@ Page({
 
     }, 1000);
   },
-  btnRecorderPlay: function() {
+  btnRecorderPlay: function () {
     var that = this;
     if (tempRecorderFile && this.data.RecorderPlayName == "播放") {
       innerAudioContext.src = tempRecorderFile;
@@ -1241,16 +1244,16 @@ Page({
       });
     }
   },
-  btnRecorderSave: function() {
+  btnRecorderSave: function () {
     var that = this;
     this.recorderInit();
     wx.showLoading({
       title: '上传中请稍候',
     });
-    setTimeout(function() {
+    setTimeout(function () {
       wx.hideLoading();
     }, 60000);
-    that.uploadFileToServer(tempRecorderFile, function(data) {
+    that.uploadFileToServer(tempRecorderFile, function (data) {
       if (data) {
         data = JSON.parse(data);
         //console.log(data);
@@ -1275,7 +1278,7 @@ Page({
             cancelText: "不再提示",
             confirmColor: "#0071EF",
             success(res) {
-              if (res.confirm) {} else {
+              if (res.confirm) { } else {
                 wx.setStorageSync("NoRemindRecorder", true);
               }
             },
@@ -1284,12 +1287,38 @@ Page({
       }
     });
   },
-  gotoSymbol: function(e) {
+  gotoSymbol: function (e) {
     wx.navigateTo({
       url: '../main/symbolsetting',
     });
   },
-  onShareAppMessage: function() {
+  gotoTest: function () {
+    var that=this;
+    if (that.data.Field[1].length > 0 || that.data.Field[2].length > 0 || that.data.Field[2].length > 0) {
+      wx.showModal({
+        title: '尚未保存',
+        content: '即将打开“知识检验”功能，但当前题卡尚未保存，按继续将放弃保存。',
+        confirmText: '继续',
+        success(res) {
+          if (res.confirm) {
+            
+            wx.redirectTo({
+              url: '../test/index',
+            });
+            setTimeout(function(){
+              wx.removeStorageSync("TempCardNoSaved");
+            },1000);
+          }
+        }
+      });
+    }
+    else {
+      wx.redirectTo({
+        url: '../test/index',
+      });
+    }
+  },
+  onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,
       path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,

pages/main/add.wxml

@@ -3,7 +3,8 @@
     <view class="panelTopLeft FlexRow" catchtap="onSearch">
       <view class="add">+</view> 资料
     </view>
-    <view class='panelTopRight FlexRow'>
+    <view class='panelTopLeft FlexRow' catchtap="gotoTest" wx:if="{{UpdateType=='add' || UpdateType=='add2'}}">
+      <view class="add">+</view> 检验
     </view>
   </view>
   <view style='height:120rpx'></view>

pages/main/default.js

@@ -175,7 +175,7 @@ Page({
       url: url,
     });
 
-    if (url =="../../marketing/main/index"){
+    if (url =="../marketing/index"){
       this.setData({
         IsShowMarketing: 2,
       });

pages/main/default.wxml

@@ -16,7 +16,7 @@
   <view class='panelBottom FlexColumn'>
 
     <image class="study_index_banner_close" src='../images/study_index_banner_close.png' bindtap="closeMarketing" wx:if="{{IsShowMarketing===2}}"/>
-    <image class="study_index_banner" src='../images/study_index_banner.png' bindtap="goto" data-url="../../marketing/main/index" wx:if="{{IsShowMarketing===0 || IsShowMarketing===2}}" />
+    <image class="study_index_banner" src='../images/study_index_banner.png' bindtap="goto" data-url="../marketing/index" wx:if="{{IsShowMarketing===0 || IsShowMarketing===2}}" />
     
     <image class="study_index_footer" src='../images/study_index_footer.png' />
 

pages/main/detail.js

@@ -3,45 +3,55 @@ import main from '../../utils/main';
 
 const app = getApp();
 
-const arrFontSize = [
-  { Name: "紧凑", Value: 36 },
-  { Name: "标准", Value: 48 },
-  { Name: "宽松", Value: 68 },
-  { Name: "超大", Value: 108 }
+const arrFontSize = [{
+  Name: "紧凑",
+  Value: 36
+},
+{
+  Name: "标准",
+  Value: 48
+},
+{
+  Name: "宽松",
+  Value: 68
+},
+{
+  Name: "超大",
+  Value: 108
+}
 ];
 
-const arrDelayedTime = [
-  {
-    DayNumber: 7,
-    Name: "推迟一周",
-  }, {
-    DayNumber: 30,
-    Name: "推迟一个月",
-  }, {
-    DayNumber: 90,
-    Name: "推迟三个月",
-  },
-]
+const arrDelayedTime = [{
+  DayNumber: 7,
+  Name: "推迟一周",
+}, {
+  DayNumber: 30,
+  Name: "推迟一个月",
+}, {
+  DayNumber: 90,
+  Name: "推迟三个月",
+},]
 
 var innerAudioContext1;
 
 var listTaskFinished = []; //完成的任务
 var timeStart; //计算时长
-var timeHistory=0;//已经过去的时间
+var timeHistory = 0; //已经过去的时间
 var TaskList = [];
 var arrImage = [],
   arrImage2 = [];
 var intervalSound = 0,
   intervalRefresh = 0;
 var isCollecting = false;
-var isExit=true;
+var isExit = true;
 
 var isPlaying = false;
 
 var timeoutPlayAudio;
 var tempPlayUrl = "";
 var tempPlayUrlLocal = "";
-var timeoutEveryCard=0;
+var timeoutEveryCard = 0;
+var timeoutHide = 0;
 
 Page({
   data: {
@@ -54,7 +64,9 @@ Page({
     FontSizeArray: arrFontSize,
     ArrDelayedTime: arrDelayedTime,
     TaskInfo: {},
-    Color: { ID: 1 },
+    Color: {
+      ID: 1
+    },
   },
   onReady: function () {
     var that = this;
@@ -64,7 +76,7 @@ Page({
     });
     innerAudioContext1.onError((res) => {
       console.log("innerAudioContext1.errMsg:" + res.errMsg);
-      console.log("innerAudioContext1.errCode:" +res.errCode);
+      console.log("innerAudioContext1.errCode:" + res.errCode);
       that.audioCtx.setSrc(tempPlayUrl);
       that.audioCtx.play();
     });
@@ -88,8 +100,8 @@ Page({
       Color: main.getDetailColor(app.globalData.ColorIndex),
     });
 
-    this.audioCtx = wx.createAudioContext('myAudio'); 
-    
+    this.audioCtx = wx.createAudioContext('myAudio');
+
 
     this.getList();
 
@@ -140,20 +152,28 @@ Page({
     that.setData({
       IsMore: false,
     });
+    clearTimeout(timeoutHide);
+    //console.log("显示");
   },
   onUnload: function () {
     clearInterval(intervalSound);
     clearTimeout(timeoutEveryCard);
+    clearTimeout(timeoutHide);
     listTaskFinished = [];
 
     isPlaying = false;
-    if (innerAudioContext1){
+    if (innerAudioContext1) {
       innerAudioContext1.stop();
     }
   },
-  onHide:function(e){
-    if (isExit)
-      this.onClose();
+  onHide: function (e) {
+    //console.log("隐藏");
+    var that = this;
+    if (isExit) {
+      timeoutHide = setTimeout(function () {
+        that.onClose();
+      }, 60000);
+    }
     isExit = true;
   },
   onPullDownRefresh: function () {
@@ -371,8 +391,7 @@ Page({
             return 1;
           else
             return 0;
-        }
-        else
+        } else
           return 0;
       }
     }
@@ -403,8 +422,8 @@ Page({
     if (listTaskFinished.length > 0) {
       var card = listTaskFinished.pop();
       wx.setStorageSync("ListTaskFinished", listTaskFinished);
-      
-      timeHistory=0;
+
+      timeHistory = 0;
       that.timeCompute();
 
       card.Card.Number0 = card.Number0Old;
@@ -454,202 +473,221 @@ Page({
   //进入下一张题卡
   gotoNext: function (e) {
     var that = this;
+    //btnnumber可以有 5:秒过 4正常 3困难 2挪到最后 1搁置 0不过 -1今天要练
     var btnnumber = e.currentTarget.dataset.btnnumber;
-    var time = e.currentTarget.dataset.time;
-
-    //处理当前卡片进入历史数组
-    var finishCard = {};
-    finishCard.Card = TaskList[0];
-
-    finishCard.NumberNew = this.data.NumberNew;
-    finishCard.NumberReview = this.data.NumberReview;
-    finishCard.NumberHistory = this.data.NumberHistory;
-
-    finishCard.Number0Old = TaskList[0].Number0;
-    finishCard.Number0StrOld = TaskList[0].Number0Str;
-    finishCard.Number1Old = TaskList[0].Number1;
-    finishCard.Number1StrOld = TaskList[0].Number1Str;
-    finishCard.Number2Old = TaskList[0].Number2;
-    finishCard.Number2StrOld = TaskList[0].Number2Str;
-    finishCard.Number3Old = TaskList[0].Number3;
-    finishCard.Number3StrOld = TaskList[0].Number3Str;
-
-    //若不是搁置
-    if (btnnumber != "1") {
-      //若是分钟，则进入复习列表
-      if (time.lastIndexOf("m") == time.length - 1) {
-        var minute = Number(time.substr(0, time.indexOf("m")));
-        TaskList[0].LimitTime = common.formatTime(common.addDate("n", minute, new Date()));
-        //若是新增，则10m 1d 4d
-        if (TaskList[0].IsNew) {
-          TaskList[0].Number0 = "10m";
-          TaskList[0].Number0Str = main.getMemoryLevel(app.globalData.MemoryLevel, 0, TaskList[0].Number0);
-
-          delete TaskList[0].Number1;
-          delete TaskList[0].Number1Str;
-
-          TaskList[0].Number2 = "1d";
-          TaskList[0].Number2Str = main.getMemoryLevel(app.globalData.MemoryLevel, 2, TaskList[0].Number2);
-
-          // TaskList[0].Number3 = "4d";
-          // TaskList[0].Number3Str = main.getMemoryLevel(app.globalData.MemoryLevel, 3, TaskList[0].Number3);
-          
-          delete TaskList[0].Number3;
-          delete TaskList[0].Number3Str;
-
-          TaskList[0].FirstTime = null;
-          TaskList[0].LastTime = null;
-        }
-        //若是历史的，则10m 1d
-        else if (TaskList[0].IsHistory) {
-          TaskList[0].Number0 = "10m";
-          TaskList[0].Number0Str = main.getMemoryLevel(app.globalData.MemoryLevel, 0, TaskList[0].Number0);
+    //若是“挪到最后”
+    if (btnnumber == 2) {
+      var card = TaskList.splice(0, 1);
+      card[0].IsFinally=true;
+      TaskList.push(card[0]);
+      that.setData({
+        IsShowAnswer: [0, 0],
+        TaskInfo: TaskList[0],
+        CanUndo: 1,
+        Recommend: 0,
+        IsMore: false,
+      });
+    }
+    else{
+      var time = e.currentTarget.dataset.time;
+      //处理当前卡片进入历史数组
+      var finishCard = {};
+      finishCard.Card = TaskList[0];
+
+      finishCard.NumberNew = this.data.NumberNew;
+      finishCard.NumberReview = this.data.NumberReview;
+      finishCard.NumberHistory = this.data.NumberHistory;
+
+      finishCard.Number0Old = TaskList[0].Number0;
+      finishCard.Number0StrOld = TaskList[0].Number0Str;
+      finishCard.Number1Old = TaskList[0].Number1;
+      finishCard.Number1StrOld = TaskList[0].Number1Str;
+      finishCard.Number2Old = TaskList[0].Number2;
+      finishCard.Number2StrOld = TaskList[0].Number2Str;
+      finishCard.Number3Old = TaskList[0].Number3;
+      finishCard.Number3StrOld = TaskList[0].Number3Str;
+
+      //若不是搁置
+      //算出下一次的时间
+      if (btnnumber != "1") {
+
+        //若是分钟，则进入复习列表
+        if (time.lastIndexOf("m") == time.length - 1) {
+          var minute = Number(time.substr(0, time.indexOf("m")));
+          TaskList[0].LimitTime = common.formatTime(common.addDate("n", minute, new Date()));
+          //若是新增，则10m 1d 4d
+          if (TaskList[0].IsNew) {
+            TaskList[0].Number0 = "10m";
+            TaskList[0].Number0Str = main.getMemoryLevel(app.globalData.MemoryLevel, 0, TaskList[0].Number0);
+
+            delete TaskList[0].Number1;
+            delete TaskList[0].Number1Str;
+
+            TaskList[0].Number2 = "1d";
+            TaskList[0].Number2Str = main.getMemoryLevel(app.globalData.MemoryLevel, 2, TaskList[0].Number2);
+
+            delete TaskList[0].Number3;
+            delete TaskList[0].Number3Str;
+
+            TaskList[0].FirstTime = null;
+            TaskList[0].LastTime = null;
+          }
+          //若是历史的，则10m 1d
+          else if (TaskList[0].IsHistory) {
+            TaskList[0].Number0 = "10m";
+            TaskList[0].Number0Str = main.getMemoryLevel(app.globalData.MemoryLevel, 0, TaskList[0].Number0);
 
-          delete TaskList[0].Number1;
-          delete TaskList[0].Number1Str;
+            delete TaskList[0].Number1;
+            delete TaskList[0].Number1Str;
 
-          TaskList[0].Number2 = "1d";
-          TaskList[0].Number2Str = main.getMemoryLevel(app.globalData.MemoryLevel, 2, TaskList[0].Number2);
+            TaskList[0].Number2 = "1d";
+            TaskList[0].Number2Str = main.getMemoryLevel(app.globalData.MemoryLevel, 2, TaskList[0].Number2);
 
-          delete TaskList[0].Number3;
-          delete TaskList[0].Number3Str;
+            delete TaskList[0].Number3;
+            delete TaskList[0].Number3Str;
+          }
+
+          finishCard.IsReviewOld = TaskList[0].IsReview;
+
+          TaskList[0].IsReview = true;
+          TaskList.push(TaskList[0]);
+        }
+        //若是天月年
+        else {
+          var dayNum = Number(time.substr(0, time.indexOf("d")));
+          var date = common.addDate("d", dayNum, new Date());
+          TaskList[0].LimitTime = common.formatTime(date);
         }
 
-        finishCard.IsReviewOld = TaskList[0].IsReview;
+      }
 
-        TaskList[0].IsReview = true;
-        TaskList.push(TaskList[0]);
+      //修改学习任务个数
+      var learningType = 0;
+      if (TaskList[0].IsReview) {
+        learningType = 2;
       }
-      //若是天月年
-      else {
-        var dayNum = Number(time.substr(0, time.indexOf("d")));
-        var date = common.addDate("d", dayNum, new Date());
-        TaskList[0].LimitTime = common.formatTime(date);
+      if (TaskList[0].IsNew) {
+        learningType = 0;
+      } else if (TaskList[0].IsHistory) {
+        learningType = 1;
       }
 
-    }
-
-    //修改学习任务个数
-    var learningType = 0;
-    if (TaskList[0].IsReview) {
-      learningType = 2;
-    }
-    if (TaskList[0].IsNew) {
-      learningType = 0;
-    } else if (TaskList[0].IsHistory) {
-      learningType = 1;
-    }
-
-    if (btnnumber == "1") {
-      learningType = 3;
-    }
+      if (btnnumber == "1") {
+        learningType = 3;
+      }
 
-    finishCard.IntervalTime = time;
-    finishCard.BtnNumber = btnnumber;
-    finishCard.LearningType = learningType;
+      finishCard.IntervalTime = time;
+      finishCard.BtnNumber = btnnumber;
+      finishCard.LearningType = learningType;
 
-    var duration = common.diffDate("s", timeStart, new Date());
-    if (finishCard.btnnumber == 1)
-      duration = 0;
-    finishCard.Duration = timeHistory + duration;
+      var duration = common.diffDate("s", timeStart, new Date());
+      if (finishCard.btnnumber == 1)
+        duration = 0;
+      finishCard.Duration = timeHistory + duration;
 
-    console.log("CardTime:"+finishCard.Duration);
+      console.log("CardTime:" + finishCard.Duration);
 
-    timeHistory = 0;
-    that.timeCompute();
+      timeHistory = 0;
+      that.timeCompute();
 
-    //添加完成列表，去掉任务列表数据
-    listTaskFinished.push(finishCard);
-    wx.setStorageSync("ListTaskFinished", listTaskFinished);
-    TaskList.shift();
+      //添加完成列表，去掉任务列表数据
+      listTaskFinished.push(finishCard);
+      wx.setStorageSync("ListTaskFinished", listTaskFinished);
+      TaskList.shift();
 
-    that.data.NumberNew = 0;
-    that.data.NumberHistory = 0;
-    that.data.NumberReview = 0;
-    var arrTemp = [];
-    for (var i = 0; i < TaskList.length; i++) {
-      if (TaskList[i].IsReview) {
-        if (TaskList[i].LimitTime < common.formatTime(new Date())) {
+      that.data.NumberNew = 0;
+      that.data.NumberHistory = 0;
+      that.data.NumberReview = 0;
+      for (var i = 0; i < TaskList.length; i++) {
+        if (TaskList[i].IsReview) {
+          if (TaskList[i].LimitTime < common.formatTime(new Date())) {
+            var card = TaskList.splice(i, 1);
+            TaskList.unshift(card[0]);
+          }
+          that.data.NumberReview++;
+        } else if (TaskList[i].IsNew) {
+          that.data.NumberNew++;
+        } else if (TaskList[i].IsHistory) {
+          that.data.NumberHistory++;
+        }
+        if (TaskList[i].IsFinally){
           var card = TaskList.splice(i, 1);
-          TaskList.unshift(card[0]);
+          TaskList.push(card[0]);
         }
-        that.data.NumberReview++;
-      } else if (TaskList[i].IsNew) {
-        that.data.NumberNew++;
-      } else if (TaskList[i].IsHistory) {
-        that.data.NumberHistory++;
       }
-    }
 
-    //console.log(JSON.stringify(TaskList[0]));
 
-    if (that.data.NumberNew == 0 &&
-      that.data.NumberReview == 0 &&
-      that.data.NumberHistory == 0) {
-      that.setData({
-        IsShowAnswer: [0, 0],
-        NumberNew: 0,
-        NumberReview: 0,
-        NumberHistory: 0,
-        CanUndo: 1,
-        Recommend: 0,
-        IsMore: false,
-      });
-      clearTimeout(timeoutEveryCard);
-      
-      that.setSoundFile(1);
-      main.UpdateMiaoguoCardTodayAll(true, function () {
-        listTaskFinished = [];
-        that.getTaskTime();
-      });
+      //console.log(JSON.stringify(TaskList[0]));
+      //如果所有任务完成
+      if (that.data.NumberNew == 0 &&
+        that.data.NumberReview == 0 &&
+        that.data.NumberHistory == 0) {
+        that.setData({
+          IsShowAnswer: [0, 0],
+          NumberNew: 0,
+          NumberReview: 0,
+          NumberHistory: 0,
+          CanUndo: 1,
+          Recommend: 0,
+          IsMore: false,
+        });
+        clearTimeout(timeoutEveryCard);
 
-    } else {
-      arrImage = TaskList[0].ContentNew.Images;
-      arrImage2 = TaskList[0].ContentNew.Images2;
+        that.setSoundFile(1);
+        main.UpdateMiaoguoCardTodayAll(true, function () {
+          listTaskFinished = [];
+          that.getTaskTime();
+        });
 
-      //任务没有完成，下一张卡片
-      that.setData({
-        IsShowAnswer: [0, 0],
-        TaskInfo: TaskList[0],
-        NumberNew: that.data.NumberNew,
-        NumberReview: that.data.NumberReview,
-        NumberHistory: that.data.NumberHistory,
-        CanUndo: 1,
-        Recommend: 0,
-        IsMore: false,
-      });
+      }
+      //没有完成任务
+      else {
+        arrImage = TaskList[0].ContentNew.Images;
+        arrImage2 = TaskList[0].ContentNew.Images2;
 
-      if (btnnumber == "1") {
-        that.setSoundFile(3);
-        if (time == "1d") {
-          wx.showToast({
-            title: '搁置一天',
-            mask: true,
-            image: "../images/universalpic_shelve_white_120x120.png",
-          });
-        }
-        else {
-          wx.showToast({
-            title: '已推迟',
-            mask: true,
-            image: "../images/universalpic_bell_white_120x120.png",
-          });
-        }
-      } else
-        that.setSoundFile(0);
+        //任务没有完成，下一张卡片
+        that.setData({
+          IsShowAnswer: [0, 0],
+          TaskInfo: TaskList[0],
+          NumberNew: that.data.NumberNew,
+          NumberReview: that.data.NumberReview,
+          NumberHistory: that.data.NumberHistory,
+          CanUndo: 1,
+          Recommend: 0,
+          IsMore: false,
+        });
+
+        if (btnnumber == "1") {
+          that.setSoundFile(3);
+          if (time == "1d") {
+            wx.showToast({
+              title: '搁置一天',
+              mask: true,
+              image: "../images/universalpic_shelve_white_120x120.png",
+            });
+          } else {
+            wx.showToast({
+              title: '已推迟',
+              mask: true,
+              image: "../images/universalpic_bell_white_120x120.png",
+            });
+          }
+        } else
+          that.setSoundFile(0);
+      }
     }
   },
-  timeCompute:function(){
-    var that=this;
+  timeCompute: function () {
+    var that = this;
     timeStart = new Date();
     clearTimeout(timeoutEveryCard);
-    timeoutEveryCard=setTimeout(function(){
+    timeoutEveryCard = setTimeout(function () {
       //计算暂停时已经用掉的时长
       timeHistory += common.diffDate("s", timeStart, new Date());
-      console.log("timeHistory:"+timeHistory);
+      console.log("timeHistory:" + timeHistory);
       wx.showModal({
         title: '提醒',
-        content: '您已等待了' + app.globalData.CardWaitTimeMax+'分钟',
+        content: '您已等待了' + app.globalData.CardWaitTimeMax + '分钟',
         showCancel: false,
         confirmText: "知道了",
         success(res) {
@@ -658,7 +696,7 @@ Page({
           }
         },
       })
-    }, app.globalData.CardWaitTimeMax*60*1000);
+    }, app.globalData.CardWaitTimeMax * 60 * 1000);
   },
   gotoCollect: function () {
     var that = this;
@@ -670,8 +708,7 @@ Page({
       var that = this;
       if (!TaskList[0].IsCollect) {
         TaskList[0].IsCollect = 1;
-      }
-      else {
+      } else {
         TaskList[0].IsCollect = 0;
       }
       that.setData({
@@ -688,24 +725,20 @@ Page({
     var url;
     if (str == "recorder") {
       url = e.currentTarget.dataset.soundmark;
-    }
-    else if (str.indexOf("英 [") >= 0 || str.indexOf("美 [") >= 0) {
+    } else if (str.indexOf("英 [") >= 0 || str.indexOf("美 [") >= 0) {
       str = str.replace("英 [", "[");
       str = str.replace("美 [", "[");
       url = e.currentTarget.dataset.soundmark;
-    }
-    else if (e.currentTarget.dataset.soundmark && e.currentTarget.dataset.soundmark != "undefined") {
+    } else if (e.currentTarget.dataset.soundmark && e.currentTarget.dataset.soundmark != "undefined") {
       var soundmark = e.currentTarget.dataset.soundmark;
       if (soundmark && soundmark.indexOf("http") < 0) {
         url = app.globalData.audioUrlBaidu;
         url = url.replace("[token]", app.globalData.BaiduToken);
         url = url.replace("[word]", soundmark);
-      }
-      else {
+      } else {
         url = soundmark;
       }
-    }
-    else {
+    } else {
       url = app.globalData.audioUrlBaidu;
       url = url.replace("[token]", app.globalData.BaiduToken);
       url = url.replace("[word]", str);
@@ -724,7 +757,7 @@ Page({
       timeoutPlayAudio = setTimeout(function () {
         isPlaying = false;
       }, 60000);
-      
+
       wx.showLoading({
         title: '音频下载中',
         mask: true,
@@ -738,7 +771,7 @@ Page({
         success(res) {
           wx.hideLoading();
           if (res.statusCode === 200) {
-            tempPlayUrlLocal=res.tempFilePath;
+            tempPlayUrlLocal = res.tempFilePath;
             that.audioCtx.setSrc(res.tempFilePath);
             that.audioCtx.play();
             tempPlayUrl = url;
@@ -748,8 +781,7 @@ Page({
           wx.hideLoading();
         }
       });
-    }
-    else {
+    } else {
       this.audioCtx.pause();
       if (innerAudioContext1)
         innerAudioContext1.stop();
@@ -759,7 +791,7 @@ Page({
   audioBindEnded: function () {
     isPlaying = false;
   },
-  audioBindError:function(err){
+  audioBindError: function (err) {
     console.log(err);
     innerAudioContext1.src = tempPlayUrlLocal;
     innerAudioContext1.play();
@@ -776,14 +808,14 @@ Page({
         }
 
         var speed1 = 0;
-        if (data.Duration>0)
+        if (data.Duration > 0)
           speed1 = Math.round(100 * data.Count / (data.Duration / 60)) / 100;
 
-        var speed2 = 0+"秒";
+        var speed2 = 0 + "秒";
         if (data.Count > 0)
           speed2 = common.getMinuteSecond(Math.round(data.Duration / data.Count), true);
 
-        
+
         app.globalData.TaskToday.DayNumber = data.DayNumber;
         that.setData({
           TodayTime: duration,
@@ -867,7 +899,7 @@ Page({
   onMore: function () {
     for (var i = 0; i < this.data.FontSizeArray.length; i++) {
       if (this.data.FontSizeArray[i].Value == this.data.TaskInfo.FontSize)
-        this.data.FontSizeArray[i].CSS = "color:#1E1E1E;background-color:" + this.data.Color.LineColor+";border:3rpx solid " + this.data.Color.LineColor + ";";
+        this.data.FontSizeArray[i].CSS = "color:#1E1E1E;background-color:" + this.data.Color.LineColor + ";border:3rpx solid " + this.data.Color.LineColor + ";";
       else
         this.data.FontSizeArray[i].CSS = "";
     }
@@ -901,6 +933,7 @@ Page({
     var avatarUrl = app.globalData.userInfo.AvatarUrl;
     avatarUrl = avatarUrl.substring(0, avatarUrl.lastIndexOf("/") + 1);
     avatarUrl = avatarUrl + "0";
+    //console.log(avatarUrl);
 
     wx.downloadFile({
       url: avatarUrl, // 仅为示例，并非真实的资源
@@ -946,8 +979,9 @@ Page({
           canvas.fillText("迄今已接力", 390, 267);
           canvas.setFontSize(32);
           canvas.fillText(app.globalData.TaskToday.DayNumber + "次", 390, 295);
-
+          //console.log("生成前");
           canvas.draw(1, function (n) {
+            //console.log("生成后1");
             wx.canvasToTempFilePath({
               x: 0,
               y: 0,
@@ -958,16 +992,17 @@ Page({
               canvasId: 'shareCanvas',
               success: function (res2) {
                 wx.hideLoading();
-
+                //console.log("生成后2");
                 wx.previewImage({
                   current: res2.tempFilePath, // 当前显示图片的http链接
                   urls: [res2.tempFilePath] // 需要预览的图片http链接列表
                 });
 
-                main.getData("ShareMiaoguoTask?UserID="+app.globalData.userInfo.UserID, function (data) {});
+                main.getData("ShareMiaoguoTask?UserID=" + app.globalData.userInfo.UserID, function (data) { });
               },
-              fail: function () {
+              fail: function (e) {
                 wx.hideLoading();
+                //console.log("生成错误："+e);
               }
             })
           });

pages/main/detail.wxml

@@ -6,18 +6,18 @@
 
     <!-- 工具栏 -->
     <view class='panelTop FlexRow' style='background-color:{{Color.BackColor}};'>
-      <view class='panelCancel FlexRow' catchtouchstart='gotoCollect'>
+      <view class='panelCancel FlexRow' catchtap='gotoCollect'>
         <view class='panelCancel0 FlexRow'>
           <image hidden='{{TaskInfo.IsCollect}}' src="../images/universalpic_fav_default_gray_26x24.png" class='universalpic_fav_default_gray_26x24' />
           <image hidden='{{!TaskInfo.IsCollect}}' src="../images/universalpic_fav_enable_tc0{{Color.ID}}_26x24.png" class='universalpic_fav_default_gray_26x24' />
         </view>
       </view>
-      <view class='panelCancel FlexRow' catchtouchstart='onMore'>
+      <view class='panelCancel FlexRow' catchtap='onMore'>
         <view class='panelCancel0 FlexRow'>
           <image src="../images/universalpic_more_gray_32x8.png" class='universalpic_more_gray_32x8' />
         </view>
       </view>
-      <view class='panelNumber FlexRow' catchtouchstart='showNumberContainner'>
+      <view class='panelNumber FlexRow' catchtap='showNumberContainner'>
         <view class="FlexColumn">
           <view class='panelNumber1'>{{NumberNew}}</view>
           <view hidden="{{!TaskInfo.IsNew || TaskInfo.IsReview}}" class='panelNumber2Line' style='background-color:{{Color.LineColor}};'></view>
@@ -34,7 +34,7 @@
           <view class='panelNumber2 panelNumber1'>{{NumberNew+NumberReview+NumberHistory}}</view>
         </view>
       </view>
-      <view class='panelCancel FlexRow' catchtouchstart='gotoNext' data-time="1d" data-btnnumber="1">
+      <view class='panelCancel FlexRow' catchtap='gotoNext' data-time="1d" data-btnnumber="1">
         <view class='panelCancel0 FlexRow'>
           <image src="../images/universalpic_shelve_gray_26x26.png" class='universalpic_shelve_white_26x26' />
         </view>
@@ -44,7 +44,7 @@
           <image src="../images/universalpic_undo_gray_26x20.png" class='universalpic_undo_white_30p_26x20' />
         </view>
       </view>
-      <view class='panelCancel FlexRow' catchtouchstart='gotoPrev' wx:if="{{CanUndo==1}}">
+      <view class='panelCancel FlexRow' catchtap='gotoPrev' wx:if="{{CanUndo==1}}">
         <view class='panelCancel0 FlexRow'>
           <image src="../images/universalpic_undo_gray_26x20.png" class='universalpic_undo_white_30p_26x20' />
         </view>
@@ -62,10 +62,10 @@
     <image class="footerShade" src="../images/study_learning_bgimage_tc0{{Color.ID}}.png" />
     <view class='footer FlexColumn'>
       <image class="footerImage" src="../images/study_learning_maskimage_tc0{{Color.ID}}.png" />
-      <view class="panelFooter FlexColumn" wx:if="{{!IsShowAnswer[0] && !IsShowAnswer[1] && ClickType!=1}}" catchtouchstart="onShowAnswer">
+      <view class="panelFooter FlexColumn" wx:if="{{!IsShowAnswer[0] && !IsShowAnswer[1] && ClickType!=1}}" catchtap="onShowAnswer">
         看答案
       </view>
-      <view class="panelFooter FlexColumn" wx:if="{{IsShowAnswer[0] && !IsShowAnswer[1] && ClickType!=1}}" catchtouchstart="onShowAnswer">
+      <view class="panelFooter FlexColumn" wx:if="{{IsShowAnswer[0] && !IsShowAnswer[1] && ClickType!=1}}" catchtap="onShowAnswer">
         下一段
       </view>
       <view class="panelFooter0 panelFooter FlexColumn" wx:if="{{IsShowAnswer[1]}}">
@@ -177,10 +177,10 @@
   <view wx:if="{{IsMore}}" class="numberContainer FlexColumn" style='height:{{Containnerheight}}rpx;background-color:{{Color.BackColor}};'>
     <view class="numberContainerFooter1 FlexColumn">
       <view class='lineFooter'></view>
-      <view class='numberContainerFooter102 FlexRow' catchtap="gotoEdit">
-        <image src="../images/universalpic_edit_gray_25x25.png" class='universalpic_edit_gray_25x25' />
-        <view class='numberContainerFooter111'>编辑题卡</view>
-      </view>
+      <view class='numberContainerFooter102 FlexRow' catchtap='gotoNext' data-btnnumber="2">
+        <image src="../images/universalpic_sendtoback_gray_30x26.png" class='universalpic_sendtoback_gray_30x26' />
+        <view class='numberContainerFooter111'>挪到最后</view>
+      </view>      
       <view class='lineFooter'></view>
       <view class='numberContainerFooter103 FlexRow' catchtap="gotoEdit">
         <image src="../images/universalpic_bell_gray_30x30.png" class='universalpic_bell_gray_30x30' />
@@ -195,6 +195,11 @@
         </view>
       </block>
       <view class='lineFooter'></view>
+      <view class='numberContainerFooter102 FlexRow' catchtap="gotoEdit">
+        <image src="../images/universalpic_edit_gray_25x25.png" class='universalpic_edit_gray_25x25' />
+        <view class='numberContainerFooter111'>编辑题卡</view>
+      </view>
+      <view class='lineFooter'></view>
       <view class='numberContainerFooter101 FlexRow'>
         <image src="../images/universalpic_typesize_gray_30x18.png" class='universalpic_typesize_gray_30x18' />
         <view class='numberContainerFooter11 FlexColumn'>

pages/main/detail.wxss

@@ -632,6 +632,12 @@
   align-items: flex-start;
 }
 
+.universalpic_sendtoback_gray_30x26{
+  width: 30rpx; 
+  height: 26rpx;
+  margin: 0 30rpx 0 30rpx;
+}
+
 .universalpic_edit_gray_25x25{
   width: 25rpx; 
   height: 25rpx;

pages/main/preview.wxml

@@ -30,7 +30,7 @@
   <!-- 幻灯片播放 -->
   <block wx:if="{{ShowType=='play'}}">
     <view class="panelTop FlexRow"  style='background-color:{{Color.BackColor}};border-bottom:0;'>
-      <view class='left' catchtouchstart='gotoCollect'>
+      <view class='left' catchtap='gotoCollect'>
       <view class='panelCancel0 FlexRow'>
           <image hidden='{{IsCollect}}' src="../images/universalpic_fav_default_gray_26x24.png" class='universalpic_fav_default_gray_26x24' />
           <image hidden='{{!IsCollect}}' src="../images/universalpic_fav_enable_tc0{{Color.ID}}_26x24.png" class='universalpic_fav_default_gray_26x24' />
@@ -54,7 +54,7 @@
   <view style='height:150rpx'></view>
 
   <view class='footer FlexColumn' style='background-color:{{Color.BackColor}}'>
-    <view class="panelFooter FlexRow" wx:if="{{ShowType=='preview'}}" catchtouchstart="close">
+    <view class="panelFooter FlexRow" wx:if="{{ShowType=='preview'}}" catchtap="close">
       退出预览
     </view>
 
@@ -63,10 +63,10 @@
       <view class='btn1 FlexRow' catchtap="previewNext" data-id="{{PrevID}}" wx:if="{{PrevID>0}}">
         <image class="universalpic_next_gray_30x30" src='../images/universalpic_prev_gray_30x30.png' />
       </view>
-      <view class='btn22 FlexRow' wx:if="{{IsShowAnswer[0]==1}}" catchtouchstart='onHideAnswer'>
+      <view class='btn22 FlexRow' wx:if="{{IsShowAnswer[0]==1}}" catchtap='onHideAnswer'>
         隐藏答案
       </view>
-      <view class='btn22 FlexRow' wx:if="{{IsShowAnswer[0]==0}}" catchtouchstart='onShowAnswer'>
+      <view class='btn22 FlexRow' wx:if="{{IsShowAnswer[0]==0}}" catchtap='onShowAnswer'>
         显示答案
       </view>
       <button class="btn21" open-type='share'>分享给大家</button>
@@ -92,10 +92,10 @@
       <view class='btn1 FlexRow' catchtap="playNext" data-div="-1" wx:if="{{PrevID>0}}">
         <image class="universalpic_next_gray_30x30" src='../images/universalpic_prev_gray_30x30.png' />
       </view>
-      <view class='btn3 FlexRow' catchtouchstart='onPlayAgain'>
+      <view class='btn3 FlexRow' catchtap='onPlayAgain'>
         稍后回放
       </view>
-      <view class='btn4 FlexRow' catchtouchstart='onShowAnswer'>
+      <view class='btn4 FlexRow' catchtap='onShowAnswer'>
         看答案
       </view>
       <view class='btn1 FlexRow' catchtap="playNext" data-div="1" wx:if="{{NextID>0}}">

pages/main/searchWeb2.wxml

@@ -131,7 +131,8 @@
       <view class="panelTitle1">中文释义</view>
     </view>
     <view class="panelItem FlexRow">
-      <view class="{{CSS['CHN_PinYin_explain_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.PinYin}}" wx:key="pinyin" bindtap='getInputData' data-type="normal" data-content="[读]{{item.pinyin}}[/读]\n{{item.explain}}" data-css="CHN_PinYin_explain_{{index}}" data-tag="释义">
+      <view class="{{CSS['CHN_PinYin_explain_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.PinYin}}" wx:key="pinyin" bindtap='getInputData' data-type="normal" data-content="[读]{{item.pinyin}}[/读]\n{{item.explain}}" data-css="CHN_PinYin_explain_{{index}}"
+        data-tag="释义">
         <view class="{{CSS['CHN_PinYin_explain_'+index].Css2}} panelSelect0">{{CSS['CHN_PinYin_explain_'+index].Number}}</view>
         <text class="text1"><block wx:if="{{Result.CHN.PinYin.length>1}}">
         [{{item.pinyin}}]\n 
@@ -141,6 +142,20 @@
     <view class='lineFooter'></view>
   </block>
 
+  <!-- 部首 -->
+  <block wx:if="{{Result.CHN.BuShou && Result.CHN.BuShou.length>0}}">
+    <view class="panelTitle FlexRow">
+      <view class="panelTitle1">部首</view>
+    </view>
+    <view class="panelItem FlexRow">
+      <view class="{{CSS.CHN_BuShou.Css1}} panelItemFrame FlexRow" bindtap='getInputData' data-type="normal" data-content="{{Result.CHN.BuShou}}" data-css="CHN_BuShou" data-tag="部首">
+        <view class="{{CSS.CHN_BuShou.Css2}} panelSelect0">{{CSS.CHN_BuShou.Number}}</view>
+        <view class="text1">{{Result.CHN.BuShou}}</view>
+      </view>
+    </view>
+    <view class='lineFooter'></view>
+  </block>
+
   <!-- 作者与朝代 -->
   <block wx:if="{{Result.CHN.Author && Result.CHN.Author.length>0}}">
     <view class="panelTitle FlexRow">

pages/other/binding.js

@@ -10,27 +10,27 @@ Page({
     var that = this;
     if (options && options.type && options.type == "bebound") {
       
-      if (app.globalData.userSource=="1007"){
-        that.setData({
-          ShowPanel: "bebound",
-          ParentUserID: options.ParentUserID,
-          NickName: options.NickName,
-        });
-        that.download(options.AvatarUrl);
-      }
-      else{
+      if (app.globalData.userSource == "1044" || app.globalData.userSource == "1008"){
         wx.showModal({
           title: '抱歉',
           content: '绑定功能只能用于朋友单聊',
           showCancel: false,
           confirmText: "知道了",
-          success:function(){
+          success: function () {
             wx.reLaunch({
               url: '../index/index',
             })
           }
         });
       }
+      else{
+        that.setData({
+          ShowPanel: "bebound",
+          ParentUserID: options.ParentUserID,
+          NickName: options.NickName,
+        });
+        that.download(options.AvatarUrl);
+      }
     }
     else {
       main.getData("GetUserBindingList?UserID=" + app.globalData.userInfo.UserID, function (data) {

pages/other/userbook.wxml

@@ -45,7 +45,7 @@
         <view>作业清单</view>
       </view>    
 
-      <view class="panel21 FlexColumn" bindtap="goto" data-url="../../marketing/main/index" wx:if="{{IsPay==1 && !IsLoseEfficacy}}">
+      <view class="panel21 FlexColumn" bindtap="goto" data-url="../marketing/index" wx:if="{{IsPay==1 && !IsLoseEfficacy}}">
         <image class="usermanual_index_handshake" src='../images/usermanual_index_handshake.png' />
         <view>推广计划</view>
       </view>
@@ -98,7 +98,7 @@
 
     <block wx:if="{{IsShow==1 && PanelShow===2 && ClassDayNumber>0 && IsPay==1 && !IsLoseEfficacy}}">
       <view class="panelItem FlexColumn">
-        <image class="salesactivity_a05_usermanual_banner" src='../images/salesactivity_a05_usermanual_banner.png' bindtap="goto" data-url="../../marketing/main/index" />
+        <image class="salesactivity_a05_usermanual_banner" src='../images/salesactivity_a05_usermanual_banner.png' bindtap="goto" data-url="../marketing/index" />
         <view class="marketingDetail" bindtap="goto" data-url="../../pages/other/webview?PageID=7"></view>
       </view>
     </block>

pages/test/index.js

@@ -7,66 +7,8 @@ Page({
   data: {
     List: [],
     IsSelectGrade: false,
-    SelectGrade:0,
-    GradeArr: [
-      {
-        Name: "一年级",
-        Select:"Select",
-        List: [
-          {
-            ID: 1,
-            Type: "Shizi",
-            Name: "语文识字",
-            Name2: "上学期",
-            Image: "../images/examine_subject_a001.png"
-          }, {
-            ID: 2,
-            Type: "Shizi",
-            Name: "语文识字",
-            Name2: "下学期",
-            Image: "../images/examine_subject_a002.png"
-          },
-        ]
-      },
-      {
-        Name: "二年级",
-        Select: "",
-        List: [
-          {
-            ID: 3,
-            Type: "Shizi",
-            Name: "语文识字",
-            Name2: "上学期",
-            Image: "../images/examine_subject_a003.png"
-          }, {
-            ID: 4,
-            Type: "Shizi",
-            Name: "语文识字",
-            Name2: "下学期",
-            Image: "../images/examine_subject_a004.png"
-          },
-        ]
-      },
-      {
-        Name: "三年级",
-        Select: "",
-        List: [
-          {
-            ID: 5,
-            Type: "Shizi",
-            Name: "语文识字",
-            Name2: "上学期",
-            Image: "../images/examine_subject_a005.png"
-          }, {
-            ID: 6,
-            Type: "Shizi",
-            Name: "语文识字",
-            Name2: "下学期",
-            Image: "../images/examine_subject_a006.png"
-          },
-        ]
-      }
-    ],
+    TestSelectGrade:0,
+    
   },
   onLoad: function (options) {
     var that = this;
@@ -74,12 +16,17 @@ Page({
       Containnerheight: main.getWindowHeight(),
     });
 
-    that.getHanzi(function (arr) {
-      if (arr) {
-
+    main.getHanzi(function (arr) {
+      if (!arr) {
+        wx.removeStorageSync("HanziUpdateTime");
+        wx.removeStorageSync("HanziAll");
+        main.getHanzi(function(arr){});
       }
     });
   },
+  onShow:function(){
+    this.getTestReportList();
+  },
   showSelectGrade: function () {
     var that = this;
     that.setData({
@@ -98,22 +45,130 @@ Page({
       url: url,
     });
   },
-  getHanzi: function (callback) {
+  getTestReportList: function () {
     var that = this;
-    var time = wx.getStorageSync("HanziUpdateTime");
-    main.getData('GetHanziAll?UpdateTime=' + time, function (data) {
+    that.setData({
+      GradeArr: [
+        {
+          Name: "一年级",
+          Select: "Select",
+          List: [
+            {
+              ID: 1,
+              Type: "Shizi",
+              Name: "语文识字",
+              Name2: "上学期",
+              Finish: 0,
+              Total: 12,
+              Image: "../images/examine_subject_a001.png"
+            }, {
+              ID: 2,
+              Type: "Shizi",
+              Name: "语文识字",
+              Name2: "下学期",
+              Finish: 0,
+              Total: 14,
+              Image: "../images/examine_subject_a002.png"
+            },
+          ]
+        },
+        {
+          Name: "二年级",
+          Select: "",
+          List: [
+            {
+              ID: 3,
+              Type: "Shizi",
+              Name: "语文识字",
+              Name2: "上学期",
+              Finish: 0,
+              Total: 16,
+              Image: "../images/examine_subject_a003.png"
+            }, {
+              ID: 4,
+              Type: "Shizi",
+              Name: "语文识字",
+              Name2: "下学期",
+              Finish: 0,
+              Total: 16,
+              Image: "../images/examine_subject_a004.png"
+            },
+          ]
+        },
+        {
+          Name: "三年级",
+          Select: "",
+          List: [
+            {
+              ID: 5,
+              Type: "Shizi",
+              Name: "语文识字",
+              Name2: "上学期",
+              Finish: 0,
+              Total: 16,
+              Image: "../images/examine_subject_a005.png"
+            }, {
+              ID: 6,
+              Type: "Shizi",
+              Name: "语文识字",
+              Name2: "下学期",
+              Finish: 0,
+              Total: 16,
+              Image: "../images/examine_subject_a006.png"
+            },
+          ]
+        }
+      ],
+    })
+    var userid = app.globalData.userInfo.UserID;
+    main.getData('GetTestReportList?UserID=' + userid, function (data) {
       if (data) {
-        var arr = [];
-        if (data.List) {
-          arr = common.Decrypt(data.List);
-          wx.setStorageSync("HanziAll", arr);
-          wx.setStorageSync("HanziUpdateTime", data.UpdateTime);
+        var dataTemp=[];
+        for (var i = 0; i < data.length; i++) {
+          for(var j=0;j<dataTemp.length;j++){
+            if (dataTemp[j].Name[0] == data[i].Name[0]
+              && dataTemp[j].Name[1] == data[i].Name[1]
+              && dataTemp[j].TestType == data[i].TestType 
+              && data[i].IsFinished==1
+              ){
+              dataTemp.splice(j,1);
+              break;
+            }
+          }
+          dataTemp.push(data[i]);
+        }
+
+        for (var i = 0; i < dataTemp.length;i++){
+          var name = dataTemp[i].Name[0].split(" ");
+          for(var j=0;j<that.data.GradeArr.length;j++){
+            var item = that.data.GradeArr[j];
+            if (name[0]==item.Name){
+              for(var k=0;k<item.List.length;k++){
+                if (name[1] == item.List[k].Name && name[2] == item.List[k].Name2){
+                  if (dataTemp[i].IsFinished==1)
+                    item.List[k].Finish++;
+                }
+              }
+            }
+          }
         }
-        else {
-          arr = wx.getStorageSync("HanziAll");
-          arr=JSON.parse(arr);
+
+        for (var j = 0; j < that.data.GradeArr.length; j++) {
+          var item = that.data.GradeArr[j];
+          for (var k = 0; k < item.List.length; k++) {
+            item.List[k].Finished = Math.round(100 * item.List[k].Finish / item.List[k].Total);
+          }
         }
-        callback(arr);
+
+        that.setData({
+          TestReport: data,
+          GradeArr:that.data.GradeArr,
+        });
+        wx.setStorageSync("UserTestReport", data);
+
+        common.getStorageValue(that, "TestSelectGrade", 0, function () {
+          that.onSelectGrade({ currentTarget: { dataset: { value: that.data.TestSelectGrade } } });
+        });
       }
     });
   },
@@ -123,10 +178,26 @@ Page({
       this.data.GradeArr[i].Select = "";
     this.data.GradeArr[index].Select="Select";
     this.setData({
-      SelectGrade:index,
+      TestSelectGrade:index,
       GradeArr: this.data.GradeArr,
     });
     this.closeSelectGrade();
+    wx.setStorageSync("TestSelectGrade", index);
+  },
+  gotoTestReportInfo: function (e) {
+    var id = e.currentTarget.dataset.id;
+    var userid = app.globalData.userInfo.UserID;
+    main.getData('GetTestReportInfo?UserID=' + userid+'&ID='+id, function (data) {
+      if (data) {
+        wx.setStorageSync("TestTask", data);
+        wx.navigateTo({
+          url: "./report?type=edit",
+        });
+      }
+    });
+  },
+  onUnload:function(){
+    wx.removeStorageSync("UserTestReport");
   },
   onShareAppMessage: function () {
     return {

pages/test/index.json

@@ -1,3 +1,6 @@
 {
-  "navigationBarTitleText": "知识检验"
+  "navigationBarTitleText": "知识检验",
+  "backgroundColor": "#ffffff",
+  "backgroundColorTop": "#f0f0f0",
+  "backgroundColorBottom": "#ffffff"
 }

pages/test/index.wxml

@@ -1,57 +1,70 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="panelTop FlexRow" bindtap="showSelectGrade">
-    <view class="panelTop1">{{GradeArr[SelectGrade].Name}}</view>
+    <view class="panelTop1">{{GradeArr[TestSelectGrade].Name}}</view>
     <view class="panelTop2 FlexRow">
       <image class="universalpic_menu_blue_26x26" src="../images/universalpic_menu_blue_26x26.png"></image>
       <view>首选年级</view>
     </view>
   </view>
-  <view style="height:106rpx;"></view>
-  <scroll-view scroll-x="true" class="panelCard FlexRow">
-    <view class="Card" wx:for="{{GradeArr[SelectGrade].List}}" wx:key="index" bindtap="goto" data-url="./list?id={{item.ID}}">
+  <view class="panelLine"></view>
+  <scroll-view scroll-x class="panelCard FlexRow">
+    <view class="Card" wx:for="{{GradeArr[TestSelectGrade].List}}" wx:key="index" bindtap="goto" data-url="./list?id={{item.ID}}&name1={{GradeArr[TestSelectGrade].Name}} {{item.Name}} {{item.Name2}}">
       <image class="examine_subject_a001" src="{{item.Image}}"></image>
       <view class="Card1">{{item.Name}}</view>
       <view class="Card2">{{item.Name2}}</view>
-      <view class="Card3">已检验</view>
+      <view class="Card3">检验过</view>
       <view class="Card4 FlexRow">
-        <view class="Progress FlexRow"><view class="Progress1"></view></view>
-        <view class="Number">12%</view>
+        <view class="Progress FlexRow">
+          <view class="Progress1" style="width:{{item.Finished}}%;"></view>
+        </view>
+        <view class="Number">{{item.Finished}}%</view>
       </view>
     </view>
     <view class="Card0"></view>
   </scroll-view>
   <view class="panelList FlexColumn">
     <view class="panelListTitle FlexRow">
-      <view>检验报告</view>
+      <view>报告汇总</view>
     </view>
-    <block wx:if="{{List.length==0}}">
+    <block wx:if="{{TestReport.length==0}}">
       <image class="examine_clipboard_80x80" src="../images/examine_clipboard_80x80.png"></image>
-      <text class="panelListContent">您还没有做过知识检验，选择科目开始检验吧，\n检验后的报告将显示在这里。</text>
+      <text class="panelListContent">您还没有做过知识检验，选择科目开始检验吧，\n检验后的报告将显示在这里。\n</text>
+
     </block>
 
-    <block wx:if="{{List.length>0}}" wx:for="{{[1,2,3,2,3,2,3,2,3]}}">
-      <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
-        <view class="lineWidth720"></view>
-      </view>
-      <view class="Item FlexRow">
+    <block wx:if="{{TestReport.length>0}}" wx:for="{{TestReport}}" wx:key="index">
+
+      <view class="Item FlexRow" bindtap="gotoTestReportInfo" data-id="{{item.ID}}">
         <view class="Item1 FlexColumn">
-          <view class="ItemTitle">汉语拼音 9-13</view>
-          <view class="ItemTitle2">语文识字 上学期</view>
-        </view>        
+          <view class="ItemTitle FlexRow">
+            <view>{{item.Name[1]}}</view>
+            <view class="ItemTitle11" wx:if="{{item.TestType=='read'}}">会念</view>
+            <view class="ItemTitle11" wx:if="{{item.TestType=='write'}}">会写</view>
+          </view>
+          <view class="ItemTitle2">{{item.Name[0]}}</view>
+        </view>
         <view class="Item2 FlexColumn">
-          <view class="ItemDate">12月12日</view>
+          <view class="ItemDate">{{item.CreateTime}}</view>
           <view class="ItemNumber FlexRow">
-            <image class="examine_willread_gray_22x22" src="../images/examine_willread_gray_22x22.png"></image>
+            <image wx:if="{{item.TestType=='read' && item.IsFinished==1}}" class="examine_willread_gray_22x22" src="../images/examine_willread_green_22x22.png"></image>
+            <image wx:if="{{item.TestType=='read' && item.IsFinished==0}}" class="examine_willread_gray_22x22" src="../images/examine_willread_gray_22x22.png"></image>
+            <image wx:if="{{item.TestType=='write' && item.IsFinished==1}}" class="examine_willwrite_gray_22x22" src="../images/examine_willwrite_green_22x22.png"></image>
+            <image wx:if="{{item.TestType=='write' && item.IsFinished==0}}" class="examine_willwrite_gray_22x22" src="../images/examine_willwrite_gray_22x22.png"></image>
             <image class="universalpic_checked_gray_14x12" src="../images/universalpic_checked_gray_14x12.png"></image>
-            <view class="Number2">10</view>
+            <view class="Number2">{{item.TestRight}}</view>
             <image class="universalpic_wrong_gray_12x12" src="../images/universalpic_wrong_gray_12x12.png"></image>
-            <view class="Number3">5</view>
+            <view class="Number3">{{item.TestWrong}}</view>
           </view>
         </view>
       </view>
+
+      <view class="lineWidthAll FlexRow">
+        <view class="lineWidth720"></view>
+      </view>
     </block>
 
   </view>
+
 </view>
 
 <!-- 更多功能 -->

pages/test/index.wxss

@@ -9,6 +9,7 @@
   position: fixed;
   z-index: 10;
   top:0;
+  border-bottom:1rpx solid #d2d2d2; 
 }
 
 .panelTop1{
@@ -28,6 +29,12 @@
   margin-right: 10rpx;
 }
 
+.panelLine{
+  width:100%;
+  height:106rpx;
+  background-color: #f0f0f0;
+}
+
 .panelCard{
   width:100%;
   height:443rpx;
@@ -94,7 +101,6 @@
   justify-content: flex-start;
 }
 .Progress1{
-  width:100rpx;
   height:10rpx;
   border-radius: 5rpx;
   background-color: #34BD88;
@@ -113,7 +119,6 @@
 .panelListTitle{
   font-size:32rpx;
   margin: 0 0 0 30rpx;
-  width:100%;
   height:115rpx;
   justify-content: flex-start;
 }
@@ -125,17 +130,18 @@
 }
 
 .panelListContent{
-  width:100%;
-  margin: 30rpx 0 0 30rpx;
+  margin: 30rpx 0 30rpx 30rpx;
   font-size:24rpx;
   font-weight: 400;
 }
 
+
 .Item{
   width:100%;
   height:136rpx;
   justify-content: space-between;
 }
+
 .Item1{
   margin: 0 0 0 30rpx;
   align-items: flex-start;
@@ -145,6 +151,10 @@
   font-size:30rpx;
   font-weight: 400;
 }
+.ItemTitle11{
+  margin-left: 20rpx;
+}
+
 .ItemTitle2{
   font-size:24rpx;
   font-weight: 400;
@@ -190,6 +200,11 @@
   font-size:24rpx;
 }
 
+.footer{
+  width:100%;
+  height:100rpx;
+  background-color: #F0F0F0;
+}
 
 .numberContainer {
   width: 100%;

pages/test/item.js

@@ -2,49 +2,243 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 const app = getApp();
+var TaskList = [];
+
+var isPlaying = false;
+
+var innerAudioContext1;
+var timeoutPlayAudio;
+var tempPlayUrl = "";
+var tempPlayUrlLocal = "";
+var timeoutEveryCard = 0;
+var isFinished=0;
 
 Page({
   data: {
     IsSelect: true,
+    Color: { ID: 1 },
+  },
+  onReady: function () {
+    var that = this;
+    innerAudioContext1 = wx.createInnerAudioContext();
+    innerAudioContext1.onPlay(() => {
+      console.log('开始播放')
+    });
+    innerAudioContext1.onError((res) => {
+      console.log("innerAudioContext1.errMsg:" + res.errMsg);
+      console.log("innerAudioContext1.errCode:" + res.errCode);
+      that.audioCtx.setSrc(tempPlayUrl);
+      that.audioCtx.play();
+    });
+
+    this.audioCtx = wx.createAudioContext('myAudio');
 
   },
   onLoad: function (options) {
     var that = this;
     that.setData({
-      Containnerheight: main.getWindowHeight(),
       IsShowAnswer: [0, 0],
-      Color: main.getDetailColor(1),
+      Color: main.getDetailColor(app.globalData.ColorIndex),
+      Containnerheight: main.getWindowHeight(),
+    });
+
+    if (options.type)
+      that.init2(options);
+    else
+      that.init(options);
+
+    that.getColor();
+
+    isFinished = 0;
+
+    if (app.globalData.BaiduToken === "")
+      main.getBaiduToken();
+  },
+  
+  init: function (options) {
+    var that = this;
+    that.setData({
+      TaskInfo: {},
+      TestType: options.testtype,
+      TestName1: options.name1,
+      TestName2: options.name2,
     });
+    main.getData('GetHanziUnitWords?UnitID=' + options.unitsid, function (data) {
+      if (data) {
+        TaskList = [];
+        var words = data;
+        for (var k = 0; k < words.length; k++) {
+          var taskInfo = {
+            FontSize: 144,
+            Content: [
+              { ContentType: 0, Content: [] },
+              { ContentType: 1, Content: [] },
+              { ContentType: 2, Content: [] },
+            ]
+          };
+          taskInfo.Word=words[k].Name;
+          
+          var pinyinNormal = "(" + main.getPinyinNormal(words[k].Pinyin) + ")";
+          taskInfo.ReadString = words[k].Name + pinyinNormal + "," + words[k].CombineWords + "的" + words[k].Name + pinyinNormal;
 
-    var words = [];
-    var unitsName = "";
-    var arr = wx.getStorageSync("HanziAll");
-    arr = JSON.parse(arr);
-    var unitsid = Number(options.unitsid);
-    var id = Number(options.id);
-    for (var i = 0; i < arr.length; i++) {
-      if (arr[i].ID == unitsid) {
-        var list = arr[i].Units;
-        for (var j = 0; j < list.length; j++) {
-          if (list[j].ID == id) {
-            unitsName = list[j].Name;
-            words = list[j].Words;
+          if (that.data.TestType == "read") {
+            taskInfo.Content[0].Content = ["怎么念"];
+            var question = words[k].CombineWords;
+            question = common.ReplaceAllString(question, words[k].Name, "(" + words[k].Name + ")");
+            taskInfo.Content[1].Content = question;
+            
+            
+            var answer = "[读 src='" + taskInfo.ReadString + "']" + words[k].Pinyin + "[/读]";
+            taskInfo.Content[2].Content = answer;
+
+            if (words[k].CombineWords.length > 6) {
+              taskInfo.FontSize = 108;
+              if (words[k].CombineWords.length > 10) {
+                taskInfo.FontSize = 68;
+              }
+            }
           }
-        }
+          else if (that.data.TestType == "write") {
+            taskInfo.Content[0].Content = ["怎么写"];
 
-        var tags=["怎么写"];
-        if (options.category=="read")
-          tags = ["怎么念"];
+            var question = words[k].CombineWords;
+            var question2 = common.ReplaceAllString(question, words[k].Name, words[k].Pinyin);
+            
+            question = "[读 src='" + taskInfo.ReadString + "']" + question2 + "[/读]"
+            taskInfo.Content[1].Content = question;
+            var answer = words[k].Name;
+            answer += "[图 w='650' h='650']" + words[k].BiShunUrl + "[/图]";
+            taskInfo.Content[2].Content = answer;
 
+            if (question2.length > 6) {
+              taskInfo.FontSize = 108;
+              if (question2.length > 10) {
+                taskInfo.FontSize = 68;
+                if (question2.length > 14) {
+                  taskInfo.FontSize = 48;
+                }
+              }
+            }
+          }
+          taskInfo.ContentNew = main.changeStringToView(taskInfo.Content);
+          TaskList.push(taskInfo);
+        }
+
+        TaskList = common.randomArray(TaskList);
 
         that.setData({
-          UnitsName: unitsName,
-          Words: words,
-          Tags:tags,
+          TaskInfo: TaskList[0],
+          TaskLength: TaskList.length,
+          CurrentIndex: 0,
+        });
+
+        common.getStorageValue(that, "TestAutioPlay", 1, function () { 
+          if (that.data.TestAutioPlay == 1 && that.data.TestType == "write") {
+            that.playSound({ currentTarget: { dataset: { content: TaskList[that.data.CurrentIndex].ReadString } } })
+          }
         });
-        break;
+      }
+    });
+
+    
+  },
+  init2: function (options) {
+    var that = this;
+    var TestTask2=wx.getStorageSync("TestTask2");
+    var name = TestTask2.Name.split("#");
+    that.setData({
+      TaskInfo: {},
+      ID:TestTask2.ID,
+      TestType: TestTask2.TestType,
+      TestName1: name[0],
+      TestName2: name[1],
+    });
+
+    TestTask2.List = common.randomArray(TestTask2.List);
+
+    var list = [];
+    var i = 0;
+    for (var i = 0; i < TestTask2.List.length;i++){
+      if (TestTask2.List[i].Result){
+        list.push(TestTask2.List[i]);
+      }
+    }
+    var currentIndex=list.length;
+    for (var i = 0; i < TestTask2.List.length; i++) {
+      if (!TestTask2.List[i].Result) {
+        list.push(TestTask2.List[i]);
+      }
+    }
+    TaskList = list;
+
+    if (currentIndex >= TaskList.length || options.type=="restart"){
+      currentIndex=0;
+      for (var i = 0; i < TaskList.length; i++) {
+        delete TaskList[i].Result;
+      }
+    }
+
+    that.setData({
+      TaskLength: TaskList.length,
+      CurrentIndex: currentIndex,
+      TaskInfo: TaskList[currentIndex],
+    });
+
+    common.getStorageValue(that, "TestAutioPlay", 1, function () {
+      if (that.data.TestAutioPlay == 1 && that.data.TestType == "write") {
+        that.playSound({ currentTarget: { dataset: { content: TaskList[that.data.CurrentIndex].ReadString } } })
+      }
+    });
+
+  },
+  //进入下一张题卡
+  gotoNext: function (e) {
+    var that = this;
+    that.setData({
+      IsShowAnswer: [0, 0],
+    });
+
+    var btnnumber = e.currentTarget.dataset.btnnumber;
+    
+    if (btnnumber>="0"){
+      that.setSoundFile(0);
+      if (btnnumber==="4")
+        TaskList[that.data.CurrentIndex].Result = 1;
+      else if (btnnumber === "0")
+        TaskList[that.data.CurrentIndex].Result = -1;
+      else if (btnnumber === "1")
+        TaskList[that.data.CurrentIndex].Result = 0;
+      that.data.CurrentIndex++;
+    }
+    else{
+      that.setSoundFile(2);
+      TaskList[that.data.CurrentIndex].Result=null;
+      that.data.CurrentIndex--;
+    }
+    //结束
+    if (that.data.CurrentIndex>=TaskList.length){
+      isFinished = 1;
+      that.onFinished();
+    }
+    else if (that.data.CurrentIndex <0) {
+      wx.showToast({
+        title: '到开始了',
+      });
+      that.setSoundFile(-1);
+    }
+    else{
+      
+      that.setData({
+        TaskInfo: TaskList[that.data.CurrentIndex],
+        CurrentIndex: that.data.CurrentIndex,
+      });
+      if (that.data.TestAutioPlay == 1 && that.data.TestType == "write") {
+        that.playSound({ currentTarget: { dataset: { content: TaskList[that.data.CurrentIndex].ReadString } } })
       }
     }
+
+    //console.log(that.data.TestType);
+    //console.log(JSON.stringify(that.data.TaskInfo));
   },
   onPullDownRefresh: function () {
     var that = this;
@@ -54,10 +248,177 @@ Page({
     wx.stopPullDownRefresh();
   },
   onShowAnswer: function (e) {
-    var that=this;
-    that.setData({
-      IsShowAnswer: [1,1],
+    var that = this;
+    var clicktype = e.currentTarget.dataset.type;
+    if (!(clicktype && clicktype == "all" && app.globalData.ClickType == 0)) {
+      that.setData({
+        IsShowAnswer: [1, 1],
+      });
+
+      if (that.data.TestAutioPlay == 1 && that.data.TestType == "read") {
+        that.playSound({ currentTarget: { dataset: { content: TaskList[that.data.CurrentIndex].ReadString } } })
+      }
+    }
+  },
+  getColor: function () {
+    var that = this;
+    if (wx.setBackgroundColor) {
+      wx.setBackgroundColor({
+        backgroundColor: that.data.Color.BackColor,
+        backgroundColorTop: that.data.Color.BackColor,
+        backgroundColorBottom: that.data.Color.BackColor,
+      })
+    }
+    if (wx.setNavigationBarColor) {
+      wx.setNavigationBarColor({
+        frontColor: "#ffffff",
+        backgroundColor: that.data.Color.BackColor,
+      })
+    }
+  },
+  playSound: function (e) {
+    clearTimeout(timeoutPlayAudio);
+
+    var that = this;
+    var str = e.currentTarget.dataset.content;
+    var url;
+    if (str == "recorder") {
+      url = e.currentTarget.dataset.soundmark;
+    }
+    else if (str.indexOf("英 [") >= 0 || str.indexOf("美 [") >= 0) {
+      str = str.replace("英 [", "[");
+      str = str.replace("美 [", "[");
+      url = e.currentTarget.dataset.soundmark;
+    }
+    else if (e.currentTarget.dataset.soundmark && e.currentTarget.dataset.soundmark != "undefined") {
+      var soundmark = e.currentTarget.dataset.soundmark;
+      if (soundmark && soundmark.indexOf("http") < 0) {
+        url = app.globalData.audioUrlBaidu;
+        url = url.replace("[token]", app.globalData.BaiduToken);
+        url = url.replace("[word]", soundmark);
+      }
+      else {
+        url = soundmark;
+      }
+    }
+    else {
+      url = app.globalData.audioUrlBaidu;
+      url = url.replace("[token]", app.globalData.BaiduToken);
+      url = url.replace("[word]", str);
+    }
+
+
+    if (url.indexOf("http") > 0)
+      url = url.substr(url.indexOf("http"));
+    if (url.indexOf("'") > 0)
+      url = common.ReplaceAllString(url, "'", "");
+    url = url.replace("http://", "https://");
+
+    url = encodeURI(url);
+    if (!isPlaying || tempPlayUrl == "" || url != tempPlayUrl) {
+      isPlaying = true;
+      timeoutPlayAudio = setTimeout(function () {
+        isPlaying = false;
+      }, 60000);
+
+      wx.showLoading({
+        title: '音频下载中',
+        mask: true,
+      });
+      setTimeout(function () {
+        wx.hideLoading();
+      }, 30000);
+
+      wx.downloadFile({
+        url: url,
+        success(res) {
+          wx.hideLoading();
+          if (res.statusCode === 200) {
+            tempPlayUrlLocal = res.tempFilePath;
+            that.audioCtx.setSrc(res.tempFilePath);
+            that.audioCtx.play();
+            tempPlayUrl = url;
+          }
+        },
+        fail(err) {
+          wx.hideLoading();
+        }
+      });
+    }
+    else {
+      this.audioCtx.pause();
+      if (innerAudioContext1)
+        innerAudioContext1.stop();
+      isPlaying = false;
+    }
+  },
+  audioBindEnded: function () {
+    isPlaying = false;
+  },
+  audioBindError: function (err) {
+    console.log(err);
+    innerAudioContext1.src = tempPlayUrlLocal;
+    innerAudioContext1.play();
+
+    main.getBaiduToken();
+  },
+  setSoundFile: function (isFinish) { //isFinish=3搁置 =2撤退 =1结束 =0正常 =-1开始
+    var that = this;
+    var url = "/pages/sounds/";
+    if (isFinish == 1) {
+      url += "end.mp3";
+    } else if (isFinish == 2) {
+      url += "short3.mp3";
+    } else if (isFinish == 3) {
+      url += "short1.mp3";
+    } else {
+      url += "short2.mp3";
+    }
+    if (isFinish >= 0) {
+      innerAudioContext1.src = url;
+      innerAudioContext1.play();
+    }
+
+    wx.pageScrollTo({
+      scrollTop: 0,
+    });
+  },
+  onAutoPlay:function(e){
+    var id=e.currentTarget.dataset.id;
+    this.setData({
+      TestAutioPlay:id,
     });
+    wx.setStorageSync("TestAutioPlay",id);
+  },
+  //获取导航栏高度
+  getBarInfo(e) {
+    this.setData({ topBarHeight: e.detail.topBarHeight })
+  },
+  onFinished:function(){
+    if (TaskList.length > 0 && this.data.CurrentIndex > 0) {
+      var TestTask = {};
+      if (this.data.ID)
+        TestTask.ID=this.data.ID;
+      TestTask.TestType = this.data.TestType;
+      TestTask.IsFinished = isFinished;
+      TestTask.Name = this.data.TestName1 + "#" + this.data.TestName2;
+      TestTask.List = TaskList;
+      wx.setStorageSync("TestTask", TestTask);
+      wx.redirectTo({
+        url: './report?type=new',
+      });
+    }
+    else{
+      wx.navigateBack({
+        delta: 1,
+      });
+    }
+  },
+  onUnload:function(){
+    wx.removeStorageSync("TestTask2");
+    if (innerAudioContext1) {
+      innerAudioContext1.stop();
+    }
   },
   onShareAppMessage: function () {
     return {

pages/test/item.json

@@ -1,7 +1,9 @@
 {
   "navigationBarTitleText": "检验中",
-  "navigationBarBackgroundColor": "#1F3C88",
   "navigationBarTextStyle": "white",
-  "backgroundColor": "#1F3C88",
-  "enablePullDownRefresh": true
+  "enablePullDownRefresh": true,
+  "usingComponents": {
+    "navigation-bar": "/components/navigation-bar/navigation-bar"
+  },
+  "navigationStyle": "custom"
 }

pages/test/item.wxml

@@ -1,45 +1,61 @@
 <import src="../template/cardShow.wxml" />
-<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <view class="panelTop FlexRow">
+<navigation-bar title="检验中" bindgetBarInfo="getBarInfo" show="true" left="true" background="{{Color.BackColor}}" color="#fff">
+    <view slot="left" bindtap="onFinished">
+      <view class="square">提前退出</view>
+    </view>
+</navigation-bar>
+
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;background-color:{{Color.BackColor}};' bindtap='onShowAnswer' data-type="all">
+  <view class="panelTop FlexColumn" style="background-color:{{Color.BackColor}}; top:{{topBarHeight*2-30}}rpx;">
+    <view class="panelTop2 FlexRow">
     <view class="left FlexRow">
       <view class="Number2 Number1 FlexColumn">
-        <view>1</view>
+        <view>{{CurrentIndex+1}}</view>
         <view class="line2 line1"></view>
       </view>
       <view class="Number1 FlexColumn">
-        <view>88</view>
+        <view>{{TaskLength}}</view>
         <view class="line1"></view>
       </view>
     </view>
     <view class="right FlexRow">
-      <view class="btnTop FlexRow">
+      <view class="btnTop FlexRow" catchtap='onAutoPlay' data-id="1" wx:if="{{TestAutioPlay==0}}">
+        <image src="../images/universalpic_broadcast_default_gray_34x25.png" class="universalpic_broadcast_default_gray_34x25" />
+      </view>
+      <view class="btnTop FlexRow" catchtap='onAutoPlay' data-id="0"  wx:if="{{TestAutioPlay==1}}">
+        <image src="../images/universalpic_broadcast_enable_tc0{{Color.ID}}_34x25.png" class="universalpic_broadcast_default_gray_34x25" />
+      </view>
+      
+      <view class="panelTopText">自动播报</view>
+      <view class="btnTop FlexRow" catchtap='gotoNext' data-btnnumber="1">
         <image src="../images/universalpic_shelve_gray_26x26.png" class="universalpic_shelve_gray_26x26" />
       </view>
-      <view class="btnTop FlexRow">
+      <view class="btnTop FlexRow" catchtap='gotoNext' data-btnnumber="-1" >
         <image src="../images/universalpic_undo_gray_26x20.png" class="universalpic_undo_gray_26x20" />
       </view>
     </view>
+    </view>
   </view>
-  <view style='width:100%;height:110rpx;'></view>
-  <template is="CardShow" data="{{Color:Color,Field:Field,Tags:Tags,IsShowAnswer:IsShowAnswer,TagWidth:TagWidth,FontSize:FontSize,LimitTimeStr:LimitTimeStr,ShowType:ShowType}}" />
-  <view style='width:100%;height:100rpx;'></view>
+  <view style='width:100%;height:120rpx;'></view>
+  <template is="CardShow" data="{{Color:Color,Field:TaskInfo.ContentNew.Field,Tags:TaskInfo.ContentNew.Tags,IsShowAnswer:IsShowAnswer,TagWidth:136,FontSize:TaskInfo.FontSize}}" />
+  <view style='width:100%;height:180rpx;'></view>
 
   <!-- 下方按钮 -->
   <image class="footerShade" src="../images/study_learning_bgimage_tc0{{Color.ID}}.png" />
   <view class='footer FlexColumn'>
     <image class="footerImage" src="../images/study_learning_maskimage_tc0{{Color.ID}}.png" />
-    <view class="panelFooter FlexColumn" hover-class='AnswerHover' wx:if="{{!IsShowAnswer[0] && !IsShowAnswer[1] && ClickType!=1}}" catchtouchstart="onShowAnswer">
+    <view class="panelFooter FlexColumn" hover-class='AnswerHover' wx:if="{{!IsShowAnswer[0] && !IsShowAnswer[1] && ClickType!=1}}" catchtap="onShowAnswer">
       看答案
     </view>
     <view class="panelFooter0 panelFooter FlexColumn" wx:if="{{IsShowAnswer[1]}}">
       <view class='panelBottomAnswer panelBottom FlexRow'>
-        <view class="AnswerLeft Answer FlexColumn" hover-class='AnswerHover' catchtap='gotoNext' data-time="{{TaskInfo.Number0}}" data-btnnumber="0">
+        <view class="AnswerLeft Answer FlexColumn" hover-class='AnswerHover' catchtap='gotoNext' data-btnnumber="0">
           <view class="btnTime">
             答错
           </view>
           <view class="Answer0 btnColor"></view>
         </view>
-        <view class="Answer FlexColumn" hover-class='AnswerHover' catchtap='gotoNext' data-time="{{TaskInfo.Number2}}" data-btnnumber="4">
+        <view class="Answer FlexColumn" hover-class='AnswerHover' catchtap='gotoNext' data-btnnumber="4">
           <view class="btnTime">
             答对
           </view>
@@ -48,4 +64,6 @@
       </view>
     </view>
   </view>
-</view>
+</view>
+
+<audio hidden='true' src="{{AudioSrc}}" id="myAudio" bindended="audioBindEnded" binderror="audioBindError"></audio>

pages/test/item.wxss

@@ -1,15 +1,32 @@
-.container {
-  background-color: #1F3C88;
+page{
+  background-color: #D2D2D2;
+}
+
+.square{
+  background-color: #181A21;
+  width:136rpx;
+  line-height:53rpx;
+  text-align: center;
+  color: #fff;
+  border-radius:10rpx;
+  font-size:24rpx;
+  font-weight: 500;
 }
 
 .panelTop{
   width:100%;
-  height:110rpx;
+  height:140rpx;
+  justify-content: flex-end;
+  position: fixed;
+  top:100rpx;
+  z-index: 100;
+}
+
+.panelTop2{
+  width:100%;
+  height:120rpx;
   justify-content: space-between;
   color:#fff;
-  position: fixed;
-  top:0;
-  z-index: 10;
 }
 
 .left{
@@ -47,7 +64,15 @@
   background-color: rgba(0,0,0,0.1);
   margin-left: 30rpx;
 }
-
+.universalpic_broadcast_default_gray_34x25{
+  width:34rpx;
+  height:25rpx;
+}
+.panelTopText{
+  font-size: 20rpx;
+  color:#D2D2D2;
+  margin-left: 14rpx;
+}
 .universalpic_shelve_gray_26x26{
   width:26rpx;
   height:26rpx;

pages/test/list.js

@@ -2,76 +2,160 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 const app = getApp();
+var isClick = true;
 
 Page({
   data: {
-    IsSelect:false,
+    IsSelect: false,
+    ImagePath: app.globalData.uploadImageUrl,
   },
-  onLoad: function (options) {
+  onLoad: function(options) {
     var that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),
+      Name1: options.name1,
+    });
+    isClick = true;
+    main.getHanzi(function(arr) {
+      if (!arr) {
+        wx.removeStorageSync("HanziUpdateTime");
+        wx.removeStorageSync("HanziAll");
+        main.getHanzi(function(arr) {
+          that.init(options);
+        });
+      } else {
+        that.init(options);
+      }
+    });
+  },
+  init: function(options) {
+    var that = this;
+    var name = options.name1;
+    if (name.indexOf(" ") > 0)
+      name = name.substr(name.indexOf(" ") + 1);
+    wx.setNavigationBarTitle({
+      title: name
     });
     var arr = wx.getStorageSync("HanziAll");
+    var testReportList = wx.getStorageSync("UserTestReport");
     arr = JSON.parse(arr);
-    var id=Number(options.id);
-    for(var i=0;i<arr.length;i++){
-      if (arr[i].ID==id){
+    var id = Number(options.id);
+    for (var i = 0; i < arr.length; i++) {
+      if (arr[i].ID == id) {
         var list = arr[i].Units;
-        for (var j = 0; j < list.length;j++){
-          var str="";
-          for(var k=0;k<list[j].Words.length;k++){
-            if (k < 27 && k < list[j].Words.length-1)
-              str += list[j].Words[k].Name+"、";
-            else if (k == list[j].Words.length-1)
+        for (var j = 0; j < list.length; j++) {
+          var str = "";
+          for (var k = 0; k < list[j].Words.length; k++) {
+            if (k < 27 && k < list[j].Words.length - 1)
+              str += list[j].Words[k].Name + "、";
+            else if (k == list[j].Words.length - 1)
               str += list[j].Words[k].Name;
-            else{
-              str += list[j].Words[k].Name +"…";
+            else {
+              str += list[j].Words[k].Name + "…";
               break;
             }
           }
 
-          list[j].WordList=str;
+          list[j].WordList = str;
+          list[j].TestTypeReadFinished = true;
+          list[j].TestTypeWriteFinished = true;
+
+          for (var k = 0; k < testReportList.length; k++) {
+            if (testReportList[k].Name[0] == options.name1 &&
+              testReportList[k].Name[1] == list[j].Name) {
+
+
+              if (testReportList[k].TestType == "read") {
+                if (testReportList[k].IsFinished == 1)
+                  list[j].TestTypeRead = 1;
+
+                if ((testReportList[k].TestRight + testReportList[k].TestWrong + testReportList[k].TestSkip) < testReportList[k].TestTotal) {
+                  list[j].TestTypeReadFinished = false;
+                }
+
+                list[j].ReadReportID = testReportList[k].ID;
+              }
+              if (testReportList[k].TestType == "write") {
+                if (testReportList[k].IsFinished == 1)
+                  list[j].TestTypeWrite = 1;
+
+                if ((testReportList[k].TestRight + testReportList[k].TestWrong + testReportList[k].TestSkip) < testReportList[k].TestTotal) {
+                  list[j].TestTypeWriteFinished = false;
+                }
+
+                list[j].WriteReportID = testReportList[k].ID;
+              }
+            }
+          }
         }
         that.setData({
-          List:list,
-          UnitsID:id,
+          List: list,
+          UnitsID: id,
         });
       }
     }
-
   },
-  onShowFrame: function (e) {
-    var selectID,selectName;
-    var id=e.currentTarget.dataset.id;
-    for(var i=0;i<this.data.List.length;i++){
-      if (id==this.data.List[i].ID){
-        selectID=id;
-        selectName = this.data.List[i].Name;
+  onShowFrame: function(e) {
+    var selectItem;
+    var id = e.currentTarget.dataset.id;
+    for (var i = 0; i < this.data.List.length; i++) {
+      if (id == this.data.List[i].ID) {
+        selectItem = this.data.List[i];
       }
     }
     this.setData({
       IsSelect: true,
-      SelectID:selectID,
-      SelectName:selectName,
+      SelectItem: selectItem,
     });
   },
-  onClose: function () {
+  onClose: function() {
     this.setData({
       IsSelect: false,
     });
   },
-  goto: function (e) {
+  goto: function(e) {
     var url = e.currentTarget.dataset.url;
     wx.navigateTo({
       url: url,
     });
+    this.onClose();
+  },
+  gotoTestReportInfo: function(e) {
+    var that=this;
+    if (isClick) {
+      isClick=false;
+      setTimeout(function(){
+        isClick=true;
+      },2000);
+
+      var id = e.currentTarget.dataset.id;
+      var userid = app.globalData.userInfo.UserID;
+
+      if (id) {
+        var reporttype = e.currentTarget.dataset.type;
+        main.getData('GetTestReportInfo?UserID=' + userid + '&ID=' + id, function(data) {
+          if (data) {
+            wx.setStorageSync("TestTask2", data);
+            that.onClose();
+            wx.navigateTo({
+              url: "./item?type=" + reporttype,
+            });
+          }
+        });
+      } else {
+        that.onClose();
+        var url = e.currentTarget.dataset.url;
+        wx.navigateTo({
+          url: url,
+        });
+      }
+    }
   },
-  onShareAppMessage: function () {
+  onShareAppMessage: function() {
     return {
       title: app.globalData.ShareTitle,
       path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
       imageUrl: app.globalData.ShareImage,
     }
   },
-})
+})

pages/test/list.json

@@ -1,3 +1,5 @@
 {
-  "navigationBarTitleText": "语文识字 上学期"
+  "navigationBarTitleText": "语文识字",
+  "backgroundColorTop": "#f0f0f0",
+  "backgroundColorBottom": "#f0f0f0"
 }

pages/test/list.wxml

@@ -5,7 +5,7 @@
       <view class="PanelItem1 FlexRow">
         <view class="left FlexRow">
           <view class="Word FlexRow">
-            {{item.Words[0].Name}}
+            <image class="img" src="{{ImagePath}}web/test/{{item.Words[0].Name}}.png" />
           </view>
           <view class="Title FlexRow">
             {{item.Name}}
@@ -13,8 +13,10 @@
         </view>
         <view class="right FlexColumn">
           <view class="right1 FlexRow">
-            <image class="examine_willread_gray_22x22" src="../images/examine_willread_gray_22x22.png"></image>
-            <image class="examine_willwrite_green_22x22" src="../images/examine_willwrite_green_22x22.png"></image>
+            <image wx:if="{{item.TestTypeRead==1}}" class="examine_willread_gray_22x22" src="../images/examine_willread_green_22x22.png"></image>
+            <image wx:if="{{!item.TestTypeRead}}" class="examine_willread_gray_22x22" src="../images/examine_willread_gray_22x22.png"></image>
+            <image wx:if="{{item.TestTypeWrite==1}}" class="examine_willwrite_gray_22x22" src="../images/examine_willwrite_green_22x22.png"></image>
+            <image wx:if="{{!item.TestTypeWrite}}" class="examine_willwrite_gray_22x22" src="../images/examine_willwrite_gray_22x22.png"></image>
           </view>
           <view class="right2">{{item.Words.length}}个字</view>
         </view>
@@ -22,7 +24,7 @@
       <view class="lineWidthAll FlexRow">
         <view class="lineWidth720"></view>
       </view>
-      <text class="PanelItem2 FlexRow">
+      <text class="PanelItem2">
         {{item.WordList}}
       </text>
     </view>
@@ -35,23 +37,49 @@
 <view wx:if="{{IsSelect}}" class="SelectContainer FlexColumn" style='height:{{Containnerheight}}rpx;'>
   <view class="SelectContainer1 FlexColumn">
     <image src="../images/examine_subjecticon_01.png" class="examine_subjecticon_01" />
-    <view class="SelectContainer1Text1">{{SelectName}}</view>
+    <view class="SelectContainer1Text1">{{SelectItem.Name}}</view>
     <view class="SelectContainer1Text2">检验哪个方面</view>
+
+    <view class="btnPanel0 FlexRow" bindtap="goto" data-url="./wordlist?unitsid={{UnitsID}}&id={{SelectItem.ID}}">
+      <image src="../images/universalpic_word_blue_30x30.png" class="universalpic_word_blue_30x30" />
+      <view class="SelectContainer1Text4">查看字表</view>
+    </view>
+
     <view class="btnPanel FlexRow">
-      <view class="btn FlexRow" bindtap="goto" data-url="./item?category=read&unitsid={{UnitsID}}&id={{SelectID}}">
+      <view wx:if="{{SelectItem.TestTypeReadFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-url="./item?testtype=read&unitsid={{SelectItem.ID}}&name1={{Name1}}&name2={{SelectItem.Name}}">
         <image src="../images/examine_willread_gray_30x30.png" class="examine_willread_gray_30x30" />
         <view class="SelectContainer1Text3">会念</view>
       </view>
-      <view class="btn FlexRow" bindtap="goto" data-url="./item?category=write&unitsid={{UnitsID}}&id={{SelectID}}">
+      
+      <view wx:if="{{!SelectItem.TestTypeReadFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="continue">
+        <image src="../images/examine_willread_green_30x30.png" class="examine_willread_gray_30x30" />
+        <view class="SelectContainer1Text3">会念 继续检验</view>
+      </view>
+      
+      <view wx:if="{{SelectItem.TestTypeWriteFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-id="{{SelectItem.WriteReportID}}" data-url="./item?testtype=write&unitsid={{SelectItem.ID}}&name1={{Name1}}&name2={{SelectItem.Name}}">
         <image src="../images/examine_willwrite_gray_27x27.png" class="examine_willwrite_gray_27x27" />
         <view class="SelectContainer1Text3">会写</view>
       </view>
-    </view>
-    <view class="btnPanel FlexRow" bindtap="goto" data-url="./wordlist?unitsid={{UnitsID}}&id={{SelectID}}">
-      <image src="../images/universalpic_word_blue_30x30.png" class="universalpic_word_blue_30x30" />
-      <view class="SelectContainer1Text4">查看字表</view>
+
+      <view wx:if="{{!SelectItem.TestTypeWriteFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-id="{{SelectItem.WriteReportID}}" data-type="continue">
+        <image src="../images/examine_willwrite_green_27x27.png" class="examine_willwrite_gray_27x27" />
+        <view class="SelectContainer1Text3">会写 继续检验</view>
+      </view>
+      
     </view>
 
+    <view class="btnPanel2 FlexRow">
+      <view wx:if="{{SelectItem.TestTypeReadFinished}}" class="btnPanel21"></view>
+      <view wx:if="{{!SelectItem.TestTypeReadFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}"  data-type="restart" >
+        重新开始
+      </view>
+
+      <view wx:if="{{SelectItem.TestTypeWriteFinished}}" class="btnPanel21"></view>
+      <view wx:if="{{!SelectItem.TestTypeWriteFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.WriteReportID}}"  data-type="restart">
+        重新开始
+      </view>
+    </view>
+    
     <view class="close FlexRow" bindtap="onClose">
       <image src="../images/universalpic_close_black_24x24.png" class="universalpic_close_black_24x24" />
     </view>

pages/test/list.wxss

@@ -49,14 +49,17 @@
 .right1{
   margin-bottom: 15rpx;
 }
-
+.img{
+  width:70rpx;
+  height:70rpx;
+}
 .examine_willread_gray_22x22{
   width:22rpx;
   height:22rpx;
   margin-right: 20rpx;
 }
 
-.examine_willwrite_green_22x22{
+.examine_willwrite_gray_22x22{
   width:22rpx;
   height:22rpx;
 }
@@ -88,16 +91,19 @@
   border-radius: 10rpx;
   background-color: #F8F8F8;
   position: relative;
+  justify-content: flex-start;
 }
 
 .examine_subjecticon_01{
   width:80rpx;
   height:80rpx;
+  margin-top: 80rpx;
 }
 
 .SelectContainer1Text1{
   font-size:36rpx;
   margin-top: 20rpx;
+  font-weight: 500;
 }
 
 .SelectContainer1Text2{
@@ -109,12 +115,18 @@
   font-size:36rpx;
   margin-left: 10rpx;
   color:#787878;
+  font-weight: 500;
 }
 
 .btnPanel{
   margin-top: 60rpx;
 }
 
+.btnPanel0{
+  margin-top: 20rpx;
+}
+
+
 .btn{
   width:315rpx;
   height:110rpx;
@@ -143,6 +155,20 @@
   font-size:24rpx;
   margin-left: 10rpx;
   color:#0071EF;
+  font-weight: 500;
+}
+
+
+.btnPanel2{
+  margin-top: 30rpx;
+}
+.btnPanel21{
+  width:315rpx;
+  margin: 0 10rpx;
+  text-align: center;
+  color:#0071EF;
+  font-size:28rpx;
+  font-weight: 500;
 }
 
 .close{

pages/test/report.js

@@ -2,16 +2,231 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 const app = getApp();
+var intervalBuild = 0;
+var TestReportID = 0;
 
 Page({
   data: {
     IsSelect: true,
+    IsBuild: 0,
+    IsIPhoneX: app.globalData.IsIPhoneX,
   },
   onLoad: function (options) {
     var that = this;
     that.setData({
+      ReportType:options.type,
       Containnerheight: main.getWindowHeight(),
     });
+
+    that.init();
+  },
+  init: function () {
+    var that = this;
+    var TestTask = wx.getStorageSync("TestTask");
+    var list = TestTask.List;
+    var listRight = [];
+    var listSkip = [];
+    var listWrong = [];
+    if (list) {
+      for (var i = 0; i < list.length; i++) {
+        if (list[i].Result == 1) {
+          listRight.push(list[i]);
+        }
+        else if (list[i].Result == -1) {
+          listWrong.push(list[i]);
+        }
+        else if (list[i].Result == 0) {
+          listSkip.push(list[i]);
+        }
+      }
+
+      var result = [];
+      if (listWrong.length > 0) {
+        result.push({ Name: "答错的题目", Expand: 1, List: listWrong });
+        if (listSkip.length > 0)
+          result.push({ Name: "跳过的题目", Expand: 1, List: listSkip });
+        if (listRight.length > 0)
+          result.push({ Name: "答对的题目", Expand: 1, List: listRight });
+      }
+      else {
+        if (listSkip.length > 0) {
+          result.push({ Name: "跳过的题目", Expand: 1, List: listSkip });
+          if (listRight.length > 0)
+            result.push({ Name: "答对的题目", Expand: 1, List: listRight });
+        }
+        else {
+          if (listRight.length > 0)
+            result.push({ Name: "答对的题目", Expand: 1, List: listRight });
+        }
+      }
+
+      var name = "";
+      if (TestTask.Name && TestTask.Name.indexOf("#")>0){
+        name=TestTask.Name;
+        name=name.substr(name.indexOf("#")+1);
+        if (TestTask.TestType=="read")
+          name+=" 会念";
+        else
+          name+=" 会写";
+      }
+
+      that.setData({
+        NumberWrong: listWrong.length,
+        NumberSkip: listSkip.length,
+        NumberRight: listRight.length,
+        Name: name,
+        List: result,
+        NumberTotal: list.length,
+      });
+
+      if (that.data.ReportType=="new")
+        that.saveInfo();
+
+      wx.setNavigationBarTitle({
+        title: "报告"
+      });
+    }
+
+  },
+  expandPanel: function (e) {
+    var that = this;
+    var index = e.currentTarget.dataset.index;
+    if (that.data.List[index].Expand == "1")
+      that.data.List[index].Expand = "0";
+    else
+      that.data.List[index].Expand = "1";
+    that.setData({
+      List: that.data.List,
+    });
+  },
+  onSelectItem: function (e) {
+    var that = this;
+    var index = e.currentTarget.dataset.index;
+    var word = e.currentTarget.dataset.word;
+    for (var i = 0; i < that.data.List[index].List.length; i++) {
+      if (that.data.List[index].List[i].Word == word) {
+        if (that.data.List[index].List[i].Css == "Select") {
+          that.data.List[index].List[i].Css = "";
+          that.setData({
+            List: that.data.List,
+          });
+        }
+        else if (that.data.List[index].List[i].Css == "Select2") {
+          wx.showToast({
+            title: '已经生成过了',
+            image: "../images/universalpic_ribbon_white_96x120.png",
+          });
+        }
+        else {
+          that.data.List[index].List[i].Css = "Select";
+          that.setData({
+            List: that.data.List,
+          });
+        }
+        break;
+      }
+    }
+
+  },
+  buildCard: function () {
+    var that = this;
+    var arr = [];
+    for (var i = 0; i < that.data.List.length; i++) {
+      for (var j = 0; j < that.data.List[i].List.length; j++) {
+        if (that.data.List[i].List[j].Css === "Select") {
+          var item = that.data.List[i].List[j];
+          var obj = {};
+          obj.Field1 = item.Content[1].Content;
+          obj.Field2 = item.Content[2].Content;
+          obj.Field3 = "";
+          obj.Tags = item.Content[0].Content;
+          obj.IsTodayStudy = 0;
+          obj.ID = 0;
+          obj.LimitTime = common.formatTime(new Date());
+          obj.FontSize = item.FontSize;
+          arr.push(obj);
+        }
+      }
+    }
+    //console.log(arr);
+
+    if (arr.length > 0) {
+      that.setData({
+        IsBuild: 1,
+      });
+      var buildCardNumber = 0;
+      intervalBuild = setInterval(function () {
+        that.addCard(arr[buildCardNumber]);
+        buildCardNumber++;
+        that.setData({
+          BuildCardNumber: Math.round(100 * buildCardNumber / arr.length) + "%",
+        });
+        if (buildCardNumber >= arr.length) {
+          clearInterval(intervalBuild);
+          that.setData({
+            IsBuild: 2,
+          });
+        }
+      }, 500);
+    }
+    else {
+      wx.showToast({
+        title: '先选题目',
+        image: "../images/universalpic_wrong_white_120x120.png",
+      });
+    }
+
+  },
+  addCard: function (card) {
+    var userid = app.globalData.userInfo.UserID;
+    main.postData('AddMiaoguoCard?Type=add&UserID=' + userid, card, function (data) {
+
+    });
+  },
+  close: function (e) {
+    wx.removeStorageSync("TestTask");
+    var delta=2;
+    if (this.data.ReportType=="edit")
+      delta=1;
+    wx.navigateBack({
+      delta: delta,
+    });
+  },
+  saveInfo: function () {
+    var that = this;
+    clearInterval(intervalBuild);
+    var userid = app.globalData.userInfo.UserID;
+    var param1 = wx.getStorageSync("TestTask");
+    param1.TestRight = this.data.NumberRight;
+    param1.TestWrong = this.data.NumberWrong;
+    param1.TestSkip = this.data.NumberSkip;
+    param1.TestTotal = param1.List.length;
+    param1.List = JSON.stringify(param1.List);
+    main.postData('InsertTestReport?UserID=' + userid, param1, function (data) {
+      if (data)
+        TestReportID = data;
+    });
+  },
+  gotoReport: function (e) {
+    if ((this.data.NumberRight + this.data.NumberWrong + this.data.NumberSkip) >= this.data.NumberTotal) {
+      wx.showToast({
+        title: '已经完成！',
+        image: "../images/universalpic_wrong_white_120x120.png",
+      });
+    }
+    else {
+      var testTask = wx.getStorageSync("TestTask");
+      if (TestReportID)
+        testTask.ID = TestReportID;
+      wx.setStorageSync("TestTask2", testTask);
+      var url = "./item?type=edit";
+      wx.redirectTo({
+        url: url,
+      });
+    }
+  },
+  onUnload: function () {
+    wx.removeStorageSync("TestTask");
   },
   onShareAppMessage: function () {
     return {

pages/test/report.wxml

@@ -1,65 +1,51 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="panelTop FlexColumn">
-    <view class="text1">答错3个 跳过1个</view>
+    <view class="text0">{{Name}}</view>
+    <view class="text1">答对{{NumberRight}}个 答错{{NumberWrong}}个 跳过{{NumberSkip}}个</view>
     <view class="text2">选择题目可一键生成题卡</view>
   </view>
-  <view class="panelItem FlexRow">
-    <view class="panelItem1 FlexRow">
-      <view class="text3">答错的题目</view>
-      <image src="../images/universalpic_indicator_right_gray.png" class="universalpic_indicator_right_gray" />
-    </view>
-    <view class="btn2 btn FlexRow">
-      <image src="../images/universalpic_checked_white_22x17.png" class="universalpic_checked_white_22x17" />
-      <view class="text4">秒过</view>
-    </view>
-    <view class="btn FlexRow">
-      <view class="circle"></view>
-      <view class="text4">五彩缤纷</view>
-    </view>
-    <view class="btn FlexRow">
-      <view class="circle"></view>
-      <view class="text4">五彩缤纷</view>
-    </view>
-    <view class="btn FlexRow">
-      <view class="circle"></view>
-      <view class="text4">五彩缤纷</view>
-    </view>
-    <view class="btn FlexRow">
-      <view class="circle"></view>
-      <view class="text4">五彩缤纷</view>
-    </view>
-    <view class="btn FlexRow">
-      <view class="circle"></view>
-      <view class="text4">五彩缤纷</view>
-    </view>
-    <view class="btn FlexRow">
-      <view class="circle"></view>
-      <view class="text4">五彩缤纷</view>
-    </view>
-    <view class="btn FlexRow">
-      <view class="circle"></view>
-      <view class="text4">五彩缤纷</view>
-    </view>
-    <view class="btn FlexRow">
-      <view class="circle"></view>
-      <view class="text4">五彩缤纷</view>
-    </view>
-    
+  <view class="panelItem FlexRow" wx:for="{{List}}" wx:key="index">
+    <view class="panelItem1 FlexRow" bindtap="expandPanel" data-index="{{index}}">
+      <view class="text3">{{item.Name}}</view>
+      <image src="../images/universalpic_indicator_right_gray.png" class="universalpic_indicator_right_gray" wx:if="{{item.Expand=='1'}}" />
+      <image src="../images/universalpic_indicator_right_gray.png" class="universalpic_indicator_right_gray2" wx:if="{{item.Expand=='0'}}" />
+    </view>
+    <block wx:if="{{item.Expand==1}}">
+      <view class="btn{{itemChild.Css}} FlexRow" wx:for="{{item.List}}" wx:key="indexChild" wx:for-item="itemChild" wx:for-index="intexChild" bindtap="onSelectItem" data-index="{{index}}" data-word="{{itemChild.Word}}">
+        <image wx:if="{{itemChild.Css=='Select'}}" src="../images/universalpic_checked_white_22x17.png" class="universalpic_checked_white_22x17" />
+        <image wx:if="{{itemChild.Css=='Select2'}}" src="../images/universalpic_bookmark_blue_40x40.png" class="universalpic_bookmark_blue_40x40" />
+        <view wx:if="{{!itemChild.Css}}" class="circle"></view>
+        <view class="text4">{{itemChild.Word}}</view>
+      </view>
+    </block>
   </view>
+  <view style="height:150rpx;"></view>
+  <view class="panelFooter FlexColumn">
+    <view class="panelFooter0 FlexRow">
+      <view class="btn4 btn3 btn FlexRow" bindtap="close">
+        关闭
+      </view>
+      <view class="btn4 btn3 btn FlexRow" bindtap="gotoReport">
+        继续检验
+      </view>
+      <view class="btn3 btn FlexRow" bindtap="buildCard">
+        生成题卡
+      </view>
 
-  <view class="panelItem FlexRow">
-    <view class="panelItem1 FlexRow">
-      <view class="text3">跳过的题目</view>
-      <image src="../images/universalpic_indicator_right_gray.png" class="universalpic_indicator_right_gray2" />
     </view>
-  </view>
 
-  <view class="panelFooter FlexRow">
-    <view class="btn3 btn FlexRow">
-      生成题卡
-    </view>
-    <view class="btn4 btn3 btn FlexRow">
-      关闭
-    </view>
+    <view class="iphone10plus" wx:if="{{IsIPhoneX}}"></view>
   </view>
+
+</view>
+
+<!-- 生成页面 -->
+<view wx:if="{{IsBuild>0}}" class="buildContainer FlexColumn" style='height:{{Containnerheight}}rpx;'>
+  <image src="../images/examine_clipboard_200x200.png" class="examine_clipboard_200x200" />
+
+  <view wx:if="{{IsBuild==1}}" class="buildText1">生成中……{{BuildCardNumber}}</view>
+  <block wx:if="{{IsBuild==2}}">
+    <view class="buildText1">生成完毕</view>
+    <view class="buildBtn" bindtap="close">关闭</view>
+  </block>
 </view>

pages/test/report.wxss

@@ -2,10 +2,17 @@
   width:100%;
   align-items: flex-start;
 }
-.text1{
+.text0{
   margin-top: 50rpx;
   margin-left: 30rpx;
   font-size:32rpx;
+  font-weight: 400;
+}
+.text1{
+  margin-top: 10rpx;
+  margin-left: 30rpx;
+  font-size:32rpx;
+  font-weight: 500;
 }
 .text2{
   margin-bottom: 30rpx;
@@ -22,6 +29,7 @@
   flex-wrap: wrap;
   margin-bottom: 50rpx;
   padding-bottom: 40rpx;
+  border-bottom: 1rpx solid #d2d2d2;
 }
 
 .panelItem1{
@@ -53,6 +61,7 @@
 }
 
 .btn{
+  min-width: 88rpx;
   border:1rpx solid #9B9B9B;
   height:100rpx;
   border-radius: 10rpx;
@@ -61,12 +70,28 @@
   color:#1e1e1e;
 }
 
-.btn2{
+.btnSelect{
+  min-width: 88rpx;
+  height:100rpx;
+  border-radius: 10rpx;
+  margin: 30rpx 0 0 30rpx;
+  padding: 0 30rpx;
+
   border:1rpx solid #0071EF;
   background-color: #0071EF;
   color:#fff;
 }
 
+.btnSelect2{
+  min-width: 88rpx;
+  border:1rpx solid #9B9B9B;
+  height:100rpx;
+  border-radius: 10rpx;
+  margin: 30rpx 0 0 30rpx;
+  padding: 0 30rpx;
+  color:#1e1e1e;
+}
+
 .circle{
   width:34rpx;
   height:34rpx;
@@ -80,6 +105,11 @@
   height:17rpx;
 }
 
+.universalpic_bookmark_blue_40x40{
+  width:40rpx;
+  height:40rpx;
+}
+
 .text4{
   margin-left: 20rpx;
   font-size:28rpx;
@@ -88,23 +118,70 @@
 
 .panelFooter{
   width:100%;
-  height:120rpx;
   background-color: #fff;
   position: fixed;
   z-index: 10;
   bottom:0;
+  border-top: 1rpx solid #d2d2d2;
+}
+
+.panelFooter0{
+  width:100%;
+  height:120rpx;
+  background-color: #fff;
+}
+
+.iphone10plus{
+  width:100%;
+  height:30rpx;
+  background-color: #fff;
 }
 
+
 .btn3{
-  width:270rpx;
+  width:223rpx;
   height:80rpx;
   color:#0071EF;
   font-size:32rpx;
   text-align: center;
   line-height: 80rpx;
-  margin: 0 15rpx;
+  margin: 0 10rpx;
+  padding: 0;
 }
 
 .btn4{
   color:#1e1e1e;
+  font-weight: 400;
+}
+
+.buildContainer{
+  position: fixed;
+  width:100%;
+  top:0;
+  z-index: 10;
+  background-color: #fff;
+  justify-content: flex-start;
+  color:#1e1e1e;
+}
+
+.examine_clipboard_200x200{
+  width:200rpx;
+  height:200rpx;
+  margin-top: 150rpx;
+}
+
+.buildText1{
+  font-size: 54rpx;
+  margin-top: 170rpx;
+  font-weight: 500;
 }
+.buildBtn{
+  width:600rpx;
+  border:1rpx solid #9B9B9B;
+  text-align: center;
+  line-height: 90rpx;
+  font-size:36rpx;
+  margin-top: 40rpx;
+  font-weight: 500;
+  border-radius: 14rpx;
+}

project.config.json

@@ -6,10 +6,13 @@
 	"setting": {
 		"urlCheck": false,
 		"es6": true,
+		"enhance": true,
 		"postcss": true,
+		"preloadBackgroundData": false,
 		"minified": true,
 		"newFeature": true,
 		"autoAudits": false,
+		"scopeDataCheck": true,
 		"uglifyFileName": false,
 		"checkInvalidKey": true,
 		"checkSiteMap": true,
@@ -18,8 +21,7 @@
 			"ignore": [],
 			"disablePlugins": [],
 			"outputPath": ""
-		},
-		"enhance": true
+		}
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.7.3",
@@ -108,12 +110,12 @@
 					"id": 7,
 					"name": "pages/test/index",
 					"pathName": "pages/test/index",
-					"query": "id=1",
+					"query": "",
 					"scene": null
 				},
 				{
 					"id": 8,
-					"name": "/pages/index/index",
+					"name": "绑定",
 					"pathName": "pages/index/index",
 					"query": "type=bebound&ParentUserID=2&NickName=一二",
 					"scene": 1007

utils/main.js

@@ -1,6 +1,7 @@
 import common from '../utils/util';
+
 var app = getApp();
-var dataSendTimeout=0;
+var dataSendTimeout = 0;
 
 function getData(url, callback) {
   if (!app.globalData.IsProduction)
@@ -405,7 +406,7 @@ function changeStringToView(field) {
                     }
                   }
                 }
-                else{
+                else {
                   content.push({
                     key: "normal",
                     value: temp,
@@ -413,7 +414,7 @@ function changeStringToView(field) {
                   temp = "";
                 }
               }
-              else{
+              else {
                 content.push({
                   key: "normal",
                   value: temp,
@@ -421,8 +422,8 @@ function changeStringToView(field) {
                 temp = "";
               }
 
-              if (temp.length > 0 && ( num1>=0 || num2>=0 )){
-                if ((num1 < num2 && num1 >= 0 && num2 >= 0) || (num1>=0 && num2 < 0) ) {
+              if (temp.length > 0 && (num1 >= 0 || num2 >= 0)) {
+                if ((num1 < num2 && num1 >= 0 && num2 >= 0) || (num1 >= 0 && num2 < 0)) {
                   temp = temp.substr(temp.indexOf("[线]") + 3);
 
                   temp1 = temp.substring(0, temp.indexOf("[/线]"));
@@ -435,7 +436,7 @@ function changeStringToView(field) {
 
                   temp = temp.substr(temp.indexOf("[/线]") + 4);
                 }
-                else if ((num1 > num2 && num1 >= 0 && num2 >= 0) || (num1 < 0 && num2>=0)) {
+                else if ((num1 > num2 && num1 >= 0 && num2 >= 0) || (num1 < 0 && num2 >= 0)) {
                   temp = temp.substr(temp.indexOf("[光]") + 3);
 
                   temp1 = temp.substring(0, temp.indexOf("[/光]"));
@@ -449,11 +450,11 @@ function changeStringToView(field) {
                   temp = temp.substr(temp.indexOf("[/光]") + 4);
                 }
                 else
-                  temp="";
+                  temp = "";
               }
               else
-                temp="";
-              
+                temp = "";
+
             }
             while (temp.length > 0);
 
@@ -479,11 +480,11 @@ function changeStringToView(field) {
           else if (arr[k].indexOf("[音") >= 0 && arr[k].indexOf("[/音]") > 0) {
             var obj = {};
             obj.Type = "recorder";
-            
+
             var tempIndex = arr[k].indexOf("\']") + 2;
             //obj.Content = arr[k].substring(tempIndex, arr[k].indexOf("[/音]"));
             obj.SoundMark = arr[k].substring(arr[k].indexOf("url='") + 5, arr[k].indexOf("']"));;
-            
+
             arrResult.push(obj);
           }
           else if (arr[k] != "") {
@@ -507,7 +508,7 @@ function changeStringToView(field) {
         while (arrResult[0].Type == "return"
           || arrResult[0].Type == "br") {
           arrResult.shift();
-          if (arrResult.length==0)
+          if (arrResult.length == 0)
             break;
         }
         //去掉后回车换行
@@ -541,7 +542,7 @@ function getTaskTodayList(callback) {
       });
       setTimeout(function () {
         wx.hideLoading();
-      }, 5000);
+      }, 60000);
     }
   }, 2000);
 
@@ -657,7 +658,7 @@ function UpdateMiaoguoCardTodayAll(isShowLoading, callback) {
       mask: true,
     });
     clearTimeout(dataSendTimeout);
-    dataSendTimeout=setTimeout(function () {
+    dataSendTimeout = setTimeout(function () {
       wx.hideLoading();
       wx.reLaunch({
         url: '../index/index',
@@ -774,9 +775,8 @@ function setCollect(id, collect, callback) {
   });
 }
 
-function buildInitData (callback) {
+function buildInitData(callback) {
   var that = this;
-  //app.globalData.userInfo.UserID=4;
   wx.showLoading({
     title: '数据初始化',
   });
@@ -923,6 +923,44 @@ function getPinyin(pinyin) {
   return result.join(",");
 }
 
+function getPinyinNormal(pinyin) {
+  var result = "";
+  var arr = getPinyinArray();
+  for (var i = 0; i < arr.length; i++) {
+    if (arr[i][1] == pinyin) {
+      result = arr[i][0];
+      break;
+    }
+  }
+  return result;
+}
+
+function getHanzi(callback) {
+  var that = this;
+  wx.showLoading({
+    title: '请稍候',
+    mask: true,
+  });
+  var time = wx.getStorageSync("HanziUpdateTime");
+  getData('GetHanziAll?UpdateTime=' + time, function (data) {
+    wx.hideLoading();
+    if (data) {
+      var arr = [];
+      if (data.List) {
+        arr = common.Decrypt(data.List);
+        wx.setStorageSync("HanziAll", arr);
+        wx.setStorageSync("HanziUpdateTime", data.UpdateTime);
+      }
+      else {
+        arr = wx.getStorageSync("HanziAll");
+        if (arr)
+          arr = JSON.parse(arr);
+      }
+      callback(arr);
+    }
+  });
+}
+
 function getPinyinArray() {
   var arrPinyin = [
     ['a1', 'ā', ['阿']],
@@ -1534,10 +1572,10 @@ function getPinyinArray() {
     ['lao3', 'lǎo', ['老']],
     ['lao4', 'lào', ['涝']],
     ['lao5', 'lao', ['']],
-    ['le', 'le', ['了']],
+    //['le', 'le', ['了']],
     ['le1', 'lē', ['肋']],
     ['le4', 'lè', ['乐']],
-    ['le5', 'le', ['']],
+    ['le5', 'le', ['了']],
     ['lei1', 'lēi', ['勒']],
     ['lei2', 'léi', ['雷']],
     ['lei3', 'lěi', ['磊']],
@@ -2437,4 +2475,6 @@ module.exports = {
   getServerImage: getServerImage,
   getBaiduToken: getBaiduToken,
   buildInitData: buildInitData,
+  getPinyinNormal: getPinyinNormal,
+  getHanzi: getHanzi
 }