1.1.10

app.js

@@ -26,7 +26,7 @@ App({
   },
   globalData: {
     Version: "1.1.9",
-    IsProduction: true,
+    IsProduction: false,
     ShareTitle: "刻意学习，高效成长",
     SharePath: "pages/index/index",
     ShareImage: '',

pages/index/index.js

@@ -233,32 +233,36 @@ Page({
   //得到当天任务
   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,
-              });
-
-              app.globalData.TaskToday = data;
-              app.globalData.CardList = [];
-            }
+    main.postData('UploadUserConfig?Type=getData&UserID=' + app.globalData.userInfo.UserID, {}, function (data) {
+      var url = 'GetMiaoguoCardToday?UserID=' + app.globalData.userInfo.UserID;
+      url += "&New=" + data.CardMaxNumberNew;
+      url += "&History=" + data.CardMaxNumberHistory;
+      url += "&SortTypeIndex=" + 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,
           });
-        });
+
+          app.globalData.TaskToday = data;
+          app.globalData.CardList = [];
+        }
       });
-    });
 
+      wx.setStorageSync("CardMaxNumberNew", data.CardMaxNumberNew);
+      wx.setStorageSync("CardMaxNumberHistory", data.CardMaxNumberHistory);
+      wx.setStorageSync("SortTypeIndex", data.SortTypeIndex);
+      wx.setStorageSync("MemoryLevel", data.MemoryLevel);
+      wx.setStorageSync("ClickType", data.ClickType);
+      wx.setStorageSync("SecondConfigArray", data.SecondConfigArray.split(","));
+      wx.setStorageSync("ColorIndexArr", data.ColorIndexArr.split(","));
+    
+    });
   },
   updateProgram: function () {
     const updateManager = wx.getUpdateManager();

pages/main/clicktype.js

@@ -67,6 +67,7 @@ Page({
     });
 
     wx.setStorageSync("ClickType", index);
+    main.UploadUserConfig();
   },
   onShareAppMessage: function () {
     return {

pages/main/colorplan.js

@@ -63,6 +63,7 @@ Page({
     });
 
     wx.setStorageSync("ColorIndexArr", arr);
+    main.UploadUserConfig();
   },
   onShareAppMessage: function () {
     return {

pages/main/memoryLevel.js

@@ -36,6 +36,7 @@ Page({
     this.init(index);
     wx.setStorageSync("MemoryLevel", index);
     app.globalData.MemoryLevel=index;
+    main.UploadUserConfig();
   },
   onShareAppMessage: function () {
     return {

pages/main/preview.wxml

@@ -74,7 +74,7 @@
 
     <view class="panelFooter FlexRow" wx:if="{{ShowType=='share'}}">
       <view class='btn1 FlexRow' catchtap="returnDefault">
-        <image class="universalpic_home_gray_28x28" src='../images/universalpic_home_gray_28x28.png' />
+        <image class="universalpic_home_gray_36x36" src='../images/universalpic_home_gray_36x36.png' />
       </view>
       <view class='btn2 FlexRow'>
         <button class="btn21" catchtap="copyCard">另存为我的题卡</button>

pages/main/preview.wxss

@@ -412,7 +412,7 @@
   height: 10rpx;
 }
 
-.universalpic_home_gray_28x28{
-  width: 28rpx;
-  height: 28rpx;
+.universalpic_home_gray_36x36{
+  width: 36rpx;
+  height: 36rpx;
 }

pages/main/recommend.js

@@ -2,6 +2,7 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 const app = getApp();
+const DefaultSecondArray=[5,40,60];
 
 Page({
   data: {
@@ -34,7 +35,7 @@ Page({
       secondConfig=[0,0,0];
     }
     else{
-      secondConfig = [5, 40, 60];
+      secondConfig = DefaultSecondArray;
       that.data.IsChangeRecommend = true;
       for (var j = 0; j < 3; j++) {
         var arr = [];
@@ -72,6 +73,7 @@ Page({
       });
       var arr = [this.data.SecondConfig[0].Value, this.data.SecondConfig[1].Value, this.data.SecondConfig[2].Value];
       wx.setStorageSync("SecondConfigArray", arr);
+      main.UploadUserConfig();
     }
   },
   switch1Change(e) {
@@ -82,10 +84,11 @@ Page({
       IsChangeRecommend: that.data.IsChangeRecommend,
     });
     if (that.data.IsChangeRecommend)
-      wx.setStorageSync("SecondConfigArray", [10, 30, 50]);
+      wx.setStorageSync("SecondConfigArray", DefaultSecondArray);
     else
       wx.setStorageSync("SecondConfigArray", [0, 0, 0]);
-
+    
+    main.UploadUserConfig();
     that.init();
   },
   onShareAppMessage: function () {

pages/main/setting.js

@@ -103,6 +103,7 @@ Page({
       CardMaxNumberNew: this.data.CardNumber[this.data.CardMaxNumberNewIndex],
     });
     wx.setStorageSync("CardMaxNumberNew", this.data.CardNumber[this.data.CardMaxNumberNewIndex]);
+    main.UploadUserConfig();
   },
   bindUpdateCardNumberHistoryMax: function (e) {
     this.data.CardMaxNumberHistoryIndex = e.detail.value;
@@ -111,6 +112,7 @@ Page({
       CardMaxNumberHistory: this.data.CardNumber[this.data.CardMaxNumberHistoryIndex],
     });
     wx.setStorageSync("CardMaxNumberHistory", this.data.CardNumber[this.data.CardMaxNumberHistoryIndex]);
+    main.UploadUserConfig();
   },
   setSortType: function () {
     var that = this;
@@ -121,6 +123,7 @@ Page({
           SortType: arrSortType2[res.tapIndex],
         });
         wx.setStorageSync("SortTypeIndex", res.tapIndex);
+        main.UploadUserConfig();
       },
       fail(res) {
         console.log(res.errMsg)

utils/main.js

@@ -558,6 +558,22 @@ function saveTempImage(serverUrl, tempUrl) {
   wx.setStorageSync("TempImageList", list);
 }
 
+function UploadUserConfig() {
+  var that=this;
+  var param1 = {};
+  param1.CardMaxNumberNew = wx.getStorageSync("CardMaxNumberNew");
+  param1.CardMaxNumberHistory = wx.getStorageSync("CardMaxNumberHistory");
+  param1.SortTypeIndex = wx.getStorageSync("SortTypeIndex");
+  param1.MemoryLevel = wx.getStorageSync("MemoryLevel");
+  
+  param1.ClickType = wx.getStorageSync("ClickType");
+  param1.SecondConfigArray = wx.getStorageSync("SecondConfigArray");
+  param1.ColorIndexArr = wx.getStorageSync("ColorIndexArr");
+
+  that.postData('UploadUserConfig?Type=update&UserID=' + app.globalData.userInfo.UserID, param1, function (data) {
+  });
+}
+
 function UpdateMiaoguoCardTodayAll(isShowLoading, callback) {
   var that = this;
   if (isShowLoading) {
@@ -659,14 +675,14 @@ function setCollect(id,collect,callback) {
     wx.showToast({
       title: '添加到幻灯片',
       duration: 2000,
-      image: "../images/universalpic_fav_enable_white_120x110.png",
+      image: "../images/universalpic_fav_white_120x110.png",
     });
   }
   else {
     wx.showToast({
       title: '从幻灯片移除',
       duration: 2000,
-      image: "../images/universalpic_fav_enable_white_120x110.png",
+      image: "../images/universalpic_fav_white_120x110.png",
     });
   }
   getData("UpdateMiaoguoCardInfo?UserID=" + app.globalData.userInfo.UserID + "&MiaoguoCardID=" + id+ "&IsCollect=" + collect, function (data) { 
@@ -2316,4 +2332,5 @@ module.exports = {
   getShareImageBackColor: getShareImageBackColor,
   UpdateMiaoguoCardTodayAll: UpdateMiaoguoCardTodayAll,
   setCollect: setCollect,
+  UploadUserConfig: UploadUserConfig,
 }