chengjie 6 年之前
父节点
当前提交
5353953172
共有 38 个文件被更改,包括 417 次插入95 次删除
  1. 1 1
      app.js
  2. 1 0
      app.json
  3. 二进制
      pages/images/help_picture_chooseadvice.png
  4. 二进制
      pages/images/help_picture_clickshow_01.png
  5. 二进制
      pages/images/help_picture_clickshow_02.png
  6. 二进制
      pages/images/help_picture_clickshow_03.png
  7. 二进制
      pages/images/help_picture_themecolor.png
  8. 二进制
      pages/images/practice_finish_footer.png
  9. 二进制
      pages/images/study_report_footer.png
  10. 二进制
      pages/images/study_report_header.png
  11. 二进制
      pages/images/universalpic_fav_default_gray_26x24.png
  12. 二进制
      pages/images/universalpic_fav_enable_color1_26x24.png
  13. 二进制
      pages/images/universalpic_fav_enable_white_120x110.png
  14. 二进制
      pages/images/universalpic_more_gray_32x8.png
  15. 二进制
      pages/images/universalpic_report_gray_30x30.png
  16. 二进制
      pages/images/universalpic_starting_color1_26x26.png
  17. 22 30
      pages/main/colorplan.js
  18. 1 1
      pages/main/colorplan.json
  19. 19 16
      pages/main/colorplan.wxml
  20. 16 2
      pages/main/colorplan.wxss
  21. 7 4
      pages/main/default.js
  22. 1 1
      pages/main/default.wxml
  23. 10 0
      pages/main/detail.js
  24. 1 1
      pages/main/detail.json
  25. 1 1
      pages/main/detail.wxml
  26. 10 5
      pages/main/memoryLevel.wxml
  27. 21 6
      pages/main/memoryLevel.wxss
  28. 1 0
      pages/main/preview.js
  29. 91 0
      pages/main/recommend.js
  30. 4 0
      pages/main/recommend.json
  31. 45 0
      pages/main/recommend.wxml
  32. 82 0
      pages/main/recommend.wxss
  33. 18 9
      pages/main/searchWeb.wxml
  34. 24 7
      pages/main/searchWeb1.js
  35. 22 4
      pages/main/setting.js
  36. 12 0
      pages/main/setting.wxml
  37. 3 3
      project.config.json
  38. 4 4
      utils/main.js

+ 1 - 1
app.js

@@ -25,7 +25,7 @@ App({
25 25
     }
26 26
   },
