1.0.0.18

app.js

@@ -25,7 +25,7 @@ App({
     }
   },
   globalData: {
-    Version: "1.0.0.11",
+    Version: "1.0.0.18",
     IsProduction: true,
     ShareTitle: "可以用来记忆一切的工具",
     SharePath: "pages/index/index",
@@ -51,5 +51,9 @@ App({
     Key: "kylx365_chengjie",
     IV: "kylx365hongliren",
     IsEnter: true,//是否是刚进来
+
+    CardList:[],//卡列表变量
+    TaskToday:[],//今天任务列表
+    TempMiaoguoCardID:0,//临时题卡ID，用于资料选取时用
   }
 })

app.json

@@ -1,5 +1,5 @@
 {
-  "pages": [    
+  "pages": [
     "pages/index/index",
     "pages/main/addItem",
     "pages/index/accredit",

pages/index/index.js

@@ -2,6 +2,16 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 const app = getApp();
+const arrSentence = [
+  "荀子曰:\n君子博学而日参省乎己，\n则知明而行无过矣",
+  "子曰:\n学而时习之，不亦悦乎。",
+  "子曰:\n学而不思则罔，\n思而不学则殆。",
+  "荀子曰:\n青，取之于蓝，而青于蓝。\n冰，水为之，而寒于水。",
+  "荀子曰:\n不积跬步，无以至千里；\n不积小流，无以成江海。",
+  "荀子曰:\n骐骥一跃，不能十步；\n驽马十驾，功在不舍。",
+  "荀子曰:\n锲而舍之，朽木不折；\n锲而不舍，金石可镂。",
+  "孟子曰:\n故天将降大任于是人也，\n必先苦其心志，劳其筋骨，\n饿其体肤……",
+];
 
 Page({
   data: {
@@ -56,6 +66,7 @@ Page({
     }
     this.setData({
       Containnerheight: main.getWindowHeight(),
+      Sentence: arrSentence[common.random(0,arrSentence.length-1)],
     });
 
     this.updateProgram();
@@ -227,8 +238,8 @@ Page({
                 IsStart: data.IsStart,
               });
 
-              wx.setStorageSync("TaskToday", data);
-
+              app.globalData.TaskToday=data;
+              app.globalData.CardList=[];
             }
           });
         });

pages/index/index.wxml

@@ -1,4 +1,4 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <image src='../images/program_start_footer.png' class="program_start_footer" />
-  <text class="text1">荀子曰:\n君子博学而日参省乎己，\n则知明而行无过矣</text>  
+  <text class="text1">{{Sentence}}</text>  
 </view>

pages/main/add.js

@@ -7,6 +7,7 @@ var arrTag = [];
 
 Page({
   data: {
+    PracticeTimeStr:"智能安排"
   },
   onLoad: function (options) {
     wx.hideShareMenu();
@@ -21,9 +22,15 @@ Page({
       FieldID: fieldid,
     });
 
-    wx.setStorageSync("TempMiaoguoCardID", that.data.MiaoguoCardID);
+    var list = app.globalData.CardList;
+    for (var i = 0; i < list.length; i++) {
+      if (that.data.MiaoguoCardID == list[i].MiaoguoCardID) {
+        wx.setStorageSync("TempCardInfo", list[i]);
+        break;
+      }
+    }
+    app.globalData.TempMiaoguoCardID=that.data.MiaoguoCardID;
 
-    common.getStorageValue(that, "IsTodayStudy", true, function () {});
   },
   onShow: function () {
     var that = this;
@@ -33,12 +40,13 @@ Page({
     }
     else {
       var card = {};
-      var list = wx.getStorageSync("CardList");
+      var list = app.globalData.CardList;
       for (var i = 0; i < list.length; i++) {
         if (that.data.MiaoguoCardID == list[i].MiaoguoCardID) {
           card = main.changeStringToView(list[i].Content);
           card.MiaoguoCardID = list[i].MiaoguoCardID;
           card.LimitTime = list[i].LimitTime;
+          
           break;
         }
       }
@@ -66,14 +74,15 @@ Page({
     field = [[], [], [], []];
     var card = wx.getStorageSync("TempCardInfo");
     if (card) {
-      var list = wx.getStorageSync("CardList");
+      var list = app.globalData.CardList;
       for (var i = 0; i < list.length; i++) {
         if (this.data.MiaoguoCardID == list[i].MiaoguoCardID) {
           list[i] = card;
           break;
         }
       }
-      wx.setStorageSync("CardList", list);
+      app.globalData.CardList=list;
+      wx.removeStorageSync("TempCardInfo");
     }
   },
   onClose: function () {
@@ -109,12 +118,14 @@ Page({
   },
   switch1Change(e) {
 
+    var str="智能安排";
+    if (e.detail.value){
+      str="今日必练";
+    }
     this.setData({
       IsTodayStudy: e.detail.value,
     });
 
-    wx.setStorageSync("IsTodayStudy", e.detail.value);
-
   },
   saveCard: function () {
     var that = this;
@@ -151,11 +162,7 @@ Page({
             var item = that.data.Field[i][key];
             var str = "";
             if (item.Type == "image") {
-              if (item.Url) {
-                str = "[图 url='" + item.Url + "']" + item.Content + "[/图]";
-              }
-              else
-                str = "[图]" + item.Content + "[/图]";
+              str = "[图]" + item.Content + "[/图]";
             }
             else if (item.Type == "line") {
               for (var j = 0; j < item.Content.length; j++) {
@@ -183,17 +190,20 @@ Page({
           param1["Field" + i] = main.changeViewToString(param1["Field" + i]);
 
         }
+
+        that.saveLocalCardList(param1);
+
         // var param2 = {
         //   param: common.Encrypt(JSON.stringify(param1))
         // }
         main.postData('AddMiaoguoCard?Type=' + that.data.UpdateType + '&UserID=' + userid, param1, function (data) {
           if (that.data.UpdateType == "edit" || that.data.UpdateType == "edit2") {
-            that.saveNewData();
+            
             that.onClose();
           }
           else {
             wx.showToast({
-              title: '已保存！',
+              title: '已保存！',
               image: "../images/universalpic_saved_white_120x120.png",
             });
 
@@ -201,12 +211,15 @@ Page({
               that.initAddCard();
             }
 
-            var taskToday = wx.getStorageSync("TaskToday");
+            var taskToday = app.globalData.TaskToday;
             taskToday.CardNumber++;
-            wx.setStorageSync("TaskToday", taskToday);
+            app.globalData.TaskToday=taskToday;
 
-            that.saveNewData();
+            that.setData({
+              IsTodayStudy:false,
+            })
           }
+          wx.removeStorageSync("TempCardInfo");
         });
       });
     }
@@ -216,14 +229,19 @@ Page({
     var arrSource=[], arrResult=[];
     for(var i=0;i<arr.length;i++){
       for(var j=0;j<arr[i].length;j++){
-        if (arr[i][j].Type == "image" && arr[i][j].Url && !arr[i][j].Content){
-          //console.log("Source:" +arr[i][j].Url);
-          arrSource.push(arr[i][j].Url);
-          that.uploadImage(arr[i][j].Url, function (data) {
-            //console.log("Target:"+data);
-            data = app.globalData.uploadImageUrl+data;
-            arrResult.push(data);
-          });
+        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 ){
+            arrResult.push(arr[i][j].ContentServer);
+          }
+          else{
+            that.uploadImage(arr[i][j].Content, function (data) {
+              //console.log("Target:"+data);
+              data = app.globalData.uploadImageUrl + data;
+              arrResult.push(data);
+            });
+          }
         }
       }
     }
@@ -235,8 +253,13 @@ Page({
         var ari=0;
         for (var i = 0; i < arr.length; i++) {
           for (var j = 0; j < arr[i].length; j++) {
-            if (arr[i][j].Type == "image" && arr[i][j].Url && !arr[i][j].Content) {
-              arr[i][j].Content=arrResult[ari++];
+            if (arr[i][j].Type == "image" && arr[i][j].Content) {
+              var tempUrl = arr[i][j].Content;
+              var serverUrl = arrResult[ari++];
+              main.saveTempImage(serverUrl, tempUrl);
+              arr[i][j].Content = serverUrl;
+              arr[i][j].ContentServer = serverUrl;
+
             }
           }
         }
@@ -266,11 +289,20 @@ Page({
     });
 
   },
-  saveNewData: function () {
-    var list = wx.getStorageSync("CardList");
+  saveLocalCardList:function(param1){
+    var that=this;
+    var list = app.globalData.CardList;
     for (var i = 0; i < list.length; i++) {
-      if (this.data.MiaoguoCardID == list[i].MiaoguoCardID) {
-        wx.setStorageSync("TempCardInfo", list[i]);
+      if (that.data.MiaoguoCardID == list[i].MiaoguoCardID) {
+        for (var j = 0; j < 4; j++) {
+          if (j == 0){
+            if (param1.tags && param1.tags.length > 0)
+              list[i].Content[j].Content = param1.tags.join(",");
+          }
+          else
+            list[i].Content[j].Content = param1["Field" + j];
+        }
+        app.globalData.CardList=list;
         break;
       }
     }
@@ -285,7 +317,7 @@ Page({
       obj.Content = [];
       card.Content.push(obj);
     }
-    wx.setStorageSync("CardList", [card]);
+    app.globalData.CardList=[card];
     this.setData({
       MiaoguoCardID: 0,
       Field: [[], [], [], []],
@@ -305,6 +337,7 @@ Page({
       Field: this.data.Field,
     });
   },
+  
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/add.wxml

@@ -28,42 +28,46 @@
         <block wx:for="{{Field[itemParent]}}" wx:key="index">
 
           <text class="textNormal" wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
-          
+
           <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>
-            </block>
-          </text>
+          <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
+        </block>
+        </text>
 
-          <image class="universalpic_read_gray_40x40" wx:if="{{item.Type=='sound'}}" src='../images/universalpic_read_gray_40x40.png' />
-          <text class="textPinyin" wx:if="{{item.Type=='sound'}}">{{item.Content}}</text>
+        <image class="universalpic_read_gray_40x40" wx:if="{{item.Type=='sound'}}" src='../images/universalpic_read_gray_40x40.png' />
+        <text class="textPinyin" wx:if="{{item.Type=='sound'}}">{{item.Content}}</text>
 
-          <image class="imageBishun" wx:if="{{item.Type=='image' && !item.Url}}" src='{{item.Content}}' />
-          
-          <image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image' && item.Url}}" src='{{item.Url}}' binderror="onBindError" />
-          
-          <text class="textReturn" wx:if="{{item.Type=='return'}}"></text>
-        </block>
-      </view>
-    </view>
+        <image class="imageBishun" wx:if="{{item.Type=='image' && !item.Url}}" src='{{item.Content}}' />
+
+        <image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image' && item.Url}}" src='{{item.Url}}' binderror="onBindError" />
+
+        <text class="textReturn" wx:if="{{item.Type=='return'}}"></text>
+  </block>
+  </view>
+  </view>
 
   </block>
   <view class='lineFooter'></view>
 
   <view class="panelItem3 FlexRow" wx:if="{{UpdateType=='add' || UpdateType=='add2'}}">
     <view class="panelItem1">
-      今天练
+      练习时间
+    </view>
+    <view class="panelItem2 FlexRow">
+      <view class="panelItem31" hidden="{{IsTodayStudy}}">智能安排</view>
+      <view class="panelItem311 panelItem31" hidden="{{!IsTodayStudy}}">今日必练</view>
+      <switch class='panelItem32' checked="{{IsTodayStudy}}" bindchange="switch1Change" />
     </view>
-    <switch class='panelItem32' checked="{{IsTodayStudy}}" bindchange="switch1Change" />
   </view>
   <view class='lineFooter'></view>
-
+  <view class="panelItem3Remark" wx:if="{{UpdateType=='add' || UpdateType=='add2'}}">指定该题卡必定出现在今天任务中，可能增加额外的任务量</view>
   <view style='height:300rpx;'></view>
 
   <view class='panelSave FlexRow'>
     <view class="panelSave1 FlexRow" bindtap="onSearch">
-      <view class="add">+</view>  资料
+      <view class="add">+</view> 资料
     </view>
     <view class='panelSave0' bindtap="saveCard">保存</view>
     <view class="panelSave2 FlexRow" bindtap='onPreview'>
@@ -71,5 +75,4 @@
       <image class="universalpic_preview_black_30x30" src='../images/universalpic_preview_black_30x30.png' />
     </view>
   </view>
-
 </view>

pages/main/add.wxss

@@ -142,7 +142,21 @@
 }
 
 .panelItem3 .panelItem32 {
-  margin-right: 30rpx;
+  margin-left: 30rpx;
+}
+
+.panelItem3 .panelItem31{
+  color:#787878;
+}
+.panelItem3 .panelItem311{
+  color:#0071ef;
+}
+
+.panelItem3Remark{
+  font-size:24rpx;
+  margin-top:30rpx;
+  color:#787878;
+  font-weight: 400;
 }
 
 .panelSave {

pages/main/addItem.js

@@ -14,7 +14,7 @@ Page({
     Field: "",
     SoundSign: "[读]",
     LineSign: "[线]",
-    BtnArray: ["+", "-", "×", "÷", "="],
+    BtnArray: ["+", "-", "×", "÷", "=", "<", ">"],
   },
   onLoad: function (options) {
     wx.hideShareMenu();
@@ -35,15 +35,15 @@ Page({
 
   },
   onShow: function () {
-    console.log("onShow");
+    //console.log("onShow");
     var that = this;
 
-    console.log("onShow:" + isEdit);
+    //console.log("onShow:" + isEdit);
     if (app.globalData.IsAndroid && !isEdit) {
       return;
     }
 
-    var list = wx.getStorageSync("CardList");
+    var list = app.globalData.CardList;
     var card = {};
     for (var i = 0; i < list.length; i++) {
       if (that.data.MiaoguoCardID == list[i].MiaoguoCardID) {
@@ -55,7 +55,6 @@ Page({
         if (!wx.getStorageSync("TempCardInfoAddItem")) {
           wx.setStorageSync("TempCardInfoAddItem", content);
         }
-
         break;
       }
     }
@@ -73,6 +72,8 @@ Page({
     isEdit = true;
   },
   bindinputField: function (e) {
+    console.log("bindinputField:" + e.detail.value + " isEdit:" + isEdit);
+
     var that = this;
     if (app.globalData.IsAndroid && !isEdit) {
       return;
@@ -81,12 +82,11 @@ Page({
     this.setData({
       Field: e.detail.value,
     });
-    console.log("bindinputField:" + e.detail.value);
     //this.updateField();
 
   },
   addSymbol: function (e) {
-    console.log("addSymbol");
+    //console.log("addSymbol");
     isEdit = true;
     var that = this;
 
@@ -130,15 +130,22 @@ Page({
   },
   onBindblur: function (e) {
     var that = this;
-    console.log("onBindblur:" + isEdit + " Filed:" + this.data.Field);
+    //console.log("onBindblur:" + isEdit + " Filed:" + this.data.Field);
     if (app.globalData.IsAndroid && !isEdit) {
       setTimeout(function () {
         isEdit = true;
+        console.log("onBindblur2:" + isEdit);
       }, 500);
       return;
     }
     isEdit = false;
-    console.log("onBindblur:"+isEdit);
+    if (app.globalData.IsAndroid && !isEdit) {
+      setTimeout(function () {
+        isEdit = true;
+        console.log("onBindblur2:" + isEdit);
+      }, 500);
+    }
+    //console.log("onBindblur:"+isEdit);
 
     this.updateField();
     tempCursor = e.detail.cursor;
@@ -184,12 +191,12 @@ Page({
     
     setTimeout(function () {
       isEdit = true;
-      console.log("onSearchEnd");
+      //console.log("onSearchEnd");
     }, 1000);
   },
   clear: function () {
     var that = this;
-    console.log("clear");
+    //console.log("clear");
     this.setData({
       Field: "",
       Focus: true,
@@ -213,7 +220,7 @@ Page({
   },
 
   uploadImage: function () {
-    console.log("uploadImageStart");
+    //console.log("uploadImageStart");
     var that = this;
 
     wx.chooseImage({
@@ -226,7 +233,6 @@ Page({
         //console.log(tempFilePaths[0]);
         //that.data.Field = that.data.Field + "[图 url='" + tempFilePaths[0] + "']" + tempFilePaths[0] + "[/图]";
 
-
         if (tempCursor == undefined)
           tempCursor = that.data.Field.length;
         var str1 = "",
@@ -236,11 +242,11 @@ Page({
           str2 = that.data.Field.substring(tempCursor, that.data.Field.length);
         }
 
-        var str0 = "[图 url='" + tempFilePaths[0] + "'][/图]";
+        var str0 = "[图]" + tempFilePaths[0] + "[/图]";
 
         that.data.Field = str1 + str0 + str2;
 
-        console.log("uploadImageEnd:" + that.data.Field);
+        //console.log("uploadImageEnd:" + that.data.Field);
 
         that.setData({
           Field: that.data.Field,
@@ -264,7 +270,7 @@ Page({
     str = str.replace(/\[\/图\]/g, "[\/图]\n");
     str = str.replace(/\n\n/g, "\n");
 
-    var list = wx.getStorageSync("CardList");
+    var list = app.globalData.CardList;
     for (var i = 0; i < list.length; i++) {
       if (this.data.MiaoguoCardID == list[i].MiaoguoCardID) {
         if (history != undefined)
@@ -274,7 +280,7 @@ Page({
         break;
       }
     }
-    wx.setStorageSync("CardList", list);
+    app.globalData.CardList=list;
   },
   onShareAppMessage: function () {
     return {

pages/main/addItem.wxml

@@ -30,25 +30,29 @@
     <textarea class="input" maxlength='-1' show-confirm-bar="true" value="{{Field}}" focus="{{Focus}}" cursor="{{Cursor}}" bindinput="bindinputField" bindblur="onBindblur" bindfocus="onBindFocus" data-id='{{FieldNumber}}' />
   </view>
   <cover-view class='lineFooter'></cover-view>
-  <cover-view class="panelTag0 panelTag FlexRow">
-    <cover-view class="btn0"></cover-view>
-    <cover-view class="btn1 FlexRow" bindtap="addSymbol" data-id="(     )">
-      <cover-image class="universalpic_editbar_brackets_gray" src='../images/universalpic_editbar_brackets_gray.png' />
+  <cover-view class='panel2 FlexColumn'>
+    <cover-view class="panelBtnSmall FlexRow">
+      <cover-view class="btn0"></cover-view>
+      <cover-view class="btn1 FlexRow" bindtap="addSymbol" data-id="(     )">
+        <cover-image class="universalpic_editbar_brackets_gray" src='../images/universalpic_editbar_brackets_gray.png' />
+      </cover-view>
+      <cover-view class="btn1 FlexRow" bindtap="addSymbol" data-id="_____">
+        <cover-image class="universalpic_editbar_underline_gray" src='../images/universalpic_editbar_underline_gray.png' />
+      </cover-view>
+      <cover-view class="btn" bindtap="addSymbol" wx:for="{{BtnArray}}" wx:key="index" data-id="{{item}}">{{item}}</cover-view>
+      <cover-view class="btn1 FlexRow" bindtap="addSymbol" data-id="²">
+        <cover-image class="universalpic_editbar_sqr_gray" src='../images/universalpic_editbar_sqr_gray.png' />
+      </cover-view>
+      <cover-view class="btn1 FlexRow" bindtap="addSymbol" data-id="³">
+        <cover-image class="universalpic_editbar_sqr_gray" src='../images/universalpic_editbar_cube_gray.png' />
+      </cover-view>
     </cover-view>
-    <cover-view class="btn1 FlexRow" bindtap="addSymbol" data-id="_____">
-      <cover-image class="universalpic_editbar_underline_gray" src='../images/universalpic_editbar_underline_gray.png' />
+    <cover-view class='lineFooter'></cover-view>
+    <cover-view class='panelBtn FlexRow'>
+      <cover-view class='text1' bindtap="closeAddItem" data-idsave="false">取消</cover-view>
+      <cover-view class='line1'></cover-view>
+      <cover-view class='text2 text1' bindtap="closeAddItem" data-idsave="true">确定</cover-view>
     </cover-view>
-    <cover-view class="btn" bindtap="addSymbol" wx:for="{{BtnArray}}" wx:key="index" data-id="{{item}}">{{item}}</cover-view>
-    <cover-view class="btn1 FlexRow" bindtap="addSymbol" data-id="²">
-      <cover-image class="universalpic_editbar_sqr_gray" src='../images/universalpic_editbar_sqr_gray.png' />
-    </cover-view>
-  </cover-view>
-  <cover-view class='lineFooter'></cover-view>
-  <cover-view class='panelBtn FlexRow'>
-    <cover-view class='text1' bindtap="closeAddItem" data-idsave="false">取消</cover-view>
-    <cover-view class='line1'></cover-view>
-    <cover-view class='text2 text1' bindtap="closeAddItem" data-idsave="true">确定</cover-view>
+    <cover-view class='lineFooter'></cover-view>
   </cover-view>
-  <cover-view class='lineFooter'></cover-view>
-
 </view>

pages/main/addItem.wxss

@@ -3,6 +3,8 @@
   font-weight: 500;
   color: #1e1e1e;
   background-color: #f0f0f0;
+  position: fixed;
+  top: 0;
 }
 
 .left {
@@ -23,8 +25,8 @@
 .panelSave1 {
   width: 148rpx;
   background-color: #fff;
-  border:1rpx solid #9B9B9B;
-  color:#787878;
+  border: 1rpx solid #9b9b9b;
+  color: #787878;
   text-align: center;
   height: 80rpx;
   line-height: 80rpx;
@@ -36,7 +38,7 @@
   width: 80rpx;
   height: 80rpx;
   background-color: #fff;
-  border:1rpx solid #9B9B9B;
+  border: 1rpx solid #9b9b9b;
   margin-left: 10rpx;
 }
 
@@ -44,8 +46,8 @@
   width: 80rpx;
   height: 80rpx;
   margin-left: 10rpx;
-  background-color: #0071EF;
-  border:1rpx solid #0071EF;
+  background-color: #0071ef;
+  border: 1rpx solid #0071ef;
 }
 
 .universalpic_read_begin_gray_20x20 {
@@ -53,22 +55,22 @@
   height: 20rpx;
 }
 
-.universalpic_read_end_white_38x22{
+.universalpic_read_end_white_38x22 {
   width: 38rpx;
   height: 22rpx;
 }
 
-.universalpic_editbar_underline_gray_14x20{
+.universalpic_editbar_underline_gray_14x20 {
   width: 14rpx;
   height: 20rpx;
 }
 
-.universalpic_underline_end_white_30x22{
+.universalpic_underline_end_white_30x22 {
   width: 31rpx;
   height: 22rpx;
 }
 
-.universalpic_picture_gray_26x26{
+.universalpic_picture_gray_26x26 {
   width: 26rpx;
   height: 26rpx;
 }
@@ -84,7 +86,7 @@
   height: 80rpx;
   color: #0071ef;
   background-color: #fff;
-  border:1rpx solid #9B9B9B;
+  border: 1rpx solid #9b9b9b;
   text-align: center;
   border-radius: 10rpx;
   line-height: 80rpx;
@@ -104,21 +106,46 @@
   margin: 0 0 0 40rpx;
 }
 
-.panelTag0 {
-  justify-content: flex-start;
+.panelInput {
+  width: 100%;
+  height: 250rpx;
+  margin-top: 10rpx;
+  background-color: #fff;
+  font-size: 36rpx;
+  font-weight: 400;
+}
+
+.input {
+  margin: 30rpx 30rpx 0 30rpx;
+  width: 690rpx;
+  height: 220rpx;
+}
+
+.panel2 {
+  position: fixed;
+  top: 382rpx;
+  width: 100%;
+  background-color: #fff;
+}
+
+.panelBtnSmall {
   z-index: 10;
+  width:100%;
+  height: 120rpx;
+  background-color: #fff;
+  justify-content: flex-start;
 }
 
-.panelTag .btn0 {
-  width: 20rpx;
+.panelBtnSmall .btn0 {
+  width: 10rpx;
 }
 
-.panelTag .btn {
+.panelBtnSmall .btn {
   font-family: 'Roboto-Black';
   width: 80rpx;
   background-color: #fff;
-  border:1rpx solid #9B9B9B;
-  color:#787878;
+  border: 1rpx solid #9b9b9b;
+  color: #787878;
   border-radius: 10rpx;
   text-align: center;
   line-height: 80rpx;
@@ -127,11 +154,11 @@
   font-size: 36rpx;
 }
 
-.panelTag .btn1 {
+.panelBtnSmall .btn1 {
   width: 80rpx;
   height: 80rpx;
   background-color: #fff;
-  border:1rpx solid #9B9B9B;
+  border: 1rpx solid #9b9b9b;
   border-radius: 10rpx;
   margin-right: 10rpx;
 }
@@ -141,7 +168,7 @@
   height: 26rpx;
 }
 
-.universalpic_editbar_underline_gray{
+.universalpic_editbar_underline_gray {
   width: 18rpx;
   height: 28rpx;
 }
@@ -151,21 +178,6 @@
   height: 22rpx;
 }
 
-.panelInput {
-  width: 100%;
-  height: 250rpx;
-  margin-top: 10rpx;
-  background-color: #fff;
-  font-size: 36rpx;
-  font-weight: 400;
-}
-
-.input {
-  margin: 30rpx 30rpx 0 30rpx;
-  width: 690rpx;
-  height:220rpx;
-}
-
 .panelBtn {
   width: 100%;
   background-color: #f8f8f8;
@@ -190,6 +202,6 @@
   color: #0071ef;
 }
 
-.lineFooter{
+.lineFooter {
   z-index: 10;
-}
+}

pages/main/cardInfo.js

@@ -18,7 +18,7 @@ Page({
   init: function (id) {
     var that = this;
     var card={};
-    var list = wx.getStorageSync("CardList");
+    var list = app.globalData.CardList;
     for (var i = 0; i < list.length; i++) {
       if (id == list[i].MiaoguoCardID) {
         card.CreateTimeStr = common.formatDateCHS(list[i].CreateTime);

pages/main/default.js

@@ -59,39 +59,16 @@ Page({
   },
   //得到当天任务
   getTaskTodayList: function () {
-    wx.showLoading({
-      title: '请稍候',
-      mask:true,
-    })
-    var that = this;
-    common.getStorageValue(that, "CardMaxNumberNew", 10, function () {
-      common.getStorageValue(that, "CardMaxNumberHistory", 30, function () {
-        common.getStorageValue(that, "SortTypeIndex", 0, function () {
-          var url = 'GetMiaoguoCardToday?UserID=' + app.globalData.userInfo.UserID;
-          url += "&New=" + that.data.CardMaxNumberNew;
-          url += "&History=" + that.data.CardMaxNumberHistory;
-          url += "&SortTypeIndex=" + that.data.SortTypeIndex;
-
-          main.getData(url, function (data) {
-            wx.hideLoading();
-
-            if (data) {
-              var TodayTaskNumber = data.ListNew.length + data.ListReview.length + data.ListHistory.length;
-              that.setData({
-                List: data,
-                DayNumber: data.DayNumber,
-                TodayTaskNumber: TodayTaskNumber,
-                IsStart: data.IsStart,
-              });
-
-              wx.setStorageSync("TaskToday", data);
-
-            }
-          });
-        });
+    var that=this;
+    main.getTaskTodayList(function(data){
+      var TodayTaskNumber = data.ListNew.length + data.ListReview.length + data.ListHistory.length;
+      that.setData({
+        List: data,
+        DayNumber: data.DayNumber,
+        TodayTaskNumber: TodayTaskNumber,
+        IsStart: data.IsStart,
       });
     });
-    
   },
   gotoCard: function () {
     wx.redirectTo({

pages/main/detail.js

@@ -12,7 +12,7 @@ var timeStart; //计算时长
 var TaskList = [];
 var iTimeout = 0;
 var arrImage = [], arrImage2 = [];
-var intervalSound;
+var intervalSound = 0, intervalRefresh=0;
 
 Page({
   data: {
@@ -72,17 +72,16 @@ Page({
       that.setSoundFile(-1);
 
 
-      var list = wx.getStorageSync("CardList");
+      var list = app.globalData.CardList;
       if (list && list.length > 0) {
         for (var i = 0; i < list.length; i++) {
           if (TaskList[0].MiaoguoCardID == list[i].MiaoguoCardID) {
-            var card = {};
             TaskList[0].Content = list[i].Content;
             TaskList[0].ContentNew = main.changeStringToView(list[i].Content);
             that.setData({
               TaskInfo: TaskList[0],
             });
-            wx.removeStorageSync("CardList");
+            app.globalData.CardList=[];
             break;
           }
         }
@@ -140,7 +139,7 @@ Page({
     });
   },
   getList: function () {
-    var task = wx.getStorageSync("TaskToday");
+    var task = app.globalData.TaskToday;
     var that = this;
     var arrNew = task.ListNew;
     var arrHistory = task.ListHistory;
@@ -291,9 +290,8 @@ Page({
     var that = this;
     //console.log(res.tapIndex);
     var list = [];
-    TaskList[0].MiaoguoCardID = TaskList[0].ID;
     list.push(TaskList[0]);
-    wx.setStorageSync("CardList", list);
+    app.globalData.CardList=list;
     wx.navigateTo({
       url: './add?type=edit&id=' + TaskList[0].MiaoguoCardID,
     });
@@ -325,7 +323,7 @@ Page({
 
       var that = this;
       var url = "UndoMiaoguoCard?";
-      url += "ID=" + card.Card.ID;
+      url += "ID=" + card.Card.MiaoguoCardID;
       url += "&UserID=" + app.globalData.userInfo.UserID;
       url += "&IntervalTime=" + card.IntervalTime;
       url += "&IntervalDay=" + card.Card.IntervalDay;
@@ -353,7 +351,7 @@ Page({
 
         //去除重复
         for (var i = 0; i < TaskList.length; i++) {
-          if (TaskList[i].ID == card.Card.ID) {
+          if (TaskList[i].MiaoguoCardID == card.Card.MiaoguoCardID) {
             TaskList.splice(i, 1);
           }
         }
@@ -491,7 +489,7 @@ Page({
 
     //保存上传
     var obj = {
-      ID: TaskList[0].ID,
+      MiaoguoCardID: TaskList[0].MiaoguoCardID,
       IntervalTime: time,
       BtnNumber: btnnumber,
       LearningType: learningType,
@@ -569,7 +567,7 @@ Page({
   },
   saveCard: function (obj, callback) {
     var url = "UpdateMiaoguoCardToday?";
-    url += "ID=" + obj.ID;
+    url += "ID=" + obj.MiaoguoCardID;
     url += "&UserID=" + app.globalData.userInfo.UserID;
     url += "&IntervalTime=" + obj.IntervalTime;
     url += "&BtnNumber=" + obj.BtnNumber;
@@ -577,6 +575,8 @@ Page({
     url += "&FontSize=" + TaskList[0].FontSize;
 
     var duration = common.diffDate("s", timeStart, new Date());
+    if (obj.btnnumber==1)
+      duration=0;
     url += "&Duration=" + duration;
 
     url += "&IsUndo=" + obj.IsUndo;
@@ -598,7 +598,15 @@ Page({
       url = e.currentTarget.dataset.soundmark;
     }
     else if (e.currentTarget.dataset.soundmark && e.currentTarget.dataset.soundmark != "undefined") {
-      url = e.currentTarget.dataset.soundmark;
+      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;
@@ -681,6 +689,35 @@ Page({
     });
   },
   onBindError: function (e) {
+    var that = this;
+    var serverUrl = e.currentTarget.dataset.serverurl;
+    var oldTempUrl = e.currentTarget.dataset.name;
+    //console.log("serverUrl1:" + serverUrl);
+    wx.downloadFile({
+      url: serverUrl, // 仅为示例，并非真实的资源
+      success(res) {
+        // 只要服务器有响应数据，就会把响应内容写入文件并进入 success 回调，业务需要自行判断是否下载到了想要的内容
+        if (res.statusCode === 200) {
+          //console.log("serverUrl2:" + serverUrl);
+          //console.log(res.tempFilePath);
+          main.saveTempImage(serverUrl, res.tempFilePath);
+          for(var i=0;i<arrImage.length;i++){
+            if (arrImage[i] == oldTempUrl){
+              arrImage[i] = res.tempFilePath;
+            }
+          }
+        }
+      }
+    });
+
+    clearTimeout(intervalRefresh);
+    intervalRefresh = setTimeout(function () {
+      TaskList[0].ContentNew = main.changeStringToView(TaskList[0].Content);
+      that.setData({
+        TaskInfo: TaskList[0],
+      });
+    }, 1000);
+
     for (var i = 1; i < this.data.TaskInfo.ContentNew.Field.length; i++) {
       for (var j = 0; j < this.data.TaskInfo.ContentNew.Field[i].length; j++) {
         if (this.data.TaskInfo.ContentNew.Field[i][j].Type == "image") {
@@ -688,14 +725,9 @@ Page({
         }
       }
     }
-    arrImage = arrImage2;
     this.setData({
       TaskInfo: this.data.TaskInfo,
     });
-
-    main.getData('UpdateCardImageUrl?MiaoguoCardID=' + this.data.TaskInfo[0].ID, function (data) {
-
-    });
   },
   onClose:function(){
     wx.navigateBack({

pages/main/detail.wxml

@@ -57,10 +57,10 @@
 
         <text class="textPinyin" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="1">{{item.Content}}</text>
 
-        <image class="imageBishun" wx:if="{{item.Type=='image'  && !item.Url}}" src='{{item.Content}}' catchtap='showImage' data-name="{{item.Content}}" />
-
-        <image class="imageFree" mode='widthFix' wx:if="{{item.Type=='image' && item.Url}}" src='{{item.Url}}' catchtap='showImage' data-name="{{item.Url}}" binderror="onBindError" />
+        <!-- <image class="imageBishun" wx:if="{{item.Type=='image'  && !item.Url}}" src='{{item.Content}}' catchtap='showImage' data-name="{{item.Content}}" /> -->
 
+        <image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" data-serverurl="{{item.ContentServer}}" binderror="onBindError" />
+      
   </block>
   </view>
 
@@ -103,10 +103,10 @@
 
         <text class="textPinyin" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">{{item.Content}}</text>
 
-        <image class="imageBishun" wx:if="{{item.Type=='image' && !item.Url}}" src='{{item.Content}}' catchtap='showImage' data-name="{{item.Content}}" />
-
-        <image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image' && item.Url}}" src='{{item.Url}}' catchtap='showImage' data-name="{{item.Url}}" binderror="onBindError" />
+        <!-- <image class="imageBishun" wx:if="{{item.Type=='image' && !item.Url}}" src='{{item.Content}}' catchtap='showImage' data-name="{{item.Content}}" /> -->
 
+        <image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" data-serverurl="{{item.ContentServer}}" binderror="onBindError" />
+      
         </block>
       </view>
     </view>
@@ -188,7 +188,7 @@
       <view class="lineWidth700"></view>
     </view>
     <view class="numberContainer12 FlexRow">
-      <view class='left'>重点回顾</view>
+      <view class='left'>及时强化</view>
       <view class='right3'>{{NumberReview}}张</view>
     </view>
     <view class='lineFooter'></view>

pages/main/preview.js

@@ -2,8 +2,8 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 const app = getApp();
-var iTimeout = 0, intervalSound=0;
-var arrImage = [], arrImage2 = [];
+var iTimeout = 0, intervalSound = 0, intervalRefresh = 0;
+var arrImage = [];
 
 Page({
   data: {
@@ -22,9 +22,9 @@ Page({
       MiaoguoCardID: id,
     });
     //console.log("MiaoguoCardID:" + id);
-    
+
     this.audioCtx = [];
-    
+
 
     if (options.type == "share") {
       wx.setNavigationBarTitle({
@@ -34,30 +34,31 @@ Page({
   },
   onShow: function () {
     var that = this;
-    if (that.data.ShowType == "share") {
-      var url = "GetMiaoguoCardInfo?UserID=" + app.globalData.introducer + "&MiaoguoCardID=" + that.data.MiaoguoCardID;
-      main.getData(url, function (data) {
-        if (data) {
-          wx.setStorageSync("CardList", [data]);
-          that.init();
-        }
-      });
-    }
-    else
-      that.init();
+    if (that.data.ShowType)
+      if (that.data.ShowType == "share") {
+        var url = "GetMiaoguoCardInfo?UserID=" + app.globalData.introducer + "&MiaoguoCardID=" + that.data.MiaoguoCardID;
+        main.getData(url, function (data) {
+          if (data) {
+            app.globalData.CardList=[data];
+            that.init();
+          }
+        });
+      }
+      else
+        that.init();
   },
   onUnload: function () {
     clearTimeout(iTimeout);
     clearInterval(intervalSound);
   },
   init: function () {
-    var list = wx.getStorageSync("CardList");
+    var that=this;
+    var list = app.globalData.CardList;
     var card = {};
     var prevId = 0;
     var nextId = 0;
     for (var i = 0; i < list.length; i++) {
       if (this.data.MiaoguoCardID == list[i].MiaoguoCardID) {
-        wx.setStorageSync("TempCardInfo", list[i]);
         if (i > 0)
           prevId = list[i - 1].MiaoguoCardID;
         else
@@ -78,10 +79,34 @@ Page({
       card.FontSize = 46;
 
     arrImage = card.Images;
-    arrImage2 = card.Images2;
 
-    console.log("arrImage:" + arrImage);
-    console.log("arrImage2" + arrImage2);
+    //console.log("arrImage:" + arrImage);
+
+    var limitTimeStr = common.formatDateCHS(card.LimitTime);
+
+    var isTodayPractice = true;
+    var task = app.globalData.TaskToday;
+
+    for (var i = 0; i < task.ListNew.length; i++) {
+      if (task.ListNew[i].MiaoguoCardID == that.data.MiaoguoCardID) {
+        isTodayPractice = false;
+        break;
+      }
+    }
+    for (var i = 0; i < task.ListHistory.length; i++) {
+      if (task.ListHistory[i].MiaoguoCardID == that.data.MiaoguoCardID) {
+        isTodayPractice = false;
+        break;
+      }
+    }
+    for (var i = 0; i < task.ListReview.length; i++) {
+      if (task.ListReview[i].MiaoguoCardID == that.data.MiaoguoCardID) {
+        isTodayPractice = false;
+        break;
+      }
+    }
+
+
 
     this.setData({
       ID: card.MiaoguoCardID,
@@ -90,7 +115,8 @@ Page({
       PrevID: prevId,
       NextID: nextId,
       FontSize: card.FontSize,
-      LimitTimeStr: common.formatDateCHS(card.LimitTime),
+      LimitTimeStr: limitTimeStr,
+      IsTodayPractice: isTodayPractice,
     });
   },
   practiceToday: function () {
@@ -109,8 +135,9 @@ Page({
             var time = common.formatTime(new Date());
             that.setData({
               LimitTimeStr: common.formatDateCHS(time),
+              IsTodayPractice: false,
             });
-            var list = wx.getStorageSync("CardList");
+            var list = app.globalData.CardList;
             for (var i = 0; i < list.length; i++) {
               if (that.data.ID == list[i].MiaoguoCardID) {
                 list[i].LimitTime = time;
@@ -118,7 +145,7 @@ Page({
                 break;
               }
             }
-            wx.setStorageSync("CardList", list);
+            app.globalData.CardList=list;
             wx.showToast({
               title: '改为今天练',
               icon: 'none',
@@ -131,6 +158,49 @@ Page({
       }
     })
   },
+  shelveTask: function () {
+    //搁置题卡，今天不练
+    var that = this;
+    wx.showModal({
+      title: '今天不练吗？',
+      content: '这张题卡今天不练习',
+      success(res) {
+        if (res.confirm) {
+          var url = "UpdateMiaoguoCardToday?";
+          url += "ID=" + that.data.MiaoguoCardID;
+          url += "&UserID=" + app.globalData.userInfo.UserID;
+          url += "&IntervalTime=1d";
+          url += "&BtnNumber=1";
+          url += "&LearningType=3";
+          url += "&Duration=0";
+          url += "&IsUndo=0";
+          main.getData(url, function (data) {
+            var time = common.formatTime(common.addDate("d", 1, new Date()));
+            that.setData({
+              LimitTimeStr: common.formatDateCHS(time),
+              IsTodayPractice: true,
+            });
+            var list = app.globalData.CardList;
+            for (var i = 0; i < list.length; i++) {
+              if (that.data.ID == list[i].MiaoguoCardID) {
+                list[i].LimitTime = time;
+                list[i].LimitTimeStr = "明天";
+                break;
+              }
+            }
+            app.globalData.CardList=list;
+            wx.showToast({
+              title: '改为明天练',
+              icon: 'none',
+            });
+          });
+        }
+        else if (res.cancel) {
+
+        }
+      }
+    })
+  },
   saveCard: function (obj, callback) {
     var url = "UpdateMiaoguoCardToday?";
     url += "ID=" + obj.ID;
@@ -184,10 +254,18 @@ Page({
       url = e.currentTarget.dataset.soundmark;
     }
     else if (e.currentTarget.dataset.soundmark && e.currentTarget.dataset.soundmark != "undefined") {
-      url = e.currentTarget.dataset.soundmark;
+      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 url = app.globalData.audioUrlBaidu;
+      url = app.globalData.audioUrlBaidu;
       url = url.replace("[token]", app.globalData.BaiduToken);
       url = url.replace("[word]", str);
     }
@@ -252,6 +330,7 @@ Page({
       },
     })
   },
+
   deleteCard: function () {
     var that = this;
     wx.showModal({
@@ -262,18 +341,18 @@ Page({
           var url = 'DeleteMiaoguoCard?UserID=' + app.globalData.userInfo.UserID;
           url += "&ID=" + that.data.MiaoguoCardID;
           main.getData(url, function (data) {
-            var list = wx.getStorageSync("CardList");
+            var list = app.globalData.CardList;
             for (var i = 0; i < list.length; i++) {
               if (that.data.MiaoguoCardID == list[i].MiaoguoCardID) {
                 list.splice(i, 1);
                 break;
               }
             }
-            wx.setStorageSync("CardList", list);
+            app.globalData.CardList=list;
 
-            var taskToday = wx.getStorageSync("TaskToday");
+            var taskToday = app.globalData.TaskToday;
             taskToday.CardNumber--;
-            wx.setStorageSync("TaskToday", taskToday);
+            app.globalData.TaskToday=taskToday;
 
             wx.navigateBack({
               delta: 1,
@@ -312,17 +391,31 @@ Page({
     });
   },
   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") {
-          this.data.Field[i][j].Url = this.data.Field[i][j].Content;
+    var that = this;
+    var serverUrl = e.currentTarget.dataset.serverurl;
+    var oldTempUrl = e.currentTarget.dataset.name;
+    //console.log("serverUrl1:" + serverUrl);
+    wx.downloadFile({
+      url: serverUrl, // 仅为示例，并非真实的资源
+      success(res) {
+        // 只要服务器有响应数据，就会把响应内容写入文件并进入 success 回调，业务需要自行判断是否下载到了想要的内容
+        if (res.statusCode === 200) {
+          //console.log("serverUrl2:" + serverUrl);
+          //console.log(res.tempFilePath);
+          main.saveTempImage(serverUrl, res.tempFilePath);
+          for (var i = 0; i < arrImage.length; i++) {
+            if (arrImage[i] == oldTempUrl) {
+              arrImage[i] = res.tempFilePath;
+            }
+          }
         }
       }
-    }
-    arrImage = arrImage2;
-    this.setData({
-      Field: this.data.Field,
     });
+
+    clearTimeout(intervalRefresh);
+    intervalRefresh = setTimeout(function () {
+      that.init();
+    }, 1000);
   },
   onShareAppMessage: function () {
     var that = this;

pages/main/preview.wxml

@@ -6,7 +6,8 @@
         <view class="text2">{{LimitTimeStr}}</view>
       </view>
       <view class='right FlexRow'>
-        <view class="text3" bindtap='practiceToday'>今天练</view>
+        <view class="text3" bindtap='practiceToday' hidden="{{!IsTodayPractice}}">今天必练</view>
+        <view class="text4 text3" bindtap='shelveTask' hidden="{{IsTodayPractice}}">今天不练</view>
       </view>
     </view>
     <view class="panelTop1"></view>
@@ -15,29 +16,20 @@
     <view class="panelField11 panelItem FlexRow" style="font-size:{{FontSize}}rpx;">
       <block wx:for="{{Field[1]}}" wx:key="index">
         <text class="textReturn" wx:if="{{index>0 && item.Type=='return'}}"></text>
-
         <text class="textNormal" wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
-
         <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>
         </block>
         </text>
-
         <view class="panelSound FlexRow" wx:if="{{item.Type=='sound'}}" bindtap="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.{{item.SoundImageName}}' />
         </view>
-
         <text class="textPinyin" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="1">{{item.Content}}</text>
-
-        <image class="imageBishun" wx:if="{{item.Type=='image' && !item.Url}}" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" />
-        
-        <image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image' && item.Url}}" src='{{item.Url}}' bindtap='showImage' data-name="{{item.Url}}" binderror="onBindError" />
-      
+        <image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" data-serverurl="{{item.ContentServer}}" binderror="onBindError" />
       </block>
     </view>
-
   </view>
 
   <view class="panelTag FlexRow" wx:if="{{Tags && Tags.length>0}}">
@@ -47,6 +39,7 @@
     </view>
     <view wx:if="{{true}}"></view>
   </view>
+  
   <view class="panelField2 FlexColumn" wx:for="{{[2,3]}}" wx:key="indexParent" wx:for-index="indexParent" wx:for-item="itemParent" wx:if="{{Field[itemParent].length>0}}" bindlongpress='editField' data-id="{{itemParent}}">
     <view wx:if="{{itemParent==3}}" class="lineField"></view>
 
@@ -69,9 +62,9 @@
 
         <text class="textPinyin" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">{{item.Content}}</text>
 
-        <image class="imageBishun" wx:if="{{item.Type=='image' && !item.Url}}" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" />
-        
-        <image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image' && item.Url}}" src='{{item.Url}}' bindtap='showImage' data-name="{{item.Url}}" binderror="onBindError" />
+        <!-- <image class="imageBishun" wx:if="{{item.Type=='image' && !item.Url}}" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" />
+         -->
+        <image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" data-serverurl="{{item.ContentServer}}" binderror="onBindError" />
       
       </block>
     </view>

pages/main/preview.wxss

@@ -49,7 +49,9 @@
   font-size: 24rpx;
 }
 
-
+.text4 {
+  color: #1e1e1e;
+}
 
 .panelItem {
   width: 650rpx;

pages/main/searchCard.js

@@ -14,7 +14,7 @@ Page({
     });
   },
   onShow:function(){
-    var taskToday=wx.getStorageSync("TaskToday");
+    var taskToday = app.globalData.TaskToday;
     this.setData({
       CardNumber: taskToday.CardNumber,
     })
@@ -41,19 +41,37 @@ Page({
     });
     var IsToday=e.currentTarget.dataset.id;
     var that = this;
-    var url = 'GetMiaoguoCardList?UserID=' + app.globalData.userInfo.UserID;
-    if (IsToday)
-      url += "&IsToday=" + IsToday;
 
-    main.getData(url, function (data) {
-      wx.hideLoading();
-      if (data) {
-        wx.setStorageSync("CardList", data.List);
+    if (IsToday==1){
+      main.getTaskTodayList(function(task){
+        var list = [];
+        for (var i = 0; i < task.ListNew.length; i++) {
+          list.push(task.ListNew[i]);
+        }
+        for (var i = 0; i < task.ListHistory.length; i++) {
+          list.push(task.ListHistory[i]);
+        }
+        for (var i = 0; i < task.ListReview.length; i++) {
+          list.push(task.ListReview[i]);
+        }
+        app.globalData.CardList=list;
         wx.navigateTo({
-          url: './searchCardList?type='+IsToday+"&Count="+data.Count,
-        })
-      }
-    });
+          url: './searchCardList?type=1&Count=' + list.length,
+        });
+      });
+    }
+    else{
+      var url = 'GetMiaoguoCardList?UserID=' + app.globalData.userInfo.UserID;
+      main.getData(url, function (data) {
+        wx.hideLoading();
+        if (data) {
+          app.globalData.CardList= data.List;
+          wx.navigateTo({
+            url: './searchCardList?type=0&Count=' + data.Count,
+          })
+        }
+      });
+    }
   },
   onShareAppMessage: function () {
     return {

pages/main/searchCard.wxml

@@ -12,7 +12,7 @@
         <view class="text2">{{CardNumber}}</view>
       </view>
       <view class='line1'></view>
-      <view class='text1' bindtap="getList" data-id="1">今日的任务</view>
+      <view class='text1' bindtap="getList" data-id="1">剩余任务</view>
     </view>
     <view class='lineFooter'></view>
   </view>

pages/main/searchCard1.js

@@ -32,7 +32,7 @@ Page({
 
       main.getData(url, function (data) {
         if (data) {
-          wx.setStorageSync("CardList", data.List);
+          app.globalData.CardList= data.List;
           wx.navigateTo({
             url: './searchCardList?search=' + search+'&Count='+data.Count,
           })

pages/main/searchCardList.js

@@ -2,9 +2,11 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 const app = getApp();
+var intervalRefresh = 0;
 
 Page({
   data: {
+    HasPage:false,
   },
   onLoad: function (options) {
     wx.hideShareMenu();
@@ -21,7 +23,7 @@ Page({
     else if (options.type == 1) {
       IsToday = 1;
       wx.setNavigationBarTitle({
-        title: "今日的任务"
+        title: "剩余任务"
       });
     }
 
@@ -37,7 +39,8 @@ Page({
     that.getList();
   },
   getList: function () {
-    var list = wx.getStorageSync("CardList");
+    var that=this;
+    var list = app.globalData.CardList;
     var len = 20;
     for (var i = 0; i < list.length; i++) {
       var item = list[i];
@@ -55,27 +58,41 @@ Page({
       if (imageUrl.length == 0 && item.Content[3].Content)
         imageUrl = getImage(item.Content[3].Content);
 
-      if (imageUrl.length > 0)
-        item.ImageUrl = imageUrl;
+      if (imageUrl.length > 0) {
+        item.ImageUrlTemp = main.getTempImage(imageUrl);
+        item.ImageUrlServer = imageUrl;
+      }
     }
+
+    if (that.data.IsToday==1){
+      var tempList=[];
+      for (var i = 0; i < list.length; i++) {
+        var item = list[i];
+        var limitTimeStr = common.formatDateCHS(item.LimitTime);
+        var today = common.formatDateCHS(common.formatTime(new Date()));
+        if (limitTimeStr <= today) {
+          tempList.push(list[i]);
+        }
+      }
+      list=tempList;
+      app.globalData.CardList=list;
+    }
+
+    var hasPage=false;
+    if (list.length % 20 == 0 && that.data.IsToday==0)
+      hasPage=true;
+    
     this.setData({
       List: list,
+      HasPage:hasPage,
     });
     wx.hideLoading();
 
     function getImage(str) {
-      var result = [];
-      if (str.indexOf("[图") >= 0) {
-        if (str.indexOf("[图]") >= 0)
-          result.push(str.substring(str.indexOf("[图]") + 3, str.indexOf("[/图]")));
-        else {
-          str = str.substr(str.indexOf("[图") + 2);
-          result.push(str.substring(str.indexOf(" url='") + 6, str.indexOf("]")-1));
-          str = str.substring(str.indexOf("]") + 1, str.indexOf("[/图]"));
-          result.push(str);
-        }
+      var result = "";
+      if (str.indexOf("[图]") >= 0) {
+        result = str.substring(str.indexOf("[图]") + 3, str.indexOf("[/图]"));
       }
-      //console.log("images:"+result);
       return result;
     }
 
@@ -118,23 +135,24 @@ Page({
     })
   },
   onBindError: function (e) {
+    var that = this;
     var id = e.currentTarget.dataset.id;
-    for (var i = 0; i < this.data.List.length; i++) {
-      if (this.data.List[i].ImageUrl && this.data.List[i].ImageUrl.length>1) {
-        if (id == this.data.List[i].MiaoguoCardID){
-          this.data.List[i].ImageUrl[0] = this.data.List[i].ImageUrl[1];
-          //console.log("Image1:" + this.data.List[i].ImageUrl[0]);
-          //console.log("Image2:" + this.data.List[i].ImageUrl[1]);
+
+    var serverUrl = e.currentTarget.dataset.serverurl;
+    wx.downloadFile({
+      url: serverUrl, // 仅为示例，并非真实的资源
+      success(res) {
+        // 只要服务器有响应数据，就会把响应内容写入文件并进入 success 回调，业务需要自行判断是否下载到了想要的内容
+        if (res.statusCode === 200) {
+          main.saveTempImage(serverUrl, res.tempFilePath);
         }
       }
-    }
-    this.setData({
-      List: this.data.List,
     });
 
-    main.getData('UpdateCardImageUrl?MiaoguoCardID='+id, function (data) {
-      
-    });
+    clearTimeout(intervalRefresh);
+    intervalRefresh = setTimeout(function () {
+      that.getList();
+    }, 1000);
   },
   gotoNextPage: function (e) {
     wx.showLoading({
@@ -149,11 +167,11 @@ Page({
     main.getData(url, function (data) {
       if (data) {
 
-        var list = wx.getStorageSync("CardList");
+        var list = app.globalData.CardList;
         for (var i = 0; i < data.List.length; i++) {
           list.push(data.List[i]);
         }
-        wx.setStorageSync("CardList", list);
+        app.globalData.CardList=list;
         that.getList();
       }
     });

pages/main/searchCardList.wxml

@@ -13,7 +13,7 @@
       </view>
       <view class="panelItem FlexRow" bindtap='onPreview' data-id="{{item.MiaoguoCardID}}">
         <view class="panelItem1 FlexRow">
-          <image class="ImageCSS" mode="aspectFill" src='{{item.ImageUrl[0]}}' wx:if="{{item.ImageUrl[0]}}" binderror="onBindError" data-id="{{item.MiaoguoCardID}}" />
+          <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>
@@ -24,10 +24,10 @@
         </view>
       </view>
     </block>
-    <view class="lineWidthAll FlexRow" wx:if="{{List.length % 20 ==0}}">
+    <view class="lineWidthAll FlexRow" wx:if="{{HasPage}}">
       <view class="lineWidth750"></view>
     </view>
-    <view class='panelItem3 panelItem FlexRow' wx:if="{{List.length % 20 ==0}}" bindtap='gotoNextPage' data-id="{{List[List.length-1].MiaoguoCardID}}">
+    <view class='panelItem3 panelItem FlexRow' wx:if="{{HasPage}}" bindtap='gotoNextPage' data-id="{{List[List.length-1].MiaoguoCardID}}">
       <view class="more">更多</view>
     </view>
     <view class='lineFooter'></view>

pages/main/searchWeb2.js

@@ -135,13 +135,9 @@ Page({
       this.data.CSS[css].Tag = tag;
       if (tag == "发音")
         this.data.CSS[css].SoundMark = soundmark;
-      if (tag == "拼音") {
-        var pinyin = main.getPinyin(content);
-        if (pinyin)
-          this.data.CSS[css].SoundMark = pinyin;
-      } 
+      
       if (tag == "读写") {
-        var pinyin = main.getPinyin(e.currentTarget.dataset.pinyin);
+        var pinyin = e.currentTarget.dataset.pinyin;
         if (pinyin)
           this.data.CSS[css].SoundMark = pinyin;
       }
@@ -179,8 +175,8 @@ Page({
         wx.removeStorageSync("TempFieldNumber");
       }
 
-      var id = wx.getStorageSync("TempMiaoguoCardID");
-      var list = wx.getStorageSync("CardList");
+      var id = app.globalData.TempMiaoguoCardID;
+      var list = app.globalData.CardList;
       for (var i = 0; i < list.length; i++) {
         if (id == list[i].MiaoguoCardID) {
           for (var key in this.data.CSS) {
@@ -225,7 +221,7 @@ Page({
           break;
         }
       }
-      wx.setStorageSync("CardList", list);
+      app.globalData.CardList=list;
 
       wx.navigateBack({
         delta: back,

pages/main/searchWeb2.wxml

@@ -195,7 +195,7 @@
     <view class="numberContainer12 FlexRow">
       <text class='numberContainer121'>
       点一下，添加到段落1；\n
-      第两下，添加到段落2；\n
+      第二下，添加到段落2；\n
       第三下，添加到段落3；\n
       第四下，不添加；\n
       1、2、3是段落号码，和点选的先后顺序无关。

pages/main/setting.js

@@ -4,8 +4,8 @@ import main from '../../utils/main';
 const app = getApp();
 const arrSortType = ["时间较早的题卡", "时间较近的题卡"];
 const arrSortType2 = ["较早的", "较近的"];
-var arrUserName = ["程杰", "程晟涵", "唱意班主任", "teresa", "古利古拉"];
-var arrUserID = [1, 2, 4, 8, 9];
+var arrUserName = ["程杰", "程晟涵", "大耳兔", "teresa", "古利古拉", "Lucy-chan"];
+var arrUserID = [1, 2, 11, 8, 9, 10];
 
 Page({
   data: {
@@ -131,6 +131,11 @@ Page({
       url: './colorplan',
     })
   },
+  updateMember:function(){
+    wx.reLaunch({
+      url: '../index/index',
+    })
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

utils/main.js

@@ -187,7 +187,7 @@ function getWindowHeight() {
   else {
     height = height + 50;
   }
-  console.log("height:" + height);
+  //console.log("height:" + height);
 
   //var height = app.globalData.systemInfo.screenHeight * 2;
   return height;
@@ -310,7 +310,6 @@ function changeStringToView(field) {
   var result = {};
   result.Field = [[]];
   result.Images = [];
-  result.Images2 = [];
 
   for (var j = 0; j < field.length; j++) {
     if (j == 0) {
@@ -341,17 +340,9 @@ function changeStringToView(field) {
             var obj = {};
             obj.Type = "image";
             if (arr[k].indexOf("[图]") >= 0) {
-              obj.Content = arr[k].substring(arr[k].indexOf("[图]") + 3, arr[k].indexOf("[/图]"));
+              obj.ContentServer = arr[k].substring(arr[k].indexOf("[图]") + 3, arr[k].indexOf("[/图]"));
+              obj.Content = getTempImage(obj.ContentServer);
               result.Images.push(obj.Content);
-              result.Images2.push(obj.Content);
-            }
-            else {
-              var temp = arr[k].substring(arr[k].indexOf("[图"), arr[k].indexOf("[/图]"));
-              obj.Url = temp.substring(temp.indexOf("url=") + 5, temp.indexOf("]") - 1);
-              temp = temp.substr(temp.indexOf("]") + 1);
-              obj.Content = temp;
-              result.Images.push(obj.Url);
-              result.Images2.push(obj.Content);
             }
             arrResult.push(obj);
 
@@ -446,6 +437,41 @@ function changeStringToView(field) {
   return result;
 }
 
+//得到当天任务
+function getTaskTodayList(callback) {
+  wx.showLoading({
+    title: '请稍候',
+    mask: true,
+  })
+  var that = this;
+  var CardMaxNumberNew = wx.getStorageSync("CardMaxNumberNew");
+  if (!CardMaxNumberNew)
+    CardMaxNumberNew = 10;
+
+  var CardMaxNumberHistory = wx.getStorageSync("CardMaxNumberHistory");
+  if (!CardMaxNumberHistory)
+    CardMaxNumberHistory = 30;
+
+  var SortTypeIndex = wx.getStorageSync("SortTypeIndex");
+  if (!SortTypeIndex)
+    SortTypeIndex = 0;
+
+  var url = 'GetMiaoguoCardToday?UserID=' + app.globalData.userInfo.UserID;
+  url += "&New=" + CardMaxNumberNew;
+  url += "&History=" + CardMaxNumberHistory;
+  url += "&SortTypeIndex=" + SortTypeIndex;
+
+  getData(url, function (data) {
+    wx.hideLoading();
+
+    if (data) {
+      app.globalData.TaskToday= data;
+      callback(data);
+
+    }
+  });
+}
+
 function getDetailColor(index) {
   var arr = [
     {//随机
@@ -588,6 +614,39 @@ function getDetailColor(index) {
     return arr;
 }
 
+function getTempImage(serverUrl) {
+  if (serverUrl.indexOf("miaguo-1253256735") >= 0) {
+    var list = wx.getStorageSync("TempImageList");
+    if (!list)
+      list = [];
+    for (var i = 0; i < list.length; i++) {
+      if (list[i].ServerUrl == serverUrl) {
+        return list[i].TempUrl;
+        break;
+      }
+    }
+  }
+  return serverUrl;
+}
+
+function saveTempImage(serverUrl, tempUrl) {
+  var list = wx.getStorageSync("TempImageList");
+  if (!list)
+    list = [];
+  var b = false;
+  for (var i = 0; i < list.length; i++) {
+    if (list[i].ServerUrl == serverUrl) {
+      list[i].TempUrl = tempUrl;
+      b = true;
+      break;
+    }
+  }
+  if (!b) {
+    list.push({ "ServerUrl": serverUrl, "TempUrl": tempUrl });
+  }
+  wx.setStorageSync("TempImageList", list);
+}
+
 function getPinyin(pinyin) {
   var result = [];
   var arr = getPinyinArray();
@@ -2106,4 +2165,7 @@ module.exports = {
   encryptUrl: EncryptUrl,
   decryptUrl: DecryptUrl,
   getPinyin: getPinyin,
+  saveTempImage: saveTempImage,
+  getTempImage: getTempImage,
+  getTaskTodayList: getTaskTodayList,
 }