chengjie пре 3 месеци
родитељ
комит
a6c8cc15fc
48 измењених фајлова са 519 додато и 71 уклоњено
  1. BIN
      .DS_Store
  2. 1 1
      app.js
  3. 17 1
      app.json
  4. 0 4
      app.wxss
  5. BIN
      packageProduct/.DS_Store
  6. BIN
      packageProduct/images/.DS_Store
  7. 0 0
      packageProduct/images/icon_add_01.png
  8. 0 0
      packageProduct/images/icon_check_01.png
  9. BIN
      packageProduct/images/pdt_a01.png
  10. BIN
      packageProduct/images/pdt_a02.png
  11. BIN
      packageProduct/images/pdt_a03.png
  12. BIN
      packageProduct/images/pdt_a04.png
  13. BIN
      packageProduct/images/pdt_a05.png
  14. BIN
      packageProduct/images/pdt_a07.png
  15. BIN
      packageProduct/images/pdt_b01.png
  16. BIN
      packageProduct/images/pdt_b02.png
  17. BIN
      packageProduct/images/pdt_b03.gif
  18. BIN
      packageProduct/images/pdt_b04.png
  19. BIN
      packageProduct/images/pdt_b05.png
  20. BIN
      packageProduct/images/pdt_b06.png
  21. BIN
      packageProduct/images/pdt_b07.gif
  22. BIN
      packageProduct/images/pdt_b08.png
  23. BIN
      packageProduct/images/pdt_b09.png
  24. 14 1
      pages/main/feedbackinfo.js
  25. 0 0
      packageProduct/main/feedbackinfo.json
  26. 0 0
      packageProduct/main/feedbackinfo.wxml
  27. 0 0
      packageProduct/main/feedbackinfo.wxss
  28. 76 0
      packageProduct/main/product.js
  29. 4 0
      packageProduct/main/product.json
  30. 117 0
      packageProduct/main/product.wxml
  31. 182 0
      packageProduct/main/product.wxss
  32. BIN
      pages/.DS_Store
  33. BIN
      pages/images/.DS_Store
  34. BIN
      pages/images/sysIcon_a43.png
  35. BIN
      pages/images/sysIcon_b20.png
  36. BIN
      pages/main/.DS_Store
  37. 1 1
      pages/main/article.wxml
  38. 1 1
      pages/main/article.wxss
  39. 1 1
      pages/main/articlecategory.js
  40. 3 3
      pages/main/articlecategory.wxml
  41. 24 9
      pages/main/articlecategory.wxss
  42. 2 2
      pages/main/articlefine.js
  43. 20 12
      pages/main/articlefine.wxml
  44. 48 13
      pages/main/articlefine.wxss
  45. 1 1
      pages/main/index.js
  46. 4 5
      pages/main/index.wxml
  47. 2 2
      project.private.config.json
  48. 1 14
      utils/constant.js

+ 1 - 1
app.js

