0

app.json

@@ -61,6 +61,7 @@
     "pages/other/help",
     "pages/other/paycustom",
     "pages/other/annualreport",
+    "pages/other/systemrestore",
     "pages/other/pay"
     
   ],

pages/main/mainlist.js

@@ -1357,7 +1357,7 @@ Page({
         else if (index==3){
           list[i].IsCollect=Number(mData.Param.IsCollect);
           
-          if (source>0 && source<10 && index==source && mData.Param.IsCollect==0) {//不同类型列表删除
+          if (source>0 && source<8 && index==source && mData.Param.IsCollect==0) {//不同类型列表删除
             list.splice(i,1);
             that.data.Count--;
           }
@@ -1366,7 +1366,7 @@ Page({
           list[i].CardType=-1;
           list[i].CardTypeStr="归档";
           
-          if (source>0 && source<10 && index!=source){ //不同类型列表删除
+          if (source>0 && source<8 && index!=source){ //不同类型列表删除
             list.splice(i,1);
             that.data.Count--;
           }
@@ -1374,7 +1374,7 @@ Page({
         else if (index==5){
           list[i].CardType=0;
           list[i].CardTypeStr="日常"; 
-          if (source>0 && source<10 && index!=source){ //不同类型列表删除
+          if (source>0 && source<8 && index!=source){ //不同类型列表删除
             list.splice(i,1);   
             that.data.Count--;
           }
@@ -1382,7 +1382,7 @@ Page({
         else if (index==6){
           list[i].CardType=1;
           list[i].CardTypeStr="紧急";
-          if (source>0 && source<10 && index!=source){ //不同类型列表删除
+          if (source>0 && source<8 && index!=source){ //不同类型列表删除
             list.splice(i,1); 
             that.data.Count--;
           } 

pages/main/systemsetting.js

@@ -7,7 +7,6 @@ Page({
   data: {
     IsShow: 0,
     HasSound: true,
-    ShowUserID:"000000000"
   },
   onLoad: function (options) {
     var that = this;
@@ -17,7 +16,6 @@ Page({
       ProgramName: app.globalData.ProgramName,
       Version: app.globalData.Version,
       IsShow: app.globalData.userInfo.isShow,
-      ShowUserID:app.globalData.userInfo.ShowUserID,
       IsPromoter:app.globalData.userInfo.IsPromoter,
     });
 
@@ -58,9 +56,6 @@ Page({
     });
     wx.setStorageSync("HasSound", that.data.HasSound);
   },
-  resetTodayTask:function(){
-    main.ResetTodayTask();
-  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/systemsetting.wxml

@@ -65,16 +65,13 @@
     返现推广计划（测试版）
   </view>  
   <view class='lineFooter'></view>
-  <view class="panelItem01 panelItem00 panelItem FlexRow" bindtap='resetTodayTask'>
-    重置今天的任务
-  </view>
-  <view class='lineFooter'></view>
-  <view class="panelItem00 panelItem FlexRow" bindtap='goto' data-url="../index/accredit">
-    重新获取用户信息
+ 
+  <view class="panelItem00 panelItem FlexRow" bindtap='goto' data-url="../other/systemrestore">
+    系统还原
   </view>
   <view class="text2">{{ShowUserID}}</view>
   <view style='width:100%;height:50rpx;'></view>
-  <text class='text1'> 秒过学习 {{Version}}\n©2017-2023 唱意教育小程序产品</text>
+  <text class='text1'> 秒过学习 {{Version}}\n©2017-2024 唱意教育小程序产品</text>
   <view style='width:100%;height:100rpx;'></view>
 
 </view>

pages/other/systemrestore.js

@@ -0,0 +1,58 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  onLoad: function (options) {
+    var that = this;
+    
+    this.setData({
+      Containnerheight: main.getWindowHeight(),
+      ChildUserID: app.globalData.userInfo.ChildUserID,
+      CurrentUserID: app.globalData.userInfo.CurrentUserID,
+      UserID:app.globalData.userInfo.UserID,
+    });
+  },
+  resetTodayTask:function(){
+    main.ResetTodayTask();
+  },
+  deleteAll:function(){
+    wx.showModal({
+      title: '提醒',
+      content: "该操作将删除所有题卡。删除的题卡可在90天内前往回收站恢复。删除所有题卡后必须创建新题卡方可开始练习。",
+      confirmText:'删除所有',
+      complete: (res) => {
+        if (res.confirm) {
+          main.getData("DeleteAllMiaoguoCard?UserID=" + app.globalData.userInfo.UserID, function (data) {
+            wx.showToast({
+              title: "删除完成",
+              duration: 2000,
+            });            
+          });
+        }
+      }
+    });
+  },
+  goto: function (e) {
+    var url = e.currentTarget.dataset.url;
+    var gotoType = e.currentTarget.dataset.type;
+    if (!gotoType) {
+      wx.navigateTo({
+        url: url,
+      });
+      
+    } else {
+      wx.redirectTo({
+        url: url,
+      })
+    }
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/other/systemrestore.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "系统还原"
+}

pages/other/systemrestore.wxml

@@ -0,0 +1,34 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  
+  <view class="panelItem FlexRow" bindtap='goto' data-url="../index/accredit">
+    <view class="panelItem1">修改头像和名字</view>
+    <view class="panelItem2 FlexRow">
+      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+    </view>
+  </view>
+  <view class='lineFooter'></view>
+  
+  <view class="text1">无法正常生成接力图片时请重新编辑头像信息。</view>
+
+  <view class="panelItem FlexRow" bindtap='resetTodayTask'>
+    <view class="panelItem1">重置今天的任务</view>
+    <view class="panelItem2 FlexRow">
+      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+    </view>
+  </view>
+  <view class='lineFooter'></view>
+  <view class="text1">从新安排今天的练习内容。如今天已有练完的题卡会恢复到未练过的状态。此操作执行后无法恢复。</view>
+  
+  <block wx:if="{{!ChildUserID && CurrentUserID==UserID}}">
+    <view class="panelItem FlexRow" bindtap='deleteAll'>
+      <view class="panelItem1">删除所有题卡</view>
+      <view class="panelItem2 FlexRow">
+        <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+      </view>
+    </view>
+    <view class='lineFooter'></view>
+    <view class="text1">删除题卡库中所有题卡。90天内可在回收中恢复。不影响练习天数、接力等数据。</view>
+  </block>
+  
+
+</view>

pages/other/systemrestore.wxss

@@ -0,0 +1,35 @@
+.container {
+  background-color: #F0F0F0;
+}
+
+.panelItem{
+  margin-top: 60rpx;
+  width:100%;
+  justify-content: space-between;
+  font-size:28rpx;
+  height:100rpx;
+  background-color: #fff;
+}
+
+.panelItem .panelItem1{
+  margin-left: 30rpx;
+  font-weight: 400;
+}
+.panelItem .panelItem2{
+  margin-right: 30rpx;
+  color:#787878;
+  font-weight: 400;
+}
+
+.Arrow{
+  width:16rpx;
+  height:26rpx;
+  margin-left: 30rpx;
+}
+
+.text1{
+  width:690rpx;
+  margin-top: 30rpx;
+  font-size:22rpx;
+  font-weight: 400;
+}