1.0.0

pages/index/accredit.js

@@ -12,6 +12,8 @@ Page({
     this.setData({
       Containnerheight: common.getSystemHeight(),
     });
+
+    wx.hideShareMenu();
   },
   onUnload: function () {
 

pages/index/index.js

@@ -7,6 +7,7 @@ Page({
   data: {
   },
   onLoad: function (options) {
+    wx.hideShareMenu();
     if (options) {
       if (options.UserID) {
         console.log("UserID:" + options.UserID);

pages/main/add.js

@@ -11,6 +11,7 @@ Page({
     IsShowRemind2: false,
   },
   onLoad: function (options) {
+    wx.hideShareMenu();
     var that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),
@@ -162,6 +163,11 @@ Page({
           if (that.data.UpdateType == "add2") {
             that.initAddCard();
           }
+
+          var taskToday = wx.getStorageSync("TaskToday");
+          taskToday.CardNumber++;
+          wx.setStorageSync("TaskToday", taskToday);
+
           that.saveNewData();
         }
       });

pages/main/addItem.js

@@ -14,6 +14,7 @@ Page({
     BtnArray: ["+", "-", "×", "÷", "="],
   },
   onLoad: function (options) {
+    wx.hideShareMenu();
     var id = options.id;
     var fieldid = options.fieldid;
     // var card={};

pages/main/cardInfo.js

@@ -7,6 +7,7 @@ Page({
   data: {
   },
   onLoad: function (options) {
+    wx.hideShareMenu();
     var that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),

pages/main/default.js

@@ -7,6 +7,7 @@ Page({
   data: {
   },
   onLoad: function () {
+    wx.hideShareMenu();
     var that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),
@@ -17,8 +18,10 @@ Page({
 
     common.getStorageValue(that, "CardMaxNumberNew", 10, function () {
       common.getStorageValue(that, "CardMaxNumberHistory", 30, function () {
-        that.getList();
-        wx.stopPullDownRefresh();
+        common.getStorageValue(that, "SortTypeIndex", 0, function () {
+          that.getList();
+          wx.stopPullDownRefresh();
+        });
       });
     });
 
@@ -51,6 +54,7 @@ Page({
     var url = 'GetMiaoguoCardToday?UserID=' + app.globalData.userInfo.UserID;
     url += "&New=" + this.data.CardMaxNumberNew;
     url += "&History=" + this.data.CardMaxNumberHistory;
+    url += "&SortTypeIndex=" + this.data.SortTypeIndex;
 
     main.getData(url, function (data) {
       if (data) {

pages/main/detail.js

@@ -20,6 +20,7 @@ Page({
     IsShowNumberInfo: false,
   },
   onLoad: function () {
+    wx.hideShareMenu();
     var that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),
@@ -65,7 +66,6 @@ Page({
     }
   },
   onPullDownRefresh: function () {
-    this.gotoEdit(1);
   },
   setSoundFile: function (isFinish) {//isFinish=1 结束 =0正常 =-1开始
     var that = this;
@@ -240,33 +240,16 @@ Page({
       url: './add'
     });
   },
-  onMore: function () {
-    var that = this;
-    wx.showActionSheet({
-      itemList: ["详细信息", "编辑笔记"],
-      success(res) {
-        that.gotoEdit(res.tapIndex);
-      },
-    })
-  },
-  gotoEdit:function(tapIndex){
+  gotoEdit:function(){
     var that = this;
     //console.log(res.tapIndex);
     var list = [];
     that.data.TaskList[0].MiaoguoCardID = that.data.TaskList[0].ID;
     list.push(that.data.TaskList[0]);
     wx.setStorageSync("CardList", list);
-
-    if (tapIndex == 0) {
-      wx.navigateTo({
-        url: './cardInfo?id=' + that.data.TaskList[0].MiaoguoCardID,
-      });
-    }
-    else if (tapIndex == 1) {
-      wx.navigateTo({
-        url: './add?type=edit&id=' + that.data.TaskList[0].MiaoguoCardID,
-      });
-    }
+    wx.navigateTo({
+      url: './add?type=edit&id=' + that.data.TaskList[0].MiaoguoCardID,
+    });
   },
   onFontSize:function(){
     for(var i=0;i<arrFontSize.length;i++){

pages/main/detail.wxml

@@ -1,28 +1,36 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight-50}}rpx;'>
   <view class='panelTop FlexRow'>
-    <view class='panelCancel' wx:if="{{CanUndo==0}}">
+    <view class='panelCancel' wx:if="{{NumberNew+NumberReview+NumberHistory==0}}">
     </view>
-    <view class='panelCancel FlexRow' bindtap='gotoPrev' wx:if="{{CanUndo==1}}">
-      <image src="../images/universalpic_undo_white_20x28.png" class='universalpic_undo_white_20x28' />
+    <view class='panelCancel' wx:if="{{NumberNew+NumberReview+NumberHistory==0}}">
     </view>
-    <view class='panelCancel1 panelCancel FlexRow' bindtap='gotoNext' data-time="1d" data-btnnumber="1" wx:if="{{NumberNew+NumberReview+NumberHistory>0}}">
-      <image src="../images/universalpic_shelve_white_30x14.png" class='universalpic_shelve_white_30x14' />
+    
+    <view class='panelCancel FlexRow' bindtap='onFontSize' wx:if="{{NumberNew+NumberReview+NumberHistory>0}}">
+      <image src="../images/universalpic_typesize_white_30x18.png" class='universalpic_typesize_white_30x18' />
+    </view>
+    <view class='panelCancel FlexRow' bindtap='gotoEdit' wx:if="{{NumberNew+NumberReview+NumberHistory>0}}">
+      <image src="../images/universalpic_more_white_32x8.png" class='universalpic_more_white_32x8' />
     </view>
+
     <view class='panelNumber FlexRow' bindtap='showNumberContainner'>
       <view class="panelNumber1">{{NumberNew}}</view>
       <view class="panelNumber1">{{NumberHistory}}</view>
       <view class="panelNumber1">{{NumberReview}}</view>
       <view class="panelNumber2 panelNumber1">{{NumberNew+NumberReview+NumberHistory}}</view>
     </view>
-    <view class='panelCancel2 panelCancel FlexRow' bindtap='onFontSize' wx:if="{{NumberNew+NumberReview+NumberHistory>0}}">
-      <image src="../images/universalpic_typesize_white_30x18.png" class='universalpic_typesize_white_30x18' />
-    </view>
-    <view class='panelCancel FlexRow' bindtap='onMore' wx:if="{{NumberNew+NumberReview+NumberHistory>0}}">
-      <image src="../images/universalpic_more_white_32x8.png" class='universalpic_more_white_32x8' />
+    <view class='panelCancel FlexRow' bindtap='gotoNext' data-time="1d" data-btnnumber="1" wx:if="{{NumberNew+NumberReview+NumberHistory>0}}">
+      <image src="../images/universalpic_shelve_white_30x14.png" class='universalpic_shelve_white_30x14' />
     </view>
-
     <view class='panelCancel' wx:if="{{NumberNew+NumberReview+NumberHistory==0}}">
     </view>
+    
+    <view class='panelCancel FlexRow' bindtap='gotoPrev' wx:if="{{CanUndo==1}}">
+      <image src="../images/universalpic_undo_white_20x28.png" class='universalpic_undo_white_20x28' />
+    </view>
+    
+    <view class='panelCancel' wx:if="{{CanUndo==0}}">
+    </view>
+    
   </view>
 
   <!-- 练习页 -->

pages/main/detail.wxss

@@ -14,21 +14,14 @@
   font-size: 20rpx;
   z-index: 10;
   background-color: #a5656e;
-  justify-content: space-between;
 }
 
 .panelCancel {
   width: 100rpx;
   height: 110rpx;
+  margin: 0 5rpx;
 }
 
-.panelCancel1 {
-  margin: 0 36rpx 0 10rpx;
-}
-
-.panelCancel2 {
-  margin: 0 10rpx 0 36rpx;
-}
 
 .universalpic_undo_white_20x28 {
   width: 17rpx;
@@ -56,6 +49,7 @@
 .panelNumber {
   width: 218rpx;
   height: 120rpx;
+  margin: 0 31rpx;
 }
 
 .panelNumber1 {

pages/main/preview.js

@@ -7,6 +7,8 @@ Page({
   data: {
   },
   onLoad: function (options) {
+    wx.hideShareMenu();
+    
     var that = this;
     var id = 0;
     if (options.id)
@@ -180,9 +182,18 @@ Page({
     });
   },
   onShareAppMessage: function () {
+    var that=this;
+    this.setData({
+      ShowType:'preview'
+    });
+    setTimeout(function(){
+      that.setData({
+        ShowType: 'show'
+      });
+    },1000);
     return {
-      title: app.globalData.ShareTitle,
-      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      title: '分享题卡',
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID + '&type=sharecard&id=' + this.data.MiaoguoCardID,
       imageUrl: app.globalData.ShareImage,
     }
   },

pages/main/preview.wxml

@@ -74,7 +74,8 @@
     <view class='btn1 FlexRow' bindtap="onPreview" data-id="{{PrevID}}" wx:if="{{PrevID>0}}">
       <image class="universalpic_prev_black_30x30" src='../images/universalpic_prev_black_30x30.png' />
     </view>
-    <view class='btn1 FlexRow' bindtap="onMore" >
+    <button class="btn2" open-type='share'>共享给大家</button>
+    <view class='btn2 FlexRow' bindtap="onMore" >
       <image class="universalpic_more_40x10" src='../images/universalpic_more_40x10.png' />
     </view>
     <view class='btn1 FlexRow' bindtap="onPreview" data-id="{{NextID}}" wx:if="{{NextID>0}}">

pages/main/preview.wxss

@@ -41,6 +41,7 @@
   min-height: 320rpx;
   justify-content: flex-start;
 }
+
 .panelField11 {
   width: 100%;
   font-size: 68rpx;
@@ -48,7 +49,6 @@
   margin: 60rpx 0 80rpx 0;
 }
 
-
 .panelItem {
   width: 650rpx;
   font-weight: 400;
@@ -148,15 +148,33 @@
   justify-content: space-between;
 }
 
-.btn1{
-  width:150rpx;
-  height:120rpx;
+.btn1 {
+  width: 150rpx;
+  height: 120rpx;
 }
+
+.btn2 {
+  width: 225rpx;
+  height: 120rpx;
+  font-size: 28rpx;
+  color: #0071ef;
+  line-height: 120rpx;
+  text-align: center;
+  padding-left: 0;
+  padding-right: 0;
+  background-color: #fff;
+}
+
+.btn2::after {
+  border: 0px;
+}
+
 .universalpic_prev_black_30x30 {
   width: 28rpx;
   height: 26rpx;
 }
-.universalpic_more_40x10{
+
+.universalpic_more_40x10 {
   width: 40rpx;
   height: 10rpx;
 }

pages/main/searchCard.js

@@ -7,11 +7,18 @@ Page({
   data: {
   },
   onLoad: function () {
+    wx.hideShareMenu();
     var that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),
     });
   },
+  onShow:function(){
+    var taskToday=wx.getStorageSync("TaskToday");
+    this.setData({
+      CardNumber: taskToday.CardNumber,
+    })
+  },
   gotoDefault:function(){
     wx.redirectTo({
       url: './default',

pages/main/searchCard.wxml

@@ -9,7 +9,7 @@
   <view class='panelBtn FlexRow'>
     <view class='text1 FlexRow' bindtap="getList" data-id="0">
       <view>全部笔记</view>
-      <!-- <view class="text2">127</view> -->
+      <view class="text2">{{CardNumber}}</view>
     </view>
     <view class='line1'></view>
     <view class='text1' bindtap="getList" data-id="1">今日的任务</view>

pages/main/searchCard1.js

@@ -7,6 +7,7 @@ Page({
   data: {
   },
   onLoad: function () {
+    wx.hideShareMenu();
     var that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),

pages/main/searchCardList.js

@@ -7,21 +7,32 @@ Page({
   data: {
   },
   onLoad: function (options) {
+    wx.hideShareMenu();
     var that = this;
     that.setData({
-      Containnerheight: main.getWindowHeight(),
+      
     });
 
+    var Search="",IsToday=0;
+
     if (options.search) {
+      Search=options.search;
       wx.setNavigationBarTitle({
         title: options.search
       });
     } 
     else if (options.type==1) {
+      IsToday = 1;
       wx.setNavigationBarTitle({
         title: "今日的任务"
       });
     }
+
+    that.setData({
+      Search: Search,
+      IsToday: IsToday,
+      Containnerheight: main.getWindowHeight(),
+    });
   },
   onPullDownRefresh:function(){
     var that = this;
@@ -95,6 +106,26 @@ Page({
       url: './preview?type=show&id='+id,
     })
   },
+  gotoNextPage: function (e) {
+    var id = e.currentTarget.dataset.id;
+    
+    var that = this;
+    var url = 'GetMiaoguoCard?UserID=' + app.globalData.userInfo.UserID+"&IsToday="+that.data.IsToday + "&PageID=" + id;
+    if (that.data.Search)
+      url += "&Key=" + that.data.Search;
+
+    main.getData(url, function (data) {
+      if (data) {
+
+        var list = wx.getStorageSync("CardList");
+        for(var i=0;i<data.length;i++){
+          list.push(data[i]);
+        }
+        wx.setStorageSync("CardList", list);
+        that.getList();
+      }
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/searchCardList.wxml

@@ -18,7 +18,14 @@
         </view>
       </view>
     </block>
+    <view class="lineWidthAll FlexRow" wx:if="{{List.length % 20 ==0}}">
+      <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="more">更多</view>
+    </view>
     <view class='lineFooter'></view>
+
     <view style='width:100%;height:100rpx;'></view>
   </block>
 

pages/main/searchCardList.wxss

@@ -56,4 +56,14 @@
   font-size:24rpx;
   color:#787878;
   font-weight: 400;
+}
+
+.panelItem3 {
+  justify-content: center;
+  height:100rpx;
+}
+
+.more{
+  font-size:28rpx;
+  color:#0071EF;
 }

pages/main/searchWeb.js

@@ -7,6 +7,7 @@ Page({
   data: {
   },
   onLoad: function () {
+    wx.hideShareMenu();
     var that = this;
     
     that.setData({

pages/main/searchWeb1.js

@@ -7,6 +7,7 @@ Page({
   data: {
   },
   onLoad: function () {
+    wx.hideShareMenu();
     var that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),

pages/main/searchWeb2.js

@@ -9,6 +9,7 @@ Page({
     CSS: {},
   },
   onLoad: function (options) {
+    wx.hideShareMenu();
     var that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),

pages/main/setting.js

@@ -2,12 +2,15 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 const app = getApp();
+const arrSortType = ["以前落下的笔记", "近期到期的笔记"]
 
 Page({
   data: {
     CardNumber: [],
+    
   },
   onLoad: function () {
+    wx.hideShareMenu();
     var that = this;
 
     for (var i = 5; i <= 200; i++) {
@@ -20,7 +23,6 @@ Page({
       TimeSecond: 60,
     });
 
-    
     common.getStorageValue(this, "CardMaxNumberNew", 10, function () {
       that.setData({
         CardMaxNumberNewIndex: that.data.CardMaxNumberNew - 5,
@@ -31,6 +33,11 @@ Page({
         CardMaxNumberHistoryIndex: that.data.CardMaxNumberHistory - 5,
       });
     });
+    common.getStorageValue(this, "SortTypeIndex", 0, function () {
+      that.setData({
+        SortType: arrSortType[that.data.SortTypeIndex],
+      });
+    });
 
   },
   bindUpdateCardNumberNewMax: function (e) {
@@ -49,6 +56,21 @@ Page({
     });
     wx.setStorageSync("CardMaxNumberHistory", this.data.CardNumber[this.data.CardMaxNumberHistoryIndex]);
   },
+  setSortType:function(){
+    var that=this;
+    wx.showActionSheet({
+      itemList: arrSortType,
+      success(res) {
+        that.setData({
+          SortType: arrSortType[res.tapIndex],
+        });
+        wx.setStorageSync("SortTypeIndex", res.tapIndex);
+      },
+      fail(res) {
+        console.log(res.errMsg)
+      }
+    })
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/setting.wxml

@@ -11,7 +11,7 @@
           {{CardMaxNumberNew}}
         </view>
       </picker>
-      <image src='../../images/Arrow.png' class="Arrow" />
+      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
   </view>
   <view class="lineWidthAll FlexRow">
@@ -25,37 +25,23 @@
           {{CardMaxNumberHistory}}
         </view>
       </picker>
-      <image src='../../images/Arrow.png' class="Arrow" />
+      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
   </view>
-  <!-- <view class="lineWidthAll FlexRow">
-    <view class="lineWidth720"></view>
+  <view class='lineFooter'></view>
+  <view class="panelTitle FlexRow">
+    <view class="panelTitle1">练习内容</view>
+    <view class="panelTitle2"></view>
   </view>
-  <view class="panelItem FlexRow">
-    <view class="panelItem1">秒过秒数</view>
+  <view class="panelItem FlexRow" bindtap='setSortType'>
+    <view class="panelItem1">优先选取</view>
     <view class="panelItem2 FlexRow">
-      <picker bindchange="bindUpdateCardNumberMax" value="{{CardMaxNumberIndex}}" range="{{CardNumber}}">
-        <view class="picker">
-          {{MinSecond}}
-        </view>
-      </picker>
-      <image src='../../images/Arrow.png' class="Arrow" />
+      <view class="picker">
+        {{SortType}}
+      </view>
+      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
   </view>
-  <view class="lineWidthAll FlexRow">
-    <view class="lineWidth720"></view>
-  </view>
-  <view class="panelItem FlexRow">
-    <view class="panelItem1">时间提醒</view>
-    <view class="panelItem2 FlexRow">
-      <picker bindchange="bindUpdateCardNumberMax" value="{{CardMaxNumberIndex}}" range="{{CardNumber}}">
-        <view class="picker">
-          {{TimeSecond}}
-        </view>
-      </picker>
-      <image src='../../images/Arrow.png' class="Arrow" />
-    </view>
-  </view> -->
-  <view class='lineFooter'></view>
+
   <view style='height:350rpx'></view>
 </view>