1.0.0.26

app.js

@@ -25,8 +25,8 @@ App({
     }
   },
   globalData: {
-    Version: "1.0.0.24",
-    IsProduction: false,
+    Version: "1.0.0.26",
+    IsProduction: true,
     ShareTitle: "可以用来记忆一切的工具",
     SharePath: "pages/index/index",
     ShareImage: '',

pages/main/add.js

@@ -388,7 +388,7 @@ Page({
 
   //字段输入
   bindinputField: function (e) {
-    console.log("bindinputField:" + e.detail.value + " isEdit:" + isEdit);
+    //console.log("bindinputField:" + e.detail.value + " isEdit:" + isEdit);
 
     var that = this;
     if (app.globalData.IsAndroid && !isEdit) {
@@ -533,29 +533,29 @@ Page({
       isUnload = false;
       wx.removeStorageSync("TempCardInfoAddItem");
       this.updateField();
-      var title ="编辑题卡";
-      if (that.data.UpdateType == "add2") {
-        title = "添加题卡";
-      }
-      wx.setNavigationBarTitle({
-        title: title,
-      });
-
     }
     this.setData({
       HiddenFieldEdit:true,
     });
+
+    var title = "编辑题卡";
+    if (that.data.UpdateType == "add2") {
+      title = "添加题卡";
+    }
+    wx.setNavigationBarTitle({
+      title: title,
+    });
   },
 
   updateField: function (history) {
     var str = this.data.FieldContent;
-    str = main.decryptUrl(str);
+    // str = main.decryptUrl(str);
 
-    str = str.replace(/\[读\]/g, "\n[读]");
-    str = str.replace(/\[图\]/g, "\n[图]");
-    str = str.replace(/\[\/读\]/g, "[\/读]\n");
-    str = str.replace(/\[\/图\]/g, "[\/图]\n");
-    str = str.replace(/\n\n/g, "\n");
+    // str = str.replace(/\[读\]/g, "\n[读]");
+    // str = str.replace(/\[图\]/g, "\n[图]");
+    // str = str.replace(/\[\/读\]/g, "[\/读]\n");
+    // str = str.replace(/\[\/图\]/g, "[\/图]\n");
+    // str = str.replace(/\n\n\n/g, "\n\n");
 
     var list = app.globalData.CardList;
     var card={};

pages/main/add.wxml

@@ -9,7 +9,7 @@
       <switch class='panelTimePlan2' checked="{{IsTodayStudy}}" bindchange="switch1Change" />
     </view>
   </view>
-  <view class='lineFooter'></view>
+  <view style='height:120rpx'></view>
   <view class="panelTitle FlexRow">
     <view class="panelTitle1">段落</view>
   </view>
@@ -38,6 +38,7 @@
         <image class="universalpic_read_gray_40x40" wx:if="{{item.Type=='sound'}}" src='../images/universalpic_read_gray_40x40.png' />
         <text class="textPinyin" wx:if="{{item.Type=='sound'}}">{{item.Content}}</text>
         <image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' binderror="onBindError" />
+        <view class="textBr" wx:if="{{item.Type=='br'}}"></view>
         <text class="textReturn" wx:if="{{item.Type=='return'}}"></text>
   </block>
   </view>
@@ -69,10 +70,11 @@
       <view class="add">+</view> 资料
     </view>
     <view class='panelSave0' bindtap="saveCard">保存</view>
-    <view class="panelSave2 FlexRow" bindtap='onPreview'>
-      <view class="line1"></view>
-      <image class="universalpic_preview_black_30x30" src='../images/universalpic_preview_black_30x30.png' />
+
+    <view class="panelSave2 panelSave1 FlexRow" bindtap="onPreview">
+      预览
     </view>
+    
   </view>
 </view>
 

pages/main/add.wxss

@@ -6,11 +6,15 @@
 }
 
 .panelTimePlan {
-  min-height: 120rpx;
+  height: 120rpx;
   width: 100%;
   justify-content: space-between;
   font-size: 28rpx;
   background-color: #fff;
+  position: fixed;
+  top:0;
+  z-index: 10;
+  border-bottom: 1rpx solid #d2d2d2;
 }
 
 
@@ -137,6 +141,10 @@
 .panelItem .textReturn{
   width:100%;
 }
+.panelItem .textBr{
+  width:100%;
+  height:20rpx;
+}
 .panelItem .textReturn2{
   width:100%;
   height:30rpx;
@@ -208,12 +216,11 @@
   line-height: 80rpx;
   height:80rpx;
   border-radius: 10rpx;
-  font-size:28rpx;
-  margin-left: 20rpx;
+  font-size:24rpx;
+  margin:0 20rpx;
 }
 .panelSave .panelSave2 {
-  width: 168rpx;
-  justify-content: flex-end;
+  width: 108rpx;
 }
 
 .add {
@@ -226,6 +233,7 @@
   width:400rpx;
   line-height:100rpx;
   text-align: center;
+  margin-right: 40rpx;
 }
 
 .panelSave .line1 {

pages/main/detail.wxml

@@ -41,27 +41,27 @@
       <view class="panelField11 panelItem FlexRow" style="font-size:{{TaskInfo.FontSize}}rpx;">
         <block wx:for="{{TaskInfo.ContentNew.Field[1]}}" wx:key="index">
           <text class="textReturn" wx:if="{{index>0 && item.Type=='return'}}"></text>
-
+          <view class="textBr" wx:if="{{index>0 && item.Type=='br'}}"></view>
           <text class="textNormal" selectable="true" space='ensp' wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
 
           <text class="textNormal FlexRow" selectable="true" space='ensp' wx:if="{{item.Type=='line'}}">
             <block wx:for="{{item.Content}}" wx:key="contentIndex" wx:for-item="contentItem">
               <text space='ensp' wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
-          <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
-        </block>
-        </text>
+            <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
+          </block>
+          </text>
 
-        <view class="panelSound FlexRow" wx:if="{{item.Type=='sound'}}" bindtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="1">
-          <image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.{{item.SoundImageName}}' />
-        </view>
+          <view class="panelSound FlexRow" wx:if="{{item.Type=='sound'}}" bindtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="1">
+            <image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.{{item.SoundImageName}}' />
+          </view>
 
-        <text class="textPinyin" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="1">{{item.Content}}</text>
-        <image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" data-serverurl="{{item.ContentServer}}" binderror="onBindError" />
+          <text class="textPinyin" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="1">{{item.Content}}</text>
+          <image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" data-serverurl="{{item.ContentServer}}" binderror="onBindError" />
       
-  </block>
-  </view>
+        </block>
+      </view>
 
-  </view>
+    </view>
   <view class="panelTag FlexRow" bindtap="onShowAnswer" style='background-color:{{Color.BackColor2}};color:{{Color.FrontColor2}};'>
     <view wx:if="{{!TaskInfo.ContentNew.Tags || TaskInfo.ContentNew.Tags.length==0}}"></view>
     <view class="panelTag1 FlexRow" wx:if="{{TaskInfo.ContentNew.Tags && TaskInfo.ContentNew.Tags.length>0}}">
@@ -84,26 +84,23 @@
       <view class="panelField21 panelItem FlexRow">
         <block wx:for="{{TaskInfo.ContentNew.Field[itemParent]}}" wx:key="index">
           <text class="textReturn" wx:if="{{index>0 && item.Type=='return'}}"></text>
-
+          <view class="textBr" wx:if="{{index>0 && item.Type=='br'}}"></view>
+        
           <text class="textNormal2 textNormal" selectable="true" space='ensp' wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
 
           <text class="textNormal2 FlexRow" selectable="true" space='ensp' wx:if="{{item.Type=='line'}}">
             <block wx:for="{{item.Content}}" wx:key="contentIndex" wx:for-item="contentItem">
               <text space='ensp' wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
-          <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
-        </block>
-        </text>
+              <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
+            </block>
+          </text>
 
-        <view class="panelSound FlexRow" wx:if="{{item.Type=='sound'}}" bindtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">
-          <image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.{{item.SoundImageName}}' />
-        </view>
+          <view class="panelSound FlexRow" wx:if="{{item.Type=='sound'}}" bindtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">
+            <image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.{{item.SoundImageName}}' />
+          </view>
 
-        <text class="textPinyin" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">{{item.Content}}</text>
-
-        <!-- <image class="imageBishun" wx:if="{{item.Type=='image' && !item.Url}}" src='{{item.Content}}' catchtap='showImage' data-name="{{item.Content}}" /> -->
-
-        <image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" data-serverurl="{{item.ContentServer}}" binderror="onBindError" />
-      
+          <text class="textPinyin" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">{{item.Content}}</text>
+          <image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" data-serverurl="{{item.ContentServer}}" binderror="onBindError" />
         </block>
       </view>
     </view>

pages/main/detail.wxss

@@ -210,6 +210,11 @@
   border-radius: 20rpx;
 }
 
+.panelItem .textBr{
+  width:100%;
+  height:20rpx;
+}
+
 .panelItem .textReturn {
   width: 100%;
 }

pages/main/preview.wxml

@@ -16,6 +16,8 @@
     <view class="panelField11 panelItem FlexRow" style="font-size:{{FontSize}}rpx;">
       <block wx:for="{{Field[1]}}" wx:key="index">
         <text class="textReturn" wx:if="{{index>0 && item.Type=='return'}}"></text>
+        <view class="textBr" wx:if="{{index>0 && item.Type=='br'}}"></view>
+        
         <text class="textNormal" selectable="true" space='ensp' wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
         <text class="textNormal FlexRow" selectable="true" space='ensp' wx:if="{{item.Type=='line'}}">
           <block wx:for="{{item.Content}}" wx:key="contentIndex" wx:for-item="contentItem">
@@ -46,7 +48,8 @@
     <view class="panelField21 panelItem FlexRow">
       <block wx:for="{{Field[itemParent]}}" wx:key="index">
         <text class="textReturn" wx:if="{{index>0 && item.Type=='return'}}"></text>
-
+        <view class="textBr" wx:if="{{index>0 && item.Type=='br'}}"></view>
+        
         <text class="textNormal" selectable="true" space='ensp' wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
 
         <text class="textNormal FlexRow" selectable="true" space='ensp' wx:if="{{item.Type=='line'}}">

pages/main/preview.wxss

@@ -124,6 +124,11 @@
   border-radius: 20rpx;
 }
 
+.panelItem .textBr{
+  width:100%;
+  height:20rpx;
+}
+
 .panelItem .textReturn {
   width: 100%;
 }

pages/main/searchWeb.js

@@ -16,7 +16,7 @@ Page({
   },
   onShow: function () {
     var that = this;
-    var arr = wx.getStorageSync("SearchWord2");
+    var arr = wx.getStorageSync("SearchWord3");
     if (!arr)
       arr = [];
 
@@ -45,6 +45,7 @@ Page({
     });
   },
   onSearch: function (e) {
+    app.globalData.TempSearcchBackNumber = 3;
     wx.navigateTo({
       url: './searchWeb1',
     })

pages/main/searchWeb1.js

@@ -57,19 +57,22 @@ Page({
 
       that.searchResult(search);
 
-      var arr = that.data.SearchTextList;
-      for (var i = 0; i < arr.length; i++) {
-        if (arr[i] == search) {
-          arr.splice(i, 1);
-          break;
+      setTimeout(function(){
+        var arr = that.data.SearchTextList;
+        for (var i = 0; i < arr.length; i++) {
+          if (arr[i] == search) {
+            arr.splice(i, 1);
+            break;
+          }
         }
-      }
-      arr.unshift(search);
+        arr.unshift(search);
 
-      wx.setStorageSync("SearchTextList", arr);
-      that.setData({
-        SearchTextList: arr,
-      });
+        wx.setStorageSync("SearchTextList", arr);
+        that.setData({
+          SearchTextList: arr,
+        });
+      },2000);
+      
     }
     else {
       wx.showToast({

pages/main/searchWeb2.js

@@ -16,7 +16,7 @@ Page({
       Containnerheight: main.getWindowHeight(),
     });
     this.getList();
-    
+
     hasStart = {};
 
   },
@@ -53,6 +53,32 @@ Page({
           }
         }
       }
+
+      //判断诗词单词是否过长，过长就分段显示
+      if (data.CHN.PeomContent) {
+        data.CHN.PeomContentIsLong = false;
+        if (data.CHN.PeomContent.length > 1 ) {
+          for (var i = 0; i < data.CHN.PeomContent.length; i++) {
+            if (data.CHN.PeomContent[i]){
+              var item = data.CHN.PeomContent[i].join("");
+              if (item && item.length>18){
+                data.CHN.PeomContentIsLong = true;
+                break;
+              }
+            }
+          }
+        }
+        else if (data.CHN.PeomContent.length == 1) {
+          
+          for (var i = 0; i < data.CHN.PeomContent[0].length; i++) {
+            var item = data.CHN.PeomContent[0][i];
+            if (item && item.length > 18) {
+              data.CHN.PeomContentIsLong = true;
+              break;
+            }
+          }
+        }
+      }
     }
 
     if (data.ENG && data.ENG.Paraphrase && common.checkIsArray(data.ENG.Paraphrase)) {
@@ -97,7 +123,7 @@ Page({
       }
 
       this.data.CSS[css].Number = "1";
-      if (app.globalData.TempFieldNumber>0 && !hasStart[css]) {
+      if (app.globalData.TempFieldNumber > 0 && !hasStart[css]) {
         this.data.CSS[css].Number = app.globalData.TempFieldNumber;
         hasStart[css] = true;
       }
@@ -138,8 +164,14 @@ Page({
                 strArrTag = list[i].Content[0].Content.join(",") + ",";
               else
                 list[i].Content[0].Content = list[i].Content[0].Content.split(",");
-              if (strArrTag.indexOf(item.Tag + ",") < 0)
-                list[i].Content[0].Content.push(item.Tag);
+
+              var tags = item.Tag.split(",");
+              for (var j = 0; j < tags.length; j++) {
+                if (tags[i]) {
+                  if (strArrTag.indexOf(tags[i] + ",") < 0)
+                    list[i].Content[0].Content.push(tags[i]);
+                }
+              }
             }
 
             var str = "";
@@ -161,21 +193,32 @@ Page({
               }
             }
             else {
-              if (item.Tag == "原文") {
-                for (var j = 0; j < item.Content.length; j++) {
-                  if (item.Content.length == 1)
-                    item.Content[j] = item.Content[j].join("\n");
+              if (item.Tag == "原文" || item.Tag == "译文"){
+                if (common.checkIsArray(item.Content) 
+                  && common.checkIsArray(item.Content[0])){
+                  for (var j = 0; j < item.Content.length; j++) {
+                    if (common.checkIsArray(item.Content[j])){
+                      item.Content[j] = item.Content[j].join("");
+                    }
+                  }
+                  if (common.checkIsArray(item.Content))
+                    str = item.Content.join("\n");
+                  else
+                    str = item.Content;
+                }
+                else{
+                  if (common.checkIsArray(item.Content))
+                    str = item.Content.join("");
                   else
-                    item.Content[j] = item.Content[j].join("");
+                    str = item.Content;
                 }
-                str = item.Content.join("\n");
               }
               else
                 str = item.Content;
             }
 
             if (list[i].Content[item.Number].Content)
-              str = "\n" + str;
+              str = "\n\n" + str;
             list[i].Content[item.Number].Content += str;
 
           }

pages/main/searchWeb2.wxml

@@ -41,7 +41,8 @@
       <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="index" bindtap='getInputData' data-type="sound" data-content="{{item}}" data-css="CHN_TianKong_{{index}}" data-pinyin="{{Result.CHN.PinYin[0].pinyin}}" data-tag="读写">
+      <view class="{{CSS['CHN_TianKong_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.TianKong}}" wx:key="index" bindtap='getInputData' data-type="sound" data-content="{{item}}" data-css="CHN_TianKong_{{index}}" data-pinyin="{{Result.CHN.PinYin[0].pinyin}}"
+        data-tag="读写">
         <view class="{{CSS['CHN_TianKong_'+index].Css2}} panelSelect0">{{CSS['CHN_TianKong_'+index].Number}}</view>
         <view class="text1">{{item}}</view>
       </view>
@@ -124,10 +125,10 @@
   <!-- 作者与朝代 -->
   <block wx:if="{{Result.CHN.Author && Result.CHN.Author.length>0}}">
     <view class="panelTitle FlexRow">
-      <view class="panelTitle1">诗词作者</view>
+      <view class="panelTitle1">作者</view>
     </view>
     <view class="panelItem FlexRow">
-      <view class="{{CSS.CHN_Author.Css1}} panelItemFrame FlexRow" bindtap='getInputData' data-type="normal" data-content="{{Result.CHN.Dynasty}} {{Result.CHN.Author}}" data-css="CHN_Author"  data-tag="作者">
+      <view class="{{CSS.CHN_Author.Css1}} panelItemFrame FlexRow" bindtap='getInputData' data-type="normal" data-content="{{Result.CHN.Dynasty}} {{Result.CHN.Author}}" data-css="CHN_Author" data-tag="作者">
         <view class="{{CSS.CHN_Author.Css2}} panelSelect0">{{CSS.CHN_Author.Number}}</view>
         <view class="text1">{{Result.CHN.Dynasty}} {{Result.CHN.Author}}</view>
       </view>
@@ -138,17 +139,44 @@
   <!-- 诗词原文 -->
   <block wx:if="{{Result.CHN.PeomContent && Result.CHN.PeomContent.length>0}}">
     <view class="panelTitle FlexRow">
-      <view class="panelTitle1">诗词原文</view>
+      <view class="panelTitle1">原文</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>
-        <view class="text1">
+        <text class="text1">
           <block wx:for="{{Result.CHN.PeomContent}}" wx:key="index" wx:for-item="item1">
-            <block wx:for="{{item1}}" wx:key="indexChild" wx:for-item="item2">{{item2}}</block>\n
+            <block wx:if="{{index>0}}">\n</block>
+            <block wx:for="{{item1}}" wx:key="indexChild" wx:for-item="item2">{{item2}}</block>
           </block>
-        </view>
+        </text>
       </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="index" 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="text1">
+            <block wx:for="{{item}}" wx:key="indexChild" wx:for-item="item2">{{item2}}</block>
+          </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[0]}}" wx:if="{{item}}" wx:key="index" 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="text1">
+            {{item}}
+          </view>
+        </view>
+      </block>
+      
+      
     </view>
     <view class='lineFooter'></view>
   </block>
@@ -156,13 +184,44 @@
   <!-- 诗词译文 -->
   <block wx:if="{{Result.CHN.Translation && Result.CHN.Translation.length>0}}">
     <view class="panelTitle FlexRow">
-      <view class="panelTitle1">诗词译文</view>
+      <view class="panelTitle1">译文</view>
     </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>
-        <view class="text1">{{Result.CHN.Translation}}</view>
+        <text class="text1">
+          <block wx:for="{{Result.CHN.Translation}}" wx:key="index" wx:for-item="item1">
+            <block wx:if="{{index>0}}">\n</block>
+            <block wx:for="{{item1}}" wx:key="indexChild" wx:for-item="item2">{{item2}}</block>
+          </block>
+        </text>
       </view>
+      </block>
+
+      <!-- 每段原文较长，且有多段 -->
+      <block wx:if="{{Result.CHN.PeomContentIsLong && Result.CHN.Translation.length>1}}">
+        <view class="{{CSS['CHN_Translation_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.Translation}}" wx:key="index" bindtap='getInputData' data-type="normal" data-content="{{item}}" data-css="CHN_Translation_{{index}}" data-tag="译文">
+          <view class="{{CSS['CHN_Translation_'+index].Css2}} panelSelect0">{{CSS['CHN_Translation_'+index].Number}}</view>
+          <view class="text1">
+            <block wx:for="{{item}}" wx:key="indexChild" wx:for-item="item2">{{item2}}</block>
+          </view>
+        </view>
+      </block>
+
+      <!-- 每句原文较长，且有单段 -->
+      <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">
+          <block wx:for="{{Result.CHN.Translation}}" wx:key="index" wx:for-item="item1">
+            {{item1}}
+          </block>
+        </text>
+      </view>
+      </block>
+      
     </view>
     <view class='lineFooter'></view>
   </block>

utils/main.js

@@ -260,7 +260,7 @@ function changeViewToString(content) {
   if (!str)
     str = ""
   else {
-    str = str.replace(/\n\n/g, "\n");
+    str = str.replace(/\n\n\n/g, "\n\n");
     if (str.indexOf("\n") == 0) {
       str = str.substr(1);
     }
@@ -332,7 +332,7 @@ function changeStringToView(field) {
         str = str.replace(/\[图/g, "\n[图");
         str = str.replace(/\[\/读\]/g, "[\/读]\n");
         str = str.replace(/\[\/图\]/g, "[\/图]\n");
-        str = str.replace(/\n\n/g, "\n");
+        str = str.replace(/\n\n\n/g, "\n\n");
 
         var arr = str.split("\n");
         for (var k = 0; k < arr.length; k++) {
@@ -421,6 +421,12 @@ function changeStringToView(field) {
             obj.Type = "normal";
             obj.Content = arr[k];
             arrResult.push(obj);
+          } 
+          else if (k>0 && arr[k] == "") {
+            var obj = {};
+            obj.Type = "br";
+            obj.Content = "";
+            arrResult.push(obj);
           }
           var obj = {};
           obj.Type = "return";
@@ -652,7 +658,7 @@ function saveTempImage(serverUrl, tempUrl) {
 }
 
 function updateSearchList(obj){
-  var arr = wx.getStorageSync("SearchWord2");
+  var arr = wx.getStorageSync("SearchWord3");
   if (!arr)
     arr = [];
   for (var i = 0; i < arr.length; i++) {
@@ -669,7 +675,7 @@ function updateSearchList(obj){
   if (arr.length > 100) {
     arr.pop();
   }
-  wx.setStorageSync("SearchWord2", arr);
+  wx.setStorageSync("SearchWord3", arr);
   app.globalData.SearchItem = obj.Value;
 }