1.0.0

app.js

@@ -14,7 +14,7 @@ App({
   },
   globalData: {
     Version: "1.0.0",
-    IsProduction: true,
+    IsProduction: false,
     ShareTitle: "可以用来记忆一切的工具",
     SharePath: "pages/index/index",
     ShareImage: '',

pages/index/index.js

@@ -1,5 +1,5 @@
 import common from '../../utils/util';
-import server from '../../utils/main';
+import main from '../../utils/main';
 
 const app = getApp();
 
@@ -61,7 +61,6 @@ Page({
     this.updateProgram();
 
     this.getUserInfo();
-
   },
   //得到用户信息
   getUserInfo: function (cb) {
@@ -117,8 +116,8 @@ Page({
   login: function (param) {
     var that = this;
 
-    server.getLocalHost(function () {
-      server.postData('MiaoguoLogin', {
+    main.getLocalHost(function () {
+      main.postData('MiaoguoLogin', {
         Code: param.Code,
         NickName: param.nickName,
         Language: param.language,
@@ -180,10 +179,10 @@ Page({
           //   url: url,
           // });
 
-          var url = '../main/default';
+          var url = '../main/default?IsStart=1';
 
           if (that.data.MiaoguoCardID){
-            url += "?Share=1&MiaoguoCardID=" + that.data.MiaoguoCardID;
+            url += "&Share=1&MiaoguoCardID=" + that.data.MiaoguoCardID;
           }
 
           setTimeout(function () {
@@ -193,22 +192,50 @@ Page({
           }, 2000);
 
           that.getBaiduToken();
+          that.getTaskTodayList();
         }
       });
 
     });
   },
   getBaiduToken: function () {
-    server.getLocalHost(function () {
-      server.getData('GetBaiduToken', function (data) {
+      main.getData('GetBaiduToken', function (data) {
         if (data) {
           app.globalData.BaiduToken = data;
           //console.log(app.globalData.BaiduToken);
         }
       });
-    });
   },
+  //得到当天任务
+  getTaskTodayList: function () {
+    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) {
+            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);
 
+            }
+          });
+        });
+      });
+    });
+
+  },
   updateProgram: function () {
     const updateManager = wx.getUpdateManager();
 

pages/main/add.js

@@ -7,8 +7,6 @@ var arrTag = [];
 
 Page({
   data: {
-    IsShowRemind: false,
-    IsShowRemind2: false,
   },
   onLoad: function (options) {
     wx.hideShareMenu();
@@ -49,9 +47,11 @@ Page({
         Tags: card.Tags,
       });
 
-      wx.setNavigationBarTitle({
-        title: '编辑题卡'
-      });
+      if (that.data.UpdateType != "add2") {
+        wx.setNavigationBarTitle({
+          title: '编辑题卡'
+        });
+      }
 
       if (that.data.UpdateType == "edit3") {
         that.setData({
@@ -60,10 +60,6 @@ Page({
         that.gotoAddItem({ currentTarget: { dataset: { fieldid: that.data.FieldID } } });
       }
     }
-
-    this.setData({
-      IsShowRemind: false,
-    });
   },
   onUnload: function () {
     field = [[], [], [], []];
@@ -97,10 +93,10 @@ Page({
     })
   },
   onPreview: function (e) {
-    var that=this;
+    var that = this;
     if (that.data.Field[1] == "") {
-      that.setData({
-        IsShowRemind: true,
+      wx.showToast({
+        title: '请在第一段输入内容',
       });
     }
     else {
@@ -118,8 +114,8 @@ Page({
     var that = this;
 
     if (that.data.Field[1] == "") {
-      that.setData({
-        IsShowRemind: true,
+      wx.showToast({
+        title: '请在第一段输入内容',
       });
     }
     else {
@@ -183,14 +179,9 @@ Page({
           that.onClose();
         }
         else {
-          that.setData({
-            IsShowRemind2: true,
+          wx.showToast({
+            title: '保存成功！',
           });
-          setTimeout(function () {
-            that.setData({
-              IsShowRemind2: false,
-            });
-          }, 2000);
 
           if (that.data.UpdateType == "add2") {
             that.initAddCard();

pages/main/add.json

@@ -1,3 +1,4 @@
 {
-  "navigationBarTitleText": "添加题卡"
+  "navigationBarTitleText": "添加题卡",
+  "backgroundColor": "#F0F0F0"
 }

pages/main/add.wxml

@@ -21,8 +21,8 @@
       </view>
       <view class="panelItem21 FlexRow">
         <text class="textNull" wx:if="{{!Field[itemParent] || Field[itemParent].length==0}}">
-          <block wx:if="{{itemParent==1}}">写题目，必填</block>
-          <block wx:if="{{itemParent==2}}">写答案</block>
+          <block wx:if="{{itemParent==1}}">题目</block>
+          <block wx:if="{{itemParent==2}}">答案</block>
           <block wx:if="{{itemParent==3}}">其它</block>
         </text>
         <block wx:for="{{Field[itemParent]}}" wx:key="index">
@@ -58,8 +58,6 @@
 
   <view style='height:300rpx;'></view>
 
-  <view wx:if="{{IsShowRemind}}" class="remind">请在第一段输入内容</view>
-  <view wx:if="{{IsShowRemind2}}" class="remind1 remind">保存成功</view>
   <view class='panelSave FlexRow'>
     <view class="panelSave1 FlexRow" bindtap="onSearch">
       <view class="add">+</view>  资料

pages/main/add.wxss

@@ -143,21 +143,6 @@
   margin-right: 30rpx;
 }
 
-.remind{
-  width:100%;
-  line-height: 60rpx;
-  text-align: center;
-  color:#fff;
-  background-color: #B3443B;
-  font-size:24rpx;
-  position: fixed;
-  bottom: 120rpx;
-}
-
-.remind1{
-  background-color: #2e2e2e;
-}
-
 .panelSave {
   width: 100%;
   background-color: #fff;
@@ -168,6 +153,7 @@
   z-index: 10;
   color: #0071ef;
   justify-content: space-between;
+  border-top: 1rpx solid #d2d2d2;
 }
 
 .panelSave .panelSave1 {
@@ -180,7 +166,11 @@
   height:80rpx;
   border-radius: 10rpx;
   font-size:28rpx;
-  margin-left: 30rpx;
+  margin-left: 20rpx;
+}
+.panelSave .panelSave2 {
+  width: 168rpx;
+  justify-content: flex-end;
 }
 
 .add {

pages/main/addItem.json

@@ -1,3 +1,4 @@
 {
-  "navigationBarTitleText": "编辑 段落1"
+  "navigationBarTitleText": "编辑 段落1",
+  "backgroundColor": "#F0F0F0"
 }

pages/main/addItem.wxml

@@ -16,7 +16,7 @@
       <view class="panelSave3 panelSave1 FlexRow" bindtap="addSymbol" data-id="{{LineSign}}" wx:if="{{LineSign=='[/线]'}}">
         <image class="universalpic_underline_end_white_30x22" src='../images/universalpic_underline_end_white_30x22.png' />
       </view>
-      <image class="universalpic_help_gray_26x26" src='../images/universalpic_help_gray_26x26.png' />
+      <!-- <image class="universalpic_help_gray_26x26" src='../images/universalpic_help_gray_26x26.png' /> -->
 
     </view>
     <view class='right FlexRow'>

pages/main/cardInfo.wxml

@@ -12,7 +12,7 @@
     <view class="lineWidth720"></view>
   </view>
   <view class="panelItem FlexRow">
-    <view class="panelItem1">首次练习</view>
+    <view class="panelItem1">首次练习</view>
     <view class="panelItem2 FlexRow">
       {{CardInfo.FirstTimeStr}}
     </view>
@@ -44,7 +44,7 @@
     <view class="panelTitle1">进展</view>
   </view>
   <view class="panelItem FlexRow">
-    <view class="panelItem1">练习遍数</view>
+    <view class="panelItem1">练习次数</view>
     <view class="panelItem2 FlexRow">
       {{CardInfo.LearnNumber}}
     </view>
@@ -53,7 +53,7 @@
     <view class="lineWidth720"></view>
   </view>
   <view class="panelItem FlexRow">
-    <view class="panelItem1">总练习用时</view>
+    <view class="panelItem1">总学习用时</view>
     <view class="panelItem2 FlexRow">
       {{CardInfo.Duration}}
     </view>

pages/main/colorplan.wxml

@@ -1,6 +1,6 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="panelTitle FlexRow">
-    <view class="panelTitle1">练习中界面</view>
+    <view class="panelTitle1">学习中界面</view>
   </view>
   <view class="panelItem FlexRow">
     <view class="panelItem1">每次更换颜色</view>
@@ -10,18 +10,19 @@
   </view>
   <view class='lineFooter'></view>
 
-  <view class="panelTitle FlexRow">
-    <view class="panelTitle1">配色</view>
-  </view>
-  <view class="panelItem FlexColumn">
-    <view style="height:30rpx;"></view>
-    <view class="{{item.SelectedCSS}} panelItem0 FlexRow"  wx:for="{{ColorList}}" wx:key="index" wx:if="{{index>0}}" bindtap="selectColor" data-index="{{index}}">
-      <view class='panelItem01' style='background-color:{{item.BackColor}};color:{{item.FrontColor}};'>{{item.Name}}</view>
-      <view class='panelItem02' style='background-color:{{item.BackColor1}};'></view>
-      <view class='panelItem03' style='background-color:{{item.BackColor2}};'></view>
+  <block wx:if="{{!IsChangeColor}}">
+    <view class="panelTitle FlexRow">
+      <view class="panelTitle1">配色</view>
     </view>
-  </view>
-  <view class='lineFooter'></view>
-
+    <view class="panelItem FlexColumn">
+      <view style="height:30rpx;"></view>
+      <view class="{{item.SelectedCSS}} panelItem0 FlexRow" wx:for="{{ColorList}}" wx:key="index" wx:if="{{index>0}}" bindtap="selectColor" data-index="{{index}}">
+        <view class='panelItem01' style='background-color:{{item.BackColor}};color:{{item.FrontColor}};'>{{item.Name}}</view>
+        <view class='panelItem02' style='background-color:{{item.BackColor1}};'></view>
+        <view class='panelItem03' style='background-color:{{item.BackColor2}};'></view>
+      </view>
+    </view>
+    <view class='lineFooter'></view>
+  </block>
   <view style='height:100rpx'></view>
 </view>

pages/main/default.js

@@ -17,27 +17,25 @@ Page({
       var id = options.MiaoguoCardID;
       wx.navigateTo({
         url: './preview?type=share&id=' + id,
-      })
+      });
     }
   },
   onShow: function () {
     var that = this;
-
-    common.getStorageValue(that, "CardMaxNumberNew", 10, function () {
-      common.getStorageValue(that, "CardMaxNumberHistory", 30, function () {
-        common.getStorageValue(that, "SortTypeIndex", 0, function () {
-          that.getList();
-          wx.stopPullDownRefresh();
-        });
-      });
-    });
-
     wx.getSetting({
       success(res) {
         if (res.authSetting['scope.userInfo']) {
           that.setData({
             IsAccredit: true,
           });
+
+          common.getStorageValue(that, "UserName", "秒过", function () {
+            wx.setNavigationBarTitle({
+              title: that.data.UserName
+            });
+          });
+
+          that.getTaskTodayList();
         }
         else {
           wx.navigateTo({
@@ -46,16 +44,6 @@ Page({
         }
       }
     });
-
-    common.getStorageValue(this, "UserName", "秒过", function () {
-      wx.setNavigationBarTitle({
-        title: that.data.UserName
-      });
-    });
-    
-  },
-  onPullDownRefresh: function () {
-    this.onShow();
   },
   goto: function (e) {
     var url = e.currentTarget.dataset.url;
@@ -63,27 +51,41 @@ Page({
       url: './' + url,
     })
   },
-  getList: function () {
+  //得到当天任务
+  getTaskTodayList: function () {
+    wx.showLoading({
+      title: '请稍候',
+      mask:true,
+    })
     var that = this;
-    var url = 'GetMiaoguoCardToday?UserID=' + app.globalData.userInfo.UserID;
-    url += "&New=" + this.data.CardMaxNumberNew;
-    url += "&History=" + this.data.CardMaxNumberHistory;
-    url += "&SortTypeIndex=" + this.data.SortTypeIndex;
+    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) {
-      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,
-        });
+          main.getData(url, function (data) {
+            wx.hideLoading();
 
-        wx.setStorageSync("TaskToday", data);
-        
-      }
+            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);
+
+            }
+          });
+        });
+      });
     });
+    
   },
   gotoCard: function () {
     wx.redirectTo({

pages/main/default.json

@@ -2,6 +2,5 @@
   "navigationBarBackgroundColor": "#3157BA",
   "navigationBarTextStyle": "white",
   "navigationBarTitleText": "秒过",
-  "backgroundColor": "#3157BA",
-  "enablePullDownRefresh": true
+  "backgroundColor": "#3157BA"
 }

pages/main/default.wxml

@@ -18,7 +18,7 @@
     <view class='panelBottom1 FlexRow'>
       <view class='panelBottom11 FlexColumn'>
         <image class="program_tabbar_task_default" src='../images/program_tabbar_task_normal.png' />
-        <view class='text5'>练习</view>
+        <view class='text5'>学习</view>
       </view>
       <view class='line1'></view>
       <view class='panelBottom11 FlexColumn' bindtap="goto" data-url="add?type=add&id=0">

pages/main/default.wxss

@@ -6,7 +6,8 @@
 }
 
 .panel1 {
-  margin-top: 120rpx;
+  position: fixed;
+  top:120rpx;
   color: #fff;
 }
 
@@ -29,7 +30,8 @@
 .task_index_start {
   width: 377rpx;
   height: 240rpx;
-  margin-top: 156rpx;
+  position: fixed;
+  top:523rpx;
 }
 
 .panelBottom {
@@ -51,6 +53,7 @@
   font-size:20rpx;
   color:#787878;
   height:98rpx;
+  justify-content: flex-start;
 }
 .panelBottom1 .line1{
   height:98rpx;
@@ -64,5 +67,5 @@
 .program_tabbar_task_default {
   width: 54rpx;
   height: 54rpx;
-  margin-bottom: 4rpx;
+  margin: 10rpx 0 4rpx 0;
 }

pages/main/detail.js

@@ -6,7 +6,6 @@ const app = getApp();
 const arrFontSize = [46, 68, 108];
 
 var innerAudioContext1;
-var innerAudioContext2;
 
 var listTaskFinished = []; //完成的任务
 var timeStart; //计算时长
@@ -45,8 +44,8 @@ Page({
     });
 
     innerAudioContext1 = wx.createInnerAudioContext();
-    innerAudioContext2 = wx.createInnerAudioContext();
-
+    this.audioCtx = wx.createAudioContext('myAudio');
+    
     this.getList();
 
     this.getColor();
@@ -369,6 +368,7 @@ Page({
 
     wx.showLoading({
       title: '请稍候',
+      mask: true,
     });
 
     var btnnumber = e.currentTarget.dataset.btnnumber;
@@ -577,9 +577,9 @@ Page({
       url = url.replace("[token]", app.globalData.BaiduToken);
       url = url.replace("[word]", str);
     }
-    innerAudioContext2.src = url;
-    innerAudioContext2.play();
-    console.log(url);
+    this.audioCtx.setSrc(url);
+    this.audioCtx.play();
+    //console.log(url);
 
     var fieldid = e.currentTarget.dataset.fieldid;
     var content = TaskList[0].ContentNew.Field[fieldid];

pages/main/detail.json

@@ -1,3 +1,3 @@
 {
-  "navigationBarTitleText": "练习中"
+  "navigationBarTitleText": "学习中"
 }

pages/main/detail.wxml

@@ -33,7 +33,7 @@
 
   </view>
 
-  <!-- 练习页 -->
+  <!-- 学习页 -->
   <block wx:if="{{(NumberNew+NumberReview+NumberHistory)>0}}">
 
     <view class="panelField10" style='background-color:{{Color.BackColor}};'></view>
@@ -70,7 +70,7 @@
     </view>
 
     <view class='right2 FlexRow' wx:if="{{IsShowAnswer[0]==0}}">
-      <image class="universalpic_hide_white_34x34" src='../images/universalpic_hide_white_20p_34x34.png' />
+      <image class="universalpic_hide_white_34x34" src='../images/universalpic_hide_{{Color.IconColor}}_20p_34x34.png' />
     </view>
     <view class='right2 FlexRow' catchtap='onShowAnswer' data-start="true" wx:if="{{IsShowAnswer[0]==1}}">
       <image class="universalpic_hide_white_34x34" src='../images/universalpic_hide_{{Color.IconColor}}_34x34.png' />
@@ -189,4 +189,6 @@
       <view>知道了</view>
     </view>
   </view>
-</view>
+</view>
+
+<audio hidden='true' id="myAudio"></audio>

pages/main/preview.js

@@ -2,7 +2,6 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 const app = getApp();
-var innerAudioContext1;
 
 Page({
   data: {
@@ -20,8 +19,7 @@ Page({
       MiaoguoCardID: id,
     });
 
-    innerAudioContext1 = wx.createInnerAudioContext();
-
+    this.audioCtx = wx.createAudioContext('myAudio');
   },
   onShow: function () {
     var that = this;
@@ -169,8 +167,8 @@ Page({
       url = url.replace("[word]", str);
     }
 
-    innerAudioContext1.src = url;
-    innerAudioContext1.play();
+    this.audioCtx.setSrc(url);
+    this.audioCtx.play();
   },
   onMore: function () {
     var that = this;

pages/main/preview.wxml

@@ -90,7 +90,7 @@
       <image class="universalpic_prev_black_30x30" src='../images/universalpic_next_black_30x30.png' />
     </view>
     <view class='btn1' wx:if="{{NextID==0}}"></view>
-
   </view>
+</view>
 
-</view>
+<audio hidden='true' id="myAudio"></audio>

pages/main/searchCard.json

@@ -1,3 +1,5 @@
 {
-  "navigationBarTitleText": "题卡"
+  "navigationBarTitleText": "题卡",
+  "backgroundColor": "#F0F0F0"
+  
 }

pages/main/searchCard.wxml

@@ -21,7 +21,7 @@
     <view class='panelBottom1 FlexRow'>
       <view class='panelBottom11 FlexColumn' bindtap="gotoDefault">
         <image class="program_tabbar_task_default" src='../images/program_tabbar_task_default.png' />
-        <view>练习</view>
+        <view>学习</view>
       </view>
       <view class='line1'></view>
       <view class='panelBottom11 FlexColumn' bindtap="goto" data-url="add?type=add&id=0">

pages/main/searchCard.wxss

@@ -67,7 +67,7 @@
   font-size:20rpx;
   color:#787878;
   height:98rpx;
-
+  justify-content: flex-start;
 }
 .panelBottom1 .line1{
   height:98rpx;
@@ -77,7 +77,7 @@
 .program_tabbar_task_default {
   width: 54rpx;
   height: 54rpx;
-  margin-bottom: 4rpx;
+  margin: 10rpx 0 4rpx 0;
 }
 
 .text5{

pages/main/searchCard1.json

@@ -1,3 +1,4 @@
 {
-  "navigationBarTitleText": "搜索中"
+  "navigationBarTitleText": "搜索中",
+  "backgroundColor": "#F0F0F0"
 }

pages/main/searchCardList.json

@@ -1,4 +1,5 @@
 {
   "navigationBarTitleText": "全部题卡",
+  "backgroundColor": "#F0F0F0",
   "enablePullDownRefresh": true
 }

pages/main/searchWeb.json

@@ -1,3 +1,4 @@
 {
-  "navigationBarTitleText": "搜索资料"
+  "navigationBarTitleText": "搜索资料",
+  "backgroundColor": "#F0F0F0"
 }

pages/main/searchWeb1.json

@@ -1,3 +1,4 @@
 {
-  "navigationBarTitleText": "搜索中"
+  "navigationBarTitleText": "搜索中",
+  "backgroundColor": "#F0F0F0"
 }

pages/main/searchWeb2.js

@@ -3,6 +3,7 @@ import main from '../../utils/main';
 
 const app = getApp();
 var back = 3;
+var isStart;
 
 Page({
   data: {
@@ -26,6 +27,8 @@ Page({
       
     });
 
+    isStart = true;
+
   },
   getList: function (word, type) {
 
@@ -139,8 +142,9 @@ Page({
       }
 
       this.data.CSS[css].Number = "1";
-      if (wx.getStorageSync("TempFieldNumber")) {
+      if (wx.getStorageSync("TempFieldNumber") && isStart) {
         this.data.CSS[css].Number = Number(wx.getStorageSync("TempFieldNumber"));
+        isStart=false;
       }
     }
     else if (this.data.CSS[css].Number == "3") {
@@ -153,14 +157,14 @@ Page({
     }
     else {
       this.data.CSS[css].Number = Number(this.data.CSS[css].Number) + 1;
-      if (wx.getStorageSync("TempFieldNumber")) {
-        this.data.CSS[css].Css1 = "";
-        this.data.CSS[css].Css2 = "";
-        this.data.CSS[css].Number = "";
-        this.data.CSS[css].Content = "";
-        this.data.CSS[css].Type = "";
-        this.data.CSS[css].Tag = "";
-      }
+      //if (wx.getStorageSync("TempFieldNumber")) {
+        // this.data.CSS[css].Css1 = "";
+        // this.data.CSS[css].Css2 = "";
+        // this.data.CSS[css].Number = "";
+        // this.data.CSS[css].Content = "";
+        // this.data.CSS[css].Type = "";
+        // this.data.CSS[css].Tag = "";
+      //}
     }
 
     this.setData({

pages/main/searchWeb2.json

@@ -1,3 +1,4 @@
 {
-  "navigationBarTitleText": "资料"
+  "navigationBarTitleText": "资料",
+  "backgroundColor": "#F0F0F0"
 }

pages/main/setting.json

@@ -1,3 +1,4 @@
 {
-  "navigationBarTitleText": "练习方案"
+  "navigationBarTitleText": "练习方案",
+  "backgroundColor": "#F0F0F0"
 }

pages/main/setting.wxml

@@ -48,7 +48,7 @@
     <view class="panelTitle2"></view>
   </view>
   <view class="panelItem FlexRow" bindtap='setColorPlan'>
-    <view class="panelItem1">练习中界面</view>
+    <view class="panelItem1">学习中界面</view>
     <view class="panelItem2 FlexRow">
       <view class="picker">
         {{ColorName}}