1.0.22

app.js

@@ -25,8 +25,8 @@ App({
     }
   },
   globalData: {
-    Version: "1.0.0.20",
-    IsProduction: true,
+    Version: "1.0.0.22",
+    IsProduction: false,
     ShareTitle: "可以用来记忆一切的工具",
     SharePath: "pages/index/index",
     ShareImage: '',
@@ -54,6 +54,9 @@ App({
 
     CardList:[],//卡列表变量
     TaskToday:[],//今天任务列表
-    TempMiaoguoCardID:0,//临时题卡ID，用于资料选取时用
+    SearchResultList: [],//搜索获得要选择的字词或古诗词列表
+    TempMiaoguoCardID: 0,//临时题卡ID，用于资料选取时用
+    SearchNull: 0,//资料搜索为空时标记，用于资料搜索时用
+    SearchItem: {},//资料搜索项信息，用于资料搜索时用
   }
 })

pages/main/searchWeb.js

@@ -16,11 +16,29 @@ Page({
   },
   onShow:function(){
     var that = this;
-    var arr = wx.getStorageSync("SearchWord");
+    var arr = wx.getStorageSync("SearchWord2");
     if (!arr)
       arr = [];
+    
+    var list=[];
+    for(var i=0;i<10;i++){
+      if (!arr[i].Type)
+        arr[i].Type="zici";
+      switch(arr[i].Type){
+        case 'zici':
+          arr[i].TypeName = '字词';
+          break;
+        case 'shici':
+          arr[i].TypeName = '诗词';
+          break;
+        case 'eng':
+          arr[i].TypeName = '外语';
+          break;
+      }
+      list.push(arr[i]);
+    }
     that.setData({
-      SelectList: arr,
+      SelectList: list,
     });
   },
   onSearch: function (e) {
@@ -30,40 +48,11 @@ Page({
   },
   onSearchHistory: function (e) {
     var search = e.currentTarget.dataset.search;
-    var arr = wx.getStorageSync("SearchWord");
-    if (!arr)
-      arr = [];
-    var obj = {};
-    obj.Key = search;
-    for (var i = 0; i < arr.length; i++) {
-      if (arr[i].Key == search) {
-        obj.Key = arr[i].Key;
-        obj.Value = arr[i].Value;
-        arr.splice(i, 1);
-        break;
-      }
-    }
-    arr.unshift(obj);
-    wx.setStorageSync("SearchWord", arr);
+    var searchType = e.currentTarget.dataset.searchtype;
+    var author = e.currentTarget.dataset.author;
+
     wx.navigateTo({
-      url: './searchWeb2?back=2&search=' + search+'&type=1',
-    });
-  },
-  deleteItem:function(e){
-    var that=this;
-    wx.showModal({
-      title: '提醒',
-      content: '删除这条搜索记录？',
-      success(res) {
-        if (res.confirm) {
-          var index = e.currentTarget.dataset.id;
-          that.data.SelectList.splice(index, 1);
-          that.setData({
-            SelectList: that.data.SelectList,
-          });
-          wx.setStorageSync("SearchWord", that.data.SelectList);
-        }
-      }
+      url: './searchWeb2?back=2&search=' + search + '&searchType=' + searchType+'&author='+author,
     });
   },
   onShareAppMessage: function () {

pages/main/searchWeb.wxml

@@ -2,26 +2,32 @@
   <view class="panelSearch FlexRow">
     <view class="panelSearch1 FlexRow" bindtap="onSearch">
       <image class="universalpic_search_gray_30x30" src='../images/universalpic_search_gray_30x30.png' />
-      <view>搜索字、词、成语、单词，添加丰富资料</view>
+      <view>搜索字词、成语、诗词、单词，添加丰富资料</view>
     </view>
   </view>
   <view class='lineFooter'></view>
-  <view class="panelTitle FlexRow">
-    <view class="panelTitle1">搜索记录</view>
+  <view class="panelTitle FlexRow" wx:if="{{SelectList.length>0}}">
+    <view class="panelTitle1">看过的资料</view>
   </view>
 
   <block wx:for="{{SelectList}}" wx:key="index">
     <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
       <view class="lineWidth720"></view>
     </view>
-    <view class="panelItem FlexRow" >
-      <view class="panelItem1">
+    <view class="panelItemSearch FlexColumn">
+      <view class="panelItemSearch1 FlexRow">
+        <view class="panelItemSearch11" bindtap='onSearchHistory' data-search="{{item.Key}}" data-searchtype="{{item.Type}}" data-author="{{item.Author}}">
+          {{item.Key}}
+        </view>
+        <view class="panelItemSearch12 FlexRow">
+          {{item.TypeName}}
+        </view>
       </view>
-      <view class="panelItem2 FlexRow">
-        <text class="text1" bindtap='onSearchHistory' data-search="{{item.Key}}">{{item.Key}}</text>
-        <view class="panelItem21 FlexRow" bindtap='deleteItem' data-id="{{index}}">
-            <image src='../images/universalpic_del_gray_14x14.png' class="universalpic_del_gray_14x14" />
-         </view>
+      <view class="panelItemSearch2 FlexRow" wx:if="{{item.Type=='shici'}}">
+        {{item.Author}} {{item.Dynasty}}
+      </view>
+      <view class="panelItemSearch2 FlexRow" wx:if="{{item.Type=='shici'}}">
+        {{item.Content}}
       </view>
     </view>
   </block>

pages/main/searchWeb.wxss

@@ -50,38 +50,53 @@
   margin-bottom: 32rpx;
 }
 
-.panelItem {
+.panelItemSearch {
   width: 100%;
-  justify-content: flex-start;
-  font-size: 28rpx;
   min-height: 100rpx;
-  height:auto;
   background-color: #fff;
+  justify-content: flex-start;
+  align-items: flex-start;
 }
 
-.panelItem1 {
-  margin-left: 30rpx;
-  font-weight: 400;
-}
-
-.panelItem2 {
+.panelItemSearch .panelItemSearch1{
   color: #1e1e1e;
   font-weight: 400;
   justify-content: space-between;
-  width:720rpx;
+  width:100%;
 }
 
-.text1{
+.panelItemSearch .panelItemSearch11{
   width:624rpx;
-  line-height: 100rpx;
+  font-size:28rpx;
+  font-weight: 400;
+  margin-left: 30rpx;
+  margin-top: 30rpx
 }
 
-.panelItem21{
-  width:96rpx;
-  height:100rpx;
+
+.panelItemSearch .panelItemSearch12{
+  border:2rpx solid #0071EF;
+  font-size:20rpx;
+  text-align: center;
+  line-height: 34rpx;
+  width:60rpx;
+  color:#0071EF;
+  margin-right: 30rpx;
+  margin-top: 34rpx
 }
 
-.universalpic_del_gray_14x14{
-  width:14rpx;
-  height:14rpx;
+.panelItemSearch .panelItemSearch2{
+  color: #1e1e1e;
+  font-weight: 400;
+  justify-content: flex-start;
+  margin-left: 30rpx;
+  font-size:24rpx;
+}
+.panelItemSearch .panelItemSearch3{
+  color: #787878;
+  font-weight: 400;
+  justify-content: flex-start;
+  margin-left: 30rpx;
+  font-size:24rpx;
+  margin-bottom: 30rpx;
 }

pages/main/searchWeb1.js

@@ -5,6 +5,20 @@ const app = getApp();
 
 Page({
   data: {
+    ListOther: [{
+      Key: '愛', Type: 'zici'
+    }, {
+      Key: '饕餮', Type: 'zici'
+    }, {
+      Key: '鸿鹄之志', Type: 'zici'
+    }, {
+      Key: '天净沙·秋思', Type: 'shici'
+    }, {
+      Key: 'success', Type: 'zici'
+    }, {
+      Key: 'Study hard and make progress every day.', Type: 'eng'
+    }
+    ]
   },
   onLoad: function () {
     wx.hideShareMenu();
@@ -13,13 +27,24 @@ Page({
       Containnerheight: main.getWindowHeight(),
       IsShowNull: false,
     });
+    app.globalData.SearchResultList = [];
+    app.globalData.SearchNull = 0;
+    common.getStorageValue(that, "SearchTextList", [], function () {
+    });
   },
-  onShow:function(){
-    if (wx.getStorageSync("SearchNull")){
+  onShow: function () {
+    if (app.globalData.SearchNull == 1) {
+      var len = 26;
+      var list = app.globalData.SearchResultList;
+      for (var i = 0; i < list.length; i++) {
+        var item = list[i];
+        if (item.Content && item.Content.length > len)
+          item.Content = item.Content.substr(0, len) + "...";
+      }
       this.setData({
-        IsShowNull:true,
-      })
-      wx.removeStorageSync("SearchNull");
+        List: list,
+      });
+      app.globalData.SearchNull = 0;
     }
   },
   onKeyInput: function (e) {
@@ -30,63 +55,148 @@ Page({
     });
   },
   onSearch: function (e) {
-    if (this.data.SearchInfo && this.data.SearchInfo.length>0){
+    var that = this;
+    if (e.currentTarget.dataset.search)
+      this.data.SearchInfo = e.currentTarget.dataset.search;
+    if (this.data.SearchInfo && this.data.SearchInfo.length > 0) {
       var search = this.data.SearchInfo;
-      var arr=wx.getStorageSync("SearchWord");
-      if (!arr)
-        arr=[];
-      var obj = {};
-      obj.Key = search;
-      for(var i=0;i<arr.length;i++){
-        if (arr[i].Key == search){
-          obj.Key = arr[i].Key;
-          obj.Value = arr[i].Value;
-          arr.splice(i,1);
+      
+      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;
         }
       }
-      arr.unshift(obj);
-      wx.setStorageSync("SearchWord", arr);
-      wx.navigateTo({
-        url: './searchWeb2?back=3&search=' + search+'&type=0',
-      })
+      arr.unshift(search);
+
+      wx.setStorageSync("SearchTextList", arr);
+      that.setData({
+        SearchTextList: arr,
+      });
     }
-    else{
+    else {
       wx.showToast({
         title: '请输搜索内容',
       })
     }
   },
-  onSearchHistory: function (e) {
+  onSearchSelect: function (e) {
     var search = e.currentTarget.dataset.search;
-    var arr = wx.getStorageSync("SearchWord");
+    var searchType = e.currentTarget.dataset.searchtype;
+    var author = e.currentTarget.dataset.author;
+    wx.navigateTo({
+      url: './searchWeb2?search=' + search + '&searchType=' + searchType + '&author=' + author,
+    });
+  },
+  close: function (e) {
+    wx.navigateBack({
+      delta: 1,
+    });
+  },
+
+  deleteItem: function (e) {
+    var that = this;
+    var index = e.currentTarget.dataset.id;
+    that.data.SearchTextList.splice(index, 1);
+    that.setData({
+      SearchTextList: that.data.SearchTextList,
+    });
+    wx.setStorageSync("SearchTextList", that.data.SearchTextList);
+
+  },
+  searchResult: function (search, searchType, author,dynasty,content) {
+
+    wx.showLoading({
+      title: '查询中',
+    });
+    var that = this;
+
+    var arr = wx.getStorageSync("SearchWord2");
     if (!arr)
       arr = [];
     var obj = {};
     obj.Key = search;
-    var b=false,type=0;
+    if (searchType)
+      obj.Type = searchType;
+    else
+      obj.Type = "zici";
+    if (author)
+      obj.Author = author;
+    if (dynasty)
+      obj.dynasty = dynasty;
+    if (content)
+      obj.Content = content;
+    var b = false;
     for (var i = 0; i < arr.length; i++) {
-      if (arr[i].Key == search) {
-        obj.Key = arr[i].Key;
+      if (arr[i].Key == search 
+      && arr[i].Type == searchType 
+      && arr[i].Author == author) {
         obj.Value = arr[i].Value;
         arr.splice(i, 1);
-        b=true;
-        type=1
+        b = true;
         break;
       }
     }
-    if (b){
+    if (b) {
       arr.unshift(obj);
-      wx.setStorageSync("SearchWord", arr);
+      wx.setStorageSync("SearchWord2", arr);
+      app.globalData.SearchItem=obj.Value;
+
+      wx.hideLoading();
+
+      wx.navigateTo({
+        url: './searchWeb2?back=3',
+      });
+    }
+    else {
+      var url = 'GetMiaoguoAISearch?UserID=' + app.globalData.userInfo.UserID;
+      url += "&Word=" + search;
+      if (searchType)
+        url += "&SearchType=" + searchType;
+      if (author)
+        url += "&Author=" + author;
+      main.getData(url, function (data) {
+        wx.hideLoading();
+        searchType = "";
+        author = "";
+        if (data) {
+          //console.log(data);
+
+          if (data.List) {
+            app.globalData.SearchResultList = data.List;
+            app.globalData.SearchNull = 1;
+            wx.navigateBack({
+              delta: 1,
+            });
+          }
+          else {
+            obj.Value = data;
+            if (data.CHN && data.CHN.Author)
+              obj.Author = data.CHN.Author;
+            if (data.CHN && data.CHN.PeomContent)
+              obj.Type = "shici";
+            arr.unshift(obj);
+
+            if (arr.length > 100) {
+              arr.pop();
+            }
+
+            wx.setStorageSync("SearchWord2", arr);
+            that.getListFinished(data);
+          }
+        }
+        else {
+          app.globalData.SearchNull = 1;
+          app.globalData.SearchResultList = [];
+          wx.navigateBack({
+            delta: 1,
+          });
+        }
+      });
     }
-    wx.navigateTo({
-      url: './searchWeb2?back=2&search=' + search + '&type='+type,
-    });
-  },
-  close: function (e) {
-    wx.navigateBack({
-      delta: 1,
-    });
   },
   onShareAppMessage: function () {
     return {

pages/main/searchWeb1.wxml

@@ -12,25 +12,69 @@
     <view class='text2 text1' bindtap="onSearch" data-idsave="true">搜索</view>
   </view>
   <view class='lineFooter'></view>
-  <block wx:if="{{IsShowNull}}">
+
+  <block wx:if="{{SearchTextList.length>0}}">
+    <view class="panelTitle FlexRow">
+      <view class="panelTitle1">搜索记录</view>
+    </view>
+    <block wx:for="{{SearchTextList}}" wx:key="index">
+      <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
+        <view class="lineWidth720"></view>
+      </view>
+      <view class="panelItemSearch FlexRow">
+        <view class="panelItemSearch1">
+        </view>
+        <view class="panelItemSearch2 FlexRow">
+          <view class="panelItemSearchText1" bindtap='onSearch' data-search="{{item}}">
+            {{item}}
+          </view>
+          <view class="panelItemSearch21 FlexRow" bindtap='deleteItem' data-id="{{index}}">
+            <image src='../images/universalpic_del_gray_14x14.png' class="universalpic_del_gray_14x14" />
+          </view>
+        </view>
+      </view>
+
+    </block>
+    <view class='lineFooter'></view>
+  </block>
+
+  <block wx:if="{{List.length==0}}">
     <view class='panelNull FlexColumn'>
       <view class="text3">无资料匹配</view>
-      <view class="text4">通过搜索汉字、词语、成语、英语单词，添加相关资料</view>
+      <view class="text4">通过搜索汉字、词语、成语、诗词、英语单词，添加相关资料</view>
     </view>
     <view class="panelTitle FlexRow">
       <view class="panelTitle1">换个搜搜看</view>
     </view>
-
-    <block wx:for="{{['饕餮','鸿鹄之志','success','好好学习，天天向上','Study hard and make progress every day.']}}" wx:key="index">
+    <block wx:for="{{ListOther}}" wx:key="index">
       <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
         <view class="lineWidth720"></view>
       </view>
-      <view class="panelItem FlexRow" bindtap='onSearchHistory' data-search="{{item}}">
-        <view class="panelItem1">
+      <view class="panelItem0 panelItem FlexColumn" bindtap='onSearchSelect' data-search="{{item.Key}}" data-searchtype="{{item.Type}}">
+        <view class='Text1 FlexRow'>
+          <view>{{item.Key}}</view>
+          <view class='Text11'></view>
         </view>
-        <view class="panelItem2">
-          <text class="textNull">{{item}}</text>
+      </view>
+
+    </block>
+    <view class='lineFooter'></view>
+  </block>
+
+  <block wx:if="{{List.length>0}}">
+    <view class="panelTitle FlexRow">
+      <view class="panelTitle1">请选择</view>
+    </view>
+    <block wx:for="{{List}}" wx:key="index">
+      <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
+        <view class="lineWidth720"></view>
+      </view>
+      <view class="panelItem FlexColumn" bindtap='onSearchSelect' data-search="{{item.Title}}" data-searchtype="{{item.Type}}" data-author="{{item.Author}}">
+        <view class='Text1 FlexRow'>
+          <view>{{item.Title}}</view>
+          <view class='Text11'>{{item.Remark}}</view>
         </view>
+        <view class='Text2'>{{item.Content}}</view>
       </view>
     </block>
     <view class='lineFooter'></view>

pages/main/searchWeb1.wxss

@@ -95,6 +95,37 @@
 }
 
 .panelItem {
+  width: 100%;
+  align-items: flex-start;
+  min-height: 136rpx;
+  background-color: #fff;
+}
+.panelItem0 {
+  min-height: 100rpx;
+}
+
+.Text1 {
+  margin-left: 30rpx;
+  color: #1e1e1e;
+  font-weight: 400;
+  font-size:30rpx;
+}
+.Text11 {
+  margin-left: 30rpx;
+  color: #787878;
+  font-weight: 400;
+  font-size:24rpx;
+}
+
+.Text2 {
+  margin-left: 30rpx;
+  color: #787878;
+  font-weight: 400;
+  font-size:24rpx;
+}
+
+
+.panelItemSearch {
   width: 100%;
   justify-content: flex-start;
   font-size: 28rpx;
@@ -103,13 +134,37 @@
   background-color: #fff;
 }
 
-.panelItem1 {
+.panelItemSearch .panelItemSearch1 {
   margin-left: 30rpx;
   font-weight: 400;
 }
 
-.panelItem2 {
-  margin-right: 30rpx;
+.panelItemSearch .panelItemSearch2 {
   color: #1e1e1e;
   font-weight: 400;
-}
+  justify-content: space-between;
+  width:720rpx;
+}
+
+.panelItemSearch .panelItemSearchText1{
+  width:624rpx;
+  font-size:28rpx;
+  justify-content: flex-start;
+}
+
+
+.panelItemSearch .panelItemSearchText11{
+  color:#787878;
+  font-size:24rpx;
+  margin-right: 10rpx;
+}
+
+.panelItemSearch .panelItemSearch21{
+  width:96rpx;
+  height:100rpx;
+}
+
+.universalpic_del_gray_14x14{
+  width:14rpx;
+  height:14rpx;
+}

pages/main/searchWeb2.js

@@ -3,7 +3,8 @@ import main from '../../utils/main';
 
 const app = getApp();
 var back = 3;
-var hasStart={};
+var hasStart = {};
+var searchType="",author="";
 
 Page({
   data: {
@@ -16,9 +17,15 @@ Page({
     that.setData({
       Containnerheight: main.getWindowHeight(),
     });
-
+    searchType="";
+    if (options.searchType)
+      searchType = options.searchType;
+    
+    author = "";
+    if (options.author)
+      author = options.author;
     if (options.search) {
-      this.getList(options.search, options.type);
+      this.getList(options.search);
     }
     if (options.back)
       back = Number(options.back);
@@ -26,56 +33,84 @@ Page({
     hasStart = {};
 
   },
-  getList: function (word, type) {
+  getList: function (search) {
 
     wx.showLoading({
       title: '查询中',
     });
     var that = this;
-    if (type == 1) {
-      var data;
-      var arr = wx.getStorageSync("SearchWord");
-      if (!arr)
-        arr = [];
-      for (var i = 0; i < arr.length; i++) {
-        if (arr[i].Key == word) {
-          data = arr[i].Value;
-          break;
-        }
-      }
-      if (!data) {
-        wx.hideLoading();
-        that.getList(word, 0);
-      }
-      else {
-        wx.hideLoading();
-        that.getListFinished(data);
+    
+    var arr = wx.getStorageSync("SearchWord2");
+    if (!arr)
+      arr = [];
+    var obj = {};
+    obj.Key = search;
+    if (searchType)
+      obj.Type = searchType;
+    else
+      obj.Type = "zici";
+    if (author)
+      obj.Author = author;
+    if (author)
+      obj.Author = author;
+    var b = false, type = 0;
+    back = 3;
+    for (var i = 0; i < arr.length; i++) {
+      if (arr[i].Key == search && arr[i].Type == searchType && arr[i].Author == author) {
+        obj.Value = arr[i].Value;
+        arr.splice(i, 1);
+        back = 2;
+        b = true;
+        type = 1
+        break;
       }
     }
-    else {
+    if (b) {
+      arr.unshift(obj);
+      wx.setStorageSync("SearchWord2", arr);
+      that.getListFinished(obj.Value);
+      wx.hideLoading();
+    }
+    else{
       var url = 'GetMiaoguoAISearch?UserID=' + app.globalData.userInfo.UserID;
-      url += "&Word=" + word;
+      url +="&Word=" + search;
+      if (searchType)
+        url += "&SearchType=" + searchType;
+      if (author)
+        url += "&Author=" + author;
       main.getData(url, function (data) {
         wx.hideLoading();
+        searchType="";
+        author="";
         if (data) {
           //console.log(data);
 
-          //保存搜索结果
-          var arr = wx.getStorageSync("SearchWord");
-          if (!arr)
-            arr = [];
-          for (var i = 0; i < arr.length; i++) {
-            if (arr[i].Key == word) {
-              arr[i].Value = data;
-              break;
-            }
+          if (data.List){
+            app.globalData.SearchResultList=data.List;
+            app.globalData.SearchNull=1;
+            wx.navigateBack({
+              delta: 1,
+            });
           }
-          wx.setStorageSync("SearchWord", arr);
+          else{
+            obj.Value=data;
+            if (data.CHN && data.CHN.Author)
+              obj.Author=data.CHN.Author;
+            if (data.CHN && data.CHN.PeomContent)
+              obj.Type="shici";
+            arr.unshift(obj);
 
-          that.getListFinished(data);
+            if (arr.length>100){
+              arr.pop();
+            }
+
+            wx.setStorageSync("SearchWord2", arr);
+            that.getListFinished(data);
+          }
         }
         else {
-          wx.setStorageSync("SearchNull", 1);
+          app.globalData.SearchNull = 1;
+          app.globalData.SearchResultList = [];
           wx.navigateBack({
             delta: 1,
           });
@@ -86,25 +121,37 @@ Page({
   getListFinished: function (data) {
     var that = this;
     if (data.CHN) {
-      for (var i = 0; i < data.CHN.PinYin.length; i++) {
-        var item = data.CHN.PinYin[i].explain;
-        item = common.ReplaceAllString(item, "<p>", "");
-        item = common.ReplaceAllString(item, "<span>", "");
-        item = common.ReplaceAllString(item, "</span>", "");
-        item = common.ReplaceAllString(item, "\r", "");
-        item = common.ReplaceAllString(item, "\n", "");
-
-        var arr = item.split("</p>");
-        arr.pop();
-        data.CHN.PinYin[i].explain = arr.join("\n");
+      if (data.CHN.PinYin) {
+        for (var i = 0; i < data.CHN.PinYin.length; i++) {
+          var item = data.CHN.PinYin[i].explain;
+          item = common.ReplaceAllString(item, "<p>", "");
+          item = common.ReplaceAllString(item, "<span>", "");
+          item = common.ReplaceAllString(item, "</span>", "");
+          item = common.ReplaceAllString(item, "\r", "");
+          item = common.ReplaceAllString(item, "\n", "");
+
+          var arr = item.split("</p>");
+          arr.pop();
+          data.CHN.PinYin[i].explain = arr.join("\n");
+        }
+      }
+
+      if (data.CHN.HanZi) {
+        if (data.CHN.HanZi.length >= 2 && data.CHN.HanZi.length <= 4 && data.CHN.PinYin && data.CHN.PinYin.length > 0) {
+          data.CHN.TianKong = [];
+          var arrPinyin = data.CHN.PinYin[0].pinyin.split(" ");
+          for (var i = 0; i < data.CHN.HanZi.length; i++) {
+            var str = data.CHN.HanZi.replace(data.CHN.HanZi[i], arrPinyin[i]);
+            data.CHN.TianKong.push(str);
+          }
+        }
       }
 
-      if (data.CHN.HanZi.length >= 2 && data.CHN.HanZi.length <= 4 && data.CHN.PinYin && data.CHN.PinYin.length > 0) {
-        data.CHN.TianKong = [];
-        var arrPinyin = data.CHN.PinYin[0].pinyin.split(" ");
-        for (var i = 0; i < data.CHN.HanZi.length; i++) {
-          var str = data.CHN.HanZi.replace(data.CHN.HanZi[i], arrPinyin[i]);
-          data.CHN.TianKong.push(str);
+      if (data.ENG && data.ENG.Paraphrase && common.checkIsArray(data.ENG.Paraphrase)) {
+
+        for (var i = 0; i < data.ENG.Paraphrase.length; i++) {
+          var item = data.ENG.Paraphrase[i];
+          item.PartOfSpeech = common.ReplaceAllString(item.PartOfSpeech, "释义", "");
         }
       }
     }
@@ -135,7 +182,7 @@ Page({
       this.data.CSS[css].Tag = tag;
       if (tag == "发音")
         this.data.CSS[css].SoundMark = soundmark;
-      
+
       if (tag == "读写") {
         var pinyin = e.currentTarget.dataset.pinyin;
         if (pinyin)
@@ -145,7 +192,7 @@ Page({
       this.data.CSS[css].Number = "1";
       if (wx.getStorageSync("TempFieldNumber") && !hasStart[css]) {
         this.data.CSS[css].Number = Number(wx.getStorageSync("TempFieldNumber"));
-        hasStart[css]=true;
+        hasStart[css] = true;
       }
     }
     else if (this.data.CSS[css].Number == "3") {
@@ -200,7 +247,7 @@ Page({
             else if (item.Type == "sound") {
               str = "[读]" + item.Content + "[/读]";
               if (item.Tag == "发音") {
-                str = "[读 src='" + item.SoundMark+"']" + item.Content + "[/读]";
+                str = "[读 src='" + item.SoundMark + "']" + item.Content + "[/读]";
               }
               else if (item.Tag == "拼音" || item.Tag == "读写") {
                 if (item.SoundMark)
@@ -210,18 +257,28 @@ Page({
               }
             }
             else {
-              str = item.Content;
+              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");
+                  else
+                    item.Content[j] = item.Content[j].join("");
+                }
+                str = item.Content.join("\n");
+              }
+              else
+                str = item.Content;
             }
-            
+
             if (list[i].Content[item.Number].Content)
-                str="\n"+str;
-            list[i].Content[item.Number].Content+=str;
-            
+              str = "\n" + str;
+            list[i].Content[item.Number].Content += str;
+
           }
           break;
         }
       }
-      app.globalData.CardList=list;
+      app.globalData.CardList = list;
 
       wx.navigateBack({
         delta: back,
@@ -238,11 +295,11 @@ Page({
       IsShowHelp: 0,
     });
   },
-  close:function(){
+  close: function () {
     this.setData({
-      IsShowHelp:1,
+      IsShowHelp: 1,
     });
-    wx.setStorageSync("IsShowHelp",1);
+    wx.setStorageSync("IsShowHelp", 1);
   },
   onShareAppMessage: function () {
     return {

pages/main/searchWeb2.wxml

@@ -121,6 +121,53 @@
     <view class='lineFooter'></view>
   </block>
 
+  <!-- 作者与朝代 -->
+  <block wx:if="{{Result.CHN.Author && Result.CHN.Author.length>0}}">
+    <view class="panelTitle FlexRow">
+      <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.Css2}} panelSelect0">{{CSS.CHN_Author.Number}}</view>
+        <view class="text1">{{Result.CHN.Dynasty}} {{Result.CHN.Author}}</view>
+      </view>
+    </view>
+    <view class='lineFooter'></view>
+  </block>
+
+  <!-- 诗词原文 -->
+  <block wx:if="{{Result.CHN.PeomContent && Result.CHN.PeomContent.length>0}}">
+    <view class="panelTitle FlexRow">
+      <view class="panelTitle1">诗词原文</view>
+    </view>
+    <view class="panelItem FlexRow">
+      <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">
+          <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>
+        </view>
+      </view>
+    </view>
+    <view class='lineFooter'></view>
+  </block>
+
+  <!-- 诗词译文 -->
+  <block wx:if="{{Result.CHN.Translation && Result.CHN.Translation.length>0}}">
+    <view class="panelTitle FlexRow">
+      <view class="panelTitle1">诗词译文</view>
+    </view>
+    <view class="panelItem FlexRow">
+      <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>
+      </view>
+    </view>
+    <view class='lineFooter'></view>
+  </block>
+
+
   <!-- 英文原文 -->
   <block wx:if="{{Result.ENG.Word && Result.ENG.Word.length>0 && !Result.CHN.HanZi}}">
     <view class="panelTitle FlexRow">

utils/main.js

@@ -644,6 +644,10 @@ function saveTempImage(serverUrl, tempUrl) {
   if (!b) {
     list.push({ "ServerUrl": serverUrl, "TempUrl": tempUrl });
   }
+
+  if (list>200){
+    list.pop();
+  }
   wx.setStorageSync("TempImageList", list);
 }