chengjie 1 年之前
父节点
当前提交
8126667a57

+ 4 - 4
app.js

@@ -1,8 +1,8 @@
1
 App({
1
 App({
2
   globalData: {
2
   globalData: {
3
-    Version: "2.3.70",
4
-    IsProduction: true,
5
-    //IsProduction: false,
3
+    Version: "2.3.79",
4
+    //IsProduction: true,
5
+    IsProduction: false,
6
     ShareTitle: "高效学习从秒过开始",
6
     ShareTitle: "高效学习从秒过开始",
7
     SharePath: "pages/index/index",
7
     SharePath: "pages/index/index",
8
     ShareImage: '../images/program_screenshot_main.png',
8
     ShareImage: '../images/program_screenshot_main.png',
@@ -14,7 +14,7 @@ App({
14
     serverUrlLocalhost: "http://localhost:3020/apiData/",
14
     serverUrlLocalhost: "http://localhost:3020/apiData/",
15
     audioUrlBaidu: "https://tsn.baidu.com/text2audio?lan=zh&ctp=1&cuid=abcdxxx&tok=[token]&tex=[word]&vol=9&per=0&spd=3&pit=5",
15
     audioUrlBaidu: "https://tsn.baidu.com/text2audio?lan=zh&ctp=1&cuid=abcdxxx&tok=[token]&tex=[word]&vol=9&per=0&spd=3&pit=5",
16
     audioUrlYoudao: "https://dict.youdao.com/dictvoice?rate=10&le=auto&audio=[word]",
16
     audioUrlYoudao: "https://dict.youdao.com/dictvoice?rate=10&le=auto&audio=[word]",
17
-    uploadImageUrl: "https://miaguo-1253256735.file.myqcloud.com/",
17
+    uploadImageUrl: "https://miaoguo-1253256735.file.myqcloud.com/",
18
     officialAccounts:"https://mp.weixin.qq.com/s/gO9S4PrPl1Uu1iksyRuBgw",
18
     officialAccounts:"https://mp.weixin.qq.com/s/gO9S4PrPl1Uu1iksyRuBgw",
19
     BaiduToken: "",//百度开发平台token
19
     BaiduToken: "",//百度开发平台token
20
     IsIOS: true,
20
     IsIOS: true,

+ 1 - 1
app.wxss

@@ -23,7 +23,7 @@
23
   width:100%;
23
   width:100%;
24
   color: #1e1e1e;
24
   color: #1e1e1e;
25
   justify-content: flex-start;
25
   justify-content: flex-start;
26
-  font-weight: 500;
26
+  font-weight: 700;
27
   background-color: #F2F2F2;
27
   background-color: #F2F2F2;
28
 } 
28
 } 
29
 .footerHeight{
29
 .footerHeight{

+ 1 - 1
components/navigation-bar/navigation-bar.wxss

@@ -27,7 +27,7 @@ page{--height:44px;--right:190rpx;}
27
   font-size:17px;text-align:center;position:relative;flex:1;display:-webkit-box;display:-webkit-flex;display:flex;
27
   font-size:17px;text-align:center;position:relative;flex:1;display:-webkit-box;display:-webkit-flex;display:flex;
28
   align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;overflow: hidden;
28
   align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;overflow: hidden;
29
 }
29
 }
30
-.weui-navigation-bar__center text{ overflow: hidden;text-overflow:ellipsis;white-space: nowrap;margin-top:-2px; font-weight: 500;}
30
+.weui-navigation-bar__center text{ overflow: hidden;text-overflow:ellipsis;white-space: nowrap;margin-top:-2px; font-weight: 700;}
31
 
31
 
32
 
32
 
33
 .weui-navigation-bar__inner .weui-navigation-bar__loading {
33
 .weui-navigation-bar__inner .weui-navigation-bar__loading {

+ 6 - 6
pages/main/add.wxss

@@ -34,7 +34,7 @@ page{
34
 }
34
 }
35
 .panelTopBtn {
35
 .panelTopBtn {
36
   font-size: 28rpx;
36
   font-size: 28rpx;
37
-  font-weight: 500;
37
+  font-weight: 700;
38
   width:110rpx;
38
   width:110rpx;
39
   height:80rpx;
39
   height:80rpx;
40
   text-align: center;
40
   text-align: center;
@@ -108,7 +108,7 @@ page{
108
 }
108
 }
109
 .panelItemCircle1110{
109
 .panelItemCircle1110{
110
   color:#4D4D4D;
110
   color:#4D4D4D;
111
-  font-weight: 500;
111
+  font-weight: 700;
112
   margin-top: 10rpx;
112
   margin-top: 10rpx;
113
 }
113
 }
114
 
114
 
@@ -412,7 +412,7 @@ page{
412
 /* 字段编辑 */
412
 /* 字段编辑 */
413
 .addItem {
413
 .addItem {
414
   justify-content: flex-start;
414
   justify-content: flex-start;
415
-  font-weight: 500;
415
+  font-weight: 700;
416
   color: #1e1e1e;
416
   color: #1e1e1e;
417
   background-color: #f0f0f0;
417
   background-color: #f0f0f0;
418
   position: fixed;
418
   position: fixed;
@@ -659,7 +659,7 @@ page{
659
 }
659
 }
660
 .numberContainer .numberContaineFooter2{
660
 .numberContainer .numberContaineFooter2{
661
   color:#B3443B;
661
   color:#B3443B;
662
-  font-weight: 500;
662
+  font-weight: 700;
663
 }
663
 }
664
 
664
 
665
 .universalpic_sequence_black_30x30_2{
665
 .universalpic_sequence_black_30x30_2{
@@ -784,7 +784,7 @@ page{
784
   border:2rpx solid #E3E3E3;
784
   border:2rpx solid #E3E3E3;
785
   text-align: center;
785
   text-align: center;
786
   font-size:28rpx;
786
   font-size:28rpx;
787
-  font-weight: 500;
787
+  font-weight: 700;
788
   color:#1E1E1E;
788
   color:#1E1E1E;
789
   margin-top: 40rpx;
789
   margin-top: 40rpx;
790
   border-radius: 10rpx;
790
   border-radius: 10rpx;
@@ -897,7 +897,7 @@ page{
897
 }
897
 }
898
 .panelMenu11{
898
 .panelMenu11{
899
   color:#FE6659;
899
   color:#FE6659;
900
-  font-weight: 500;
900
+  font-weight: 700;
901
   margin-bottom: 20rpx;
901
   margin-bottom: 20rpx;
902
 }
902
 }
903
 .panelMenu12{
903
 .panelMenu12{

+ 2 - 2
pages/main/addInfomation.wxss

@@ -86,7 +86,7 @@
86
 }
86
 }
87
 .panelTop3 {
87
 .panelTop3 {
88
   font-size: 28rpx;
88
   font-size: 28rpx;
89
-  font-weight: 500;
89
+  font-weight: 700;
90
 }
90
 }
91
 
91
 
92
 
92
 
@@ -396,7 +396,7 @@
396
 }
396
 }
397
 .panelListItem11Name1{
397
 .panelListItem11Name1{
398
   font-size: 30rpx;
398
   font-size: 30rpx;
399
-  font-weight: 500;
399
+  font-weight: 700;
400
   overflow: hidden;
400
   overflow: hidden;
401
 }
401
 }
402
 .panelListItem11Name2{
402
 .panelListItem11Name2{

+ 1 - 1
pages/main/addInfomationDetail.wxss

@@ -26,7 +26,7 @@
26
 }
26
 }
27
 .panelTop3 {
27
 .panelTop3 {
28
   font-size: 28rpx;
28
   font-size: 28rpx;
29
-  font-weight: 500;
29
+  font-weight: 700;
30
 }
30
 }
31
 
31
 
32
 .universalpic_light_black_22x30{
32
 .universalpic_light_black_22x30{

+ 8 - 7
pages/main/cardmain.js

@@ -24,13 +24,14 @@ Page({
24
       IsShow: isshow,
24
       IsShow: isshow,
25
     });
25
     });
26
 
26
 
27
-    // var year = new Date(app.globalData.userInfo.CreateTime).getFullYear();
28
-    // //console.log(year);
29
-    // if (new Date().getFullYear()>=2023 && year<2023){
30
-    //   that.setData({
31
-    //     IsYearReport: true,
32
-    //   });
33
-    // }
27
+    var year = new Date(app.globalData.userInfo.CreateTime).getFullYear();
28
+    var month = new Date().getMonth();
29
+    //console.log(year);
30
+    if (new Date().getFullYear()>=2024 && year<2024 && month<3){
31
+      that.setData({
32
+        IsYearReport: true,
33
+      });
34
+    }
34
 
35
 
35
     canPress=true;
36
     canPress=true;
36
 
37
 

+ 2 - 2
pages/main/cardmain.wxml

@@ -52,7 +52,7 @@
52
   </view>
52
   </view>
53
   <!-- 年度报告 -->
53
   <!-- 年度报告 -->
54
   <block wx:if="{{IsYearReport}}">
54
   <block wx:if="{{IsYearReport}}">
55
-    <image class="report_2021-banner" src='{{ImagePath}}web/report_2022-banner.png' bindtap="goto" data-url="../other/annualreport" />
55
+    <image class="report_2024-banner" src='{{ImagePath}}web/report_2023-banner.png' bindtap="goto" data-url="../other/annualreport" />
56
   </block>
56
   </block>
57
 
57
 
58
   <view class="panelItem3 FlexRow">
58
   <view class="panelItem3 FlexRow">
@@ -78,7 +78,7 @@
78
       <view class="text1">勤勉接力</view>
78
       <view class="text1">勤勉接力</view>
79
       <view class="text2">激励自己见证成长</view>
79
       <view class="text2">激励自己见证成长</view>
80
     </view>
80
     </view>
81
-    <image class="directory_main_pic_9" src='../images/directory_main_pic_9.png' bindtap="goto" data-url="../../pages/share/shareindex" />
81
+    <image class="directory_main_pic_9" src='../images/directory_main_pic_9.png' />
82
   </view>
82
   </view>
83
   <!-- 有勤勉接力 -->
83
   <!-- 有勤勉接力 -->
84
   <view class="panelShare FlexRow" wx:if="{{Hardworking}}" bindtap="goto" data-url="../../pages/share/shareindex"
84
   <view class="panelShare FlexRow" wx:if="{{Hardworking}}" bindtap="goto" data-url="../../pages/share/shareindex"

+ 2 - 2
pages/main/cardmain.wxss

@@ -166,9 +166,9 @@
166
   margin-right: 30rpx;
166
   margin-right: 30rpx;
167
 }
167
 }
168
 
168
 
169
-.report_2021-banner {
169
+.report_2024-banner {
170
   width: 710rpx;
170
   width: 710rpx;
171
-  height: 180rpx;
171
+  height: 280rpx;
172
   margin: 30rpx 0 0 0;
172
   margin: 30rpx 0 0 0;
173
 }
173
 }
174
 
174
 

+ 17 - 6
pages/main/detail.js

@@ -53,6 +53,7 @@ Page({
53
     IsAutoSound: false, //是否设置了自动播放
53
     IsAutoSound: false, //是否设置了自动播放
54
     IsAutoSoundStart: false, //是否开始自动播放
54
     IsAutoSoundStart: false, //是否开始自动播放
55
     Title: "",
55
     Title: "",
56
+    TextSpace:"ensp",
56
     FontSizeArray: constant.arrFontSize,
57
     FontSizeArray: constant.arrFontSize,
57
   },
58
   },
58
   onReady: function () {
59
   onReady: function () {
@@ -115,11 +116,11 @@ Page({
115
     if (app.globalData.BaiduToken === "")
116
     if (app.globalData.BaiduToken === "")
116
       main.getBaiduToken();
117
       main.getBaiduToken();
117
 
118
 
118
-    if (app.globalData.IsOppo) {
119
-      that.setData({
120
-        TextSpace: "nbsp",
121
-      });
122
-    }
119
+    // if (app.globalData.IsOppo) {
120
+    //   that.setData({
121
+    //     TextSpace: "nbsp",
122
+    //   });
123
+    // }
123
 
124
 
124
   },
125
   },
125
   onShow: function () {
126
   onShow: function () {
@@ -986,7 +987,17 @@ Page({
986
           PracticeCount:data.PracticeCount,
987
           PracticeCount:data.PracticeCount,
987
         });
988
         });
988
 
989
 
989
-        if (data.CardCount==0 && duration.toString() == "1") {
990
+        if (app.globalData.TaskToday.ListNew.length==0 
991
+          && app.globalData.TaskToday.ListReview.length==0 
992
+          && app.globalData.TaskToday.ListHistory.length==0){
993
+            wx.showModal({
994
+              title: '提醒',
995
+              showCancel: false,
996
+              confirmText: '知道了',
997
+              content: "您今天已经没有可练习的题卡了。可能是任务量已经完成(可以提高任务量上限),也可能是没有新题卡了(请去制作或检验生成一些新题卡)。"
998
+            }); 
999
+        }
1000
+        else if (data.CardCount==0 && duration.toString() == "1") {
990
           wx.showModal({
1001
           wx.showModal({
991
             title: '提醒',
1002
             title: '提醒',
992
             showCancel: false,
1003
             showCancel: false,

+ 5 - 5
pages/main/detail.wxss

@@ -10,7 +10,7 @@ page{
10
   color: #fff;
10
   color: #fff;
11
   border-radius:10rpx;
11
   border-radius:10rpx;
12
   font-size:24rpx;
12
   font-size:24rpx;
13
-  font-weight: 500;
13
+  font-weight: 700;
14
   z-index: 101;
14
   z-index: 101;
15
   position: relative;
15
   position: relative;
16
 }
16
 }
@@ -258,7 +258,7 @@ page{
258
   text-align: center;
258
   text-align: center;
259
   font-size:28rpx;
259
   font-size:28rpx;
260
   line-height: 45rpx;
260
   line-height: 45rpx;
261
-  font-weight: 500;
261
+  font-weight: 700;
262
   color:#1e1e1e;
262
   color:#1e1e1e;
263
   margin: 0 0 10rpx 0;
263
   margin: 0 0 10rpx 0;
264
 }
264
 }
@@ -701,7 +701,7 @@ page{
701
 
701
 
702
 .numberContainer .right3 {
702
 .numberContainer .right3 {
703
   margin-right: 30rpx;
703
   margin-right: 30rpx;
704
-  font-weight: 500;
704
+  font-weight: 700;
705
   font-size:28rpx;
705
   font-size:28rpx;
706
 }
706
 }
707
 
707
 
@@ -769,7 +769,7 @@ page{
769
 .text3 {
769
 .text3 {
770
   margin-top: 40rpx;
770
   margin-top: 40rpx;
771
   font-size: 20rpx;
771
   font-size: 20rpx;
772
-  font-weight: 500;
772
+  font-weight: 700;
773
   text-align: center;
773
   text-align: center;
774
 }
774
 }
775
 
775
 
@@ -928,7 +928,7 @@ page{
928
 }
928
 }
929
 .FolderItem2{
929
 .FolderItem2{
930
   color:rgba(255, 255, 255, 0.4);
930
   color:rgba(255, 255, 255, 0.4);
931
-  font-weight: 500;
931
+  font-weight: 700;
932
 }
932
 }
933
 
933
 
934
 .FolderTitle{
934
 .FolderTitle{

+ 1 - 1
pages/main/folderEdit.wxss

@@ -25,7 +25,7 @@
25
 }
25
 }
26
 .panelTopBtn {
26
 .panelTopBtn {
27
   font-size: 28rpx;
27
   font-size: 28rpx;
28
-  font-weight: 500;
28
+  font-weight: 700;
29
   background-color: #5282FA;
29
   background-color: #5282FA;
30
   width:110rpx;
30
   width:110rpx;
31
   height:70rpx;
31
   height:70rpx;

+ 7 - 7
pages/main/mainlist.wxss

@@ -78,12 +78,12 @@
78
 
78
 
79
 .panelTop21 {
79
 .panelTop21 {
80
   font-size: 28rpx;
80
   font-size: 28rpx;
81
-  font-weight: 500;
81
+  font-weight: 700;
82
 }
82
 }
83
 
83
 
84
 .panelTop3 {
84
 .panelTop3 {
85
   font-size: 28rpx;
85
   font-size: 28rpx;
86
-  font-weight: 500;
86
+  font-weight: 700;
87
 }
87
 }
88
 
88
 
89
 .panelTop5 {
89
 .panelTop5 {
@@ -183,7 +183,7 @@
183
 .panelHelpText{
183
 .panelHelpText{
184
   width:620rpx;
184
   width:620rpx;
185
   font-size: 20rpx;
185
   font-size: 20rpx;
186
-  font-weight: 500;
186
+  font-weight: 700;
187
   color:#4D4D4D;
187
   color:#4D4D4D;
188
   margin: 30rpx 0 30rpx 30rpx;
188
   margin: 30rpx 0 30rpx 30rpx;
189
 }
189
 }
@@ -251,7 +251,7 @@
251
 
251
 
252
 .panelListCategoryText{
252
 .panelListCategoryText{
253
   font-size: 32rpx;
253
   font-size: 32rpx;
254
-  font-weight: 500;
254
+  font-weight: 700;
255
   margin: 60rpx 0 30rpx 0;
255
   margin: 60rpx 0 30rpx 0;
256
 }
256
 }
257
 
257
 
@@ -323,7 +323,7 @@
323
 }
323
 }
324
 .panelListItem11Name1{
324
 .panelListItem11Name1{
325
   font-size: 30rpx;
325
   font-size: 30rpx;
326
-  font-weight: 500;
326
+  font-weight: 700;
327
   overflow: hidden;
327
   overflow: hidden;
328
 }
328
 }
329
 .panelListItem11Name2{
329
 .panelListItem11Name2{
@@ -351,7 +351,7 @@
351
   left:32rpx;
351
   left:32rpx;
352
   top:0;
352
   top:0;
353
   font-size:20rpx;
353
   font-size:20rpx;
354
-  font-weight: 500;
354
+  font-weight: 700;
355
   width:164rpx;
355
   width:164rpx;
356
   overflow: hidden;
356
   overflow: hidden;
357
   color:#787878;
357
   color:#787878;
@@ -407,7 +407,7 @@
407
   text-align: center;
407
   text-align: center;
408
   line-height: 110rpx;
408
   line-height: 110rpx;
409
   font-size:36rpx;
409
   font-size:36rpx;
410
-  font-weight: 500;
410
+  font-weight: 700;
411
   margin-top: 20rpx;
411
   margin-top: 20rpx;
412
 }
412
 }
413
 
413
 

+ 5 - 5
pages/main/preview.js

@@ -121,11 +121,11 @@ Page({
121
     if (app.globalData.BaiduToken==="")
121
     if (app.globalData.BaiduToken==="")
122
       main.getBaiduToken();
122
       main.getBaiduToken();
123
     
123
     
124
-    if (app.globalData.IsOppo){
125
-      that.setData({
126
-        TextSpace:"nbsp",
127
-      });
128
-    }
124
+    // if (app.globalData.IsOppo){
125
+    //   that.setData({
126
+    //     TextSpace:"nbsp",
127
+    //   });
128
+    // }
129
     
129
     
130
     if (options.PrintID){
130
     if (options.PrintID){
131
       that.setData({
131
       that.setData({

+ 2 - 2
pages/main/preview.wxss

@@ -279,7 +279,7 @@
279
   text-align: center;
279
   text-align: center;
280
   font-size:28rpx;
280
   font-size:28rpx;
281
   line-height: 45rpx;
281
   line-height: 45rpx;
282
-  font-weight: 500;
282
+  font-weight: 700;
283
   color:#1e1e1e;
283
   color:#1e1e1e;
284
   margin: 0 0 10rpx 0;
284
   margin: 0 0 10rpx 0;
285
 }
285
 }
@@ -495,7 +495,7 @@
495
 }
495
 }
496
 .panelMenu11{
496
 .panelMenu11{
497
   color:#FE6659;
497
   color:#FE6659;
498
-  font-weight: 500;
498
+  font-weight: 700;
499
   margin-bottom: 20rpx;
499
   margin-bottom: 20rpx;
500
 }
500
 }
501
 .panelMenu12{
501
 .panelMenu12{

+ 1 - 1
pages/main/searchCard.wxss

@@ -88,7 +88,7 @@
88
 }
88
 }
89
 .panelTop3 {
89
 .panelTop3 {
90
   font-size: 28rpx;
90
   font-size: 28rpx;
91
-  font-weight: 500;
91
+  font-weight: 700;
92
 }
92
 }
93
 
93
 
94
 .panel1{
94
 .panel1{

+ 1 - 1
pages/main/systemsetting.wxss

@@ -38,7 +38,7 @@
38
 }
38
 }
39
 .panelItem01{
39
 .panelItem01{
40
   color:#FE6659;
40
   color:#FE6659;
41
-  font-weight: 500;
41
+  font-weight: 700;
42
 }
42
 }
43
 
43
 
44
 .panelItem .panelItem1{
44
 .panelItem .panelItem1{

+ 1 - 1
pages/other/annualreport.wxml

@@ -1,5 +1,5 @@
1
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
1
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
2
-	<image src="{{ImagePath}}web/report_2022-header.png" class="panelTop" />
2
+	<image src="{{ImagePath}}web/report_2023-header.png" class="panelTop" />
3
 	<view class="panelMain FlexColumn">
3
 	<view class="panelMain FlexColumn">
4
 		<view class="text1">自{{Data.StartDate}}以来</view>
4
 		<view class="text1">自{{Data.StartDate}}以来</view>
5
 		<view class="text2">年度报告的数据统计截止于{{Data.EndDate}}</view>
5
 		<view class="text2">年度报告的数据统计截止于{{Data.EndDate}}</view>

+ 4 - 4
pages/other/annualreport.wxss

@@ -41,7 +41,7 @@ page{
41
   width:590rpx;
41
   width:590rpx;
42
   text-align: right;
42
   text-align: right;
43
   font-size: 20rpx;
43
   font-size: 20rpx;
44
-  font-weight: 500;
44
+  font-weight: 700;
45
   color:#787878;
45
   color:#787878;
46
 }
46
 }
47
 .panelMain .line1{
47
 .panelMain .line1{
@@ -63,19 +63,19 @@ page{
63
 }
63
 }
64
 .panelMain .text4{
64
 .panelMain .text4{
65
   font-size: 28rpx;
65
   font-size: 28rpx;
66
-  font-weight: 500;
66
+  font-weight: 700;
67
   color:#FE6659;
67
   color:#FE6659;
68
 }
68
 }
69
 .panelMain .text5{
69
 .panelMain .text5{
70
   width:590rpx;
70
   width:590rpx;
71
   font-size: 20rpx;
71
   font-size: 20rpx;
72
-  font-weight: 500;
72
+  font-weight: 700;
73
   color:#787878;
73
   color:#787878;
74
 }
74
 }
75
 .panelMain .text6{
75
 .panelMain .text6{
76
   width:590rpx;
76
   width:590rpx;
77
   font-size: 32rpx;
77
   font-size: 32rpx;
78
-  font-weight: 500;
78
+  font-weight: 700;
79
   color:#F2905D;
79
   color:#F2905D;
80
   margin-top: 50rpx;
80
   margin-top: 50rpx;
81
   justify-content: flex-start;
81
   justify-content: flex-start;

+ 1 - 1
pages/other/coupon.wxss

@@ -20,7 +20,7 @@
20
 .text1{
20
 .text1{
21
   font-size:32rpx;
21
   font-size:32rpx;
22
   margin-left: 30rpx;
22
   margin-left: 30rpx;
23
-  font-weight: 500;
23
+  font-weight: 700;
24
 }
24
 }
25
 
25
 
26
 .text2{
26
 .text2{

+ 1 - 1
pages/other/pay.wxss

@@ -96,7 +96,7 @@
96
 }
96
 }
97
 .text5{
97
 .text5{
98
   font-size:28rpx;
98
   font-size:28rpx;
99
-  font-weight: 500;
99
+  font-weight: 700;
100
   margin-top: 60rpx;
100
   margin-top: 60rpx;
101
   text-align: center;
101
   text-align: center;
102
 }
102
 }

+ 5 - 5
pages/other/userbook.wxss

@@ -20,7 +20,7 @@
20
   font-size: 28rpx;
20
   font-size: 28rpx;
21
   text-align: center;
21
   text-align: center;
22
   color:#1E1E1E;
22
   color:#1E1E1E;
23
-  font-weight: 500;
23
+  font-weight: 700;
24
 }
24
 }
25
 
25
 
26
 .btn00 {
26
 .btn00 {
@@ -138,7 +138,7 @@
138
 }
138
 }
139
 
139
 
140
 .panel12 {
140
 .panel12 {
141
-  font-weight: 500;
141
+  font-weight: 700;
142
   font-size: 24rpx;
142
   font-size: 24rpx;
143
 }
143
 }
144
 
144
 
@@ -250,12 +250,12 @@
250
 .text11 {
250
 .text11 {
251
   color: #B3443B;
251
   color: #B3443B;
252
   font-size:24rpx;
252
   font-size:24rpx;
253
-  font-weight: 500;
253
+  font-weight: 700;
254
 }
254
 }
255
 
255
 
256
 .btn {
256
 .btn {
257
   font-size: 28rpx;
257
   font-size: 28rpx;
258
-  font-weight: 500;
258
+  font-weight: 700;
259
   width: 480rpx;
259
   width: 480rpx;
260
   height: 90rpx;
260
   height: 90rpx;
261
   border-radius: 10rpx;
261
   border-radius: 10rpx;
@@ -341,7 +341,7 @@
341
   width: 690rpx;
341
   width: 690rpx;
342
   text-align: left;
342
   text-align: left;
343
   font-size: 32rpx;
343
   font-size: 32rpx;
344
-  font-weight: 500;
344
+  font-weight: 700;
345
   margin: 10rpx 0 10rpx 0;
345
   margin: 10rpx 0 10rpx 0;
346
 }
346
 }
347
 
347
 

+ 3 - 3
pages/plan/studyplan.wxss

@@ -442,7 +442,7 @@
442
 
442
 
443
 .panel2121{
443
 .panel2121{
444
   margin-left: 30rpx;
444
   margin-left: 30rpx;
445
-  font-weight: 500;
445
+  font-weight: 700;
446
 }
446
 }
447
 
447
 
448
 .panel22{
448
 .panel22{
@@ -698,7 +698,7 @@
698
   font-size: 28rpx;
698
   font-size: 28rpx;
699
   margin-right: 20rpx;
699
   margin-right: 20rpx;
700
   line-height: 80rpx;
700
   line-height: 80rpx;
701
-  font-weight: 500;
701
+  font-weight: 700;
702
 }
702
 }
703
 .HelpContainer .HelpPanel113{
703
 .HelpContainer .HelpPanel113{
704
   margin-right:0;
704
   margin-right:0;
@@ -806,7 +806,7 @@
806
 
806
 
807
 .HelpBtnDisabled2{
807
 .HelpBtnDisabled2{
808
   width: 330rpx;
808
   width: 330rpx;
809
-  font-weight: 500;
809
+  font-weight: 700;
810
 }
810
 }
811
 .universalpic_stop_black_20x20{
811
 .universalpic_stop_black_20x20{
812
   width: 20rpx;
812
   width: 20rpx;

+ 2 - 2
pages/plan/taskFull.wxss

@@ -404,7 +404,7 @@ page {
404
   z-index: 100;
404
   z-index: 100;
405
   width: 100%;
405
   width: 100%;
406
   justify-content: flex-start;
406
   justify-content: flex-start;
407
-  font-weight: 500;
407
+  font-weight: 700;
408
 }
408
 }
409
 
409
 
410
 .panelHigh0{
410
 .panelHigh0{
@@ -671,7 +671,7 @@ page {
671
 
671
 
672
 .color3{
672
 .color3{
673
   color:#eb5c28;
673
   color:#eb5c28;
674
-  font-weight: 500;
674
+  font-weight: 700;
675
 }
675
 }
676
 
676
 
677
 .mg4_iconTools_3{
677
 .mg4_iconTools_3{

+ 3 - 2
pages/share/shareindex.wxml

@@ -32,7 +32,7 @@
32
       </scroll-view>
32
       </scroll-view>
33
     </view>
33
     </view>
34
 
34
 
35
-    <view class="panel2 FlexColumn" wx:if="{{ShowActivity}}">
35
+    <!-- <view class="panel2 FlexColumn" wx:if="{{ShowActivity}}">
36
       <view class="panel21 FlexRow">
36
       <view class="panel21 FlexRow">
37
         <view class="text2">秒过学习小组活动</view>
37
         <view class="text2">秒过学习小组活动</view>
38
       </view>
38
       </view>
@@ -76,7 +76,7 @@
76
         <text class="panel2201text7">新年快乐,一年来您辛苦了</text>  
76
         <text class="panel2201text7">新年快乐,一年来您辛苦了</text>  
77
        
77
        
78
       </view>
78
       </view>
79
-    </view>
79
+    </view> -->
80
 
80
 
81
     <view class="panel2 FlexColumn">
81
     <view class="panel2 FlexColumn">
82
       <view class="panel21 FlexRow">
82
       <view class="panel21 FlexRow">
@@ -104,6 +104,7 @@
104
         <view class="panel2Line"></view>
104
         <view class="panel2Line"></view>
105
         <view class="panel23">今天是{{Info.Today}}。</view>
105
         <view class="panel23">今天是{{Info.Today}}。</view>
106
         <view class="panel23">本月:练习{{Info.CurrentMonth.length}}天,接力{{Info.ShareNumberMonth}}次,有{{Info.CurrentMonth.length-Info.ShareNumberMonth}}天没接力。</view>
106
         <view class="panel23">本月:练习{{Info.CurrentMonth.length}}天,接力{{Info.ShareNumberMonth}}次,有{{Info.CurrentMonth.length-Info.ShareNumberMonth}}天没接力。</view>
107
+        <view class="panel23">今年:接力{{Info.ShareNumberYear}}次。</view>
107
         <view class="panel2Line2"></view>
108
         <view class="panel2Line2"></view>
108
         <view class="panel25 FlexRow">
109
         <view class="panel25 FlexRow">
109
           <text class="text13">自{{Info.ShareFirstDay}}首次接力以来共接力</text>
110
           <text class="text13">自{{Info.ShareFirstDay}}首次接力以来共接力</text>

+ 1 - 1
pages_agent/main/enter.wxss

@@ -23,7 +23,7 @@
23
 }
23
 }
24
 .panelBottom12{
24
 .panelBottom12{
25
   font-size:24rpx;
25
   font-size:24rpx;
26
-  font-weight: 500;
26
+  font-weight: 700;
27
   text-decoration:underline;
27
   text-decoration:underline;
28
 }
28
 }
29
 
29
 

+ 1 - 1
pages_agent/main/search_user.wxss

@@ -86,7 +86,7 @@
86
 }
86
 }
87
 .panelTop3 {
87
 .panelTop3 {
88
   font-size: 28rpx;
88
   font-size: 28rpx;
89
-  font-weight: 500;
89
+  font-weight: 700;
90
 }
90
 }
91
 
91
 
92
 .panel1{
92
 .panel1{

+ 5 - 5
pages_agent/marketing/award.wxss

@@ -27,13 +27,13 @@
27
 
27
 
28
 .panelItem12{
28
 .panelItem12{
29
   font-size:48rpx;
29
   font-size:48rpx;
30
-  font-weight: 500;
30
+  font-weight: 700;
31
 }
31
 }
32
 
32
 
33
 .panelItem2{
33
 .panelItem2{
34
   width:690rpx;
34
   width:690rpx;
35
   font-size:20rpx;
35
   font-size:20rpx;
36
-  font-weight: 500;
36
+  font-weight: 700;
37
   margin:10rpx 0 30rpx 0;
37
   margin:10rpx 0 30rpx 0;
38
   color: #787878;
38
   color: #787878;
39
 }
39
 }
@@ -41,7 +41,7 @@
41
 .panelItem3{
41
 .panelItem3{
42
   width:690rpx;
42
   width:690rpx;
43
   font-size:20rpx;
43
   font-size:20rpx;
44
-  font-weight: 500;
44
+  font-weight: 700;
45
   margin:30rpx 0 0 0;
45
   margin:30rpx 0 0 0;
46
   color: #787878;
46
   color: #787878;
47
   justify-content: space-between;
47
   justify-content: space-between;
@@ -81,7 +81,7 @@
81
 .text3{
81
 .text3{
82
   width:690rpx;
82
   width:690rpx;
83
   font-size:20rpx;
83
   font-size:20rpx;
84
-  font-weight: 500;
84
+  font-weight: 700;
85
   color: #787878;
85
   color: #787878;
86
 }
86
 }
87
 
87
 
@@ -92,7 +92,7 @@
92
 .text1{
92
 .text1{
93
   width:690rpx;
93
   width:690rpx;
94
   font-size:28rpx;
94
   font-size:28rpx;
95
-  font-weight: 500;
95
+  font-weight: 700;
96
   margin-top: 30rpx;
96
   margin-top: 30rpx;
97
 }
97
 }
98
 
98
 

+ 1 - 1
pages_agent/marketing/extenduser.wxss

@@ -20,7 +20,7 @@
20
 .panelTop110{
20
 .panelTop110{
21
   font-size:28rpx;
21
   font-size:28rpx;
22
   color:#0071EF;
22
   color:#0071EF;
23
-  font-weight: 500;
23
+  font-weight: 700;
24
   margin-bottom: 20rpx;
24
   margin-bottom: 20rpx;
25
 }
25
 }
26
 .panelTop111{
26
 .panelTop111{

+ 1 - 1
pages_test/test/index.js

@@ -104,7 +104,7 @@ Page({
104
           that.setData({
104
           that.setData({
105
             Subject: "ENG",
105
             Subject: "ENG",
106
           });
106
           });
107
-          if (that.data.TestSelectGrade > 11) {
107
+          if (that.data.TestSelectGrade > 13) {
108
             that.setData({
108
             that.setData({
109
               ScrollLeft: 500,
109
               ScrollLeft: 500,
110
             });
110
             });

+ 1 - 1
pages_test/test/index.wxss

@@ -278,7 +278,7 @@
278
 }
278
 }
279
 .numberContainer .numberContaineFooter2{
279
 .numberContainer .numberContaineFooter2{
280
   color:#B3443B;
280
   color:#B3443B;
281
-  font-weight: 500;
281
+  font-weight: 700;
282
 }
282
 }
283
 
283
 
284
 .universalpic_sequence_black_30x30_2{
284
 .universalpic_sequence_black_30x30_2{

+ 2 - 2
pages_test/test/item.wxss

@@ -10,7 +10,7 @@ page{
10
   color: #fff;
10
   color: #fff;
11
   border-radius:10rpx;
11
   border-radius:10rpx;
12
   font-size:24rpx;
12
   font-size:24rpx;
13
-  font-weight: 500;
13
+  font-weight: 700;
14
 }
14
 }
15
 
15
 
16
 .panelTop{
16
 .panelTop{
@@ -241,7 +241,7 @@ page{
241
   text-align: center;
241
   text-align: center;
242
   font-size:28rpx;
242
   font-size:28rpx;
243
   line-height: 45rpx;
243
   line-height: 45rpx;
244
-  font-weight: 500;
244
+  font-weight: 700;
245
   color:#1e1e1e;
245
   color:#1e1e1e;
246
   margin: 0 0 10rpx 0;
246
   margin: 0 0 10rpx 0;
247
 }
247
 }

+ 50 - 15
pages_test/test/list.js

@@ -45,7 +45,15 @@ Page({
45
     
45
     
46
     var arr = [];
46
     var arr = [];
47
     var listType="hanzi",fieldName="单词",fieldName2="说含义";
47
     var listType="hanzi",fieldName="单词",fieldName2="说含义";
48
-    if (that.data.BookID > 164){
48
+    if (that.data.BookID > 172){
49
+      arr = wx.getStorageSync("CET4EngList");
50
+      listType="english";
51
+    }
52
+    else if (that.data.BookID > 168){
53
+      arr = wx.getStorageSync("NCEEEngList");
54
+      listType="english";
55
+    }
56
+    else if (that.data.BookID > 164){
49
       arr = wx.getStorageSync("CEWEngList");
57
       arr = wx.getStorageSync("CEWEngList");
50
       listType="english";
58
       listType="english";
51
     }
59
     }
@@ -168,7 +176,6 @@ Page({
168
                 }
176
                 }
169
               }
177
               }
170
 
178
 
171
-
172
               if (testReportList[k].TestType == "read") {
179
               if (testReportList[k].TestType == "read") {
173
                 if (testReportList[k].IsFinished == 1)
180
                 if (testReportList[k].IsFinished == 1)
174
                   list[j].TestTypeRead = 1;
181
                   list[j].TestTypeRead = 1;
@@ -238,6 +245,7 @@ Page({
238
 
245
 
239
       if (id) {
246
       if (id) {
240
         var reporttype = e.currentTarget.dataset.type;
247
         var reporttype = e.currentTarget.dataset.type;
248
+        var testtype=e.currentTarget.dataset.testtype;
241
         if (reporttype=="restart"){
249
         if (reporttype=="restart"){
242
           var testReportList = wx.getStorageSync("UserTestReport");
250
           var testReportList = wx.getStorageSync("UserTestReport");
243
           for(var i=0;i<testReportList.length;i++){
251
           for(var i=0;i<testReportList.length;i++){
@@ -246,24 +254,51 @@ Page({
246
               testReportList[i].TestWrongStr="";
254
               testReportList[i].TestWrongStr="";
247
               testReportList[i].TestSkipStr="";
255
               testReportList[i].TestSkipStr="";
248
               testReportList[i].TestExistStr="";
256
               testReportList[i].TestExistStr="";
257
+              testReportList[i].IsFinished=0;
258
+              wx.setStorageSync("UserTestReport", testReportList);
259
+
260
+              var param1 ={};
261
+              param1.ID=id;
262
+              param1.UserID=app.globalData.userInfo.UserID;
263
+              param1.IsFinished=0;
264
+              param1.TestRightStr="";
265
+              param1.TestWrongStr="";
266
+              param1.TestSkipStr="";
267
+              param1.TestExistStr="";
268
+              main.postData('InsertTestReport?UserID=' + param1.UserID, param1, function () {
269
+                main.GetTestReportInfo(id, function (data) {
270
+                  data.BookID=that.data.BookID;
271
+                  wx.setStorageSync("TestTask2", data); 
272
+                  that.onClose();
273
+                  var url="./item?type=" + reporttype+"&bookid="+that.data.BookID;
274
+                  if (testtype)
275
+                    url+="&testtype="+testtype;
276
+                  wx.navigateTo({
277
+                    url: url,
278
+                  });
279
+                });
280
+              });
249
               break;
281
               break;
250
             }
282
             }
251
           }
283
           }
252
-          wx.setStorageSync("UserTestReport", testReportList);
284
+          
285
+          
253
         }
286
         }
254
-
255
-        main.GetTestReportInfo(id, function (data) {
256
-          data.BookID=that.data.BookID;
257
-          wx.setStorageSync("TestTask2", data); 
258
-          that.onClose();
259
-          var url="./item?type=" + reporttype+"&bookid="+that.data.BookID;
260
-          var testtype=e.currentTarget.dataset.testtype;
261
-          if (testtype)
262
-            url+="&testtype="+testtype;
263
-          wx.navigateTo({
264
-            url: url,
287
+        else{
288
+          main.GetTestReportInfo(id, function (data) {
289
+            data.BookID=that.data.BookID;
290
+            wx.setStorageSync("TestTask2", data); 
291
+            that.onClose();
292
+            var url="./item?type=" + reporttype+"&bookid="+that.data.BookID;
293
+            if (testtype)
294
+              url+="&testtype="+testtype;
295
+            wx.navigateTo({
296
+              url: url,
297
+            });
265
           });
298
           });
266
-        });
299
+        }
300
+
301
+        
267
       } else {
302
       } else {
268
         that.onClose();
303
         that.onClose();
269
         var url = e.currentTarget.dataset.url+"&bookid="+that.data.BookID;
304
         var url = e.currentTarget.dataset.url+"&bookid="+that.data.BookID;

+ 8 - 8
pages_test/test/list.wxml

@@ -2,7 +2,7 @@
2
   <view class="text1" wx:if="{{ListType!='english' && BookID!=43 && BookID!=44 && BookID!=73 && BookID!=86}}">请对照课本选择字组或词组</view>
2
   <view class="text1" wx:if="{{ListType!='english' && BookID!=43 && BookID!=44 && BookID!=73 && BookID!=86}}">请对照课本选择字组或词组</view>
3
   <view class="text1" wx:if="{{ListType=='english' && BookID>110 && BookID<120}}">将词汇等分成若干单元以便分批检验,分割方法并无特殊含义</view>
3
   <view class="text1" wx:if="{{ListType=='english' && BookID>110 && BookID<120}}">将词汇等分成若干单元以便分批检验,分割方法并无特殊含义</view>
4
   <view class="text1" wx:if="{{ListType=='english' && BookID>120 && BookID<130}}">词汇根据Lesson分组</view>
4
   <view class="text1" wx:if="{{ListType=='english' && BookID>120 && BookID<130}}">词汇根据Lesson分组</view>
5
-  <view class="textNull" wx:if="{{ListType=='english' && ((BookID>130 && BookID<170) || (BookID>100 && BookID<110)) || (BookID==73) || (BookID==86)}}"></view>
5
+  <view class="textNull" wx:if="{{ListType=='english' && ((BookID>130 && BookID<=177) || (BookID>100 && BookID<110)) || (BookID==73) || (BookID==86)}}"></view>
6
 
6
 
7
   <block wx:for="{{List}}" wx:key="index">
7
   <block wx:for="{{List}}" wx:key="index">
8
     <view class="PanelItem FlexColumn" bindtap="onShowFrame" data-id="{{item.ID}}">
8
     <view class="PanelItem FlexColumn" bindtap="onShowFrame" data-id="{{item.ID}}">
@@ -70,7 +70,7 @@
70
           <view class="SelectContainer1Text3">念{{FieldName}}{{FieldName2}} 继续检验</view>
70
           <view class="SelectContainer1Text3">念{{FieldName}}{{FieldName2}} 继续检验</view>
71
         </view>
71
         </view>
72
 
72
 
73
-        <view wx:if="{{!SelectItem.TestTypeReadFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="restart">
73
+        <view wx:if="{{SelectItem.TestTypeRead}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="restart">
74
           重新开始
74
           重新开始
75
         </view>
75
         </view>
76
 
76
 
@@ -87,7 +87,7 @@
87
             <view class="SelectContainer1Text3">写{{FieldName}}{{FieldName2}}<block wx:if="{{BookID>=61 && BookID<=72}}">(新课标不要求)</block> 继续检验</view>
87
             <view class="SelectContainer1Text3">写{{FieldName}}{{FieldName2}}<block wx:if="{{BookID>=61 && BookID<=72}}">(新课标不要求)</block> 继续检验</view>
88
           </view>
88
           </view>
89
 
89
 
90
-          <view wx:if="{{!SelectItem.TestTypeWriteFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.WriteReportID}}" data-type="restart">
90
+          <view wx:if="{{SelectItem.TestTypeWrite}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.WriteReportID}}" data-type="restart">
91
             重新开始
91
             重新开始
92
           </view>
92
           </view>
93
 
93
 
@@ -111,7 +111,7 @@
111
           <view class="SelectContainer1Text3">说含义 继续检验</view>
111
           <view class="SelectContainer1Text3">说含义 继续检验</view>
112
         </view>
112
         </view>
113
 
113
 
114
-        <view wx:if="{{!SelectItem.TestTypeReadFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="restart">
114
+        <view wx:if="{{SelectItem.TestTypeRead}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="restart">
115
           重新开始
115
           重新开始
116
         </view>
116
         </view>
117
       </view>
117
       </view>
@@ -133,7 +133,7 @@
133
           <view class="SelectContainer1Text3">看上文接下文 继续检验</view>
133
           <view class="SelectContainer1Text3">看上文接下文 继续检验</view>
134
         </view>
134
         </view>
135
 
135
 
136
-        <view wx:if="{{!SelectItem.TestTypeReadFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="restart">
136
+        <view wx:if="{{SelectItem.TestTypeRead}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="restart">
137
           重新开始
137
           重新开始
138
         </view>
138
         </view>
139
 
139
 
@@ -146,7 +146,7 @@
146
             <view class="SelectContainer1Text3">看含义说古文 继续检验</view>
146
             <view class="SelectContainer1Text3">看含义说古文 继续检验</view>
147
           </view>
147
           </view>
148
 
148
 
149
-          <view wx:if="{{!SelectItem.TestTypeWriteFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-testtype="write" data-id="{{SelectItem.WriteReportID}}" data-type="restart">
149
+          <view wx:if="{{SelectItem.TestTypeWrite}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-testtype="write" data-id="{{SelectItem.WriteReportID}}" data-type="restart">
150
             重新开始
150
             重新开始
151
           </view>
151
           </view>
152
       </view>
152
       </view>
@@ -168,7 +168,7 @@
168
         </view>
168
         </view>
169
         <view class="btnPanel1">根据{{FieldName}}念读音{{FieldName2}}</view>
169
         <view class="btnPanel1">根据{{FieldName}}念读音{{FieldName2}}</view>
170
 
170
 
171
-        <view wx:if="{{!SelectItem.TestTypeReadFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-testtype="read" data-id="{{SelectItem.ReadReportID}}" data-type="restart">
171
+        <view wx:if="{{SelectItem.TestTypeRead}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-testtype="read" data-id="{{SelectItem.ReadReportID}}" data-type="restart">
172
           重新开始
172
           重新开始
173
         </view>
173
         </view>
174
 
174
 
@@ -183,7 +183,7 @@
183
           </view>
183
           </view>
184
           <view class="btnPanel1">根据发音和含义默写{{FieldName}}</view>
184
           <view class="btnPanel1">根据发音和含义默写{{FieldName}}</view>
185
 
185
 
186
-          <view wx:if="{{!SelectItem.TestTypeWriteFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-testtype="write" data-id="{{SelectItem.WriteReportID}}" data-type="restart">
186
+          <view wx:if="{{SelectItem.TestTypeWrite}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-testtype="write" data-id="{{SelectItem.WriteReportID}}" data-type="restart">
187
             重新开始
187
             重新开始
188
           </view>
188
           </view>
189
         </block>
189
         </block>

+ 4 - 4
pages_test/test/list.wxss

@@ -117,7 +117,7 @@
117
 .SelectContainer1Text1{
117
 .SelectContainer1Text1{
118
   font-size:36rpx;
118
   font-size:36rpx;
119
   margin-top: 20rpx;
119
   margin-top: 20rpx;
120
-  font-weight: 500;
120
+  font-weight: 700;
121
 }
121
 }
122
 
122
 
123
 .SelectContainer1Text2{
123
 .SelectContainer1Text2{
@@ -142,7 +142,7 @@
142
   margin-top:-10rpx;
142
   margin-top:-10rpx;
143
   margin-bottom: 30rpx;
143
   margin-bottom: 30rpx;
144
   font-size: 20rpx;
144
   font-size: 20rpx;
145
-  font-weight: 500;
145
+  font-weight: 700;
146
   color:#4D4D4D;
146
   color:#4D4D4D;
147
 }
147
 }
148
 
148
 
@@ -175,7 +175,7 @@
175
   font-size:24rpx;
175
   font-size:24rpx;
176
   margin-left: 10rpx;
176
   margin-left: 10rpx;
177
   color:#0071EF;
177
   color:#0071EF;
178
-  font-weight: 500;
178
+  font-weight: 700;
179
 }
179
 }
180
 
180
 
181
 
181
 
@@ -188,7 +188,7 @@
188
   text-align: center;
188
   text-align: center;
189
   color:#0071EF;
189
   color:#0071EF;
190
   font-size:28rpx;
190
   font-size:28rpx;
191
-  font-weight: 500;
191
+  font-weight: 700;
192
 }
192
 }
193
 
193
 
194
 .close{
194
 .close{

+ 3 - 3
pages_test/test/report.wxss

@@ -12,7 +12,7 @@
12
   margin-top: 10rpx;
12
   margin-top: 10rpx;
13
   margin-left: 30rpx;
13
   margin-left: 30rpx;
14
   font-size:32rpx;
14
   font-size:32rpx;
15
-  font-weight: 500;
15
+  font-weight: 700;
16
 }
16
 }
17
 .text2{
17
 .text2{
18
   margin-bottom: 30rpx;
18
   margin-bottom: 30rpx;
@@ -195,7 +195,7 @@
195
 .buildText1{
195
 .buildText1{
196
   font-size: 54rpx;
196
   font-size: 54rpx;
197
   margin-top: 100rpx;
197
   margin-top: 100rpx;
198
-  font-weight: 500;
198
+  font-weight: 700;
199
 }
199
 }
200
 .buildBtn{
200
 .buildBtn{
201
   width:600rpx;
201
   width:600rpx;
@@ -204,7 +204,7 @@
204
   line-height: 90rpx;
204
   line-height: 90rpx;
205
   font-size:36rpx;
205
   font-size:36rpx;
206
   margin-top: 40rpx;
206
   margin-top: 40rpx;
207
-  font-weight: 500;
207
+  font-weight: 700;
208
   border-radius: 14rpx;
208
   border-radius: 14rpx;
209
 }
209
 }
210
 
210
 

+ 5 - 1
pages_test/test/wordlist.js

@@ -83,8 +83,12 @@ Page({
83
           arr= wx.getStorageSync("MiddleSchoolTestWords");
83
           arr= wx.getStorageSync("MiddleSchoolTestWords");
84
         else if (bookid>=160 && bookid<165)
84
         else if (bookid>=160 && bookid<165)
85
           arr= wx.getStorageSync("BEWEngList");
85
           arr= wx.getStorageSync("BEWEngList");
86
-        else if (bookid>=165 && bookid<170)
86
+        else if (bookid>=165 && bookid<=168)
87
           arr= wx.getStorageSync("CEWEngList");
87
           arr= wx.getStorageSync("CEWEngList");
88
+        else if (bookid>=169 && bookid<=172)
89
+          arr= wx.getStorageSync("NCEEEngList");
90
+        else if (bookid>=173 && bookid<=177)
91
+          arr= wx.getStorageSync("CET4EngList");
88
         
92
         
89
       }
93
       }
90
       arr = JSON.parse(arr);
94
       arr = JSON.parse(arr);

+ 11 - 5
utils/main.js

@@ -897,7 +897,8 @@ function GetTestReportInfo(reportid, callback) {
897
       ||name1[0].indexOf("单词") >= 0 
897
       ||name1[0].indexOf("单词") >= 0 
898
       || name1[0].indexOf("1000") >= 0 
898
       || name1[0].indexOf("1000") >= 0 
899
       || name1[0].indexOf("2000") >= 0 
899
       || name1[0].indexOf("2000") >= 0 
900
-      || name1[0].indexOf("4000") >= 0) {
900
+      || name1[0].indexOf("4000") >= 0 
901
+      || name1[0].indexOf("高考") >= 0) {
901
         //console.log("英语");
902
         //console.log("英语");
902
         var wordStr = "";
903
         var wordStr = "";
903
         var userTestReportInfo = UserTestReport[n];
904
         var userTestReportInfo = UserTestReport[n];
@@ -935,12 +936,11 @@ function GetTestReportInfo(reportid, callback) {
935
         var unitsid = "";
936
         var unitsid = "";
936
         if (bookid > 100 && bookid < 110 && UserTestReport[n].Name[2]) {
937
         if (bookid > 100 && bookid < 110 && UserTestReport[n].Name[2]) {
937
           unitsid = Number(UserTestReport[n].Name[2]);
938
           unitsid = Number(UserTestReport[n].Name[2]);
938
-        } else if (bookid > 120 && bookid <= 124) {
939
+        } else if ((bookid > 120 && bookid <= 124) || (bookid >= 169 && bookid <= 172)) {
939
           unitsid = Number(name2.replace("Lesson ", ""));
940
           unitsid = Number(name2.replace("Lesson ", ""));
940
-        } else if (bookid > 130 && bookid <= 170 && UserTestReport[n].Name[2]) {
941
+        } else if (bookid > 130 && bookid <= 168 && UserTestReport[n].Name[2]) {
941
           unitsid = Number(UserTestReport[n].Name[2]);
942
           unitsid = Number(UserTestReport[n].Name[2]);
942
         } 
943
         } 
943
-        
944
         getData('GetTestEnglishWords?UserID=' + app.globalData.userInfo.UserID + '&BookID=' + bookid + '&LessonID=' + unitsid + '&Words=' + wordStr + "&TestType=" + userTestReportInfo.TestType, function (data) {
944
         getData('GetTestEnglishWords?UserID=' + app.globalData.userInfo.UserID + '&BookID=' + bookid + '&LessonID=' + unitsid + '&Words=' + wordStr + "&TestType=" + userTestReportInfo.TestType, function (data) {
945
           if (data) {
945
           if (data) {
946
             var result = {};
946
             var result = {};
@@ -1278,6 +1278,8 @@ function getEnglish(callback) {
1278
       var arrEEWEngList = common.Decrypt(data.EEWEngList);
1278
       var arrEEWEngList = common.Decrypt(data.EEWEngList);
1279
       var arrCEWEngList = common.Decrypt(data.CEWEngList);
1279
       var arrCEWEngList = common.Decrypt(data.CEWEngList);
1280
       var arrBEWEngList = common.Decrypt(data.BEWEngList);
1280
       var arrBEWEngList = common.Decrypt(data.BEWEngList);
1281
+      var arrNCEEEngList = common.Decrypt(data.NCEEEngList);
1282
+      var arrCET4EngList = common.Decrypt(data.CET4EngList);
1281
       var arrMiddleSchoolTestWords = common.Decrypt(data.MiddleSchoolTestWords);
1283
       var arrMiddleSchoolTestWords = common.Decrypt(data.MiddleSchoolTestWords);
1282
       var arrPhoneticEngList = common.Decrypt(data.PhoneticEngList);
1284
       var arrPhoneticEngList = common.Decrypt(data.PhoneticEngList);
1283
       wx.setStorageSync("EnglishAll", arrEng);
1285
       wx.setStorageSync("EnglishAll", arrEng);
@@ -1286,6 +1288,9 @@ function getEnglish(callback) {
1286
       wx.setStorageSync("EEWEngList", arrEEWEngList);
1288
       wx.setStorageSync("EEWEngList", arrEEWEngList);
1287
       wx.setStorageSync("CEWEngList", arrCEWEngList);
1289
       wx.setStorageSync("CEWEngList", arrCEWEngList);
1288
       wx.setStorageSync("BEWEngList", arrBEWEngList);
1290
       wx.setStorageSync("BEWEngList", arrBEWEngList);
1291
+      wx.setStorageSync("NCEEEngList", arrNCEEEngList);
1292
+      wx.setStorageSync("CET4EngList", arrCET4EngList);
1293
+      
1289
       wx.setStorageSync("MiddleSchoolTestWords", arrMiddleSchoolTestWords);
1294
       wx.setStorageSync("MiddleSchoolTestWords", arrMiddleSchoolTestWords);
1290
       wx.setStorageSync("PhoneticEngList", arrPhoneticEngList);
1295
       wx.setStorageSync("PhoneticEngList", arrPhoneticEngList);
1291
       wx.setStorageSync("EnglishUpdateTime", data.UpdateTime);
1296
       wx.setStorageSync("EnglishUpdateTime", data.UpdateTime);
@@ -1647,6 +1652,7 @@ function GetTestReportList(userID, callback) {
1647
 
1652
 
1648
           if (data[i].Name[0].indexOf("英语") >= 0 
1653
           if (data[i].Name[0].indexOf("英语") >= 0 
1649
           || data[i].Name[0].indexOf("单词") >= 0 
1654
           || data[i].Name[0].indexOf("单词") >= 0 
1655
+          || data[i].Name[0].indexOf("高考") >= 0 
1650
           || data[i].Name[0].indexOf("KET") >= 0 
1656
           || data[i].Name[0].indexOf("KET") >= 0 
1651
           || data[i].Name[0].indexOf("1000") >= 0 
1657
           || data[i].Name[0].indexOf("1000") >= 0 
1652
           || data[i].Name[0].indexOf("2000") >= 0 
1658
           || data[i].Name[0].indexOf("2000") >= 0 
@@ -1845,7 +1851,7 @@ function downloadFile(url,isShowLoading,callback){
1845
       wx.hideLoading();
1851
       wx.hideLoading();
1846
     }, 5000);
1852
     }, 5000);
1847
   }
1853
   }
1848
-  //console.log(url);
1854
+  console.log(url);
1849
   wx.downloadFile({
1855
   wx.downloadFile({
1850
     url: url,
1856
     url: url,
1851
     success(resDownload) {
1857
     success(resDownload) {