chengjie 6 年之前
父節點
當前提交
b179d1870d
共有 5 個文件被更改,包括 81 次插入22 次删除
  1. 1 1
      app.js
  2. 6 1
      pages/main/default.js
  3. 17 1
      pages/main/searchWeb2.js
  4. 44 19
      pages/main/searchWeb2.wxml
  5. 13 0
      pages/main/searchWeb2.wxss

+ 1 - 1
app.js

@@ -26,7 +26,7 @@ App({
26
     }
26
     }
27
   },
27
   },
28
   globalData: {
28
   globalData: {
29
-    Version: "1.4.5",
29
+    Version: "1.4.7",
30
     IsProduction: true,
30
     IsProduction: true,
31
     ShareTitle: "高效学习从秒过开始",
31
     ShareTitle: "高效学习从秒过开始",
32
     SharePath: "pages/index/index",
32
     SharePath: "pages/index/index",

+ 6 - 1
pages/main/default.js

@@ -39,7 +39,7 @@ Page({
39
   },
39
   },
40
   onShow: function () {
40
   onShow: function () {
41
     var that = this;
41
     var that = this;
42
-    if (!app.globalData.userInfo.IsMember && app.globalData.userInfo.IsShow == 1) {
42
+    if (app.globalData.userInfo.IsNewUser==1 && app.globalData.userInfo.IsShow == 1) {
43
       if (app.globalData.userInfo.Subscribe == 0) {
43
       if (app.globalData.userInfo.Subscribe == 0) {
44
         wx.redirectTo({
44
         wx.redirectTo({
45
           url: '../other/newuser',
45
           url: '../other/newuser',
@@ -57,6 +57,11 @@ Page({
57
                 });
57
                 });
58
                 app.globalData.GotoUrl = "";
58
                 app.globalData.GotoUrl = "";
59
               }
59
               }
60
+              else{
61
+                wx.redirectTo({
62
+                  url: '../other/newuser',
63
+                });
64
+              }
60
             }
65
             }
61
             else if (app.globalData.userInfo.IsMember && app.globalData.userInfo.IsShow == 1) {
66
             else if (app.globalData.userInfo.IsMember && app.globalData.userInfo.IsShow == 1) {
62
               var productServiceTime = common.formatDateCHS(common.formatTime(new Date(app.globalData.userInfo.ProductServiceTime)));
67
               var productServiceTime = common.formatDateCHS(common.formatTime(new Date(app.globalData.userInfo.ProductServiceTime)));

+ 17 - 1
pages/main/searchWeb2.js

@@ -7,7 +7,8 @@ var hasStart = {};
7
 Page({
7
 Page({
8
   data: {
8
   data: {
9
     IsShowHelp: 1,
9
     IsShowHelp: 1,
10
-    ShowKaiti:0,
10
+    IsPoemRead: 0,
11
+    ShowKaiti: 0,
11
     CSS: {},
12
     CSS: {},
12
   },
13
   },
13
   onLoad: function (options) {
14
   onLoad: function (options) {
@@ -165,6 +166,15 @@ Page({
165
                   else
166
                   else
166
                     str = item.Content;
167
                     str = item.Content;
167
                 }
168
                 }
169
+
170
+                if (item.Tag == "诗词" && this.data.IsPoemRead==1){
171
+                  var arr=str.split("\n");
172
+                  var arr2=[];
173
+                  for(var j=0;j<arr.length;j++){
174
+                    arr2.push("[读]" +arr[j]+ "[/读]");
175
+                  }
176
+                  str=arr2.join("\n");
177
+                }
168
               }
178
               }
169
               else
179
               else
170
                 str = item.Content;
180
                 str = item.Content;
@@ -210,6 +220,12 @@ Page({
210
     });
220
     });
211
 
221
 
212
   },
222
   },
223
+  changeRead: function (e) {
224
+    var id = e.currentTarget.dataset.id;
225
+    this.setData({
226
+      IsPoemRead: id,
227
+    });
228
+  },
213
   openHelp: function () {
229
   openHelp: function () {
214
     this.setData({
230
     this.setData({
215
       IsShowHelp: 0,
231
       IsShowHelp: 0,

+ 44 - 19
pages/main/searchWeb2.wxml

@@ -23,8 +23,12 @@
23
       <view class="panelTitle1">拼音</view>
23
       <view class="panelTitle1">拼音</view>
24
     </view>
24
     </view>
25
     <view class="panelItem FlexRow">
25
     <view class="panelItem FlexRow">
26
-      <view class="{{CSS['CHN_PinYin_'+index+'_pinyin'].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.PinYin}}" wx:key="pinyin" bindtap='getInputData' data-type="sound" data-content="{{item.pinyin}}" data-css="CHN_PinYin_{{index}}_pinyin" data-soundmark="{{Result.CHN.PinyinTone}}" data-tag="拼音">
26
+      <view class="{{CSS['CHN_PinYin_'+index+'_pinyin'].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.PinYin}}" wx:key="pinyin" bindtap='getInputData' data-type="sound" data-content="{{item.pinyin}}" data-css="CHN_PinYin_{{index}}_pinyin" data-soundmark="{{Result.CHN.PinyinTone}}"
27
+        data-tag="拼音">
27
         <view class="{{CSS['CHN_PinYin_'+index+'_pinyin'].Css2}} panelSelect0">{{CSS['CHN_PinYin_'+index+'_pinyin'].Number}}</view>
28
         <view class="{{CSS['CHN_PinYin_'+index+'_pinyin'].Css2}} panelSelect0">{{CSS['CHN_PinYin_'+index+'_pinyin'].Number}}</view>
29
+        <view class="PeomRead FlexRow">
30
+          <image class="universalpic_read_mark_black_20x20" src="../images/universalpic_read_mark_black_20x20.png" />
31
+        </view>
28
         <view class="text2 text1">{{item.pinyin}}</view>
32
         <view class="text2 text1">{{item.pinyin}}</view>
29
       </view>
33
       </view>
30
     </view>
34
     </view>
@@ -37,9 +41,12 @@
37
       <view class="panelTitle1">单字默写</view>
41
       <view class="panelTitle1">单字默写</view>
38
     </view>
42
     </view>
39
     <view class="panelItem FlexRow">
43
     <view class="panelItem FlexRow">
40
-      <view class="{{CSS['CHN_TianKong_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.TianKong}}" wx:key="*this" bindtap='getInputData' data-type="sound" data-content="{{item}}" data-css="CHN_TianKong_{{index}}" data-pinyin="{{Result.CHN.PinYin[0].pinyin}}" data-soundmark="{{Result.CHN.PinyinTone}}"
41
-        data-tag="默写">
44
+      <view class="{{CSS['CHN_TianKong_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.TianKong}}" wx:key="*this" bindtap='getInputData' data-type="sound" data-content="{{item}}" data-css="CHN_TianKong_{{index}}" data-pinyin="{{Result.CHN.PinYin[0].pinyin}}"
45
+        data-soundmark="{{Result.CHN.PinyinTone}}" data-tag="默写">
42
         <view class="{{CSS['CHN_TianKong_'+index].Css2}} panelSelect0">{{CSS['CHN_TianKong_'+index].Number}}</view>
46
         <view class="{{CSS['CHN_TianKong_'+index].Css2}} panelSelect0">{{CSS['CHN_TianKong_'+index].Number}}</view>
47
+        <view class="PeomRead FlexRow">
48
+          <image class="universalpic_read_mark_black_20x20" src="../images/universalpic_read_mark_black_20x20.png" />
49
+        </view>
43
         <view class="text1">{{item}}</view>
50
         <view class="text1">{{item}}</view>
44
       </view>
51
       </view>
45
     </view>
52
     </view>
@@ -152,26 +159,35 @@
152
   <block wx:if="{{Result.CHN.PeomContent && Result.CHN.PeomContent.length>0}}">
159
   <block wx:if="{{Result.CHN.PeomContent && Result.CHN.PeomContent.length>0}}">
153
     <view class="panelTitle FlexRow">
160
     <view class="panelTitle FlexRow">
154
       <view class="panelTitle1">诗词</view>
161
       <view class="panelTitle1">诗词</view>
162
+      <view class="panelTitle2" bindtap="changeRead" data-id="1" wx:if="{{IsPoemRead==0}}">换成朗读</view>
163
+      <view class="panelTitle2" bindtap="changeRead" data-id="0" wx:if="{{IsPoemRead==1}}">换成纯文</view>
164
+
155
     </view>
165
     </view>
156
     <view class="panelItem FlexRow">
166
     <view class="panelItem FlexRow">
157
 
167
 
158
       <!-- 每段诗词原文较短 -->
168
       <!-- 每段诗词原文较短 -->
159
-      <block wx:if="{{!Result.CHN.PeomContentIsLong}}" >
160
-      <view class="{{CSS.CHN_PeomContent.Css1}} panelItemFrame FlexRow" bindtap='getInputData' data-type="normal" data-content="{{Result.CHN.PeomContent}}" data-css="CHN_PeomContent" data-tag="诗词">
161
-        <view class="{{CSS.CHN_PeomContent.Css2}} panelSelect0">{{CSS.CHN_PeomContent.Number}}</view>
162
-        <text class="text1">
169
+      <block wx:if="{{!Result.CHN.PeomContentIsLong}}">
170
+        <view class="{{CSS.CHN_PeomContent.Css1}} panelItemFrame FlexRow" bindtap='getInputData' data-type="normal" data-content="{{Result.CHN.PeomContent}}" data-css="CHN_PeomContent" data-tag="诗词">
171
+          <view class="{{CSS.CHN_PeomContent.Css2}} panelSelect0">{{CSS.CHN_PeomContent.Number}}</view>
172
+          <view class="PeomRead FlexRow" wx:if="{{IsPoemRead==1}}">
173
+            <image class="universalpic_read_mark_black_20x20" src="../images/universalpic_read_mark_black_20x20.png" />
174
+          </view>
175
+          <text class="text1">
163
           <block wx:for="{{Result.CHN.PeomContent}}" wx:key="*this" wx:for-item="item1">
176
           <block wx:for="{{Result.CHN.PeomContent}}" wx:key="*this" wx:for-item="item1">
164
             <block wx:if="{{index>0}}">\n</block>
177
             <block wx:if="{{index>0}}">\n</block>
165
             <block wx:for="{{item1}}" wx:key="*this" wx:for-item="item2">{{item2}}</block>
178
             <block wx:for="{{item1}}" wx:key="*this" wx:for-item="item2">{{item2}}</block>
166
           </block>
179
           </block>
167
         </text>
180
         </text>
168
-      </view>
181
+        </view>
169
       </block>
182
       </block>
170
 
183
 
171
       <!-- 每段原文较长,且有多段 -->
184
       <!-- 每段原文较长,且有多段 -->
172
       <block wx:if="{{Result.CHN.PeomContentIsLong && Result.CHN.PeomContent.length>1}}">
185
       <block wx:if="{{Result.CHN.PeomContentIsLong && Result.CHN.PeomContent.length>1}}">
173
         <view class="{{CSS['CHN_PeomContent_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.PeomContent}}" wx:key="*this" bindtap='getInputData' data-type="normal" data-content="{{item}}" data-css="CHN_PeomContent_{{index}}" data-tag="诗词">
186
         <view class="{{CSS['CHN_PeomContent_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.PeomContent}}" wx:key="*this" bindtap='getInputData' data-type="normal" data-content="{{item}}" data-css="CHN_PeomContent_{{index}}" data-tag="诗词">
174
           <view class="{{CSS['CHN_PeomContent_'+index].Css2}} panelSelect0">{{CSS['CHN_PeomContent_'+index].Number}}</view>
187
           <view class="{{CSS['CHN_PeomContent_'+index].Css2}} panelSelect0">{{CSS['CHN_PeomContent_'+index].Number}}</view>
188
+          <view class="PeomRead FlexRow" wx:if="{{IsPoemRead==1}}">
189
+            <image class="universalpic_read_mark_black_20x20" src="../images/universalpic_read_mark_black_20x20.png" />
190
+          </view>
175
           <view class="text1">
191
           <view class="text1">
176
             <block wx:for="{{item}}" wx:key="*this" wx:for-item="item2" wx:for-index="indexChild">{{item2}}</block>
192
             <block wx:for="{{item}}" wx:key="*this" wx:for-item="item2" wx:for-index="indexChild">{{item2}}</block>
177
           </view>
193
           </view>
@@ -182,13 +198,16 @@
182
       <block wx:if="{{Result.CHN.PeomContentIsLong && Result.CHN.PeomContent.length==1}}">
198
       <block wx:if="{{Result.CHN.PeomContentIsLong && Result.CHN.PeomContent.length==1}}">
183
         <view class="{{CSS['CHN_PeomContent_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.PeomContent[0]}}" wx:if="{{item}}" wx:key="*this" bindtap='getInputData' data-type="normal" data-content="{{item}}" data-css="CHN_PeomContent_{{index}}" data-tag="诗词">
199
         <view class="{{CSS['CHN_PeomContent_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.PeomContent[0]}}" wx:if="{{item}}" wx:key="*this" bindtap='getInputData' data-type="normal" data-content="{{item}}" data-css="CHN_PeomContent_{{index}}" data-tag="诗词">
184
           <view class="{{CSS['CHN_PeomContent_'+index].Css2}} panelSelect0">{{CSS['CHN_PeomContent_'+index].Number}}</view>
200
           <view class="{{CSS['CHN_PeomContent_'+index].Css2}} panelSelect0">{{CSS['CHN_PeomContent_'+index].Number}}</view>
201
+          <view class="PeomRead FlexRow" wx:if="{{IsPoemRead==1}}">
202
+            <image class="universalpic_read_mark_black_20x20" src="../images/universalpic_read_mark_black_20x20.png" />
203
+          </view>
185
           <view class="text1">
204
           <view class="text1">
186
             {{item}}
205
             {{item}}
187
           </view>
206
           </view>
188
         </view>
207
         </view>
189
       </block>
208
       </block>
190
-      
191
-      
209
+
210
+
192
     </view>
211
     </view>
193
     <view class='lineFooter'></view>
212
     <view class='lineFooter'></view>
194
   </block>
213
   </block>
@@ -200,16 +219,16 @@
200
     </view>
219
     </view>
201
     <view class="panelItem FlexRow">
220
     <view class="panelItem FlexRow">
202
       <!-- 每段诗词原文较短 -->
221
       <!-- 每段诗词原文较短 -->
203
-      <block wx:if="{{!Result.CHN.PeomContentIsLong}}" >
204
-      <view class="{{CSS.CHN_Translation.Css1}} panelItemFrame FlexRow" bindtap='getInputData' data-type="normal" data-content="{{Result.CHN.Translation}}" data-css="CHN_Translation" data-tag="译文">
205
-        <view class="{{CSS.CHN_Translation.Css2}} panelSelect0">{{CSS.CHN_Translation.Number}}</view>
206
-        <text class="text1">
222
+      <block wx:if="{{!Result.CHN.PeomContentIsLong}}">
223
+        <view class="{{CSS.CHN_Translation.Css1}} panelItemFrame FlexRow" bindtap='getInputData' data-type="normal" data-content="{{Result.CHN.Translation}}" data-css="CHN_Translation" data-tag="译文">
224
+          <view class="{{CSS.CHN_Translation.Css2}} panelSelect0">{{CSS.CHN_Translation.Number}}</view>
225
+          <text class="text1">
207
           <block wx:for="{{Result.CHN.Translation}}" wx:key="*this" wx:for-item="item1">
226
           <block wx:for="{{Result.CHN.Translation}}" wx:key="*this" wx:for-item="item1">
208
             <block wx:if="{{index>0}}">\n</block>
227
             <block wx:if="{{index>0}}">\n</block>
209
             <block wx:for="{{item1}}" wx:key="*this" wx:for-item="item2" wx:for-index="indexChild">{{item2}}</block>
228
             <block wx:for="{{item1}}" wx:key="*this" wx:for-item="item2" wx:for-index="indexChild">{{item2}}</block>
210
           </block>
229
           </block>
211
         </text>
230
         </text>
212
-      </view>
231
+        </view>
213
       </block>
232
       </block>
214
 
233
 
215
       <!-- 每段诗词原文较长,且有多段 -->
234
       <!-- 每段诗词原文较长,且有多段 -->
@@ -225,15 +244,15 @@
225
       <!-- 每句诗词原文较长,且有单段 -->
244
       <!-- 每句诗词原文较长,且有单段 -->
226
       <block wx:if="{{Result.CHN.PeomContentIsLong && Result.CHN.Translation.length==1}}">
245
       <block wx:if="{{Result.CHN.PeomContentIsLong && Result.CHN.Translation.length==1}}">
227
         <view class="{{CSS.CHN_Translation.Css1}} panelItemFrame FlexRow" bindtap='getInputData' data-type="normal" data-content="{{Result.CHN.Translation[0]}}" data-css="CHN_Translation" data-tag="译文">
246
         <view class="{{CSS.CHN_Translation.Css1}} panelItemFrame FlexRow" bindtap='getInputData' data-type="normal" data-content="{{Result.CHN.Translation[0]}}" data-css="CHN_Translation" data-tag="译文">
228
-        <view class="{{CSS.CHN_Translation.Css2}} panelSelect0">{{CSS.CHN_Translation.Number}}</view>
229
-        <text class="text1">
247
+          <view class="{{CSS.CHN_Translation.Css2}} panelSelect0">{{CSS.CHN_Translation.Number}}</view>
248
+          <text class="text1">
230
           <block wx:for="{{Result.CHN.Translation}}" wx:key="*this" wx:for-item="item1">
249
           <block wx:for="{{Result.CHN.Translation}}" wx:key="*this" wx:for-item="item1">
231
             {{item1}}
250
             {{item1}}
232
           </block>
251
           </block>
233
         </text>
252
         </text>
234
-      </view>
253
+        </view>
235
       </block>
254
       </block>
236
-      
255
+
237
     </view>
256
     </view>
238
     <view class='lineFooter'></view>
257
     <view class='lineFooter'></view>
239
   </block>
258
   </block>
@@ -262,11 +281,17 @@
262
       <view class="{{CSS.ENG_Soundmark_Eng.Css1}} panelItemFrame FlexRow" wx:if="{{Result.ENG.Soundmark.Eng}}" bindtap='getInputData' data-type="sound" data-content="英 {{Result.ENG.Soundmark.Eng}}" data-soundmark="{{Result.ENG.Soundmark.EngSound}}" data-css="ENG_Soundmark_Eng"
281
       <view class="{{CSS.ENG_Soundmark_Eng.Css1}} panelItemFrame FlexRow" wx:if="{{Result.ENG.Soundmark.Eng}}" bindtap='getInputData' data-type="sound" data-content="英 {{Result.ENG.Soundmark.Eng}}" data-soundmark="{{Result.ENG.Soundmark.EngSound}}" data-css="ENG_Soundmark_Eng"
263
         data-tag="发音">
282
         data-tag="发音">
264
         <view class="{{CSS.ENG_Soundmark_Eng.Css2}} panelSelect0">{{CSS.ENG_Soundmark_Eng.Number}}</view>
283
         <view class="{{CSS.ENG_Soundmark_Eng.Css2}} panelSelect0">{{CSS.ENG_Soundmark_Eng.Number}}</view>
284
+        <view class="PeomRead FlexRow">
285
+          <image class="universalpic_read_mark_black_20x20" src="../images/universalpic_read_mark_black_20x20.png" />
286
+        </view>
265
         <view class="text2 text1">英 {{Result.ENG.Soundmark.Eng}}</view>
287
         <view class="text2 text1">英 {{Result.ENG.Soundmark.Eng}}</view>
266
       </view>
288
       </view>
267
       <view class="{{CSS.ENG_Soundmark_AmE.Css1}} panelItemFrame FlexRow" wx:if="{{Result.ENG.Soundmark.AmE}}" bindtap='getInputData' data-type="sound" data-content="美 {{Result.ENG.Soundmark.AmE}}" data-soundmark="{{Result.ENG.Soundmark.AmESound}}" data-css="ENG_Soundmark_AmE"
289
       <view class="{{CSS.ENG_Soundmark_AmE.Css1}} panelItemFrame FlexRow" wx:if="{{Result.ENG.Soundmark.AmE}}" bindtap='getInputData' data-type="sound" data-content="美 {{Result.ENG.Soundmark.AmE}}" data-soundmark="{{Result.ENG.Soundmark.AmESound}}" data-css="ENG_Soundmark_AmE"
268
         data-tag="发音">
290
         data-tag="发音">
269
         <view class="{{CSS.ENG_Soundmark_AmE.Css2}} panelSelect0">{{CSS.ENG_Soundmark_AmE.Number}} </view>
291
         <view class="{{CSS.ENG_Soundmark_AmE.Css2}} panelSelect0">{{CSS.ENG_Soundmark_AmE.Number}} </view>
292
+        <view class="PeomRead FlexRow">
293
+          <image class="universalpic_read_mark_black_20x20" src="../images/universalpic_read_mark_black_20x20.png" />
294
+        </view>
270
         <view class="text2 text1">美 {{Result.ENG.Soundmark.AmE}}</view>
295
         <view class="text2 text1">美 {{Result.ENG.Soundmark.AmE}}</view>
271
       </view>
296
       </view>
272
     </view>
297
     </view>

+ 13 - 0
pages/main/searchWeb2.wxss

@@ -162,3 +162,16 @@
162
   text-align: center;
162
   text-align: center;
163
   font-weight: 500;
163
   font-weight: 500;
164
 }
164
 }
165
+
166
+.PeomRead{
167
+  width:40rpx;
168
+  height:40rpx;
169
+  border-radius: 50%;
170
+  background-color: #F0F0F0;
171
+  margin-right: 10rpx;
172
+}
173
+
174
+.universalpic_read_mark_black_20x20{
175
+  width:21rpx;
176
+  height:20rpx;
177
+}