2.0.4

app.js

@@ -1,7 +1,7 @@
 App({
   globalData: {
-    Version: "2.0.0",
-    IsProduction: true,
+    Version: "2.0.3",
+    IsProduction: false,
     ShareTitle: "高效学习从秒过开始",
     SharePath: "pages/index/index",
     ShareImage: '../images/program_screenshot_main.png',
@@ -31,6 +31,7 @@ App({
     CardWaitTimeMax: 3,//每张卡最长等待时间（分钟）
     IsRecorderAccredit: 0,
     CardList: [],//卡列表变量
+    CardList2: [],//卡列表变量
     TaskToday: [],//今天任务列表
     SearchResultList: [],//搜索获得要选择的字词或古诗词列表
     TempMiaoguoCardID: 0,//临时题卡ID，用于资料选取时用
@@ -40,6 +41,9 @@ App({
     TempSearchBackNumber: 3,//资料搜索时返回的页面数
     TempIsEditCardType: 0,//临时是编辑学习计划
     IsShowSettingRemind: 3,//首页显示设置提醒日期限制
+    TempStr:"",//临时字符串。用于不能传递的一些参数
+    TempStr2:"",//临时字符串。用于不能传递的一些参数
+    FolderList:[],//卡单列表
 
     MemoryLevel: 0,//记忆水平
     ColorIndex: 0,//色彩方案

app.json

@@ -1,9 +1,20 @@
 {
   "pages": [
+   
     "pages/index/index",
+    
+    "pages/main/folderEdit",
+    "pages/main/folderIcon",
+
+    "pages/main/cardmain",
+    "pages/main/mainlist",
+    "pages/main/addInfomation",
+    "pages/main/addInfomationDetail",
+
+    "pages/main/searchCard",
+    
     "pages/main/preview",
     "pages/plan/pattern",
-   
     "pages/index/accredit",
     "pages/index/openSetting",
 
@@ -16,13 +27,7 @@
     "pages/main/default",
     "pages/main/cardInfo",
     "pages/main/cardInfoDetail",
-    "pages/main/searchCardList",
-    "pages/main/searchCard1",
-    "pages/main/searchCard",
     "pages/main/add",
-    "pages/main/searchWeb2",
-    "pages/main/searchWeb1",
-    "pages/main/searchWeb",
     "pages/main/detail",
     "pages/main/systemsetting",
     "pages/main/symbolsetting",

app.wxss

@@ -66,6 +66,11 @@
   height: 1rpx;
   background-color: #E3E3E3; 
 }
+.lineWidth660{
+  width: 660rpx;
+  height: 1rpx;
+  background-color: #E3E3E3; 
+}
 .lineWidth650{
   width: 650rpx;
   height: 1rpx;
@@ -88,6 +93,16 @@
   background-color: #E3E3E3; 
 }
 
+.PanelBorderTop{
+  border-top-left-radius: 20rpx;
+  border-top-right-radius: 20rpx;
+}
+
+.PanelBorderBottom{
+  border-bottom-left-radius: 20rpx;
+  border-bottom-right-radius: 20rpx;
+}
+
 
 @font-face {
     font-family: 'Roboto-Black';