1.1.33

app.js

@@ -26,8 +26,8 @@ App({
     }
   },
   globalData: {
-    Version: "1.1.29",
-    IsProduction: false,
+    Version: "1.1.33",
+    IsProduction: true,
     ShareTitle: "刻意学习，高效成长",
     SharePath: "pages/index/index",
     ShareImage: '../images/program_screenshot_main.png',
@@ -53,7 +53,8 @@ App({
     IV: "kylx365hongliren",
     IsEnter: true,//是否是刚进来
     LessonID:0,//听课ID
-
+    CardWaitTimeMax:3,//每张卡最长等待时间（分钟）
+    IsRecorderAccredit:0,
     CardList:[],//卡列表变量
     TaskToday:[],//今天任务列表
     SearchResultList: [],//搜索获得要选择的字词或古诗词列表

app.json

@@ -1,12 +1,13 @@
 {
   "pages": [
     "pages/index/index",
+    "pages/index/accredit",
     "pages/main/recommend",
     "pages/main/clicktype",
     "pages/other/lesson",
     "pages/main/colorplan",
     "pages/index/notice",
-    "pages/index/accredit",
+    "pages/index/openSetting",
     "pages/main/default",
     "pages/main/cardInfo",
     "pages/main/preview",

pages/index/accredit.json

@@ -1,6 +1,6 @@
 {
-  "navigationBarTitleText": "登录",
-  "navigationBarBackgroundColor": "#ffffff",
-  "navigationBarTextStyle": "black",
-  "backgroundColor": "#ffffff"
+  "navigationBarTitleText": "秒过",
+  "navigationBarBackgroundColor": "#0B8457",
+  "navigationBarTextStyle": "white",
+  "backgroundColor": "#0B8457"
 }

pages/index/accredit.wxml

@@ -1,16 +1,11 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <image src="../images/universalpic_face_default_green_240x240.png" class="universalpic_face_default_green_240x240" />
-
+  <image src="../images/universalpic_logo_200x200.png" class='img' />
   <text class="text0">请登录</text>
 
-  <view class="btn">
-    <button open-type="getUserInfo" bindgetuserinfo="goto" class="btn1 FlexRow">
-      <image src="../images/universalpic_share_white_52x40.png" class="universalpic_share_white_52x40" />
-
-      <view>用微信一键登录</view>
-
-    </button>
-  </view>
+  <button open-type="getUserInfo" bindgetuserinfo="goto" class="btn FlexRow">
+    <image src="../images/universalpic_share_white_52x40.png" class="universalpic_share_white_52x40" />
+    <view>微信登录</view>
+  </button>
 
-  <view class="text3">本产品仅对受邀用户开放</view>
-</view>
+  <text class="text1">本产品仅对受邀用户开放</text>
+</view>

pages/index/accredit.wxss

@@ -1,53 +1,37 @@
 .container {
-  background-color: #fff;
+  background-color: #0B8457;
   position: fixed;
   top:0;
+  color:#fff;
 }
 
-.universalpic_face_default_green_240x240{
-  width: 240rpx;
-  height:240rpx;
+.img{
+  width:200rpx;
+  height:200rpx;
   border-radius: 50%;
-  margin-top: 60rpx;
+  margin-top: 150rpx;
 }
 
 .text0{
   font-size:54rpx;
+  margin-top: 170rpx;
   text-align: center;
-  margin-top: 30rpx;
-  z-index: 10;
-  color:#03AF69;
-}
-
-.text1{
-  font-size:36rpx;
-  text-align: center;
-  margin-top: 0rpx;
-  z-index: 10;
-  color:#fff;
 }
 
-
-.btn {
-  width: 520rpx;
-  height: 100rpx;
-  background-color:#13925C;
+.btn{
+  width:600rpx;
+  height:90rpx;
   border-radius: 14rpx;
-  margin-top: 60rpx;
-  z-index: 10;
+  border:1rpx solid #fff;
+  background-color: #0B8457;
+  margin-top: 40rpx;
+  color:#fff;
 }
 
-.btn1 {
-  width: 100%;
-  height: 90rpx;
-  background-color: #03AF69;
-  border-radius: 10rpx;
-  position:relative;
-  top:0;
-  font-size: 36rpx;
+.text1{
+  font-size:28rpx;
+  margin-top: 40rpx;
   text-align: center;
-  line-height: 90rpx;
-  color:#fff;
 }
 
 .universalpic_share_white_52x40{
@@ -55,11 +39,3 @@
   height: 41rpx;
   margin-right: 20rpx;
 }
-
-.text3{
-  font-size:24rpx;
-  margin-top: 30rpx;
-  z-index: 10;
-  font-weight: 400;
-  color:#000;
-}

pages/index/openSetting.js

@@ -0,0 +1,19 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+  },
+  onLoad: function (options) {
+    this.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+  },
+  callback:function(){
+    wx.navigateBack({
+      delta: 1,
+    });
+  },
+});

pages/index/openSetting.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "秒过",
+  "navigationBarBackgroundColor": "#0B8457",
+  "navigationBarTextStyle": "white",
+  "backgroundColor": "#0B8457"
+}

pages/index/openSetting.wxml

@@ -0,0 +1,10 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  
+  <image src="../images/universalpic_logo_200x200.png" class='img' />
+  <text class="text0">录音功能需要\n使用您的麦克风</text>
+
+  <button class='btn' open-type="openSetting" bindopensetting="callback">去开启</button>
+
+  <text class="text1">点击“去开启”，把麦克风调到打开状态即可</text>
+
+</view>

pages/index/openSetting.wxss

@@ -0,0 +1,35 @@
+.container {
+  background-color: #0B8457;
+  position: fixed;
+  top:0;
+  color:#fff;
+}
+
+.img{
+  width:200rpx;
+  height:200rpx;
+  border-radius: 50%;
+  margin-top: 150rpx;
+}
+
+.text0{
+  font-size:54rpx;
+  margin-top: 170rpx;
+  text-align: center;
+}
+
+.btn{
+  width:600rpx;
+  height:90rpx;
+  border-radius: 14rpx;
+  border:1rpx solid #fff;
+  background-color: #0B8457;
+  margin-top: 40rpx;
+  color:#fff;
+}
+
+.text1{
+  font-size:28rpx;
+  margin-top: 40rpx;
+  text-align: center;
+}

pages/main/add.js

@@ -2,7 +2,13 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 const app = getApp();
-const PracticeTimeArr = ["智能安排", "今天必练", "推迟一周", "推迟一个月", "推迟三个月"];
+const PracticeTimeArr = [
+  { Name: "智能安排", CSS: "numberContainerFooter1121Select" },
+  { Name: "今天必练", },
+  { Name: "推迟一周", },
+  { Name: "推迟一个月", },
+  { Name: "推迟三个月", }
+];
 var arrTag = [];
 
 var tempCursor = undefined,
@@ -13,7 +19,10 @@ var isEdit = true;
 var isSave = true;
 var interval;
 var timeoutUploadImage = 0;
-
+var intervalRecorder = 0;//录音计时器
+var recorderManager;
+var tempRecorderFile = "";
+var innerAudioContext;
 
 Page({
   data: {
@@ -23,6 +32,27 @@ Page({
     LineSign: "[线]",
     HighlighterSign: "[光]",
     BtnArray: ["+", "-", "×", "÷", "=", "<", ">"],
+    IsPracticeTime: false,
+    IsRecorder: false,
+    PracticeTimeArr: PracticeTimeArr
+  },
+  onReady: function () {
+    recorderManager = wx.getRecorderManager();
+    recorderManager.onStart(() => {
+      console.log('recorder start')
+    });
+    recorderManager.onStop((res) => {
+      console.log('recorder stop', res);
+      tempRecorderFile = res.tempFilePath;
+    });
+    recorderManager.onError((err) => {
+      // console.log('err', err);
+      // if (err.errMsg =="operateRecorder:fail auth deny"){
+      //   wx.navigateTo({
+      //     url: '../index/openSetting',
+      //   })
+      // }
+    });
   },
   onLoad: function (options) {
     var that = this;
@@ -36,7 +66,7 @@ Page({
       UpdateType: options.type,
       MiaoguoCardID: options.id,
       FieldNumber: fieldNumber,
-      PracticeTimeStr: PracticeTimeArr[0],
+      PracticeTimeStr: PracticeTimeArr[0].Name,
     });
 
     var list = app.globalData.CardList;
@@ -50,7 +80,6 @@ Page({
     app.globalData.TempMiaoguoCardID = that.data.MiaoguoCardID;
 
   },
-
   onShow: function () {
     var that = this;
     if (that.data.UpdateType == "add") {
@@ -136,11 +165,18 @@ Page({
     }
     clearInterval(interval);
     clearTimeout(timeoutUploadImage);
+    clearInterval(intervalRecorder);
+
+    if (this.data.IsRecorder)
+      this.closeRecorder();
+
   },
   onClose: function () {
     wx.navigateBack({
       delta: 1,
     });
+
+    clearInterval(intervalRecorder);
   },
   gotoAddItem: function (e) {
     var that = this;
@@ -184,26 +220,8 @@ Page({
       });
     }
   },
-  changePracticeTime: function () {
-    var that = this;
-    wx.showActionSheet({
-      itemList: PracticeTimeArr,
-      success(res) {
-        for (var i = 0; i < PracticeTimeArr.length; i++) {
-          if (i == res.tapIndex) {
-            that.setData({
-              PracticeTimeStr: PracticeTimeArr[i],
-            });
-            break;
-          }
-        }
-      },
-    })
-
-  },
   saveCard: function () {
     var that = this;
-
     if (that.data.Field[1] == "") {
       wx.showToast({
         title: '第一段必填',
@@ -233,15 +251,15 @@ Page({
               param1.Tags = tags;
 
               param1.IsTodayStudy = 0;
-              if (that.data.PracticeTimeStr == PracticeTimeArr[1])
+              if (that.data.PracticeTimeStr == PracticeTimeArr[1].Name)
                 param1.IsTodayStudy = 1;
 
-              if (that.data.PracticeTimeStr == PracticeTimeArr[2])
-                param1.LimitTime = common.addDate("w", 1, new Date());
-              else if (that.data.PracticeTimeStr == PracticeTimeArr[3])
-                param1.LimitTime = common.addDate("m", 1, new Date());
-              else if (that.data.PracticeTimeStr == PracticeTimeArr[4])
-                param1.LimitTime = common.addDate("m", 3, new Date());
+              if (that.data.PracticeTimeStr == PracticeTimeArr[2].Name)
+                param1.LimitTime = common.formatTime(common.addDate("w", 1, new Date()));
+              else if (that.data.PracticeTimeStr == PracticeTimeArr[3].Name)
+                param1.LimitTime = common.formatTime(common.addDate("m", 1, new Date()));
+              else if (that.data.PracticeTimeStr == PracticeTimeArr[4].Name)
+                param1.LimitTime = common.formatTime(common.addDate("m", 3, new Date()));
 
 
               param1.ID = that.data.MiaoguoCardID;
@@ -318,13 +336,17 @@ Page({
               str += "[光]" + item.Content[j].value + "[/光]";
             }
           }
-        } 
+        }
         else if (item.Type == "sound") {
           if (item.SoundMark)
             str = "[读 src='" + item.SoundMark + "']" + item.Content + "[/读]";
           else
             str = "[读]" + item.Content + "[/读]";
         }
+        else if (item.Type == "recorder") {
+          if (item.SoundMark)
+            str = "[音 url='" + item.SoundMark + "'][/音]";
+        }
         else if (item.Type == "normal") {
           str = item.Content;
         }
@@ -366,7 +388,8 @@ Page({
         if (arr[i][j].Type == "image" && arr[i][j].Content) {
           arrSource.push(arr[i][j].Content);
           if (arr[i][j].ContentServer.indexOf(app.globalData.uploadImageUrl) >= 0
-            || arr[i][j].ContentServer.indexOf("baidu.com") >= 0) {
+            || arr[i][j].ContentServer.indexOf("baidu.com") >= 0
+            || arr[i][j].ContentServer.indexOf("bcebos.com") >= 0) {
             var result = {};
             result.Source = arr[i][j].ContentServer;
             result.Target = arr[i][j].ContentServer;
@@ -375,7 +398,7 @@ Page({
           }
           else {
             var source = arr[i][j].Content;
-            that.uploadImage(source, function (data) {
+            that.uploadFileToServer(source, function (data) {
               if (data) {
                 data = JSON.parse(data);
                 var result = data.result;
@@ -441,7 +464,7 @@ Page({
       }
     }, 500);
   },
-  uploadImage: function (file, callback) {
+  uploadFileToServer: function (file, callback) {
     var url = common.Encrypt("MiaoguoUploadFile2");
     wx.uploadFile({
       url: app.globalData.serverUrl + url,
@@ -453,13 +476,12 @@ Page({
       fail: function (err) {
         wx.hideLoading();
         wx.showModal({
-          title: '上传图片失败',
+          title: '上传文件失败',
           showCancel: false,
           content: JSON.stringify(err),
         });
       }
     });
-
   },
   saveLocalCardList: function (param1) {
     var that = this;
@@ -866,6 +888,24 @@ Page({
               });
               that.updateField();
 
+              if (!wx.getStorageSync("NoRemindImage")) {
+                wx.showModal({
+                  title: '图片已插到段落中',
+                  showCancel: true,
+                  content: "图片显示为[图...][/图]。如要移动到别的段落，剪切时请确保其完整性。",
+                  confirmText: "知道了",
+                  cancelText: "不再提示",
+                  confirmColor: "#0071EF",
+                  success(res) {
+                    if (res.confirm) {
+                    }
+                    else {
+                      wx.setStorageSync("NoRemindImage", true);
+                    }
+                  },
+                });
+              }
+
             }
           });
         },
@@ -875,6 +915,284 @@ Page({
       });
     }
   },
+  onPracticeTime: function (e) {
+    var that = this;
+    var value = e.currentTarget.dataset.value;
+    for (var i = 0; i < this.data.PracticeTimeArr.length; i++) {
+      if (this.data.PracticeTimeArr[i].Name == value)
+        this.data.PracticeTimeArr[i].CSS = "numberContainerFooter1121Select";
+      else
+        this.data.PracticeTimeArr[i].CSS = "";
+    }
+    that.setData({
+      PracticeTimeStr: value,
+      PracticeTimeArr: that.data.PracticeTimeArr,
+      IsPracticeTime: false,
+    });
+  },
+  showPracticeTime: function () {
+    this.setData({
+      IsPracticeTime: true,
+    });
+  },
+  closePracticeTime: function () {
+    this.setData({
+      IsPracticeTime: false,
+    });
+  },
+
+  //录音授权
+  recorderAccredit: function () {
+    var that = this;
+    if (app.globalData.IsRecorderAccredit == 1)
+      that.showRecorder();
+    else if (app.globalData.IsRecorderAccredit == 0) {
+      recorderManager.stop();
+      app.globalData.IsRecorderAccredit=-1;
+      that.showRecorder();
+    }
+    else if (app.globalData.IsRecorderAccredit == -1) {
+      wx.getSetting({
+        success(res) {
+          if (res.authSetting['scope.record'] === true) {
+            app.globalData.IsRecorderAccredit = 1;
+            that.showRecorder();
+          }
+          else if (res.authSetting['scope.record'] === false) {
+            wx.navigateTo({
+              url: '../index/openSetting',
+            });
+          }
+        }
+      });
+      
+    }
+  },
+  showRecorder: function () {
+    var that = this;
+    if (that.checkRecorderCount()) {
+      that.recorderInit();
+      tempRecorderFile="";
+      wx.setNavigationBarTitle({
+        title: '录音',
+      });
+      that.setData({
+        IsRecorder: true,
+        IsRecorderFinished: false,
+        BtnRecorderName: "按住录音",
+        RecorderTime: "00:00",
+        RecorderTimeCss: "",
+        RecorderPlayName: "播放",
+      });
+
+      innerAudioContext = wx.createInnerAudioContext();
+      innerAudioContext.onPlay(() => {
+        console.log('开始播放');
+        that.setData({
+          RecorderTimeCss: "RecorderPanel1121",
+          RecorderTime: "00:00",
+          RecorderPlayName: "停止",
+        });
+      });
+
+      innerAudioContext.onEnded(() => {
+        console.log('结束播放');
+        clearInterval(intervalRecorder);
+        that.setData({
+          RecorderTime: "00:00",
+          RecorderTimeCss: "",
+          RecorderPlayName: "播放",
+        });
+      });
+    }
+  },
+  closeRecorder: function () {
+    var that = this;
+    this.recorderInit();
+
+    if (tempRecorderFile) {
+      wx.showModal({
+        title: '提醒',
+        content: '录音还没上传，要继续退出并放弃录音吗？',
+        showCancel: true,
+        confirmText: "取消",
+        cancelColor: "#000000",
+        cancelText: "继续",
+        confirmColor: "#000000",
+        success(res) {
+          if (res.cancel) {
+            closeRecorder2();
+          }
+        },
+      })
+    }
+    else {
+      closeRecorder2();
+    }
+
+    function closeRecorder2() {
+      wx.setNavigationBarTitle({
+        title: '编辑 段落' + that.data.FieldNumber,
+      });
+      that.setData({
+        IsRecorder: false,
+        IsRecorderFinished: false,
+      });
+      tempRecorderFile = "";
+    }
+  },
+  //录音初始化
+  recorderInit: function () {
+    if (innerAudioContext)
+      innerAudioContext.stop();
+    if (recorderManager)
+      recorderManager.stop();
+
+    clearInterval(intervalRecorder);
+  },
+  checkRecorderCount: function (arr) {
+    var that = this;
+    var count = 0;
+    if (that.data.FieldContent.indexOf("[音 url=") >= 0
+      || that.data.FieldContent.indexOf("[/音]") >= 0) {
+      count = 1;
+    }
+    if (count > 0) {
+      wx.showToast({
+        title: '仅能上传一段',
+      });
+      return false;
+    }
+    else
+      return true;
+  },
+  btnRecorderStart: function () {
+    var that = this;
+    if (app.globalData.IsRecorderAccredit == 1) {
+      that.setData({
+        BtnRecorderName: "松手结束",
+        RecorderTimeCss: "RecorderPanel1121",
+      });
+      that.showRecorderTime();
+      recorderManager.start();
+    }
+  },
+  btnRecorderEnd: function () {
+    var that = this;
+    if (app.globalData.IsRecorderAccredit == 1) {
+      if (that.data.RecorderTime == "00:00") {
+        //小于1秒处理
+        wx.showToast({
+          title: '时间过短',
+          image: "../images/universalpic_wrong_white_120x120.png",
+        });
+        that.showRecorder();
+      }
+      else {
+        that.setData({
+          IsRecorderFinished: true,
+          RecorderTimeCss: "",
+        });
+        that.recorderInit();
+      }
+    }
+    else {
+      that.recorderAccredit();
+    }
+  },
+  showRecorderTime: function () {
+    var that = this;
+    var second = 0;
+    clearInterval(intervalRecorder);
+    intervalRecorder = setInterval(function () {
+      second++;
+      var secondStr = second.toString();
+      if (second < 10)
+        secondStr = "0" + secondStr;
+      that.setData({
+        RecorderTime: "00:" + secondStr,
+      });
+
+      if (second >= 59) {
+        that.setData({
+          IsRecorderFinished: true,
+          RecorderTimeCss: "",
+        });
+        that.recorderInit();
+
+        if (that.data.RecorderPlayName == "播放") {
+          wx.showToast({
+            title: '录音超时',
+            image: "../images/universalpic_wrong_white_120x120.png",
+          });
+        }
+      }
+
+    }, 1000);
+  },
+  btnRecorderPlay: function () {
+    var that = this;
+    if (tempRecorderFile && this.data.RecorderPlayName == "播放") {
+      innerAudioContext.src = tempRecorderFile;
+      innerAudioContext.play();
+      this.showRecorderTime();
+    }
+    else if (this.data.RecorderPlayName == "停止") {
+      if (innerAudioContext)
+        innerAudioContext.stop();
+      clearInterval(intervalRecorder);
+      that.setData({
+        RecorderTime: "00:00",
+        RecorderTimeCss: "",
+        RecorderPlayName: "播放",
+      });
+    }
+  },
+  btnRecorderSave: function () {
+    var that = this;
+    this.recorderInit();
+    wx.showLoading({
+      title: '上传中请稍候',
+    });
+    setTimeout(function () {
+      wx.hideLoading();
+    }, 60000);
+    that.uploadFileToServer(tempRecorderFile, function (data) {
+      if (data) {
+        data = JSON.parse(data);
+        //console.log(data);
+        wx.hideLoading();
+        var result = data.result;
+        result.Target = app.globalData.uploadImageUrl + result.Target;
+        that.data.FieldContent = that.data.FieldContent + "[音 url='" + result.Target + "'][/音]";
+        that.data.FieldContent = main.encryptUrl(that.data.FieldContent);
+        that.setData({
+          FieldContent: that.data.FieldContent,
+        });
+
+        tempRecorderFile = "";
+        that.closeRecorder();
+
+        if (!wx.getStorageSync("NoRemindRecorder")) {
+          wx.showModal({
+            title: '录音已插到段落中',
+            showCancel: true,
+            content: "录音显示为[音...][/音]。如要移动到别的段落，剪切时请确保其完整性。",
+            confirmText: "知道了",
+            cancelText: "不再提示",
+            confirmColor: "#0071EF",
+            success(res) {
+              if (res.confirm) {
+              }
+              else {
+                wx.setStorageSync("NoRemindRecorder", true);
+              }
+            },
+          });
+        }
+      }
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/add.wxml

@@ -30,19 +30,22 @@
           <text class="textNormal FlexRow" wx:if="{{item.Type=='line'}}">
             <block wx:for="{{item.Content}}" wx:key="contentIndex" wx:for-item="contentItem">
               <text wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
-              <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
-              <text class="textHighlighter" wx:if="{{contentItem.key=='highlighter'}}">{{contentItem.value}}</text>
-            </block>
-          </text>
-          
-          <view class="sound FlexRow" wx:if="{{item.Type=='sound'}}">
-            <image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.png' />
-          </view>
-          <text class="textPinyin" wx:if="{{item.Type=='sound'}}">{{item.Content}}</text>
-          <image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' binderror="onBindError" />
-          <view class="textBr" wx:if="{{item.Type=='br'}}"></view>
-          <text class="textReturn" wx:if="{{item.Type=='return'}}"></text>
+          <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
+          <text class="textHighlighter" wx:if="{{contentItem.key=='highlighter'}}">{{contentItem.value}}</text>
         </block>
+        </text>
+
+        <view class="sound FlexRow" wx:if="{{item.Type=='sound'}}">
+          <image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.png' />
+        </view>
+        <text class="textPinyin" wx:if="{{item.Type=='sound'}}">{{item.Content}}</text>
+        <view class="panelRecorder FlexRow" wx:if="{{item.Type=='recorder'}}">
+          <image class="universalpic_voicerecorder_transmit_black_44x34" src='../images/universalpic_voicerecorder_transmit_black_44x34.png' />
+        </view>
+        <image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' binderror="onBindError" />
+        <view class="textBr" wx:if="{{item.Type=='br'}}"></view>
+        <text class="textReturn" wx:if="{{item.Type=='return'}}"></text>
+  </block>
   </view>
   </view>
   <block wx:if="{{Tags && Tags.length>0 && indexParent==0}}">
@@ -66,7 +69,7 @@
   </block>
   <view class='lineFooter'></view>
 
-  <view class="panelTimePlan FlexRow" bindtap="changePracticeTime">
+  <view class="panelTimePlan FlexRow" bindtap="showPracticeTime">
     <view class="panelItem1 FlexRow">
       <image src='../images/universalpic_clock_gray_24x24.png' class="universalpic_clock_gray_24x24" />
       <view>练习时间</view>
@@ -76,7 +79,7 @@
       <view class="panelTimePlan2" hidden="{{PracticeTimeStr=='智能安排'}}">{{PracticeTimeStr}}</view>
       <!-- <switch class='panelTimePlan2' checked="{{IsTodayStudy}}" bindchange="switch1Change" /> -->
       <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
-    
+
     </view>
   </view>
   <view style='height:300rpx;'></view>
@@ -91,20 +94,34 @@
   </view>
 </view>
 
+<!-- 更多功能 -->
+<view wx:if="{{IsPracticeTime}}" class="numberContainer FlexColumn" style='height:{{Containnerheight}}rpx;'>
+  <view class="numberContainerFooter1 FlexColumn">
+    <view class='lineFooter'></view>
+    <view class='numberContainerFooter101 FlexRow'>
+      <image class="universalpic_bell_black_30x30" src='../images/universalpic_bell_black_30x30.png' />
+      <view class='numberContainerFooter11 FlexColumn'>
+        <view class='numberContainerFooter111'>练习时间</view>
+        <view class='numberContainerFooter112 FlexRow'>
+          <view class='{{item.CSS}} numberContainerFooter1121' wx:for="{{PracticeTimeArr}}" wx:key="index" catchtap='onPracticeTime' data-value='{{item.Name}}'>{{item.Name}}</view>
+        </view>
+      </view>
+    </view>
+  </view>
+  <view class='lineFooter'></view>
+  <view class="numberContaineFooter FlexRow" catchtap='closePracticeTime'>
+    <view>关闭</view>
+  </view>
+</view>
+
 <!-- 字段编辑 -->
-<view class="addItem container FlexColumn" style='height:{{Containnerheight}}rpx;' hidden='{{HiddenFieldEdit}}'>
+<view class="addItem container FlexColumn" style='height:{{Containnerheight}}rpx;' hidden='{{HiddenFieldEdit || IsRecorder}}'>
   <view class="panelItemTag FlexRow">
     <view class='left FlexRow'>
       <view class="panelSaveTag1 FlexRow" bindtap="onSearchField">
         <view class="add">+</view> 资料
       </view>
-      <view class="panelSaveTag2 panelSaveTag1 FlexRow" bindtap="addSymbol" data-id="{{SoundSign}}" hidden="{{SoundSign=='[/读]'}}">
-        <image class="universalpic_read_begin_gray_20x20" src='../images/universalpic_read_begin_gray_20x20.png' />
-      </view>
-      <view class="panelSaveTag3 panelSaveTag1 FlexRow" bindtap="addSymbol" data-id="{{SoundSign}}" hidden="{{SoundSign=='[读]'}}">
-        <image class="universalpic_read_end_white_38x22" src='../images/universalpic_read_end_white_38x22.png' />
-      </view>
-      
+
       <view class="panelSaveTag2 panelSaveTag1 FlexRow" bindtap="addSymbol" data-id="{{LineSign}}" hidden="{{LineSign=='[/线]'}}">
         <image class="universalpic_underline_begin_gray_14x20" src='../images/universalpic_underline_begin_gray_14x20.png' />
       </view>
@@ -119,16 +136,27 @@
         <image class="universalpic_highlighter_begin_gray_24x20" src='../images/universalpic_highlighter_end_white_24x20.png' />
       </view>
 
+      <view class="panelSaveTag2 panelSaveTag1 FlexRow" bindtap="addSymbol" data-id="{{SoundSign}}" hidden="{{SoundSign=='[/读]'}}">
+        <image class="universalpic_read_begin_gray_20x20" src='../images/universalpic_read_begin_gray_20x20.png' />
+      </view>
+      <view class="panelSaveTag3 panelSaveTag1 FlexRow" bindtap="addSymbol" data-id="{{SoundSign}}" hidden="{{SoundSign=='[读]'}}">
+        <image class="universalpic_read_end_white_38x22" src='../images/universalpic_read_end_white_38x22.png' />
+      </view>
+
       <view class="panelSaveTag2 panelSaveTag1 FlexRow" catchtap="uploadImageField">
         <image class="universalpic_picture_gray_26x26" src='../images/universalpic_picture_gray_26x26.png' />
       </view>
+
+      <view class="panelSaveTag2 panelSaveTag1 FlexRow" catchtap="recorderAccredit">
+        <image class="universalpic_voicerecorder_normal_gray_21x26" src='../images/universalpic_voicerecorder_normal_gray_21x26.png' />
+      </view>
     </view>
     <view class='right FlexRow'>
       <view class="clear" catchtap="clear">清空</view>
     </view>
   </view>
   <view class='lineFooter'></view>
-  
+
   <view class='panelInput'>
     <textarea class="input" maxlength='-1' show-confirm-bar="true" value="{{FieldContent}}" focus="{{Focus}}" cursor="{{Cursor}}" bindinput="bindinputField" bindblur="onBindblur" bindfocus="onBindFocus" data-id='{{FieldNumber}}' />
   </view>
@@ -159,4 +187,35 @@
     </view>
     <view class='lineFooter'></view>
   </view>
+</view>
+
+<!-- 录音功能 -->
+<view wx:if="{{IsRecorder}}" class="numberContainer FlexColumn" style='height:{{Containnerheight}}rpx;'>
+  <view class='RecorderPanel2 FlexRow' wx:if="{{!FieldContent}}">
+    <image class="edit_voicerecorder_illus" src='../images/edit_voicerecorder_illus.png' />
+  </view>
+  <view class="RecorderPanel3 FlexColumn" wx:if="{{FieldContent}}" style='height:{{Containnerheight-449}}rpx;'>
+    <view class='RecorderPanel31 FlexColumn'>
+      <text class='RecorderPanel311'>以下是段落中的内容\n可以把材料提前写入段落，方便照着录音</text>
+    </view>
+    <textarea class="RecorderPanel32" maxlength='-1' value="{{FieldContent}}" />
+  </view>
+  <view class='RecorderPanel1 FlexColumn'>
+    <view class='RecorderPanel11 FlexRow'>
+      <view class='RecorderPanel111 FlexRow'>
+        <image class="universalpic_voicerecorder_black_30x30" src='../images/universalpic_voicerecorder_black_30x30.png' />
+        <view class='RecorderPanel1111'>1分钟录音</view>
+      </view>
+      <view class='{{RecorderTimeCss}} RecorderPanel112'>{{RecorderTime}}</view>
+    </view>
+    <view class='btnRecorderStart' hover-start-time="50" hover-class="btnRecorderEnd" catchtouchstart='btnRecorderStart' catchtouchend='btnRecorderEnd' wx:if="{{!IsRecorderFinished}}">{{BtnRecorderName}}</view>
+    <view class='RecorderPanel12 FlexRow' wx:if="{{IsRecorderFinished}}">
+      <view class='btnRecorderStart2 btnRecorderStart' hover-class="btnRecorderEnd" catchtap='showRecorder'>重录</view>
+      <view class='btnRecorderStart2 btnRecorderStart' hover-class="btnRecorderEnd" catchtap='btnRecorderPlay'>{{RecorderPlayName}}</view>
+      <view class='btnRecorderStart3 btnRecorderStart' hover-class="btnRecorderEnd" catchtap='btnRecorderSave'>上传</view>
+    </view>
+  </view>
+  <view class="numberContaineFooter2 numberContaineFooter FlexRow" catchtap='closeRecorder'>
+    <view>退出录音</view>
+  </view>
 </view>

pages/main/add.wxss

@@ -11,7 +11,6 @@
   border-bottom: 1rpx solid #d2d2d2;
 }
 
-
 .panelTop .panelTopLeft {
   width: 148rpx;
   background-color: #fff;
@@ -189,6 +188,20 @@
   text-decoration: underline;
   margin-right: 10rpx;
 }
+
+.panelItem .panelRecorder {
+  width: 70rpx;
+  height: 70rpx;
+  background-color: #fff;
+  border-radius: 10rpx;
+  border:1rpx solid #9B9B9B;
+}
+
+.panelItem .universalpic_voicerecorder_transmit_black_44x34{
+  width: 44rpx;
+  height: 34rpx;
+}
+
 .panelItem .imageFree{
   width:100rpx;
 }
@@ -313,11 +326,11 @@
 }
 
 .left {
-  margin-left: 25rpx;
+  margin-left: 20rpx;
 }
 
 .right {
-  margin-right: 25rpx;
+  margin-right: 20rpx;
 }
 
 .panelItemTag {
@@ -344,13 +357,13 @@
   height: 80rpx;
   background-color: #fff;
   border: 1rpx solid #9b9b9b;
-  margin-left: 10rpx;
+  margin-left: 6rpx;
 }
 
 .panelSaveTag3 {
   width: 80rpx;
   height: 80rpx;
-  margin-left: 10rpx;
+  margin-left: 6rpx;
   background-color: #0071ef;
   border: 1rpx solid #0071ef;
 }
@@ -385,6 +398,11 @@
   height: 26rpx;
 }
 
+.universalpic_voicerecorder_normal_gray_21x26{
+  width: 21rpx;
+  height: 26rpx;
+}
+
 .add {
   font-size: 42rpx;
   font-weight: 600;
@@ -392,7 +410,7 @@
 }
 
 .clear {
-  width: 108rpx;
+  width: 88rpx;
   height: 80rpx;
   color:#787878;
   background-color: #fff;
@@ -521,4 +539,239 @@
   width:16rpx;
   height:26rpx;
   margin-left: 30rpx;
+}
+
+/* 更多功能 */
+
+.numberContainer {
+  width: 100%;
+  justify-content: flex-start;
+  align-items: flex-start;
+  position: fixed;
+  top: 0;
+  background-color: #fff;
+  color:#1e1e1e;
+  z-index: 20;
+  border-top: 1 solid #fff;
+}
+
+.universalpic_bell_black_30x30{
+  width:42rpx;
+  height:30rpx;
+  margin: 50rpx 20rpx 0 30rpx;
+}
+.numberContainer .numberContaineFooter{
+  width: 100%;
+  position: fixed;
+  bottom: 0;
+  align-items: flex-start;
+  font-size: 36rpx;
+  border-top: 1rpx solid rgba(0, 0, 0, 0.2);
+  text-align: center;
+  line-height: 131rpx;
+}
+.numberContainer .numberContaineFooter2{
+  color:#B3443B;
+  font-weight: 500;
+}
+
+.universalpic_sequence_black_30x30_2{
+  margin: 50rpx 20rpx 0 30rpx;
+}
+
+.numberContainerFooter1{
+  width:100%;
+  position: fixed;
+  bottom:131rpx;
+}
+
+.numberContainerFooter102{
+  width:100%;
+  height: 132rpx;
+  justify-content: flex-start;
+}
+.numberContainerFooter103{
+  width:100%;
+  height: 111rpx;
+  justify-content: flex-start;
+}
+.numberContainerFooter104{
+  width:100%;
+  height: 100rpx;
+  justify-content: flex-start;
+}
+.numberContainerFooter101{
+  width:100%;
+  height: 337rpx;
+  justify-content: flex-start;
+  align-items: flex-start;
+}
+
+.universalpic_edit_gray_25x25{
+  width: 25rpx; 
+  height: 25rpx;
+  margin: 0 30rpx 0 30rpx;
+}
+
+.universalpic_bell_gray_30x30{
+  width:30rpx;
+  height:30rpx;
+  margin: 40rpx 20rpx 0 30rpx;
+}
+.universalpic_typesize_gray_30x18{
+  width: 30rpx; 
+  height: 18rpx;
+  margin: 57rpx 20rpx 0 30rpx;
+}
+
+.numberContainerFooter11{
+  align-items: flex-start;
+  margin-top: 40rpx;
+}
+
+.numberContainerFooter111{
+  font-size:36rpx;
+  font-weight: 400;
+}
+.numberContainerFooter1111{
+  margin-top: 40rpx;
+}
+.numberContainerFooter113{
+  font-size:28rpx;
+  font-weight: 400;
+  margin-left: 80rpx;
+}
+
+.numberContainerFooter112{
+  justify-content: flex-start;
+  flex-wrap: wrap;
+}
+
+.numberContainerFooter1121{
+  line-height:73rpx;
+  border:3rpx solid #D2D2D2;
+  border-radius: 10rpx;
+  text-align: center;
+  margin: 30rpx 30rpx 0 0;
+  font-size:24rpx;
+  padding: 0 30rpx;
+}
+
+.numberContainerFooter1121Select{
+  border:3rpx solid #0071EF;
+  color:#fff;
+  background-color: #0071EF;
+}
+
+.RecorderPanel1{
+  width:100%;
+  height:360rpx;
+  background-color: #f8f8f8;
+  position: fixed;
+  bottom:131rpx;
+  border-top: 1rpx solid #d2d2d2;
+  justify-content: flex-start;
+}
+
+
+.RecorderPanel11{
+  width:100%;
+  justify-content: space-between;
+  margin-top: 40rpx;
+}
+.universalpic_voicerecorder_black_30x30{
+  width:30rpx;
+  height:30rpx;
+}
+
+.RecorderPanel111{
+  margin-left: 30rpx;
+}
+.RecorderPanel1111{
+  margin-left: 20rpx;
+  font-size:36rpx;
+}
+
+.RecorderPanel112{
+  font-family: 'Roboto-Black';
+  font-size:36rpx;
+  color:#787878;
+  margin-right: 30rpx;
+}
+.RecorderPanel1121{
+  color:#0071EF;
+}
+
+.btnRecorderStart{
+  width:690rpx;
+  line-height:110rpx;
+  background-color: #fff;
+  border:1rpx solid #9B9B9B;
+  text-align: center;
+  font-size:32rpx;
+  font-weight: 500;
+  color:#0071EF;
+  margin-top: 40rpx;
+  border-radius: 10rpx;
+}
+
+.RecorderPanel12{
+  width:690rpx;
+  height:110rpx;
+  margin-top: 20rpx;
+  justify-content: space-between;
+}
+
+.btnRecorderStart2{
+  width:216rpx;
+  color:#1E1E1E;
+}
+.btnRecorderStart3{
+  width:216rpx;
+}
+
+.btnRecorderEnd{
+  color:#fff;
+  background-color: #0071EF;
+  border:1rpx solid #0071EF;
+}
+
+.RecorderPanel2{
+  width:100%;
+  height:449rpx;
+  position: fixed;
+  bottom:492rpx;
+}
+
+.edit_voicerecorder_illus{
+  width:222rpx;
+  height:449rpx;
+}
+
+.RecorderPanel3{
+  width:100%;
+  min-height:714rpx;
+  position: fixed;
+  top:0;
+  justify-content: flex-start;
+}
+
+.RecorderPanel31{
+  width:100%;
+  height:116rpx;
+  justify-content: flex-start;
+  align-items: flex-start;
+}
+
+.RecorderPanel311{
+  font-size:24rpx;
+  font-weight: 400;
+  color:#787878;
+  margin: 10rpx 0 0 30rpx;
+}
+
+.RecorderPanel32{
+  width:690rpx;
+  height:500rpx;
+  font-size:36rpx;
 }

pages/main/default.js

@@ -30,6 +30,11 @@ Page({
       });
     }
 
+    // //测试跳转
+    // wx.navigateTo({
+    //   url: './add?type=add&id=0',
+    // });
+
     if (app.globalData.IsIPad){
       that.setData({
         IsIPad: "_iPad",
@@ -97,6 +102,13 @@ Page({
             url: '../index/accredit',
           });
         }
+
+        if (res.authSetting['scope.record'] === true) {
+          app.globalData.IsRecorderAccredit = 1;
+        }
+        else if (res.authSetting['scope.record'] === false) {
+          app.globalData.IsRecorderAccredit = -1;
+        }
       }
     });
   },

pages/main/detail.js

@@ -27,6 +27,7 @@ var innerAudioContext1;
 
 var listTaskFinished = []; //完成的任务
 var timeStart; //计算时长
+var timeHistory=0;//已经过去的时间
 var TaskList = [];
 var arrImage = [],
   arrImage2 = [];
@@ -34,6 +35,13 @@ var intervalSound = 0,
   intervalRefresh = 0;
 var isCollecting = false;
 
+var isPlaying = false;
+var innerAudioContext;
+
+var timeoutPlayAudio;
+var tempPlayUrl = "";
+var timeoutEveryCard=0;
+
 Page({
   data: {
     ImagePath: app.globalData.uploadImageUrl,
@@ -67,7 +75,15 @@ Page({
     });
 
     innerAudioContext1 = wx.createInnerAudioContext();
-    this.audioCtx = [];
+    
+    innerAudioContext = wx.createInnerAudioContext();
+    innerAudioContext.onPlay(() => {
+      //console.log('开始播放');
+    });
+    innerAudioContext.onEnded(() => {
+      //console.log('结束播放');
+    });
+
 
     this.getList();
 
@@ -119,7 +135,12 @@ Page({
   },
   onUnload: function () {
     clearInterval(intervalSound);
+    clearTimeout(timeoutEveryCard);
     listTaskFinished = [];
+    if (innerAudioContext) {
+      innerAudioContext.stop();
+      isPlaying = false;
+    }
   },
   onPullDownRefresh: function () {
     this.onShowAnswer({
@@ -243,7 +264,7 @@ Page({
     });
 
     listTaskFinished = [];
-    timeStart = new Date(); //起始时间
+    that.timeCompute(); //起始时间
 
     function formatList(list) {
       for (var i = 0; i < list.length; i++) {
@@ -360,13 +381,20 @@ Page({
       IsMore: false,
     });
   },
+  //回到上一张题卡
   gotoPrev: function () {
     var that = this;
+    if (innerAudioContext) {
+      innerAudioContext.stop();
+      isPlaying = false;
+    }
 
     if (listTaskFinished.length > 0) {
       var card = listTaskFinished.pop();
       wx.setStorageSync("ListTaskFinished", listTaskFinished);
-      timeStart = new Date();
+      
+      timeHistory=0;
+      that.timeCompute();
 
       card.Card.Number0 = card.Number0Old;
       card.Card.Number0Str = card.Number0StrOld;
@@ -412,8 +440,13 @@ Page({
       that.setSoundFile(2);
     }
   },
+  //进入下一张题卡
   gotoNext: function (e) {
     var that = this;
+    if (innerAudioContext) {
+      innerAudioContext.stop();
+      isPlaying = false;
+    }
 
     var btnnumber = e.currentTarget.dataset.btnnumber;
     var time = e.currentTarget.dataset.time;
@@ -509,8 +542,12 @@ Page({
     var duration = common.diffDate("s", timeStart, new Date());
     if (finishCard.btnnumber == 1)
       duration = 0;
-    finishCard.Duration = duration;
-    timeStart = new Date();
+    finishCard.Duration = timeHistory + duration;
+
+    //console.log("CardTime:"+finishCard.Duration);
+
+    timeHistory = 0;
+    that.timeCompute();
 
     //添加完成列表，去掉任务列表数据
     listTaskFinished.push(finishCard);
@@ -591,6 +628,27 @@ Page({
         that.setSoundFile(0);
     }
   },
+  timeCompute:function(){
+    var that=this;
+    timeStart = new Date();
+    clearTimeout(timeoutEveryCard);
+    timeoutEveryCard=setTimeout(function(){
+      //计算暂停时已经用掉的时长
+      timeHistory += common.diffDate("s", timeStart, new Date());
+      //console.log("timeHistory:"+timeHistory);
+      wx.showModal({
+        title: '提醒',
+        content: '您已等待了' + app.globalData.CardWaitTimeMax+'分钟',
+        showCancel: false,
+        confirmText: "知道了",
+        success(res) {
+          if (res.confirm) {
+            that.timeCompute();
+          }
+        },
+      })
+    }, app.globalData.CardWaitTimeMax*60*1000);
+  },
   gotoCollect: function () {
     var that = this;
     if (!isCollecting) {
@@ -612,53 +670,77 @@ Page({
     }
   },
   playSound: function (e) {
+    clearTimeout(timeoutPlayAudio);
+
     var that = this;
     var str = e.currentTarget.dataset.content;
-    var url = "";
-    if (str.indexOf("英 [") >= 0 || str.indexOf("美 [") >= 0) {
+    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") {
+    }
+    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);
     }
 
-    var arr = url.split(",");
-    this.audioCtx = [];
-    for (var i = 0; i < arr.length; i++) {
-      this.audioCtx.push(wx.createAudioContext('myAudio' + i));
-    }
 
-    var index = 0;
-    if (arr.length > 1) {
-      intervalSound = setInterval(function () {
-        that.audioCtx[index].setSrc(arr[index]);
-        that.audioCtx[index].play();
+    if (url.indexOf("http") > 0)
+      url = url.substr(url.indexOf("http"));
+    url = url.replace("http://", "https://");
 
-        index++;
-        if (index >= arr.length) {
-          clearInterval(intervalSound);
-        }
-      }, 1000);
-    } else {
-      if (arr[index].indexOf("http") > 0)
-        arr[index] = arr[index].substr(arr[index].indexOf("http"));
-      arr[index] = arr[index].replace("http://", "https://");
+    if (!isPlaying || tempPlayUrl == "" || url != tempPlayUrl) {
+      isPlaying = true;
+      timeoutPlayAudio = setTimeout(function () {
+        isPlaying = false;
+      }, 60000);
+      if (innerAudioContext) {
+        innerAudioContext.stop();
+      }
+      wx.showLoading({
+        title: '音频下载中',
+        mask: true,
+      });
+      setTimeout(function () {
+        wx.hideLoading();
+      }, 30000);
 
-      //console.log("play:" + arr[index]);
-      that.audioCtx[index].setSrc(arr[index]);
-      that.audioCtx[index].play();
+      wx.downloadFile({
+        url: encodeURI(url),
+        success(res) {
+          wx.hideLoading();
+          if (res.statusCode === 200) {
+            innerAudioContext.src = res.tempFilePath;
+            innerAudioContext.play();
+            tempPlayUrl = url;
+          }
+        },
+        fail(err) {
+          wx.hideLoading();
+        }
+      });
+    }
+    else {
+      if (innerAudioContext) {
+        innerAudioContext.stop();
+        isPlaying = false;
+      }
     }
   },
   getTaskTime: function () {

pages/main/detail.wxml

@@ -211,8 +211,4 @@
   </view>
 </view>
 
-<canvas class='Canvas' canvas-id="shareCanvas"></canvas>
-<audio hidden='true' id="myAudio0"></audio>
-<audio hidden='true' id="myAudio1"></audio>
-<audio hidden='true' id="myAudio2"></audio>
-<audio hidden='true' id="myAudio3"></audio>
+<canvas class='Canvas' canvas-id="shareCanvas"></canvas>

pages/main/detail.wxss

@@ -243,6 +243,22 @@
 }
 
 
+.panelItem .panelRecorder {
+  width:100%;
+  justify-content: flex-start;
+}
+.panelItem .panelRecorder0 {
+  width: 168rpx;
+  height: 70rpx;
+  background-color: #fff;
+  border-radius: 10rpx;
+}
+
+.panelItem .universalpic_voicerecorder_transmit_black_44x34{
+  width: 44rpx;
+  height: 34rpx;
+}
+
 .panelItem .imageContainer {
   width: 650rpx;
   margin: 6rpx 0;

pages/main/preview.js

@@ -7,7 +7,10 @@ var arrImage = [];
 var isCopying = false;
 var isPlaying = false;
 var isCollecting = false;
-var playList=[];
+var playList = [];
+var innerAudioContext;
+var timeoutPlayAudio;
+var tempPlayUrl = "";
 
 Page({
   data: {
@@ -20,7 +23,7 @@ Page({
     var id = 0;
     if (options.id)
       id = options.id;
-    
+
     that.setData({
       Containnerheight: main.getWindowHeight(),
       ShowType: options.type,
@@ -29,7 +32,14 @@ Page({
     });
     console.log("MiaoguoCardID:" + id);
 
-    this.audioCtx = [];
+    innerAudioContext = wx.createInnerAudioContext();
+    innerAudioContext.onPlay(() => {
+      console.log('开始播放');
+    });
+    innerAudioContext.onEnded(() => {
+      console.log('结束播放');
+      isPlaying = false;
+    });
 
 
     if (options.type == "show") {
@@ -45,7 +55,7 @@ Page({
         })
       }
     }
-    else{
+    else {
       if (options.type == "share") {
         wx.setNavigationBarTitle({
           title: "来自分享"
@@ -57,15 +67,15 @@ Page({
         });
         if (that.data.ShowType == "play") {
           playList = [];
-          for (var i = 0; i < app.globalData.CardList.length;i++){
+          for (var i = 0; i < app.globalData.CardList.length; i++) {
             playList.push(app.globalData.CardList[i].MiaoguoCardID);
           }
           playList = common.randomArray(playList);
           that.data.MiaoguoCardID = playList[0];
           that.setData({
             MiaoguoCardID: that.data.MiaoguoCardID,
-            CurrentIndex:0,
-            PlayListCount:playList.length,
+            CurrentIndex: 0,
+            PlayListCount: playList.length,
           });
         }
       }
@@ -95,14 +105,14 @@ Page({
             app.globalData.CardList = [data];
             that.init();
           }
-          else{
-            var time=2000;
+          else {
+            var time = 2000;
             wx.showToast({
               title: '分享人已删除',
-              mask:true,
+              mask: true,
               duration: time,
-              complete:function(){
-                setTimeout(function(){
+              complete: function () {
+                setTimeout(function () {
                   wx.reLaunch({
                     url: './default?IsStart=1',
                   });
@@ -116,13 +126,16 @@ Page({
         that.init();
   },
   onUnload: function () {
-    clearInterval(intervalSound);
+    if (innerAudioContext) {
+      innerAudioContext.stop();
+      isPlaying = false;
+    }
   },
   onPullDownRefresh: function () {
-    var that=this;
+    var that = this;
     if (that.data.ShowType == "play") {
       that.setData({
-        IsShowAnswer: [0,0],
+        IsShowAnswer: [0, 0],
       });
     }
     wx.stopPullDownRefresh();
@@ -130,9 +143,9 @@ Page({
   init: function () {
     var that = this;
     var list = app.globalData.CardList;
-    
+
     var card = {};
-    var prevId = 0,nextId = 0;
+    var prevId = 0, nextId = 0;
     for (var i = 0; i < list.length; i++) {
       if (this.data.MiaoguoCardID == list[i].MiaoguoCardID) {
         if (i > 0)
@@ -148,7 +161,7 @@ Page({
         card.MiaoguoCardID = list[i].MiaoguoCardID;
         card.LimitTime = list[i].LimitTime;
         card.FontSize = list[i].FontSize;
-        card.IsCollect=list[i].IsCollect;
+        card.IsCollect = list[i].IsCollect;
         break;
       }
     }
@@ -194,20 +207,20 @@ Page({
       }
     }
 
-    var IsShowAnswer=[1,1];
+    var IsShowAnswer = [1, 1];
     if (that.data.ShowType == "play") {
-      IsShowAnswer=[0, 0];
+      IsShowAnswer = [0, 0];
       if (this.data.CurrentIndex <= 0) {
         prevId = 0;
       }
-      else 
+      else
         prevId = 1;
 
-      if (this.data.CurrentIndex >=playList.length-1) {
+      if (this.data.CurrentIndex >= playList.length - 1) {
         nextId = 0;
       }
       else
-        nextId=1;
+        nextId = 1;
     }
     this.setData({
       ID: card.MiaoguoCardID,
@@ -226,6 +239,11 @@ Page({
     wx.pageScrollTo({
       scrollTop: 0,
     });
+
+    if (innerAudioContext) {
+      innerAudioContext.stop();
+      isPlaying = false;
+    }
   },
   practiceToday: function () {
     var that = this;
@@ -235,9 +253,9 @@ Page({
       success(res) {
         if (res.confirm) {
 
-          var arr=[];
+          var arr = [];
           var obj = {};
-          obj.Card={};
+          obj.Card = {};
           obj.Card.MiaoguoCardID = that.data.ID;
           obj.BtnNumber = -1;
           obj.LearningType = 2;
@@ -360,68 +378,82 @@ Page({
         });
       });
     }
-
   },
   playSound: function (e) {
-    if (!isPlaying) {
-      isPlaying = true;
-      setTimeout(function () {
-        isPlaying = false;
-      }, 3000);
+    clearTimeout(timeoutPlayAudio);
 
-      var that = this;
-      var str = e.currentTarget.dataset.content;
-      var url;
-      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 {
+    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]", str);
+        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);
+    }
 
-      var arr = url.split(",");
-      for (var i = 0; i < arr.length; i++) {
-        this.audioCtx.push(wx.createAudioContext('myAudio' + i));
+
+    if (url.indexOf("http") > 0)
+      url = url.substr(url.indexOf("http"));
+    url = url.replace("http://", "https://");
+
+    if (!isPlaying || tempPlayUrl=="" || url!=tempPlayUrl) {
+      isPlaying = true;
+      timeoutPlayAudio = setTimeout(function () {
+        isPlaying = false;
+      }, 60000);
+      if (innerAudioContext) {
+        innerAudioContext.stop();
       }
-      var index = 0;
-      if (arr.length > 1) {
-        
-        intervalSound = setInterval(function () {
-          that.audioCtx[index].setSrc(arr[index]);
-          that.audioCtx[index].play();
-
-          index++;
-          if (index >= arr.length) {
-            clearInterval(intervalSound);
+      wx.showLoading({
+        title: '音频下载中',
+        mask: true,
+      });
+      setTimeout(function () {
+        wx.hideLoading();
+      }, 30000);
+
+      wx.downloadFile({
+        url: encodeURI(url),
+        success(res) {
+          wx.hideLoading();
+          if (res.statusCode === 200) {
+            innerAudioContext.src = res.tempFilePath;
+            innerAudioContext.play();
+            tempPlayUrl=url;
           }
-        }, 1000);
-      }
-      else {
-        if (arr[index].indexOf("http") > 0)
-          arr[index] = arr[index].substr(arr[index].indexOf("http"));
-        arr[index] = arr[index].replace("http://", "https://");
-
-        that.audioCtx[index].setSrc(arr[index]);
-        that.audioCtx[index].play();
+        },
+        fail(err) {
+          wx.hideLoading();
+        }
+      });
+    }
+    else {
+      if (innerAudioContext) {
+        innerAudioContext.stop();
+        isPlaying = false;
       }
     }
   },
-  getDetailInfo:function(){
+  getDetailInfo: function () {
     wx.navigateTo({
       url: './cardInfo?id=' + this.data.MiaoguoCardID,
     });
@@ -465,7 +497,7 @@ Page({
     });
     that.init();
   },
-  
+
   close: function () {
     wx.navigateBack({
       delta: 1,
@@ -481,7 +513,7 @@ Page({
   },
   gotoCollect: function () {
     var that = this;
-    if (!isCollecting){
+    if (!isCollecting) {
       isCollecting = true;
       setTimeout(function () {
         isCollecting = false;
@@ -506,38 +538,38 @@ Page({
         }
       });
     }
-    
+
   },
-  onShowAnswer:function(){
+  onShowAnswer: function () {
     this.setData({
-      IsShowAnswer:[1,1]
+      IsShowAnswer: [1, 1]
     });
   },
-  onPlayAgain:function(){
+  onPlayAgain: function () {
     playList.push(this.data.MiaoguoCardID);
     this.setData({
       PlayListCount: playList.length,
-      NextID:1,
+      NextID: 1,
     });
     wx.showToast({
       title: '稍后回放',
-      mask:true,
-      duration:500,
+      mask: true,
+      duration: 500,
     });
   },
   playNext: function (e) {
     var that = this;
     var div = e.currentTarget.dataset.div;
-    if (div==1){
+    if (div == 1) {
       this.data.CurrentIndex++;
-      if (this.data.CurrentIndex>=playList.length){
-        this.data.CurrentIndex = playList.length-1;
+      if (this.data.CurrentIndex >= playList.length) {
+        this.data.CurrentIndex = playList.length - 1;
       }
     }
     else {
       this.data.CurrentIndex--;
-      if (this.data.CurrentIndex<0)
-        this.data.CurrentIndex=0;
+      if (this.data.CurrentIndex < 0)
+        this.data.CurrentIndex = 0;
     }
     that.setData({
       CurrentIndex: this.data.CurrentIndex,
@@ -604,7 +636,7 @@ Page({
     }, 1000);
     return {
       title: '我的分享',
-      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID + '&Share=1&ColorIndex='+app.globalData.ColorIndex+'&MiaoguoCardID=' + this.data.MiaoguoCardID,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID + '&Share=1&ColorIndex=' + app.globalData.ColorIndex + '&MiaoguoCardID=' + this.data.MiaoguoCardID,
     }
   },
 })

pages/main/preview.wxml

@@ -101,9 +101,4 @@
     </view>
   </view>
   
-</view>
-
-<audio hidden='true' id="myAudio0"></audio>
-<audio hidden='true' id="myAudio1"></audio>
-<audio hidden='true' id="myAudio2"></audio>
-<audio hidden='true' id="myAudio3"></audio>
+</view>

pages/main/preview.wxss

@@ -258,6 +258,22 @@
   height: 20rpx;
 }
 
+.panelItem .panelRecorder {
+  width:100%;
+  justify-content: flex-start;
+}
+.panelItem .panelRecorder0 {
+  width: 168rpx;
+  height: 70rpx;
+  background-color: #fff;
+  border-radius: 10rpx;
+}
+
+.panelItem .universalpic_voicerecorder_transmit_black_44x34{
+  width: 44rpx;
+  height: 34rpx;
+}
+
 .panelItem .textProblem{
   padding: 3rpx 20rpx;
   background-color: #F1AB1E;

pages/main/searchCardList.js

@@ -3,10 +3,17 @@ import main from '../../utils/main';
 
 const app = getApp();
 var intervalRefresh = 0;
+var arrOrder = [
+  { Name: "最近添加", Value: "ac.MiaoguoCardID desc", CSS: "numberContainerFooter1121Select" },
+  { Name: "较早添加", Value: "ac.MiaoguoCardID asc" },
+  { Name: "练习次数", Value: "ac.LearnNumber desc,ac.MiaoguoCardID desc" }
+];
 
 Page({
   data: {
-    HasPage:false,
+    HasPage: false,
+    ArrOrder: arrOrder,
+    OrderType: arrOrder[0].Value,
   },
   onLoad: function (options) {
     var that = this;
@@ -29,27 +36,20 @@ Page({
       wx.setNavigationBarTitle({
         title: "幻灯片"
       });
-      IsCollect=1;
+      IsCollect = 1;
     }
 
     that.setData({
-      IsCollect:IsCollect,
+      IsCollect: IsCollect,
       Search: Search,
       IsToday: IsToday,
-      Count: options.Count,
+      Count: options.count,
       Containnerheight: main.getWindowHeight(),
     });
   },
   onShow: function () {
     var that = this;
     that.getList();
-    main.getData("GetUserCardCount?UserID=" + app.globalData.userInfo.UserID, function (data) {
-      if (data) {
-        that.setData({
-          Count: data.CardNumber,
-        });
-      }
-    });
 
     //题卡主题色
     var arrColorIndex = wx.getStorageSync("ColorIndexArr");
@@ -63,17 +63,19 @@ Page({
   onPullDownRefresh: function () {
     var that = this;
     if (!that.data.IsCollect && !that.data.IsToday) {
-      app.globalData.CardList=[];
-      that.gotoNextPage({currentTarget:{dataset:{id:0}}});
+      app.globalData.CardList = [];
+      that.gotoNextPage({ currentTarget: { dataset: { id: 0 } } });
     }
     wx.stopPullDownRefresh();
   },
   getList: function () {
-    var that=this;
+    var that = this;
     var list = app.globalData.CardList;
     var len = 16;
     for (var i = 0; i < list.length; i++) {
       var item = list[i];
+      item.ScrollLeft = 0;
+      item.DeleteStr = "删除";
       item.Content[1].ContentStr = replaceString(item.Content[1].Content);
       if (item.Content[1].ContentStr.length > len)
         item.Content[1].ContentStr = replaceString(item.Content[1].ContentStr.substr(0, len)) + "...";
@@ -108,22 +110,50 @@ Page({
     //   app.globalData.CardList=list;
     // }
 
-    var hasPage=false;
-    if (list.length<that.data.Count && that.data.IsToday==0 && !that.data.IsCollect)
-      hasPage=true;
-    
-    this.setData({
-      List: list,
-      HasPage:hasPage,
-    });
+
+    if (!that.data.IsCollect && !that.data.IsToday) {
+      main.getData("GetUserCardCount?UserID=" + app.globalData.userInfo.UserID, function (data) {
+        if (data) {
+          that.setData({
+            Count: data.CardNumber,
+          });
+          var hasPage = false;
+          if (list.length < that.data.Count && that.data.IsToday == 0 && !that.data.IsCollect)
+            hasPage = true;
+
+          that.setData({
+            List: list,
+            HasPage: hasPage,
+          });
+
+
+        }
+      });
+    }
+    else {
+      that.setData({
+        Count: list.length,
+      });
+      var hasPage = false;
+      if (list.length < that.data.Count && that.data.IsToday == 0 && !that.data.IsCollect)
+        hasPage = true;
+
+      that.setData({
+        List: list,
+        HasPage: hasPage,
+      });
+
+    }
+
     wx.hideLoading();
 
     function getImage(str) {
       var result = "";
       if (str.indexOf("[图") >= 0) {
-        result = str.substring(str.indexOf("[图]") + 3, str.indexOf("[/图]"));
+        result = str.substring(str.indexOf("[图") + 3, str.indexOf("[/图]"));
         result = result.substring(result.indexOf("]") + 1);
       }
+      //console.log(result);
       return result;
     }
 
@@ -165,7 +195,7 @@ Page({
       url: './preview?type=show&id=' + id,
     })
   },
-  playPPT:function(){
+  playPPT: function () {
     wx.navigateTo({
       url: './preview?type=play',
     })
@@ -178,17 +208,16 @@ Page({
     wx.downloadFile({
       url: serverUrl, // 仅为示例，并非真实的资源
       success(res) {
-        // 只要服务器有响应数据，就会把响应内容写入文件并进入 success 回调，业务需要自行判断是否下载到了想要的内容
         if (res.statusCode === 200) {
           main.saveTempImage(serverUrl, res.tempFilePath);
         }
       }
     });
 
-    clearTimeout(intervalRefresh);
-    intervalRefresh = setTimeout(function () {
-      that.getList();
-    }, 1000);
+    // clearTimeout(intervalRefresh);
+    // intervalRefresh = setTimeout(function () {
+    //   that.getList();
+    // }, 1000);
   },
   gotoNextPage: function (e) {
     wx.showLoading({
@@ -197,15 +226,20 @@ Page({
     setTimeout(function () {
       wx.hideLoading();
     }, 5000);
-    
+
     var that = this;
-    var id = e.currentTarget.dataset.id;
     var url = 'GetMiaoguoCardList?UserID=' + app.globalData.userInfo.UserID + "&IsToday=" + that.data.IsToday;
-    if (id && id>0)
-      url+="&PageID=" + id;
+    var id = e.currentTarget.dataset.id;
+    if (id && id > 0)
+      url += "&PageID=" + id;
     if (that.data.Search)
       url += "&Key=" + that.data.Search;
 
+    var orderType = that.data.OrderType;
+    if (orderType)
+      url += "&OrderType=" + orderType;
+
+
     main.getData(url, function (data) {
       if (data) {
 
@@ -213,7 +247,7 @@ Page({
         for (var i = 0; i < data.List.length; i++) {
           list.push(data.List[i]);
         }
-        app.globalData.CardList=list;
+        app.globalData.CardList = list;
         that.getList();
       }
     });
@@ -223,11 +257,86 @@ Page({
       url: './add?type=add&id=0',
     });
   },
-  onSearch:function(){
+  onSearch: function () {
     wx.navigateBack({
       delta: 1,
     });
   },
+  onOrder: function (e) {
+    var that = this;
+    var value = e.currentTarget.dataset.value;
+    for (var i = 0; i < this.data.ArrOrder.length; i++) {
+      if (this.data.ArrOrder[i].Value == value)
+        this.data.ArrOrder[i].CSS = "numberContainerFooter1121Select";
+      else
+        this.data.ArrOrder[i].CSS = "";
+    }
+    this.setData({
+      IsOrder: false,
+      ArrOrder: this.data.ArrOrder,
+      OrderType: value,
+    });
+
+    if (!that.data.IsCollect && !that.data.IsToday) {
+      app.globalData.CardList = [];
+      that.gotoNextPage({ currentTarget: { dataset: { id: 0, OrderType: value } } });
+    }
+  },
+  showOrder: function () {
+    this.setData({
+      IsOrder: true,
+    });
+  },
+  closeOrder: function () {
+    this.setData({
+      IsOrder: false,
+    });
+  },
+  DeleteItem: function (e) {
+    var that = this;
+    var id = e.currentTarget.dataset.id;
+    var list = this.data.List;
+    var b = true;
+    for (var i = 0; i < list.length; i++) {
+      var item = list[i];
+      if (id == item.MiaoguoCardID) {
+        if (item.DeleteStr == "删除") {
+          item.ScrollLeft = 160;
+          item.DeleteStr = "确认删除";
+        }
+        else if (item.DeleteStr == "确认删除") {
+          b = false;
+          item.DeleteStr = "删除";
+          item.ScrollLeft = 0;
+          var url = 'DeleteMiaoguoCard?UserID=' + app.globalData.userInfo.UserID;
+          url += "&ID=" + id;
+          main.getData(url, function (data) {
+            var list = app.globalData.CardList;
+            for (var i = 0; i < list.length; i++) {
+              if (id == list[i].MiaoguoCardID) {
+                list.splice(i, 1);
+                break;
+              }
+            }
+            app.globalData.CardList = list;
+            that.setData({
+              List: list,
+              Count:--that.data.Count,
+            });
+          });
+        }
+      }
+      else {
+        item.DeleteStr = "删除";
+        item.ScrollLeft = 0;
+      }
+    }
+    if (b) {
+      that.setData({
+        List: list,
+      });
+    }
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/searchCardList.wxml

@@ -11,10 +11,10 @@
         <image class="universalpic_add_black_30x30" src='../images/universalpic_add_black_30x30.png' />
       </view>
       <view>{{Count}}张题卡</view>
-      <view class='panelTop1 FlexRow' bindtap='' wx:if="{{List.length>0}}">
-        <!-- <image class="universalpic_sequence_black_30x30" src='../images/universalpic_sequence_black_30x30.png' /> -->
+      <view class='panelTop1 FlexRow' bindtap='showOrder' wx:if="{{List.length>0 && !IsCollect && !IsToday}}">
+        <image class="universalpic_sequence_black_30x30" src='../images/universalpic_sequence_black_30x30.png' />
       </view>
-      <view class='panelTop1 FlexRow' wx:if='{{List.length==0}}'>
+      <view class='panelTop1 FlexRow' wx:if='{{List.length==0 || IsCollect || IsToday}}'>
       </view>
     </view>
   </view>
@@ -25,29 +25,38 @@
       <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
         <view class="lineWidth720"></view>
       </view>
-      <view class="panelItem FlexRow" bindtap='onPreview' data-id="{{item.MiaoguoCardID}}">
-        <view class="panelItem1 FlexRow">
-          <image class="ImageCSS" mode="aspectFill" src='{{item.ImageUrlTemp}}' wx:if="{{item.ImageUrlServer}}" binderror="onBindError" data-id="{{item.MiaoguoCardID}}" data-serverurl="{{item.ImageUrlServer}}" />
-          <view class="panelItem11 FlexColumn">
-            <view class='Text1'>{{item.Content[1].ContentStr}}</view>
-            <view class='Text2'>{{item.Content[2].ContentStr}}</view>
+      <scroll-view class="ScrollView" scroll-left="{{item.ScrollLeft}}" scroll-x="true" data-index="{{index}}">
+        <view class='CellItem'>
+          <view class="panelItem FlexRow" bindtap='onPreview' data-id="{{item.MiaoguoCardID}}">
+            <view class="panelItem1 FlexRow">
+              <image class="ImageCSS" mode="aspectFill" src='{{item.ImageUrlTemp}}' wx:if="{{item.ImageUrlServer}}" binderror="onBindError" data-id="{{item.MiaoguoCardID}}" data-serverurl="{{item.ImageUrlServer}}" />
+              <view class="panelItem11 FlexColumn">
+                <view class='Text1'>{{item.Content[1].ContentStr}}</view>
+                <view class='Text2'>{{item.Content[2].ContentStr}}</view>
+              </view>
+            </view>
+            <view class="panelItem2 FlexColumn">
+              <view>{{item.CreateTimeStr}}</view>
+              <view class='panelItem21'>
+                <image class="universalpic_fav_default_gray_26x24" src='../images/universalpic_fav_default_gray_26x24.png' wx:if="{{item.IsCollect==1}}" />
+              </view>
+            </view>
           </view>
         </view>
-        <view class="panelItem2 FlexColumn">
-          <view>{{item.CreateTimeStr}}</view>
-          <view class='panelItem21'>
-            <image class="universalpic_fav_default_gray_26x24" src='../images/universalpic_fav_default_gray_26x24.png' wx:if="{{item.IsCollect==1}}" />
+        <view class='CellDelete'>
+          <view class='DeleteItem' catchtap='DeleteItem' data-id="{{item.MiaoguoCardID}}">
+            <block wx:if="{{item.DeleteStr=='确认删除'}}">{{item.DeleteStr}}</block>
+            <image class="universalpic_del_white_20x28" src='../images/universalpic_del_white_20x28.png' wx:if="{{item.DeleteStr=='删除'}}" />
           </view>
         </view>
-      </view>
+      </scroll-view>
     </block>
     <view class="lineWidthAll FlexRow" wx:if="{{HasPage}}">
       <view class="lineWidth750"></view>
     </view>
-    <view class='panelItem3 panelItem FlexRow' wx:if="{{HasPage}}" bindtap='gotoNextPage' data-id="{{List[List.length-1].MiaoguoCardID}}">
+    <view class='panelItem3' wx:if="{{HasPage}}" bindtap='gotoNextPage' data-id="{{List[List.length-1].MiaoguoCardID}}">
       <view class="more">更多</view>
     </view>
-    <view class='lineFooter'></view>
 
     <view style='width:100%;height:100rpx;' wx:if="{{IsCollect!=1}}"></view>
     <view style='width:100%;height:200rpx;' wx:if="{{IsCollect==1}}"></view>
@@ -65,4 +74,24 @@
       <view class='Text4'>从左上角按钮添加新题卡</view>
     </view>
   </block>
+</view>
+
+<!-- 更多功能 -->
+<view wx:if="{{IsOrder}}" class="numberContainer FlexColumn" style='height:{{Containnerheight}}rpx;'>
+  <view class="numberContainerFooter1 FlexColumn">
+    <view class='lineFooter'></view>
+    <view class='numberContainerFooter101 FlexRow'>
+      <image class="universalpic_sequence_black_30x30_2 universalpic_sequence_black_30x30" src='../images/universalpic_sequence_black_30x30.png' />
+      <view class='numberContainerFooter11 FlexColumn'>
+        <view class='numberContainerFooter111'>调整排序</view>
+        <view class='numberContainerFooter112 FlexRow'>
+          <view class='{{item.CSS}} numberContainerFooter1121' wx:for="{{ArrOrder}}" wx:key="index" catchtap='onOrder' data-value='{{item.Value}}'>{{item.Name}}</view>
+        </view>
+      </view>
+    </view>
+  </view>
+  <view class='lineFooter'></view>
+  <view class="numberContaineFooter FlexRow" catchtap='closeOrder'>
+    <view>关闭</view>
+  </view>
 </view>

pages/main/searchCardList.wxss

@@ -1,71 +1,96 @@
-.panelTop{
+.panelTop {
   width: 100%;
   background-color: #fff;
   position: fixed;
-  top:0;
+  top: 0;
   z-index: 10;
   border-bottom: 1rpx solid #d2d2d2;
 }
 
-.panelTop0{
+.panelTop0 {
   width: 100%;
-  height:100rpx;
+  height: 100rpx;
   font-size: 28rpx;
   font-weight: 400;
   justify-content: space-between;
 }
 
-.panelSearch{
-  width:100%;
+.panelSearch {
+  width: 100%;
   background-color: #fff;
 }
-.panelSearch1{
-  width:690rpx;
-  height:80rpx;
+
+.panelSearch1 {
+  width: 690rpx;
+  height: 80rpx;
   margin: 20rpx 0 10rpx 0;
   border-radius: 14rpx;
-  background-color: #F0F0F0;
-  color:#787878;
-  font-size:28rpx;
+  background-color: #f0f0f0;
+  color: #787878;
+  font-size: 28rpx;
   font-weight: 400;
   justify-content: flex-start;
 }
 
-.universalpic_search_gray_30x30{
-  width:30rpx;
-  height:30rpx;
+.universalpic_search_gray_30x30 {
+  width: 30rpx;
+  height: 30rpx;
   margin: 0 20rpx 0 30rpx;
 }
 
-.input{
-  font-size:28rpx;
+.input {
+  font-size: 28rpx;
   font-weight: 400;
-  color:#1e1e1e;
-  width:600rpx;
-  height:40rpx;
+  color: #1e1e1e;
+  width: 600rpx;
+  height: 40rpx;
 }
 
 .panelTop1 {
-  width:90rpx;
-  height:100rpx;
+  width: 90rpx;
+  height: 100rpx;
 }
 
-.universalpic_add_black_30x30{
-  width:30rpx;
-  height:30rpx;
+.universalpic_add_black_30x30 {
+  width: 30rpx;
+  height: 30rpx;
 }
 
-.universalpic_sequence_black_30x30{
-  width:30rpx;
-  height:30rpx;
+.universalpic_sequence_black_30x30 {
+  width: 30rpx;
+  height: 30rpx;
 }
 
-.panelItem {
+.ScrollView {
   width: 100%;
+  height: 136rpx;
+  display: flex;
+  white-space: nowrap;
+}
+
+.CellItem {
+  width: 750rpx;
+  display: inline-block;
+  height: 136rpx;
+  position: relative;
+}
+
+.CellDelete {
+  width: 160rpx;
+  display: inline-block;
+  height: 136rpx;
+  position: relative;
+}
+
+.panelItem {
+  width: 750rpx;
   justify-content: space-between;
   font-size: 28rpx;
   height: 136rpx;
   background-color: #fff;
+  position: absolute;
+  top: 0;
+  left: 0;
 }
 
 .panelItem1 {
@@ -73,9 +98,9 @@
   justify-content: flex-start;
 }
 
-.ImageCSS{
-  width:75rpx;
-  height:75rpx;
+.ImageCSS {
+  width: 75rpx;
+  height: 75rpx;
   margin-right: 20rpx;
 }
 
@@ -83,80 +108,224 @@
   align-items: flex-start;
 }
 
-.panelItem1 .Text1{
+.panelItem1 .Text1 {
   font-weight: 400;
-  font-size:30rpx;
+  font-size: 30rpx;
   overflow: hidden;
 }
-.panelItem1 .Text2{
+
+.panelItem1 .Text2 {
   font-weight: 400;
-  font-size:24rpx;
+  font-size: 24rpx;
   overflow: hidden;
-  color:#787878;
+  color: #787878;
 }
 
 .panelItem2 {
   margin-right: 30rpx;
-  color: #9B9B9B;
-  font-size:22rpx;
+  color: #9b9b9b;
+  font-size: 22rpx;
   font-weight: 400;
   align-items: flex-end;
 }
 
 .panelItem21 {
-  width:26rpx;
-  height:24rpx;
+  width: 26rpx;
+  height: 24rpx;
   margin-top: 14rpx;
 }
 
-.panelNull{
+.panelNull {
   margin-top: 150rpx;
-  width:100%;
+  width: 100%;
   align-items: flex-start;
 }
-.Text3{
-  font-size:32rpx;
+
+.Text3 {
+  font-size: 32rpx;
   margin-left: 30rpx;
 }
-.Text4{
+
+.Text4 {
   margin-top: 10rpx;
-  font-size:24rpx;
-  color:#787878;
+  font-size: 24rpx;
+  color: #787878;
   font-weight: 400;
   margin-left: 30rpx;
 }
 
 .panelItem3 {
   justify-content: center;
-  height:100rpx;
+  height: 100rpx;
+  width: 100%;
+}
+
+.DeleteItem {
+  background-color: #B3443B;
+  width: 160rpx;
+  height: 136rpx;
+  line-height: 136rpx;
+  color: #fff;
+  text-align: center;
+  font-size: 30rpx;
+  position: absolute;
+  top: 0;
+  left: 0;
 }
 
-.more{
-  font-size:28rpx;
-  color:#0071EF;
+.universalpic_del_white_20x28 {
+  width: 20rpx;
+  height: 28rpx;
 }
 
-.panelFooter{
-  width:100%;
-  height:120rpx;
-  border-top:1rpx solid #D2D2D2;
+.more {
+  font-size: 28rpx;
+  color: #0071ef;
+  width: 100%;
+  height: 100rpx;
+  text-align: center;
+  line-height: 100rpx;
+}
+
+.panelFooter {
+  width: 100%;
+  height: 120rpx;
+  border-top: 1rpx solid #d2d2d2;
   position: fixed;
-  bottom:0;
+  bottom: 0;
   background-color: #fff;
 }
-.panelFooter .btn{
+
+.panelFooter .btn {
   width: 602rpx;
   background-color: #fff;
-  border:1rpx solid #9B9B9B;
-  color:#0071EF;
+  border: 1rpx solid #9b9b9b;
+  color: #0071ef;
   text-align: center;
   line-height: 80rpx;
-  height:80rpx;
+  height: 80rpx;
+  border-radius: 10rpx;
+  font-size: 32rpx;
+}
+
+.universalpic_fav_default_gray_26x24 {
+  width: 26rpx;
+  height: 24rpx;
+}
+
+/* 更多功能 */
+
+.numberContainer {
+  width: 100%;
+  justify-content: flex-start;
+  align-items: flex-start;
+  position: fixed;
+  top: 0;
+  background-color: #fff;
+  color: #1e1e1e;
+  z-index: 20;
+}
+
+.numberContainer .numberContaineFooter {
+  width: 100%;
+  position: fixed;
+  bottom: 0;
+  align-items: flex-start;
+  font-size: 36rpx;
+  border-top: 1rpx solid rgba(0, 0, 0, 0.2);
+  text-align: center;
+  line-height: 131rpx;
+}
+
+.universalpic_sequence_black_30x30_2 {
+  margin: 50rpx 20rpx 0 30rpx;
+}
+
+.numberContainerFooter1 {
+  width: 100%;
+  position: fixed;
+  bottom: 131rpx;
+}
+
+.numberContainerFooter102 {
+  width: 100%;
+  height: 132rpx;
+  justify-content: flex-start;
+}
+
+.numberContainerFooter103 {
+  width: 100%;
+  height: 111rpx;
+  justify-content: flex-start;
+}
+
+.numberContainerFooter104 {
+  width: 100%;
+  height: 100rpx;
+  justify-content: flex-start;
+}
+
+.numberContainerFooter101 {
+  width: 100%;
+  height: 234rpx;
+  justify-content: flex-start;
+  align-items: flex-start;
+}
+
+.universalpic_edit_gray_25x25 {
+  width: 25rpx;
+  height: 25rpx;
+  margin: 0 30rpx 0 30rpx;
+}
+
+.universalpic_bell_gray_30x30 {
+  width: 30rpx;
+  height: 30rpx;
+  margin: 40rpx 20rpx 0 30rpx;
+}
+
+.universalpic_typesize_gray_30x18 {
+  width: 30rpx;
+  height: 18rpx;
+  margin: 57rpx 20rpx 0 30rpx;
+}
+
+.numberContainerFooter11 {
+  align-items: flex-start;
+  margin-top: 40rpx;
+}
+
+.numberContainerFooter111 {
+  font-size: 36rpx;
+  font-weight: 400;
+}
+
+.numberContainerFooter1111 {
+  margin-top: 40rpx;
+}
+
+.numberContainerFooter113 {
+  font-size: 28rpx;
+  font-weight: 400;
+  margin-left: 80rpx;
+}
+
+.numberContainerFooter112 {
+  justify-content: flex-start;
+}
+
+.numberContainerFooter1121 {
+  width: 156rpx;
+  line-height: 73rpx;
+  border: 3rpx solid #d2d2d2;
   border-radius: 10rpx;
-  font-size:32rpx;
+  text-align: center;
+  margin: 30rpx 30rpx 0 0;
+  font-size: 24rpx;
 }
 
-.universalpic_fav_default_gray_26x24{
-  width:26rpx;
-  height:24rpx;
-}
+.numberContainerFooter1121Select {
+  border: 3rpx solid #0071ef;
+  color: #fff;
+  background-color: #0071ef;
+}

pages/main/setting.js

@@ -5,8 +5,8 @@ const app = getApp();
 const arrSortType = ["随机抽取的题卡", "时间较早的题卡", "时间较近的题卡"];
 const arrSortType2 = ["随机的", "较早的", "较近的"];
 const arrClickType = ["专属按钮", "点击空白", "两种方式"];
-var arrUserName = ["程晟涵", "大耳兔", "teresa", "古利古拉", "Lucy-chan", "临时"];
-var arrUserID = [2, 11, 8, 9, 10, 309];
+var arrUserName = ["程晟涵", "临时"];
+var arrUserID = [2, 787];
 
 Page({
   data: {

pages/template/cardShow.wxml

@@ -1,6 +1,6 @@
 <template name="CardShow">
   <!-- 第一段 -->
-  <view class="panelField1 FlexColumn" >
+  <view class="panelField1 FlexColumn">
     <view class="editFieldNull"></view>
     <block wx:if="{{ShowType=='show'}}">
       <view class="LimitTime FlexColumn">
@@ -20,10 +20,10 @@
         <text class="textNormal" selectable="true" space='ensp' wx:if="{{item.Type=='line'}}">
             <block wx:for="{{item.Content}}" wx:key="contentIndex" wx:for-item="contentItem" wx:for-index="contentIndex">
               <text space='ensp' wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
-              <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
-              <text class="textHighlighter" wx:if="{{contentItem.key=='highlighter'}}" style='background-color:{{Color.LineColor}};'>{{contentItem.value}}</text>
-            </block>
-        </text>
+        <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
+        <text class="textHighlighter" wx:if="{{contentItem.key=='highlighter'}}" style='background-color:{{Color.LineColor}};'>{{contentItem.value}}</text>
+      </block>
+      </text>
 
       <view class="panelSound FlexRow" hover-class='panelSoundHover' hover-stay-time="1000" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="1">
         <image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.png' />
@@ -31,6 +31,12 @@
 
       <view class="textPinyin" hover-class='panelSoundHover1' hover-stay-time="1000" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="1">{{item.Content}}</view>
 
+      <view class="panelRecorder FlexRow" wx:if="{{item.Type=='recorder'}}">
+        <view class="panelRecorder0 FlexRow" hover-class='panelSoundHover' hover-stay-time="1000" catchtap="playSound" data-content="recorder" data-soundmark="{{item.SoundMark}}" data-fieldid="1">
+          <image class="universalpic_voicerecorder_transmit_black_44x34" src='../images/universalpic_voicerecorder_transmit_black_44x34.png' />
+        </view>
+      </view>
+
       <view class="imageContainer FlexColumn" wx:if="{{item.Type=='image'}}" style='width:{{item.Width}}rpx;height:{{item.Height}}rpx;'>
         <image class="imageFree" mode="widthFix" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" data-serverurl="{{item.ContentServer}}" binderror="onBindError" />
       </view>
@@ -70,7 +76,7 @@
             <text space='ensp' wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
             <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
             <text class="textHighlighter" wx:if="{{contentItem.key=='highlighter'}}" style='background-color:{{Color.LineColor}};'>{{contentItem.value}}</text>
-            
+
           </block>
           </text>
 
@@ -80,6 +86,11 @@
 
           <view class="textPinyin" hover-class='panelPinyinHover1' hover-stay-time="1000" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">{{item.Content}}</view>
 
+          <view class="panelRecorder FlexRow" wx:if="{{item.Type=='recorder'}}">
+            <view class="panelRecorder0 FlexRow" hover-class='panelSoundHover' hover-stay-time="1000" catchtap="playSound" data-content="recorder" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">
+              <image class="universalpic_voicerecorder_transmit_black_44x34" src='../images/universalpic_voicerecorder_transmit_black_44x34.png' />
+            </view>
+          </view>
           <view class="imageContainer2 FlexColumn" wx:if="{{item.Type=='image'}}" style='width:{{item.Width}}rpx;height:{{item.Height}}rpx;'>
             <image class="imageFree2" mode="widthFix" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" data-serverurl="{{item.ContentServer}}" binderror="onBindError" />
           </view>

utils/main.js

@@ -299,8 +299,10 @@ function changeStringToView(field) {
 
         str = str.replace(/\[读/g, "\n[读");
         str = str.replace(/\[图/g, "\n[图");
+        str = str.replace(/\[音/g, "\n[音");
         str = str.replace(/\[\/读\]/g, "[\/读]\n");
         str = str.replace(/\[\/图\]/g, "[\/图]\n");
+        str = str.replace(/\[\/音\]/g, "[\/音]\n");
         str = str.replace(/\n\n\n/g, "\n\n");
 
         var arr = str.split("\n");
@@ -464,6 +466,16 @@ function changeStringToView(field) {
             }
             arrResult.push(obj);
           }
+          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] != "") {
             var obj = {};
             obj.Type = "normal";