27 27
   globalData: {
28
-    Version: "1.0.1.4",
28
+    Version: "1.0.1.5",
29 29
     IsProduction: true,
30 30
     ShareTitle: "可以用来记忆一切的工具",
31 31
     SharePath: "pages/index/index",

+ 1 - 0
app.json

@@ -1,6 +1,7 @@
1 1
 {
2 2
   "pages": [
3 3
     "pages/index/index",
4
+    "pages/main/recommend",
4 5
     "pages/other/test",
5 6
     "pages/main/colorplan",
6 7
     "pages/index/notice",

二进制
pages/images/help_picture_chooseadvice.png


二进制
pages/images/help_picture_clickshow_01.png


二进制
pages/images/help_picture_clickshow_02.png


二进制
pages/images/help_picture_clickshow_03.png


二进制
pages/images/help_picture_themecolor.png


二进制
pages/images/practice_finish_footer.png


二进制
pages/images/study_report_footer.png


二进制
pages/images/study_report_header.png


二进制
pages/images/universalpic_fav_default_gray_26x24.png


二进制
pages/images/universalpic_fav_enable_color1_26x24.png


二进制
pages/images/universalpic_fav_enable_white_120x110.png


二进制
pages/images/universalpic_more_gray_32x8.png


二进制
pages/images/universalpic_report_gray_30x30.png


二进制
pages/images/universalpic_starting_color1_26x26.png


+ 22 - 30
pages/main/colorplan.js

@@ -20,57 +20,49 @@ Page({
20 20
     var arr = main.getDetailColor(-1);
21 21
 
22 22
 
23
-    common.getStorageValue(this, "ColorIndex", 0, function () {
24
-      var isChangeColor = false;
25
-      if (that.data.ColorIndex == 0)
26
-        isChangeColor = true;
27
-      else {
28
-        for (var i = 1; i < arr.length; i++) {
23
+    common.getStorageValue(this, "ColorIndexArr", [1], function () {
24
+      
25
+      for (var i = 1; i < arr.length; i++) {
26
+        for(var j=0;j<that.data.ColorIndexArr.length;j++){
29 27
           arr[i].SelectedCSS = "";
30
-          if (that.data.ColorIndex == i) {
28
+          if (that.data.ColorIndexArr[j] == i) {
31 29
             arr[i].SelectedCSS = "panelItemSelected";
30
+            break;
32 31
           }
33 32
         }
34 33
       }
34
+      
35 35
       that.setData({
36 36
         ColorList: arr,
37
-        IsChangeColor: isChangeColor,
38 37
       });
39 38
     });
40 39
   },
41
-  switch1Change(e) {
42
-    var that = this;
43
-    that.data.IsChangeColor = e.detail.value;
44
-    for (var i = 0; i < that.data.ColorList.length; i++) {
45
-      that.data.ColorList[i].SelectedCSS = "";
46
-      if (!that.data.IsChangeColor && i == 1) {
47
-        that.data.ColorList[i].SelectedCSS = "panelItemSelected";
48
-      }
49
-    }
50
-    that.setData({
51
-      ColorList: that.data.ColorList,
52
-      IsChangeColor: that.data.IsChangeColor,
53
-    });
54
-    var index = 1;
55
-    if (that.data.IsChangeColor)
56
-      index = 0;
57
-    wx.setStorageSync("ColorIndex", index);
58
-  },
59 40
   selectColor: function (e) {
60 41
     var that = this;
61 42
     var index = e.currentTarget.dataset.index;
62 43
     for (var i = 0; i < that.data.ColorList.length; i++) {
63
-      that.data.ColorList[i].SelectedCSS = "";
44
+      //that.data.ColorList[i].SelectedCSS = "";
64 45
       if (i == index) {
65
-        that.data.ColorList[i].SelectedCSS = "panelItemSelected";
46
+        if (that.data.ColorList[i].SelectedCSS == "")
47
+          that.data.ColorList[i].SelectedCSS = "panelItemSelected";
48
+        else
49
+          that.data.ColorList[i].SelectedCSS = "";
66 50
       }
67 51
     }
52
+
53
+    var arr = [];
54
+    for (var i = 0; i < that.data.ColorList.length; i++) {
55
+      if (that.data.ColorList[i].SelectedCSS == "panelItemSelected")
56
+        arr.push(i);
57
+    }
58
+    if (arr.length==0)
59
+      arr.push(1);
60
+    
68 61
     that.setData({
69 62
       ColorList: that.data.ColorList,
70
-      IsChangeColor: false,
71 63
     });
72 64
 
73
-    wx.setStorageSync("ColorIndex", index);
65
+    wx.setStorageSync("ColorIndexArr", arr);
74 66
   },
75 67
   onShareAppMessage: function () {
76 68
     return {

+ 1 - 1
pages/main/colorplan.json

@@ -1,3 +1,3 @@
1 1
 {
2
-  "navigationBarTitleText": "主题色"
2
+  "navigationBarTitleText": "题卡主题色"
3 3
 }

+ 19 - 16
pages/main/colorplan.wxml

@@ -1,24 +1,27 @@
1 1
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
2
-  <view style='height:50rpx'></view>
3
-  <view class="panelItem FlexRow">
4
-    <view class="panelItem1">每次更换配色</view>
5
-    <view class="panelItem2 FlexRow">
6
-      <switch checked="{{IsChangeColor}}" bindchange="switch1Change" />
2
+  <view style='height:20rpx'></view>
3
+  <view class="panelItem FlexColumn">
4
+    <view class="panelTitle0 panelTitle FlexRow">
5
+      <view class="panelTitle1">用途说明</view>
7 6
     </view>
7
+    <view class="panelItem2">选择题卡的主题色。该功能的原理是利用“多变的环境对记忆的增效作用”,采用颜色元素,打破人体通过视觉对信息布局的识别形成记忆关系后产生的环境依赖。所以,推荐多选或全选颜色,比如根据您对颜色的喜好去除不喜欢的颜色,保留相对有吸引力的颜色就好。在选中多种颜色的情况下,系统将在每次学习时随机选择一款颜色。</view>
8
+
9
+    <image class="help_picture_themecolor" src='../images/help_picture_themecolor.png' />
10
+
8 11
   </view>
9 12
   <view class='lineFooter'></view>
10 13
 
11
-  <block wx:if="{{!IsChangeColor}}">
12
-    <view class="panelTitle FlexRow">
13
-      <view class="panelTitle1">配色</view>
14
-    </view>
15
-    <view class="panelItem FlexColumn">
16
-      <view style="height:30rpx;"></view>
17
-      <view class="{{item.SelectedCSS}} panelItem0 FlexRow" wx:for="{{ColorList}}" wx:key="index" wx:if="{{index>0}}" bindtap="selectColor" data-index="{{index}}">
18
-        <view class='panelItem01' style='background-color:{{item.BackColor}};'>{{item.Name}}</view>
19
-      </view>
14
+  <view class="panelTitle FlexRow">
15
+    <view class="panelTitle1">选择需要的主题色</view>
16
+  </view>
17
+  <view class="panelItem FlexColumn">
18
+    <view style="height:40rpx;"></view>
19
+    <view class="{{item.SelectedCSS}} panelItem0 FlexRow" wx:for="{{ColorList}}" wx:key="index" wx:if="{{index>0}}" bindtap="selectColor" data-index="{{index}}">
20
+      <view class='panelItem01' style='background-color:{{item.BackColor}};'>{{item.Name}}</view>
20 21
     </view>
21
-    <view class='lineFooter'></view>
22
-  </block>
22
+    <view style="height:10rpx;"></view>
23
+    
24
+  </view>
25
+  <view class='lineFooter'></view>
23 26
   <view style='height:100rpx'></view>
24 27
 </view>

+ 16 - 2
pages/main/colorplan.wxss

@@ -10,6 +10,11 @@
10 10
   margin-top: 50rpx;
11 11
   justify-content: flex-start;
12 12
 }
13
+
14
+.panelTitle0{
15
+  margin-top: 40rpx;
16
+}
17
+
13 18
 .panelTitle .panelTitle1{
14 19
   font-size:32rpx;
15 20
   margin-left: 30rpx;
@@ -50,6 +55,15 @@
50 55
   margin-left: 30rpx;
51 56
   font-weight: 400;
52 57
 }
53
-.panelItem .panelItem2{
54
-  margin-right: 30rpx;
58
+
59
+.panelItem2{
60
+  width:690rpx;
61
+  font-weight: 400;
62
+  font-size:24rpx;
63
+}
64
+
65
+.help_picture_themecolor{
66
+  width:688rpx;
67
+  height:380rpx;
68
+  margin: 40rpx 0;
55 69
 }

+ 7 - 4
pages/main/default.js

@@ -48,10 +48,13 @@ Page({
48 48
             });
49 49
           });
50 50
 
51
-          app.globalData.ColorIndex = wx.getStorageSync("ColorIndex");
52
-          var color = main.getDetailColor(-1);
53
-          if (!app.globalData.ColorIndex || app.globalData.ColorIndex > (color.length-1))
54
-            app.globalData.ColorIndex=0;
51
+          var arrColorIndex = wx.getStorageSync("ColorIndexArr");
52
+          if (!arrColorIndex){
53
+            app.globalData.ColorIndex = 1;
54
+          }
55
+          else{
56
+            app.globalData.ColorIndex = arrColorIndex[common.random(0,arrColorIndex.length-1)];
57
+          }
55 58
 
56 59
           that.getTaskTodayList();
57 60
         }

+ 1 - 1
pages/main/default.wxml

@@ -1,6 +1,6 @@
1 1
 <view class="container FlexColumn" style='height:{{Containnerheight}}rpx;'>
2 2
   <view class='panel1 FlexColumn'>
3
-    <view class='text1'>练习第{{DayNumber}}天</view>
3
+    <view class='text1'>第{{DayNumber}}个使用日</view>
4 4
     <view class='panel11 FlexRow' bindtap="goto" data-url="setting">
5 5
       <view class='universalpic_setup_gray_40x40'></view>
6 6
       <view class='text2'>{{TodayTaskNumber}}</view>

+ 10 - 0
pages/main/detail.js

@@ -267,9 +267,13 @@ Page({
267 267
           if (TaskList[0].ContentNew.Field[3].length == 0) {
268 268
             that.data.IsShowAnswer[1] = 1;
269 269
           }
270
+
271
+          scroll(1000);
270 272
         }
271 273
         else if (that.data.IsShowAnswer[0] && !that.data.IsShowAnswer[1]) {
272 274
           that.data.IsShowAnswer[1] = 1;
275
+
276
+          scroll(1000);
273 277
         }
274 278
       }
275 279
 
@@ -277,6 +281,12 @@ Page({
277 281
         IsShowAnswer: that.data.IsShowAnswer,
278 282
       });
279 283
     }
284
+
285
+    function scroll(top){
286
+      wx.pageScrollTo({
287
+        scrollTop: top,
288
+      });
289
+    }
280 290
   },
281 291
   gotoEdit: function () {
282 292
     var that = this;

+ 1 - 1
pages/main/detail.json

@@ -1,5 +1,5 @@
1 1
 {
2
-  "navigationBarTitleText": "习中",
2
+  "navigationBarTitleText": "习中",
3 3
   "navigationBarTextStyle": "black",
4 4
   "enablePullDownRefresh": true
5 5
 }

+ 1 - 1
pages/main/detail.wxml

@@ -84,7 +84,7 @@
84 84
     <!-- 第二段和第三段 -->
85 85
     <view class="panelField20 FlexColumn">
86 86
       <view class="editFieldNull2"></view>
87
-      <view class="panelField2 FlexColumn" wx:for="{{[2,3]}}" wx:key="indexParent" wx:for-index="indexParent" wx:for-item="itemParent" wx:if="{{TaskInfo.ContentNew.Field[itemParent].length>0 && IsShowAnswer[itemParent-2]}}" style='background-color:{{Color.FieldBackColor}};'>
87
+      <view id="ViewField{{itemParent}}" class="panelField2 FlexColumn" wx:for="{{[2,3]}}" wx:key="indexParent" wx:for-index="indexParent" wx:for-item="itemParent" wx:if="{{TaskInfo.ContentNew.Field[itemParent].length>0 && IsShowAnswer[itemParent-2]}}" style='background-color:{{Color.FieldBackColor}};'>
88 88
         <view class="panelField21 panelItem FlexRow" style='color:{{Color.FieldColor}};'>
89 89
           <block wx:for="{{TaskInfo.ContentNew.Field[itemParent]}}" wx:key="index">
90 90
             <text class="textReturn" wx:if="{{index>0 && item.Type=='return'}}"></text>

+ 10 - 5
pages/main/memoryLevel.wxml

@@ -5,9 +5,14 @@
5 5
   <view class="panelItem FlexRow">
6 6
     <view class="panelItem1">在“学习中”,界面底部有一行4色(红、黄、绿、蓝)按钮供家长根据孩子答题时的表现选择对应的“记忆评价”。可根据您的习惯,选择“记忆评价栏”的格式(各种格式的功能是相同的)。</view>
7 7
   </view>
8
+  
9
+  <view class="panelTitle0 panelTitle FlexRow">
10
+    <view class="panelTitle1">款式</view>
11
+  </view>
12
+  
8 13
   <view class='panel FlexColumn'>
9
-    <view class="panelTitle2 panelTitle FlexRow">
10
-      <view class="panelTitle1">易懂方式,用“答题的熟练度”表达</view>
14
+    <view class="panelTitle FlexRow">
15
+      <view class="panelTitle2 panelTitle1">通俗易懂,对照孩子的表现</view>
11 16
     </view>
12 17
 
13 18
     <view class='{{item.SelectedCss}} panelSelected FlexRow' wx:for="{{List}}" wx:key="index" wx:if="{{index<3}}" bindtap="onSelected" data-index="{{index}}">
@@ -27,8 +32,8 @@
27 32
       </view>
28 33
     </view>
29 34
 
30
-    <view class="panelTitle3 panelTitle FlexRow">
31
-      <view class="panelTitle1">科学方式,用“时间间隔”表达</view>
35
+    <view class="panelTitle FlexRow">
36
+      <view class="panelTitle3 panelTitle1">科学表达,遵循记忆规律</view>
32 37
     </view>
33 38
 
34 39
     <view class='{{item.SelectedCss}} panelSelected FlexRow' wx:for="{{List}}" wx:key="index" wx:if="{{index==3}}" bindtap="onSelected" data-index="{{index}}">
@@ -49,7 +54,7 @@
49 54
     </view>
50 55
 
51 56
     <view class="panelItem FlexRow">
52
-      <view class="panelItem2">【官方推荐】记忆间隔版是对“记忆评价”的直观和科学的理解方式。它的重点是,告知该题卡根据正常记忆规律可在多长时间后再现。由此,家长可依据孩子答题时不同程度的表现进行判断,希望该题卡在多久后再次练习。建议,越熟练的间隔越久,越生疏的间隔越短。</view>
57
+      <view class="panelItem2">再现间隔是对“记忆评价”的最直观和科学的理解方式(官方推荐)。它的重点是,告知该题卡根据正常记忆规律可在多长时间后再现。由此,家长可依据孩子答题时不同程度的表现进行判断,希望该题卡在多久后再次练习。建议,越熟练的间隔越久,越生疏的间隔越短。</view>
53 58
     </view>
54 59
   </view>
55 60
   <view style='height:100rpx'></view>

+ 21 - 6
pages/main/memoryLevel.wxss

@@ -7,36 +7,51 @@
7 7
 
8 8
 .panelTitle{
9 9
   width:100%;
10
-  margin-top: 50rpx;
10
+  margin-top: 20rpx;
11 11
   justify-content: flex-start;
12
+  background-color: #fff;
12 13
 }
14
+
15
+
13 16
 .panelTitle .panelTitle1{
14 17
   font-size:32rpx;
15 18
   margin-left: 30rpx;
16
-  margin-bottom: 30rpx;
19
+  margin-top: 40rpx;
20
+  font-weight: 500;
17 21
 }
18 22
 
19 23
 .panelItem{
20 24
   width:100%;
25
+  background-color: #fff;
21 26
 }
22 27
 
23 28
 .panelItem .panelItem1{
24 29
   width:690rpx;
25
-  margin: 0 0 50rpx 0;
30
+  margin: 40rpx 0 40rpx 0;
26 31
   font-weight: 400;
27 32
   font-size:24rpx;
28 33
 }
29 34
 
35
+.panelTitle0{
36
+  margin-top: 10rpx;
37
+  margin-bottom: 30rpx;
38
+  background-color: #f0f0f0;
39
+}
40
+
30 41
 .panel{
31 42
   width:100%;
32 43
   background-color: #fff;
33 44
 }
34 45
 
35 46
 .panelTitle .panelTitle2{
36
-  margin-top: 30rpx;
47
+  margin: 20rpx 0 30rpx 30rpx;
48
+  font-size:28rpx;
49
+  font-weight: 400;
37 50
 }
38 51
 .panelTitle .panelTitle3{
39
-  margin-top: 20rpx;
52
+  margin: 0 0 30rpx 30rpx;
53
+  font-size:28rpx;
54
+  font-weight: 400;
40 55
 }
41 56
 
42 57
 .panelItem .panelItem2{
@@ -49,7 +64,7 @@
49 64
 
50 65
 .panelSelected{
51 66
   width:690rpx;
52
-  height:174rpx;
67
+  height:173rpx;
53 68
   border-radius: 10rpx;
54 69
   border:1rpx solid #9B9B9B;
55 70
   margin-bottom: 30rpx;

+ 1 - 0
pages/main/preview.js

@@ -19,6 +19,7 @@ Page({
19 19
     var id = 0;
20 20
     if (options.id)
21 21
       id = options.id;
22
+    
22 23
     that.setData({
23 24
       Containnerheight: main.getWindowHeight(),
24 25
       ShowType: options.type,

+ 91 - 0
pages/main/recommend.js

@@ -0,0 +1,91 @@
1
+import common from '../../utils/util';
2
+import main from '../../utils/main';
3
+
4
+const app = getApp();
5
+
6
+Page({
7
+  data: {
8
+    IsChangeRecommend: true,
9
+    SecondConfig: [{
10
+      Key: "蓝色",
11
+      Value: 10,
12
+    }, {
13
+      Key: "绿色",
14
+      Value: 30,
15
+    }, {
16
+      Key: "黄色",
17
+      Value: 50,
18
+    }
19
+    ]
20
+  },
21
+  onLoad: function (options) {
22
+    wx.hideShareMenu();
23
+    var that = this;
24
+    
25
+    that.init();
26
+
27
+    that.setData({
28
+      Containnerheight: main.getWindowHeight(),
29
+    });
30
+  },
31
+  init:function(){
32
+    var that=this;
33
+    var secondConfig = wx.getStorageSync("SecondConfigArray");
34
+    if (!secondConfig || (secondConfig[0]==0))
35
+      secondConfig = [10, 30, 50];
36
+    for (var j = 0; j < 3; j++) {
37
+      var arr = [];
38
+      for (var i = 3; i <= 90; i++) {
39
+        arr.push(i);
40
+      }
41
+      that.data.SecondConfig[j].Value = secondConfig[j];
42
+      that.data.SecondConfig[j].NumberArray = arr;
43
+    }
44
+
45
+    that.setData({
46
+      SecondConfig: that.data.SecondConfig,
47
+    });
48
+    wx.setStorageSync("SecondConfigArray", secondConfig);
49
+  },
50
+  bindRecommendTime: function (e) {
51
+    var that = this;
52
+    var index = e.currentTarget.dataset.index;
53
+    this.data.SecondConfig[index].Value = Number(e.detail.value) + 3;
54
+    if (this.data.SecondConfig[0].Value >= this.data.SecondConfig[1].Value) {
55
+      wx.showToast({
56
+        title: '绿需大于蓝',
57
+      });
58
+    }
59
+    else if (this.data.SecondConfig[1].Value >= this.data.SecondConfig[2].Value) {
60
+      wx.showToast({
61
+        title: '黄需大于绿',
62
+      });
63
+    }
64
+    else {
65
+      this.setData({
66
+        SecondConfig: this.data.SecondConfig,
67
+      });
68
+      var arr = [this.data.SecondConfig[0].Value, this.data.SecondConfig[1].Value, this.data.SecondConfig[2].Value];
69
+      wx.setStorageSync("SecondConfigArray", arr);
70
+    }
71
+  },
72
+  switch1Change(e) {
73
+    var that = this;
74
+    that.data.IsChangeRecommend = e.detail.value;
75
+    
76
+    that.setData({
77
+      IsChangeRecommend: that.data.IsChangeRecommend,
78
+    });
79
+    if (that.data.IsChangeRecommend)
80
+      that.init();
81
+    else
82
+      wx.setStorageSync("SecondConfigArray", [0,0,0]);
83
+  },
84
+  onShareAppMessage: function () {
85
+    return {
86
+      title: app.globalData.ShareTitle,
87
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
88
+      imageUrl: app.globalData.ShareImage,
89
+    }
90
+  },
91
+})

+ 4 - 0
pages/main/recommend.json

@@ -0,0 +1,4 @@
1
+{
2
+  "navigationBarTitleText": "选择建议",
3
+  "backgroundColor": "#F0F0F0"
4
+}

文件差异内容过多而无法显示
+ 45 - 0
pages/main/recommend.wxml


+ 82 - 0
pages/main/recommend.wxss

@@ -0,0 +1,82 @@
1
+.container {
2
+  background-color: #f0f0f0;
3
+  color:#1e1e1e;
4
+  font-weight: 500;
5
+  justify-content: flex-start;
6
+}
7
+
8
+.panelTitle{
9
+  width:100%;
10
+  margin-top: 50rpx;
11
+  justify-content: flex-start;
12
+}
13
+
14
+.panelTitle0{
15
+  margin-top: 40rpx;
16
+}
17
+
18
+.panelTitle .panelTitle1{
19
+  font-size:32rpx;
20
+  margin-left: 30rpx;
21
+  margin-bottom: 30rpx;
22
+}
23
+
24
+.panelItem{
25
+  width:100%;
26
+  justify-content: space-between;
27
+  font-size:28rpx;
28
+  min-height:100rpx;
29
+  background-color: #fff;
30
+}
31
+
32
+.panelItem0{
33
+  width:690rpx;
34
+  height:100rpx;
35
+  color:#fff;
36
+  border-radius: 10rpx;
37
+  margin-bottom: 30rpx;
38
+  border:1rpx solid #9B9B9B;
39
+}
40
+
41
+.panelItemSelected{
42
+  border:5rpx solid #fff;
43
+  box-shadow:0 0 0 3px #0071EF;
44
+}
45
+
46
+.panelItem01{
47
+  width:100%;
48
+  line-height: 100rpx;
49
+  padding-left: 30rpx;
50
+  font-weight: 400;
51
+  border-radius: 10rpx;
52
+}
53
+
54
+.panelItem .panelItem1{
55
+  margin-left: 30rpx;
56
+  font-weight: 400;
57
+}
58
+
59
+.panelItem2{
60
+  width:690rpx;
61
+  font-weight: 400;
62
+  font-size:24rpx;
63
+}
64
+
65
+.help_picture_chooseadvice{
66
+  width:688rpx;
67
+  height:265rpx;
68
+  margin: 40rpx 0;
69
+}
70
+
71
+.panelItem .panelItem3{
72
+  margin-right: 25rpx;
73
+  justify-content: flex-end;
74
+  color:#787878;
75
+}
76
+
77
+
78
+.Arrow{
79
+  width:16rpx;
80
+  height:26rpx;
81
+  margin-left: 30rpx;
82
+}

+ 18 - 9
pages/main/searchWeb.wxml

@@ -15,18 +15,27 @@
15 15
     <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
16 16
       <view class="lineWidth720"></view>
17 17
     </view>
18
-    <view class="panelItemSearch FlexColumn"  bindtap='onSearchHistory' bindlongpress='deleteItem' data-index="{{index}}">
19
-      <view class="panelItemSearch1 FlexRow">
20
-        <view class="panelItemSearch11">
21
-          {{item.Author}} {{item.Key}}
18
+    <view class="panelItemSearch FlexColumn" bindtap='onSearchHistory' data-index="{{index}}" data-type="many">
19
+        <view class="panelItemSearch1 FlexRow">
20
+          <view class="panelItemSearch11">
21
+            {{item.Key}}
22
+          </view>
23
+          <view class="panelItemSearch12 FlexRow" wx:if="{{item.Type=='shici' || item.Type=='eng'}}">
24
+            {{item.TypeName}}
25
+          </view>
22 26
         </view>
23
-        <view class="panelItemSearch12 FlexRow" wx:if="{{item.Type=='shici' || item.Type=='eng'}}">
24
-          {{item.TypeName}}
27
+        <view class="panelItemSearch2 FlexRow" wx:if="{{item.Type=='zici' || item.Type=='eng'}}">
28
+          {{item.Remark}}
29
+        </view>
30
+        <view class="panelItemSearch2 FlexRow" wx:if="{{item.Type=='shici'}}">
31
+          {{item.Author}} {{item.Dynasty}}
32
+        </view>
33
+        <view class="panelItemSearch3 FlexRow">
34
+          {{item.Content}}
25 35
         </view>
26 36
       </view>
27
-    </view>
28
-    <view class='lineFooter'></view>
37
+    
29 38
   </block>
30
-  
39
+  <view class='lineFooter'></view>
31 40
   <view style='height:100rpx;'></view>
32 41
 </view>

+ 24 - 7
pages/main/searchWeb1.js

@@ -6,19 +6,19 @@ const app = getApp();
6 6
 Page({
7 7
   data: {
8 8
     ListOther: [{
9
-      Key: '愛', Type: 'zici', TypeName: '字词'
9
+      Key: '愛', Type: 'zici', TypeName: '字词', Remark: 'ài', Content:'对人或事物有很深的感情'
10 10
     }, {
11
-      Key: '饕餮', Type: 'zici', TypeName: '字词'
11
+        Key: '饕餮', Type: 'zici', TypeName: '字词', Remark: 'tāo tiè', Content: '传说中的一种凶恶贪食的野兽'
12 12
     }, {
13
-      Key: '鸿鹄之志', Type: 'zici', TypeName: '字词'
13
+        Key: '鸿鹄之志', Type: 'zici', TypeName: '字词', Remark: 'hóng hú zhī zhì', Content:'比喻远大的志向'
14 14
     }, {
15
-      Key: '咏鹅', Type: 'shici', Author: '骆宾王', Dynasty: '唐', TypeName: '诗词'
15
+        Key: '咏鹅', Type: 'shici', Author: '骆宾王', Dynasty: '唐', TypeName: '诗词', Content: '鹅鹅鹅,曲项向天歌。白毛浮绿水,红掌拨清波。'
16 16
     }, {
17
-      Key: '天净沙·秋思', Type: 'shici', Author: '马致远', Dynasty: '元', TypeName: '诗词'
17
+        Key: '天净沙·秋思', Type: 'shici', Author: '马致远', Dynasty: '元', TypeName: '诗词', Content: '枯藤老树昏鸦,小桥流水人家,古道西风瘦马......'
18 18
     }, {
19
-      Key: 'success', Type: 'zici', TypeName: '字词'
19
+        Key: 'success', Type: 'eng', TypeName: '翻译', Remark:'[səkˈses]', Content: 'n.成功,成就'
20 20
     },{
21
-        Key: 'Study hard and make progress every day.', Type: 'eng', TypeName: '翻译'
21
+        Key: 'Nice to meet you', Type: 'eng', TypeName: '翻译', Content: '很高兴见到你!'
22 22
     },
23 23
     ]
24 24
   },
@@ -171,10 +171,27 @@ Page({
171 171
           }
172 172
           else if (data.CHN){
173 173
             obj.Type = "zici";
174
+            if (data.CHN.PinYin && data.CHN.PinYin[0] && data.CHN.PinYin[0].pinyin)
175
+              obj.Remark = data.CHN.PinYin[0].pinyin;
176
+            if (data.CHN.PinYin && data.CHN.PinYin[0] && data.CHN.PinYin[0].explain){
177
+              obj.Content = data.CHN.PinYin[0].explain.substr(0, 26);
178
+              obj.Content = obj.Content.replace("<p>", "");
179
+              obj.Content = obj.Content.replace("</p>", "");
180
+              if (obj.Content.length>=26)
181
+                obj.Content += "..."
182
+            }
174 183
           }
175 184
           if (data.ENG && !data.CHN) {
176 185
             obj.Type = "eng";
177 186
             obj.TypeName ="翻译";
187
+            if (data.ENG.Soundmark && data.ENG.Soundmark.Eng)
188
+              obj.Remark = data.ENG.Soundmark.Eng;
189
+            if (data.ENG.Paraphrase.length>0){
190
+              if (common.checkIsArray(data.ENG.Paraphrase) && data.ENG.Paraphrase[0].ParaphraseList)
191
+                obj.Content = data.ENG.Paraphrase[0].ParaphraseList.join("; ").substr(0, 26);
192
+              else
193
+                obj.Content = data.ENG.Paraphrase.substr(0, 26)+"...";
194
+            }
178 195
           }
179 196
           
180 197
           main.updateSearchList(obj);

+ 22 - 4
pages/main/setting.js

@@ -13,6 +13,7 @@ Page({
13 13
     IsShowChange: false,
14 14
     ProgramName: app.globalData.ProgramName,
15 15
     Version:app.globalData.Version,
16
+    RecommendName:"启用",
16 17
   },
17 18
   onLoad: function () {
18 19
     wx.hideShareMenu();
@@ -53,6 +54,18 @@ Page({
53 54
         }
54 55
       }
55 56
     });
57
+    var secondConfig = wx.getStorageSync("SecondConfigArray");
58
+    if (!secondConfig || (secondConfig[0] > 0)){
59
+      that.setData({
60
+        RecommendName: "启用",
61
+      });
62
+    }
63
+    else{
64
+      that.setData({
65
+        RecommendName: "禁用",
66
+      });
67
+    }
68
+
56 69
     if (app.globalData.userInfo.UserID == 1 || app.globalData.userInfo.UserID == 2) {
57 70
       that.setData({
58 71
         IsShowChange: true,
@@ -60,14 +73,14 @@ Page({
60 73
     }
61 74
   },
62 75
   onShow: function () {
63
-    var colorIndex = wx.getStorageSync("ColorIndex");
64
-    if (!colorIndex) {
76
+    var colorIndex = wx.getStorageSync("ColorIndexArr");
77
+    if (!colorIndex || colorIndex.length>1) {
65 78
       this.setData({
66
-        ColorName: "每次更换配色",
79
+        ColorName: "多色变换",
67 80
       });
68 81
     }
69 82
     else {
70
-      var color = main.getDetailColor(colorIndex);
83
+      var color = main.getDetailColor(colorIndex[0]);
71 84
       this.setData({
72 85
         ColorName: color.Name,
73 86
       });
@@ -161,6 +174,11 @@ Page({
161 174
       }
162 175
     }
163 176
   },
177
+  setRecommend:function(){
178
+    wx.navigateTo({
179
+      url: './recommend',
180
+    })
181
+  },
164 182
   onShareAppMessage: function () {
165 183
     return {
166 184
       title: app.globalData.ShareTitle,

+ 12 - 0
pages/main/setting.wxml

@@ -59,6 +59,18 @@
59 59
       <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
60 60
     </view>
61 61
   </view>
62
+  <view class="lineWidthAll FlexRow">
63
+    <view class="lineWidth720"></view>
64
+  </view>
65
+  <view class="panelItem FlexRow" bindtap='setRecommend'>
66
+    <view class="panelItem1">选择建议</view>
67
+    <view class="panelItem2 FlexRow">
68
+      <view class="picker">
69
+        {{RecommendName}}
70
+      </view>
71
+      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
72
+    </view>
73
+  </view>
62 74
   <view class='lineFooter'></view>
63 75
   <view class="panelTitle FlexRow">
64 76
     <view class="panelTitle1">辅助</view>

+ 3 - 3
project.config.json

@@ -57,9 +57,9 @@
57 57
 					"scene": null
58 58
 				},
59 59
 				{
60
-					"id": -1,
61
-					"name": "记忆评价",
62
-					"pathName": "pages/main/memoryLevel",
60
+					"id": 2,
61
+					"name": "选择建议",
62
+					"pathName": "pages/main/recommend",
63 63
 					"query": "",
64 64
 					"scene": null
65 65
 				}

+ 4 - 4
utils/main.js

@@ -656,16 +656,16 @@ function checkIsIPhoneX() {
656 656
 function getMemoryLevelAll() {
657 657
   return [
658 658
     {
659
-      Key: "长文",
659
+      Key: "长文",
660 660
       Value: ["答错重来", "困难犹豫", "短暂思考", "脱口而出"]
661 661
     }, {
662
-      Key: "短文",
662
+      Key: "短文",
663 663
       Value: ["答错", "生疏", "一般", "流利"]
664 664
     }, {
665
-      Key: "特色",
665
+      Key: "特色",
666 666
       Value: ["不过", "难过", "通过", "秒过"]
667 667
     }, {
668
-      Key: "记忆间隔版",
668
+      Key: "再现间隔",
669 669
       Value: ["<10分钟", "2天", "4天", "8天"]
670 670
     },
671 671
   ];