@@ -1,6 +1,6 @@
1 1
 App({
2 2
   globalData: {
3
-    Version: "1.1.5",
3
+    Version: "1.1.6",
4 4
     //IsProduction: true,
5 5
     ShareTitle: "阅读理解+答题",
6 6
     SharePath: "pages/index/index",

+ 17 - 1
app.json

@@ -11,7 +11,6 @@
11 11
     "pages/main/paste",
12 12
     "pages/main/ocr",
13 13
     "pages/main/selectword",
14
-    "pages/main/feedbackinfo",
15 14
     "pages/main/articlefine",
16 15
     "pages/main/articlecategory",
17 16
     "pages/main/wordsinput"
@@ -23,6 +22,23 @@
23 22
     "navigationBarTitleText": "语境背单词",
24 23
     "navigationBarTextStyle": "white"
25 24
   },
25
+  "subPackages": [
26
+    {
27
+      "root": "packageProduct",
28
+      "pages": [
29
+        "main/product",
30
+        "main/feedbackinfo"
31
+      ]
32
+    }
33
+  ],
34
+  "preloadRule": {
35
+    "packageProduct/main/product": {
36
+      "network": "all",
37
+      "packages": [
38
+        "packageProduct"
39
+      ]
40
+    }
41
+  },
26 42
   "sitemapLocation": "sitemap.json",
27 43
   "permission": {
28 44
     "scope.writePhotosAlbum": {

+ 0 - 4
app.wxss

@@ -4,7 +4,6 @@
4 4
   color: transparent;
5 5
   display: none;
6 6
 }
7
-
8 7
 .FlexColumn {
9 8
   display: flex;
10 9
   flex-direction: column;
@@ -18,7 +17,6 @@
18 17
   align-items: center;
19 18
   justify-content: center;
20 19
 }
21
-
22 20
 .container {
23 21
   width:100%;
24 22
   color: #fff;
@@ -26,8 +24,6 @@
26 24
   font-weight: 700;
27 25
   background-color: #004433;
28 26
 } 
29
-
30
-
31 27
 .panelRemindParent{
32 28
   background-color: rgba(26,67,51,0.10);
33 29
   z-index: 20;

BIN
packageProduct/.DS_Store


BIN
packageProduct/images/.DS_Store


pages/images/icon_add_01.png → packageProduct/images/icon_add_01.png


pages/images/icon_check_01.png → packageProduct/images/icon_check_01.png


BIN
packageProduct/images/pdt_a01.png


BIN
packageProduct/images/pdt_a02.png


BIN
packageProduct/images/pdt_a03.png


BIN
packageProduct/images/pdt_a04.png


BIN
packageProduct/images/pdt_a05.png


BIN
packageProduct/images/pdt_a07.png


BIN
packageProduct/images/pdt_b01.png


BIN
packageProduct/images/pdt_b02.png


BIN
packageProduct/images/pdt_b03.gif


BIN
packageProduct/images/pdt_b04.png


BIN
packageProduct/images/pdt_b05.png


BIN
packageProduct/images/pdt_b06.png


BIN
packageProduct/images/pdt_b07.gif


BIN
packageProduct/images/pdt_b08.png


BIN
packageProduct/images/pdt_b09.png


+ 14 - 1
pages/main/feedbackinfo.js

@@ -6,7 +6,20 @@ const app = getApp();
6 6
 
7 7
 Page({
8 8
   data: {
9
-    Feedback:constant.arrFeedback,
9
+    Feedback:[
10
+      {
11
+        Name: "纠错",
12
+        CSS: "Selected"
13
+      },
14
+      {
15
+        Name: "提供内容",
16
+        CSS: ""
17
+      },
18
+      {
19
+        Name: "产品建议",
20
+        CSS: ""
21
+      },
22
+    ],
10 23
     ImageArr:[],
11 24
     ImagePath: app.globalData.uploadImageUrl,
12 25
   },

pages/main/feedbackinfo.json → packageProduct/main/feedbackinfo.json


pages/main/feedbackinfo.wxml → packageProduct/main/feedbackinfo.wxml


pages/main/feedbackinfo.wxss → packageProduct/main/feedbackinfo.wxss


+ 76 - 0
packageProduct/main/product.js

@@ -0,0 +1,76 @@
1
+import common from '../../utils/util';
2
+import main from '../../utils/main';
3
+
4
+const app = getApp();
5
+
6
+Page({
7
+  data: {
8
+    IsIPhoneX:app.globalData.IsIPhoneX,
9
+    ProgramName:app.globalData.ProgramName,
10
+    Version:app.globalData.Version,
11
+  },
12
+  onLoad: function (options) {
13
+    let that = this;
14
+    that.setData({
15
+      Containnerheight: main.getWindowHeight(),
16
+    });
17
+  },
18
+  onReady:function(){
19
+    let that = this;
20
+    main.getData('GetProgramList', function (data) {
21
+      if (data) {
22
+        for(let i=0;i<data.length;i++){
23
+          if (data[i].ID==app.globalData.ProgramID){
24
+            wx.setNavigationBarColor({
25
+              frontColor: data[i].FColor,
26
+              backgroundColor: data[i].BGColor,
27
+            });
28
+            wx.setBackgroundColor({
29
+              backgroundColorTop: data[i].BGColor,
30
+              backgroundColorBottom: data[i].BGColor,
31
+            })
32
+            that.setData({
33
+              BGColor:data[i].BGColor,
34
+              FColor:data[i].FColor,
35
+              ProgramList:data,
36
+            });
37
+            break;
38
+          }
39
+        }
40
+      }
41
+    });
42
+  },
43
+  goto: function (e) {
44
+    let that=this;
45
+    var url=e.currentTarget.dataset.url;
46
+    wx.navigateTo({
47
+      url: url,
48
+    });
49
+  },
50
+  gotoRedirectTo: function (e) {
51
+    let that=this;
52
+    var url=e.currentTarget.dataset.url;
53
+    wx.redirectTo({
54
+      url: url,
55
+    });
56
+  },
57
+  switchProgram:function(e) {
58
+    var list = this.data.ProgramList;
59
+    for(let i=0;i<list.length;i++){
60
+      if (list[i].ID==e.currentTarget.dataset.id){
61
+        wx.navigateToMiniProgram({
62
+          appId: list[i].AppID,
63
+          path: list[i].PathUrl+"?SourceID="+app.globalData.ProgramID,
64
+        });
65
+        break;
66
+      }
67
+    }
68
+  },
69
+  onShareAppMessage: function () {
70
+    return {
71
+      title: app.globalData.ShareTitle,
72
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
73
+      imageUrl: app.globalData.ShareImage,
74
+    }
75
+  },
76
+})

+ 4 - 0
packageProduct/main/product.json

@@ -0,0 +1,4 @@
1
+{
2
+  "navigationBarTitleText": "秒过系列产品",
3
+  "usingComponents": {}
4
+}

+ 117 - 0
packageProduct/main/product.wxml

@@ -0,0 +1,117 @@
1
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
2
+  <view class="panel1 FlexColumn" style="background-color: {{BGColor}};color:{{FColor}}">
3
+    <text class="panel1Text" style="color:{{FColor}};">除了{{ProgramName}},「秒过」团队还为您准备了以下学习工具。点开就能用。</text>
4
+    <view class="pdt_a06a_triangle" style="border-top-color:{{BGColor}};"></view>
5
+  </view>
6
+  <view style="height: 130rpx;"></view>
7
+
8
+  <view class="panel2 FlexColumn">
9
+    <view class="panel21 FlexRow">
10
+      <image src="../images/pdt_a01.png" class="pdt_a01"></image>
11
+    </view>
12
+    <view class="panel22 FlexRow">
13
+      <view class="panel221 FlexColumn" bind:tap="switchProgram" data-id="105">
14
+        <image src="../images/pdt_b01.png" class="pdt_b01"></image>
15
+        <view class="panel2Text1">数学计算题</view>
16
+        <view class="panel2Text2">计算题(竖式)出题工具。包含小学阶段全部题型,适合打印卷子做笔算、批改。</view>
17
+      </view>
18
+      <view class="panel221 FlexColumn" bind:tap="switchProgram" data-id="164">
19
+        <image src="../images/pdt_b02.png" class="pdt_b01"></image>
20
+        <view class="panel2Text1">口算星球</view>
21
+        <view class="panel2Text2">口算心算训练,包含小学全部口算题型,系统性提升效率、准确性和解题思维。</view>
22
+      </view>
23
+    </view>
24
+
25
+    <view class="panel21 FlexRow">
26
+      <image src="../images/pdt_a02.png" class="pdt_a01"></image>
27
+    </view>
28
+    <view class="panel22 FlexRow">
29
+      <view class="panel221 FlexColumn" bind:tap="switchProgram" data-id="186">
30
+        <image src="../images/pdt_b03.gif" class="pdt_b01"></image>
31
+        <view class="panel2Text1">语境背单词</view>
32
+        <view class="panel2Text3">单词三剑客之一</view>
33
+        <view class="panel2Text2">在真实语境中理解单词含义和用法,用答题巩固记忆,破解记不牢、不会用难题。</view>
34
+      </view>
35
+      <view class="panel221 FlexColumn" bind:tap="switchProgram" data-id="99">
36
+        <image src="../images/pdt_b02.png" class="pdt_b01"></image>
37
+        <view class="panel2Text1">自然拼读</view>
38
+        <view class="panel2Text3">单词三剑客之二</view>
39
+        <view class="panel2Text2">帮助孩子掌握英语单词发音规则,实现看词能读、听音能写的目标。</view>
40
+      </view>
41
+    </view>
42
+    
43
+    <view class="panel21 FlexRow">
44
+      <image src="../images/pdt_a03.png" class="pdt_a01"></image>
45
+    </view>
46
+    <view class="panel22 FlexRow">
47
+      <view class="panel221 FlexColumn" bind:tap="switchProgram" data-id="98">
48
+        <image src="../images/pdt_b04.png" class="pdt_b01"></image>
49
+        <view class="panel2Text1">秒过拼音</view>
50
+        <view class="panel2Text2">拼音音节认读、声母韵母组合练习、前后鼻音平翘舌音对比练习、诗歌朗读示范。</view>
51
+      </view>
52
+      <view class="panel221 FlexColumn" bind:tap="switchProgram" data-id="106">
53
+        <image src="../images/pdt_b05.png" class="pdt_b01"></image>
54
+        <view class="panel2Text1">秒过识字</view>
55
+        <view class="panel2Text2">一类字认读和默写工具(小学一到六年级课本同步),含笔顺、解释、发音点读。</view>
56
+      </view>
57
+    </view>
58
+
59
+    <view class="panel21 FlexRow">
60
+      <image src="../images/pdt_a04.png" class="pdt_a01 pdt_a04"></image>
61
+    </view>
62
+    <view class="panel22 FlexRow">
63
+      <view class="panel221 panel222 FlexColumn" bind:tap="switchProgram" data-id="166">
64
+        <image src="../images/pdt_b07.gif" class="pdt_b07"></image>
65
+        <view class="panel2Text1">秒过-错题记忆卡</view>
66
+        <view class="panel2Text3">单词三剑客之三</view>
67
+        <view class="panel2Text2 panel2Text5">基于艾宾浩斯记忆法,管理、练习孩子的所有背记问题。可直接解决语文字词、成语、古诗;英语词汇;数物化公式、定理;史地政等必考要点。</view>
68
+      </view>
69
+    </view>
70
+
71
+    <view class="panel21 FlexRow">
72
+      <image src="../images/pdt_a05.png" class="pdt_a01"></image>
73
+    </view>
74
+    <view class="panel22 FlexRow">
75
+      <view class="panel221 FlexColumn" bind:tap="switchProgram" data-id="173">
76
+        <image src="../images/pdt_b08.png" class="pdt_b01"></image>
77
+        <view class="panel2Text1">秒过分数线</view>
78
+        <view class="panel2Text2">上海中考招生信息查询,填写志愿的好帮手。包括招生计划、分数线,学校信息。</view>
79
+      </view>
80
+      <view class="panel221 FlexColumn" bind:tap="switchProgram" data-id="90">
81
+        <image src="../images/pdt_b09.png" class="pdt_b01"></image>
82
+        <view class="panel2Text1">秒过专注力</view>
83
+        <view class="panel2Text2">心理学常用的注意力训练工具,锻炼集中注意力,提升手眼协调控制水平。</view>
84
+      </view>
85
+    </view>
86
+  </view>
87
+
88
+  <view class="panel3 FlexColumn">
89
+    <view class="panel31 FlexRow" bind:tap="goto" data-url="feedbackinfo">
90
+      <view class="panel3Text1">纠错与建议</view>
91
+      <image src="../images/pdt_a07.png" class="pdt_a07"></image>
92
+    </view>
93
+    <view class="panel3Line"></view>
94
+    <text class="panel3Text2"><text class="panel3Text3">诚恳声明:</text>如您发现产品提供的信息存在错误,欢迎您告诉我们,我们会力所能及的范围内持续完善,感谢您的帮助和支持!</text>
95
+    <text class="panel3Text4">©2025 {{ProgramName}}\n唱意教育微信小程序 版本 {{Version}}</text>
96
+  </view>
97
+
98
+  <view style="height: 200rpx;"></view>
99
+
100
+  <view class="panelFooterNav FlexColumn">
101
+    <view class="panelFooterNav2 FlexRow">
102
+      <view class="panelFooterNavBtn FlexColumn" bind:tap="gotoRedirectTo" data-url="../../pages/main/index">
103
+        <view style="color:#4d4d4d">制作</view>
104
+        <view class="panelFooterNavLine"></view>
105
+      </view>
106
+      <view class="panelFooterNavBtn FlexColumn" bind:tap="gotoRedirectTo" data-url="../../pages/main/articlefine">
107
+        <view style="color:#4d4d4d">精选</view>
108
+        <view class="panelFooterNavLine"></view>
109
+      </view>
110
+      <view class="panelFooterNavBtn FlexColumn" >
111
+        <view>秒过</view>
112
+        <view class="panelFooterNavLine1"></view>
113
+      </view>
114
+    </view>
115
+    <view class="iphone10plus" wx:if="{{IsIPhoneX}}"></view>
116
+  </view>
117
+</view>

+ 182 - 0
packageProduct/main/product.wxss

@@ -0,0 +1,182 @@
1
+.container{
2
+  background-color: #E1D2B4;
3
+}
4
+.panel1{
5
+  width:100%;
6
+  background-color: #004433;
7
+  z-index: 10;
8
+  position: fixed;
9
+  top:0;
10
+}
11
+.panel1Text{
12
+  width:630rpx;
13
+  font-size: 28rpx;
14
+  color: #E9FFDF;
15
+  margin: 30rpx 0;
16
+}
17
+
18
+.pdt_a06a_triangle{
19
+  width: 0;
20
+  height: 0;
21
+  border-left: 45rpx solid transparent;
22
+  border-right: 85rpx solid transparent;
23
+  border-top: 50rpx solid;
24
+  position: absolute;
25
+  top:108rpx;
26
+  left:36rpx;
27
+  z-index: 10;
28
+}
29
+
30
+
31
+.panel2{
32
+  width: 100%;
33
+  justify-content: flex-start;
34
+  margin-top: 20rpx;
35
+}
36
+.panel21{
37
+  width: 100%;
38
+  justify-content: flex-start;
39
+}
40
+.pdt_a01{
41
+  width:82rpx;
42
+  height:51rpx;
43
+  margin: 60rpx 0 40rpx 50rpx;
44
+}
45
+
46
+.panel22{
47
+  width:100%;
48
+}
49
+.panel221{
50
+  width:340rpx;
51
+  margin: 0 10rpx;
52
+  justify-content: flex-start;
53
+  align-items: flex-start;
54
+  color: #464044;
55
+  position: relative;
56
+}
57
+.pdt_b01{
58
+  width:340rpx;
59
+  height:280rpx;
60
+}
61
+.panel2Text1{
62
+  font-size: 36rpx;
63
+  margin: 30rpx 0 10rpx 20rpx;
64
+}
65
+.panel2Text2{
66
+  font-weight: 400;
67
+  font-size: 24rpx;
68
+  width: 300rpx;
69
+  margin: 0 0 0 20rpx;
70
+}
71
+.panel2Text3{
72
+  width: 100rpx;
73
+  text-align: right;
74
+  font-size: 20rpx;
75
+  font-weight: 400;
76
+  position: absolute;
77
+  top: 310rpx;
78
+  right:20rpx;
79
+}
80
+.pdt_a04{
81
+  width: 156rpx;
82
+}
83
+.panel222{
84
+  width: 700rpx;
85
+}
86
+.pdt_b07{
87
+  width: 700rpx;
88
+  height:280rpx;
89
+}
90
+.panel2Text5{
91
+  width:660rpx;
92
+}
93
+
94
+.panel3{
95
+  width:100%;
96
+  margin: 100rpx 0 0 0;
97
+}
98
+
99
+.panel31{
100
+  width:100%;
101
+  justify-content: space-between;
102
+  height:100rpx
103
+}
104
+.panel3Text1{
105
+  font-size: 28rpx;
106
+  color: #4D4D4D;
107
+  margin-left: 45rpx;
108
+}
109
+.pdt_a07{
110
+  width:16rpx;
111
+  height:26rpx;
112
+  margin-right: 75rpx;
113
+}
114
+.panel3Line{
115
+  width: 660rpx;
116
+  height:1rpx;
117
+  background-color: #574E55;
118
+}
119
+
120
+.panel3Text2{
121
+  width: 660rpx;
122
+  font-size: 20rpx;
123
+  color: #4D4D4D;
124
+  margin-top: 30rpx;
125
+  font-weight: 400;
126
+}
127
+.panel3Text3{
128
+  font-weight: 700;
129
+}
130
+.panel3Text4{
131
+  width: 660rpx;
132
+  margin: 50rpx 0 0 0;
133
+  font-size: 20rpx;
134
+  color: #464044;
135
+}
136
+
137
+
138
+.panelFooterNav{
139
+  width: 100%;
140
+  background-color: #fff;
141
+  color: #004433;
142
+  position: fixed;
143
+  bottom: 0;
144
+  z-index: 10;
145
+}
146
+.panelFooterNav1{
147
+  width:100%;
148
+}
149
+.panelFooterNav2{
150
+  width:100%;
151
+  position: relative;
152
+  z-index: 50;
153
+}
154
+
155
+.pic_02{
156
+  width:100%;
157
+  height:230rpx;
158
+}
159
+
160
+.panelFooterNavBtn{
161
+  width: 50%;
162
+  font-size: 36rpx;
163
+  height: 100rpx;
164
+  justify-content: flex-end;
165
+}
166
+.panelFooterNavLine{
167
+  width: 72rpx;
168
+  height:16rpx;
169
+  margin-top: 9rpx;
170
+}
171
+.panelFooterNavLine1{
172
+  width: 72rpx;
173
+  height:16rpx;
174
+  margin-top: 9rpx;
175
+  background-color: #004433;
176
+}
177
+
178
+.iphone10plus{
179
+  width:100%;
180
+  height:30rpx;
181
+  background-color: #fff;
182
+}


BIN
pages/images/.DS_Store


BIN
pages/images/sysIcon_a43.png


BIN
pages/images/sysIcon_b20.png


BIN
pages/main/.DS_Store


+ 1 - 1
pages/main/article.wxml

@@ -119,7 +119,7 @@
119 119
   <view class="panelHelp1">
120 120
     <image src="../images/sysIcon_b07.png" class="sysIcon_b07"></image>
121 121
     <view class="panelHelp2 FlexColumn">
122
-      <text class="text07">长按翻译句子,点击翻译单词,\n点下面做题目,右下角还有PDF</text>
122
+      <text class="text07">点击译单词,双击看详细,长按译句子\n点答题做题目,右下角还有PDF</text>
123 123
       <view class="btn3 FlexColumn" catch:tap="setDataBoolean" data-name="IsShowFirstOpen2" data-savedata="2">知道了</view>
124 124
     </view>
125 125
   </view>

+ 1 - 1
pages/main/article.wxss

@@ -181,7 +181,7 @@ pages .LightColor{
181 181
   font-size: 36rpx;
182 182
   color: #2E2E2E;
183 183
   text-align: center;
184
-  width:550rpx;
184
+  width:620rpx;
185 185
 }
186 186
 .btn3{
187 187
   width:310rpx;

+ 1 - 1
pages/main/articlecategory.js

@@ -29,7 +29,7 @@ Page({
29 29
     for(let i=0;i<list.length;i++){
30 30
       if ((options.level && options.level.indexOf(list[i].LevelStr)>=0) 
31 31
       || (options.articlestyle && options.articlestyle==list[i].ArticleStyle)){
32
-        list[i].Words=list[i].Words.split(",").join("   ");
32
+        list[i].Words=list[i].Words.split(",").join(" ");
33 33
         list[i].IsShow=1;
34 34
         arr.push(list[i]);
35 35
         let b=false;

+ 3 - 3
pages/main/articlecategory.wxml

@@ -7,10 +7,10 @@
7 7
   <view class="panel2 FlexColumn"  wx:key="index" wx:for="{{List}}" wx:if="{{item.IsShow}}" bind:tap="goto" data-url="article?ID={{item.ID}}">
8 8
     <image mode="aspectFill" lazy-load="true" src="{{ImageUrl}}web/_yjbdc/{{item.ArticleImage}}" class="img"></image>
9 9
     <view class="text01">{{item.ArticleTitle}}</view>
10
-    <view class="text02">{{item.LevelStr}} {{item.ArticleStyle}}</view>
11 10
     <view class="text03">{{item.ArticleTitleCHN}}</view>
12
-    <view class="text04">单词来源:{{item.WordSource}}</view>
13
-    <view class="text05">{{item.Words}}</view>
11
+    <view class="text04">单词来自 {{item.WordSource}}</view>
12
+    <view class="text05 FlexRow"><view class="text051">{{item.Words}}</view></view>
13
+    <view class="text02">{{item.LevelStr}} {{item.ArticleStyle}}</view>
14 14
   </view>
15 15
   <view style="height:100rpx"></view>
16 16
 </view>

+ 24 - 9
pages/main/articlecategory.wxss

@@ -35,15 +35,16 @@
35 35
   margin-top: 30rpx;
36 36
   width: 690rpx;
37 37
   min-height:549rpx;
38
-  background-color: #F0EDE6;
38
+  background-color: #fff;
39 39
   border-radius: 20rpx;
40 40
   justify-content: flex-start;
41 41
   align-items: flex-start;
42
+  position: relative;
42 43
 }
43 44
 
44 45
 .img{
45 46
   width: 100%;
46
-  height:240rpx;
47
+  height:360rpx;
47 48
   border-radius: 20rpx 20rpx 0 0;
48 49
 }
49 50
 
@@ -53,24 +54,38 @@
53 54
   font-size: 36rpx;
54 55
 }
55 56
 .text02{
56
-  margin: 30rpx 0 0 30rpx;
57 57
   font-size: 24rpx;
58
-  font-weight: 400;
58
+  text-shadow: 0 3rpx 0 rgba(0,0,0,0.40);
59
+  position: absolute;
60
+  top:30rpx;
61
+  left:30rpx;
62
+  background: rgba(0,0,0,0.40);
63
+  border-radius: 25rpx;
64
+  color:#fff;
65
+  padding: 8rpx 20rpx;
59 66
 }
60 67
 .text03{
61
-  margin: 0 0 0 30rpx;
62
-  font-size: 28rpx;
68
+  margin: 10rpx 0 0 30rpx;
69
+  font-size: 36rpx;
63 70
   font-weight: 400;
64 71
 }
65 72
 .text04{
66 73
   width: 630rpx;
67
-  margin: 20rpx 0 0 30rpx;
74
+  margin: 30rpx 0 0 30rpx;
68 75
   font-size: 24rpx;
69 76
   font-weight: 400;
70 77
 }
71 78
 .text05{
72
-  width: 630rpx;
73
-  margin: 0 0 40rpx 30rpx;
79
+  width: 650rpx;
80
+  border-radius: 10rpx;
81
+  min-height: 73rpx;
82
+  margin: 10rpx 0 20rpx 20rpx;
83
+  background-color: #F0EDE6;
84
+}
85
+.text051{
86
+  width: 590rpx;
87
+  margin: 20rpx 30rpx;
74 88
   font-size: 24rpx;
75 89
   font-weight: 400;
90
+  background-color: #F0EDE6;
76 91
 }

+ 2 - 2
pages/main/articlefine.js

@@ -31,8 +31,8 @@ Page({
31 31
     let that=this;
32 32
     var url=e.currentTarget.dataset.url;
33 33
 
34
-    if (url=="index"){
35
-      wx.reLaunch({
34
+    if (url=="index" || url=="../../packageProduct/main/product"){
35
+      wx.redirectTo({
36 36
         url: url,
37 37
       });
38 38
     }

+ 20 - 12
pages/main/articlefine.wxml

@@ -5,17 +5,21 @@
5 5
         <image mode="aspectFill" src="{{ImageUrl}}web/_yjbdc/{{item.ArticleImage}}" class="img"></image>
6 6
         <view class="panel1Item1 FlexColumn">
7 7
           <view class="panel1Item11 FlexColumn">
8
-            <view class="text1">{{item.LevelStr}} {{item.ArticleStyle}}</view>
9
-            <view class="text2">{{item.ArticleTitleCHN}}</view>
10 8
             <view class="text3">{{item.ArticleTitle}}</view>
9
+            <view class="text2">{{item.ArticleTitleCHN}}</view>
11 10
           </view>
12 11
         </view>
12
+        <view class="text1">{{item.LevelStr}} {{item.ArticleStyle}}</view>
13 13
       </swiper-item>
14 14
     </swiper>
15 15
   </view>
16
-  
17
-
18
-  <view class="panelTitle">CEFR</view>
16
+  <view class="panelTitle">
17
+  单词水平
18
+  <view class="panelHelp FlexRow" bind:tap="goto" data-url="help?ID=04">
19
+    <image src="../images/sysIcon_a43.png" class="sysIcon_a43"></image>
20
+    CEFR是什么
21
+  </view>
22
+  </view>
19 23
   <view class="panel2 FlexColumn">
20 24
     <view class="panel21 FlexRow">
21 25
       <view class="panel211 FlexColumn" wx:for="{{GradeArr}}" wx:key="index" style="background-color: {{item.BColor}};" bind:tap="goto" data-url="articlecategory?title={{item.Name2}}&level={{item.Name}}">
@@ -25,26 +29,26 @@
25 29
       </view>
26 30
     </view>
27 31
   </view>
28
-  <view class="panelTitle">LATEST STORIES</view>
32
+  <view class="panelTitle">新故事</view>
29 33
   <view class="panel3 FlexColumn">
30 34
     <view class="panel3Item FlexRow" wx:for="{{ChoicenessList}}" wx:key="index" wx:if="{{index<4}}" bind:tap="goto" data-url="article?ID={{item.ID}}">
31 35
       <view class="panel3ItemLeft FlexColumn">
36
+        <view class="text11">{{item.LevelStr}} {{item.ArticleStyle}}</view>
32 37
         <view class="text6">{{item.ArticleTitle}}</view>
33
-        <view>{{item.LevelStr}} {{item.ArticleStyle}}</view>
34
-        <view  class="text7">{{item.ArticleTitleCHN}}</view>
38
+        <view class="text7">{{item.ArticleTitleCHN}}</view>
35 39
       </view>
36 40
       <image mode="aspectFill" src="{{ImageUrl}}web/_yjbdc/{{item.ArticleImage}}" class="img2"></image>
37 41
     </view>
38 42
     <view class="panel3Item panel3Item0 FlexRow" bind:tap="goto" data-url="guide">
39 43
       <view class="panel3ItemLeft FlexColumn">
40
-        <text class="text8">卡在单词输入?\n新手引导带您体验</text>
41
-        <view>New User Guide</view>
44
+        <text class="text8">「新手引导」带您完整体验一圈</text>
45
+        <view class="text81">今天就和孩子一起来创造一个单词故事怎么样?</view>
42 46
       </view>
43 47
       <image src="../images/sysIcon_b20.png" class="sysIcon_b20"></image>
44 48
     </view>
45 49
   </view>
46 50
 
47
-  <view class="panelTitle">EXPLORE BY TOPIC</view>
51
+  <view class="panelTitle">探索故事情节</view>
48 52
   <view class="panel4 FlexRow">
49 53
     <view style="width: 100%;height:20rpx"></view>
50 54
     <view class="panel4Item FlexColumn" wx:for="{{ArticleStyleArr}}" wx:key="index" bind:tap="goto" data-url="articlecategory?title={{item.Name}}&articlestyle={{item.Name}}">
@@ -56,7 +60,7 @@
56 60
     </view>
57 61
     <view style="width: 100%;height:20rpx"></view>
58 62
   </view>
59
-  <view class="panelVersion">©2025 秒过语境背单词 {{Version}}</view>
63
+  <view class="panelVersion"></view>
60 64
 
61 65
   <view class="panelFooter FlexColumn">
62 66
     <view class="panelFooter1 FlexRow">
@@ -68,6 +72,10 @@
68 72
         <view>精选</view>
69 73
         <view class="panelFooterLine1"></view>
70 74
       </view>
75
+      <view class="panelFooterBtn FlexColumn" bind:tap="goto" data-url="../../packageProduct/main/product">
76
+        <view style="color:#4d4d4d">秒过</view>
77
+        <view class="panelFooterLine"></view>
78
+      </view>
71 79
     </view>
72 80
     <view class="iphone10plus" wx:if="{{IsIPhoneX}}"></view>
73 81
   </view>

+ 48 - 13
pages/main/articlefine.wxss

@@ -35,9 +35,16 @@
35 35
   color: #FFFFFF;
36 36
   align-items: flex-start;
37 37
 }
38
-.panel1Item1 .text1{
38
+.panel1Item .text1{
39 39
   font-size: 24rpx;
40 40
   text-shadow: 0 3rpx 0 rgba(0,0,0,0.30);
41
+  position: absolute;
42
+  top:30rpx;
43
+  left:30rpx;
44
+  background: rgba(0,0,0,0.40);
45
+  border-radius: 25rpx;
46
+  color:#fff;
47
+  padding: 8rpx 20rpx;
41 48
 }
42 49
 .panel1Item1 .text2{
43 50
   font-size: 32rpx;
@@ -73,8 +80,22 @@
73 80
 .panelTitle{
74 81
   align-self: start;
75 82
   margin: 80rpx 0 0 60rpx;
76
-  
83
+  font-size:36rpx;
84
+  position: relative;
85
+}
86
+.panelHelp{
87
+  font-size: 24rpx;
88
+  color: #2E2E2E;
89
+  position: absolute;
90
+  top:12rpx;
91
+  right:-510rpx;
77 92
 }
93
+.sysIcon_a43{
94
+  width:24rpx;
95
+  height:24rpx;
96
+  margin-right: 10rpx;
97
+}
98
+
78 99
 .panel21{
79 100
   width: 100%;
80 101
   margin-top: 40rpx;
@@ -117,7 +138,7 @@
117 138
 .panel3Item{
118 139
   width: 690rpx;
119 140
   max-height: 226rpx;
120
-  background: #F0EDE6;
141
+  background: #fff;
121 142
   border-radius: 20rpx;
122 143
   margin-bottom: 20rpx;
123 144
   justify-content: space-between;
@@ -130,14 +151,22 @@
130 151
   font-weight: 400;
131 152
   justify-content: flex-start;
132 153
 }
154
+
155
+.panel3ItemLeft .text11{
156
+  font-size: 24rpx;
157
+  margin: 30rpx 0 0 0;
158
+  color: #2e2e2e;
159
+}
133 160
 .panel3ItemLeft .text6{
134 161
   font-size: 32rpx;
135 162
   width: 420rpx;
136
-  height:90rpx;
137
-  margin: 30rpx 0 10rpx 0;
163
+  margin: 10rpx 0 10rpx 0;
164
+  color: #4d4d4d;
165
+  font-weight: 700;
138 166
 }
139 167
 .panel3ItemLeft .text7{
140 168
   margin:0 0 30rpx 0;
169
+  color: #2e2e2e;
141 170
 }
142 171
 
143 172
 .img2{
@@ -148,19 +177,27 @@
148 177
 }
149 178
 
150 179
 .panel3Item0{
151
-  height:200rpx;
152
-  background-color: #fff;
180
+  height:143rpx;
181
+  background-color: #F0EDE6;
153 182
 }
154 183
 
155 184
 .panel3ItemLeft .text8{
156
-  margin:62rpx 0 5rpx 0;
185
+  margin:30rpx 0 0 0;
157 186
   font-size: 28rpx;
158 187
   font-weight: 700;
188
+  color: #4D4D4D;
189
+}
190
+
191
+.panel3ItemLeft .text81{
192
+  margin:10rpx 0 30rpx 0;
193
+  font-size: 24rpx;
194
+  font-weight: 400;
195
+  color: #2e2e2e;
159 196
 }
160 197
 
161 198
 .sysIcon_b20{
162
-  width: 270rpx;
163
-  height:200rpx;
199
+  width: 130rpx;
200
+  height:143rpx;
164 201
   border-radius: 0 20rpx 20rpx 0;
165 202
 }
166 203
 
@@ -202,9 +239,7 @@
202 239
 }
203 240
 
204 241
 .panelVersion{
205
-  margin: 0 0 200rpx 0;
206
-  font-size: 20rpx;
207
-  color: #544641;
242
+  height: 200rpx;
208 243
 }
209 244
 
210 245
 .panelFooter{

+ 1 - 1
pages/main/index.js

@@ -73,7 +73,7 @@ Page({
73 73
         return ;
74 74
       }
75 75
     }
76
-    if (url=="articlefine"){
76
+    if (url=="articlefine" || url=="../../packageProduct/main/product"){
77 77
       wx.redirectTo({
78 78
         url: url,
79 79
       });

+ 4 - 5
pages/main/index.wxml

@@ -25,11 +25,6 @@
25 25
         <image src="../images/sysIcon_a01.png" class="sysIcon_a01"></image>
26 26
         <view>如何提升AI生成内容的质量</view>
27 27
       </view>
28
-      <view class="panelLine"></view>
29
-      <view class="panel31 FlexRow" bind:tap="goto" data-url="feedbackinfo">
30
-        <view class="text04">纠错与建议</view>
31
-        <image src="../images/sysIcon_a02.png" class="sysIcon_a02"></image>
32
-      </view>
33 28
     </view>
34 29
   </view>
35 30
   
@@ -46,6 +41,10 @@
46 41
         <view style="color:#4d4d4d">精选</view>
47 42
         <view class="panelFooterLine"></view>
48 43
       </view>
44
+      <view class="panelFooterBtn FlexColumn" bind:tap="goto" data-url="../../packageProduct/main/product">
45
+        <view style="color:#4d4d4d">秒过</view>
46
+        <view class="panelFooterLine"></view>
47
+      </view>
49 48
     </view>
50 49
     <view class="iphone10plus" wx:if="{{IsIPhoneX}}"></view>
51 50
   </view>

+ 2 - 2
project.private.config.json

@@ -23,8 +23,8 @@
23 23
     "miniprogram": {
24 24
       "list": [
25 25
         {
26
-          "name": "pages/index/test",
27
-          "pathName": "pages/index/test",
26
+          "name": "pages/main/product",
27
+          "pathName": "pages/main/product",
28 28
           "query": "",
29 29
           "scene": null,
30 30
           "launchMode": "default"

+ 1 - 14
utils/constant.js

@@ -1,16 +1,3 @@
1 1
 module.exports = {
2
-  arrFeedback: [
3
-    {
4
-      Name: "纠错",
5
-      CSS: "Selected"
6
-    },
7
-    {
8
-      Name: "提供内容",
9
-      CSS: ""
10
-    },
11
-    {
12
-      Name: "产品建议",
13
-      CSS: ""
14
-    },
15
-  ],
2
+  
16 3
 }