1.4.7

app.js

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

pages/main/default.js

@@ -39,7 +39,7 @@ Page({
   },
   onShow: function () {
     var that = this;
-    if (!app.globalData.userInfo.IsMember && app.globalData.userInfo.IsShow == 1) {
+    if (app.globalData.userInfo.IsNewUser==1 && app.globalData.userInfo.IsShow == 1) {
       if (app.globalData.userInfo.Subscribe == 0) {
         wx.redirectTo({
           url: '../other/newuser',
@@ -57,6 +57,11 @@ Page({
                 });
                 app.globalData.GotoUrl = "";
               }
+              else{
+                wx.redirectTo({
+                  url: '../other/newuser',
+                });
+              }
             }
             else if (app.globalData.userInfo.IsMember && app.globalData.userInfo.IsShow == 1) {
               var productServiceTime = common.formatDateCHS(common.formatTime(new Date(app.globalData.userInfo.ProductServiceTime)));

pages/main/searchWeb2.js

@@ -7,7 +7,8 @@ var hasStart = {};
 Page({
   data: {
     IsShowHelp: 1,
-    ShowKaiti:0,
+    IsPoemRead: 0,
+    ShowKaiti: 0,
     CSS: {},
   },
   onLoad: function (options) {
@@ -165,6 +166,15 @@ Page({
                   else
                     str = item.Content;
                 }
+
+                if (item.Tag == "诗词" && this.data.IsPoemRead==1){
+                  var arr=str.split("\n");
+                  var arr2=[];
+                  for(var j=0;j<arr.length;j++){
+                    arr2.push("[读]" +arr[j]+ "[/读]");
+                  }
+                  str=arr2.join("\n");
+                }
               }
               else
                 str = item.Content;
@@ -210,6 +220,12 @@ Page({
     });
 
   },
+  changeRead: function (e) {
+    var id = e.currentTarget.dataset.id;
+    this.setData({
+      IsPoemRead: id,
+    });
+  },
   openHelp: function () {
     this.setData({
       IsShowHelp: 0,

pages/main/searchWeb2.wxml

@@ -23,8 +23,12 @@
       <view class="panelTitle1">拼音</view>
     </view>
     <view class="panelItem FlexRow">
-      <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="拼音">
+      <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="拼音">
         <view class="{{CSS['CHN_PinYin_'+index+'_pinyin'].Css2}} panelSelect0">{{CSS['CHN_PinYin_'+index+'_pinyin'].Number}}</view>
+        <view class="PeomRead FlexRow">
+          <image class="universalpic_read_mark_black_20x20" src="../images/universalpic_read_mark_black_20x20.png" />
+        </view>
         <view class="text2 text1">{{item.pinyin}}</view>
       </view>
     </view>
@@ -37,9 +41,12 @@
       <view class="panelTitle1">单字默写</view>
     </view>
     <view class="panelItem FlexRow">
-      <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}}"
-        data-tag="默写">
+      <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}}" data-tag="默写">
         <view class="{{CSS['CHN_TianKong_'+index].Css2}} panelSelect0">{{CSS['CHN_TianKong_'+index].Number}}</view>
+        <view class="PeomRead FlexRow">
+          <image class="universalpic_read_mark_black_20x20" src="../images/universalpic_read_mark_black_20x20.png" />
+        </view>
         <view class="text1">{{item}}</view>
       </view>
     </view>
@@ -152,26 +159,35 @@
   <block wx:if="{{Result.CHN.PeomContent && Result.CHN.PeomContent.length>0}}">
     <view class="panelTitle FlexRow">
       <view class="panelTitle1">诗词</view>
+      <view class="panelTitle2" bindtap="changeRead" data-id="1" wx:if="{{IsPoemRead==0}}">换成朗读</view>
+      <view class="panelTitle2" bindtap="changeRead" data-id="0" wx:if="{{IsPoemRead==1}}">换成纯文</view>
+
     </view>
     <view class="panelItem FlexRow">
 
       <!-- 每段诗词原文较短 -->
-      <block wx:if="{{!Result.CHN.PeomContentIsLong}}" >
-      <view class="{{CSS.CHN_PeomContent.Css1}} panelItemFrame FlexRow" bindtap='getInputData' data-type="normal" data-content="{{Result.CHN.PeomContent}}" data-css="CHN_PeomContent" data-tag="诗词">
-        <view class="{{CSS.CHN_PeomContent.Css2}} panelSelect0">{{CSS.CHN_PeomContent.Number}}</view>
-        <text class="text1">
+      <block wx:if="{{!Result.CHN.PeomContentIsLong}}">
+        <view class="{{CSS.CHN_PeomContent.Css1}} panelItemFrame FlexRow" bindtap='getInputData' data-type="normal" data-content="{{Result.CHN.PeomContent}}" data-css="CHN_PeomContent" data-tag="诗词">
+          <view class="{{CSS.CHN_PeomContent.Css2}} panelSelect0">{{CSS.CHN_PeomContent.Number}}</view>
+          <view class="PeomRead FlexRow" wx:if="{{IsPoemRead==1}}">
+            <image class="universalpic_read_mark_black_20x20" src="../images/universalpic_read_mark_black_20x20.png" />
+          </view>
+          <text class="text1">
           <block wx:for="{{Result.CHN.PeomContent}}" wx:key="*this" wx:for-item="item1">
             <block wx:if="{{index>0}}">\n</block>
             <block wx:for="{{item1}}" wx:key="*this" wx:for-item="item2">{{item2}}</block>
           </block>
         </text>
-      </view>
+        </view>
       </block>
 
       <!-- 每段原文较长，且有多段 -->
       <block wx:if="{{Result.CHN.PeomContentIsLong && Result.CHN.PeomContent.length>1}}">
         <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="诗词">
           <view class="{{CSS['CHN_PeomContent_'+index].Css2}} panelSelect0">{{CSS['CHN_PeomContent_'+index].Number}}</view>
+          <view class="PeomRead FlexRow" wx:if="{{IsPoemRead==1}}">
+            <image class="universalpic_read_mark_black_20x20" src="../images/universalpic_read_mark_black_20x20.png" />
+          </view>
           <view class="text1">
             <block wx:for="{{item}}" wx:key="*this" wx:for-item="item2" wx:for-index="indexChild">{{item2}}</block>
           </view>
@@ -182,13 +198,16 @@
       <block wx:if="{{Result.CHN.PeomContentIsLong && Result.CHN.PeomContent.length==1}}">
         <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="诗词">
           <view class="{{CSS['CHN_PeomContent_'+index].Css2}} panelSelect0">{{CSS['CHN_PeomContent_'+index].Number}}</view>
+          <view class="PeomRead FlexRow" wx:if="{{IsPoemRead==1}}">
+            <image class="universalpic_read_mark_black_20x20" src="../images/universalpic_read_mark_black_20x20.png" />
+          </view>
           <view class="text1">
             {{item}}
           </view>
         </view>
       </block>
-      
-      
+
+
     </view>
     <view class='lineFooter'></view>
   </block>
@@ -200,16 +219,16 @@
     </view>
     <view class="panelItem FlexRow">
       <!-- 每段诗词原文较短 -->
-      <block wx:if="{{!Result.CHN.PeomContentIsLong}}" >
-      <view class="{{CSS.CHN_Translation.Css1}} panelItemFrame FlexRow" bindtap='getInputData' data-type="normal" data-content="{{Result.CHN.Translation}}" data-css="CHN_Translation" data-tag="译文">
-        <view class="{{CSS.CHN_Translation.Css2}} panelSelect0">{{CSS.CHN_Translation.Number}}</view>
-        <text class="text1">
+      <block wx:if="{{!Result.CHN.PeomContentIsLong}}">
+        <view class="{{CSS.CHN_Translation.Css1}} panelItemFrame FlexRow" bindtap='getInputData' data-type="normal" data-content="{{Result.CHN.Translation}}" data-css="CHN_Translation" data-tag="译文">
+          <view class="{{CSS.CHN_Translation.Css2}} panelSelect0">{{CSS.CHN_Translation.Number}}</view>
+          <text class="text1">
           <block wx:for="{{Result.CHN.Translation}}" wx:key="*this" wx:for-item="item1">
             <block wx:if="{{index>0}}">\n</block>
             <block wx:for="{{item1}}" wx:key="*this" wx:for-item="item2" wx:for-index="indexChild">{{item2}}</block>
           </block>
         </text>
-      </view>
+        </view>
       </block>
 
       <!-- 每段诗词原文较长，且有多段 -->
@@ -225,15 +244,15 @@
       <!-- 每句诗词原文较长，且有单段 -->
       <block wx:if="{{Result.CHN.PeomContentIsLong && Result.CHN.Translation.length==1}}">
         <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="译文">
-        <view class="{{CSS.CHN_Translation.Css2}} panelSelect0">{{CSS.CHN_Translation.Number}}</view>
-        <text class="text1">
+          <view class="{{CSS.CHN_Translation.Css2}} panelSelect0">{{CSS.CHN_Translation.Number}}</view>
+          <text class="text1">
           <block wx:for="{{Result.CHN.Translation}}" wx:key="*this" wx:for-item="item1">
             {{item1}}
           </block>
         </text>
-      </view>
+        </view>
       </block>
-      
+
     </view>
     <view class='lineFooter'></view>
   </block>
@@ -262,11 +281,17 @@
       <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"
         data-tag="发音">
         <view class="{{CSS.ENG_Soundmark_Eng.Css2}} panelSelect0">{{CSS.ENG_Soundmark_Eng.Number}}</view>
+        <view class="PeomRead FlexRow">
+          <image class="universalpic_read_mark_black_20x20" src="../images/universalpic_read_mark_black_20x20.png" />
+        </view>
         <view class="text2 text1">英 {{Result.ENG.Soundmark.Eng}}</view>
       </view>
       <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"
         data-tag="发音">
         <view class="{{CSS.ENG_Soundmark_AmE.Css2}} panelSelect0">{{CSS.ENG_Soundmark_AmE.Number}} </view>
+        <view class="PeomRead FlexRow">
+          <image class="universalpic_read_mark_black_20x20" src="../images/universalpic_read_mark_black_20x20.png" />
+        </view>
         <view class="text2 text1">美 {{Result.ENG.Soundmark.AmE}}</view>
       </view>
     </view>

pages/main/searchWeb2.wxss

@@ -162,3 +162,16 @@
   text-align: center;
   font-weight: 500;
 }
+
+.PeomRead{
+  width:40rpx;
+  height:40rpx;
+  border-radius: 50%;
+  background-color: #F0F0F0;
+  margin-right: 10rpx;
+}
+
+.universalpic_read_mark_black_20x20{
+  width:21rpx;
+  height:20rpx;
+}