1.0.0.23

app.js

@@ -25,7 +25,7 @@ App({
     }
   },
   globalData: {
-    Version: "1.0.0.22",
+    Version: "1.0.0.23",
     IsProduction: false,
     ShareTitle: "可以用来记忆一切的工具",
     SharePath: "pages/index/index",

app.json

@@ -35,5 +35,6 @@
     "wxa5e33c61fe37dd01",
     "wxaa1a8b48d9853872",
     "wx80059777521b897c"
-  ]
+  ],
+  "sitemapLocation": "sitemap.json"
 }

pages/main/add.wxml

@@ -1,5 +1,5 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <block wx:if="{{Tags && Tags.length>0}}">
+  <!-- <block wx:if="{{Tags && Tags.length>0}}">
     <view class="panelTag FlexRow">
       <view class="panelItem1">记号</view>
       <view class="panelItem2 FlexRow">
@@ -7,7 +7,19 @@
       </view>
     </view>
     <view class='lineFooter'></view>
-  </block>
+  </block> -->
+
+  <view class="panelItem3 FlexRow" wx:if="{{UpdateType=='add' || UpdateType=='add2'}}">
+    <view class="panelItem1">
+      练习时间
+    </view>
+    <view class="panelItem2 FlexRow">
+      <view class="panelItem31" hidden="{{IsTodayStudy}}">智能安排</view>
+      <view class="panelItem311 panelItem31" hidden="{{!IsTodayStudy}}">今日必练</view>
+      <switch class='panelItem32' checked="{{IsTodayStudy}}" bindchange="switch1Change" />
+    </view>
+  </view>
+  <view class='lineFooter'></view>
   <view class="panelTitle FlexRow">
     <view class="panelTitle1">段落</view>
   </view>
@@ -51,18 +63,7 @@
   </block>
   <view class='lineFooter'></view>
 
-  <view class="panelItem3 FlexRow" wx:if="{{UpdateType=='add' || UpdateType=='add2'}}">
-    <view class="panelItem1">
-      练习时间
-    </view>
-    <view class="panelItem2 FlexRow">
-      <view class="panelItem31" hidden="{{IsTodayStudy}}">智能安排</view>
-      <view class="panelItem311 panelItem31" hidden="{{!IsTodayStudy}}">今日必练</view>
-      <switch class='panelItem32' checked="{{IsTodayStudy}}" bindchange="switch1Change" />
-    </view>
-  </view>
-  <view class='lineFooter'></view>
-  <view class="panelItem3Remark" wx:if="{{UpdateType=='add' || UpdateType=='add2'}}">指定该题卡必定出现在今天任务中，可能增加额外的任务量</view>
+  <!-- <view class="panelItem3Remark" wx:if="{{UpdateType=='add' || UpdateType=='add2'}}">指定该题卡必定出现在今天任务中，可能增加额外的任务量</view> -->
   <view style='height:300rpx;'></view>
 
   <view class='panelSave FlexRow'>

pages/main/add.wxss

@@ -134,7 +134,6 @@
 
 .panelItem3 {
   min-height: 100rpx;
-  margin-top: 50rpx;
   width: 100%;
   justify-content: space-between;
   font-size: 28rpx;

pages/main/preview.wxss

@@ -105,6 +105,7 @@
 
 .panelItem .textNormal {
   width:650rpx;
+  justify-content: flex-start;
 }
 .panelItem .textPinyin {
   text-decoration: underline;

pages/main/searchCardList.js

@@ -79,7 +79,7 @@ Page({
     }
 
     var hasPage=false;
-    if (list.length % 20 == 0 && that.data.IsToday==0)
+    if (list.length<that.data.Count && that.data.IsToday==0)
       hasPage=true;
     
     this.setData({

pages/main/searchWeb.js

@@ -9,33 +9,36 @@ Page({
   onLoad: function () {
     wx.hideShareMenu();
     var that = this;
-    
+
     that.setData({
       Containnerheight: main.getWindowHeight(),
     });
   },
-  onShow:function(){
+  onShow: function () {
     var that = this;
     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;
+
+    var list = [];
+    if (arr.length > 0) {
+      var count=arr.length<10?arr.length:10;
+      for (var i = 0; i < count; 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]);
       }
-      list.push(arr[i]);
     }
     that.setData({
       SelectList: list,
@@ -47,12 +50,17 @@ Page({
     })
   },
   onSearchHistory: function (e) {
-    var search = e.currentTarget.dataset.search;
-    var searchType = e.currentTarget.dataset.searchtype;
-    var author = e.currentTarget.dataset.author;
-
+    var index = Number(e.currentTarget.dataset.index);
+    var obj={};
+    for(var i=0;i<this.data.SelectList.length;i++){
+      if (i==index){
+        obj=this.data.SelectList[i];
+        break;
+      }
+    }
+    main.updateSearchList(obj);
     wx.navigateTo({
-      url: './searchWeb2?back=2&search=' + search + '&searchType=' + searchType+'&author='+author,
+      url: './searchWeb2?back=2',
     });
   },
   onShareAppMessage: function () {

pages/main/searchWeb.wxml

@@ -6,31 +6,27 @@
     </view>
   </view>
   <view class='lineFooter'></view>
-  <view class="panelTitle FlexRow" wx:if="{{SelectList.length>0}}">
+  <view class="panelTitle FlexRow">
     <view class="panelTitle1">看过的资料</view>
   </view>
+  <view class="panelNull" wx:if="{{SelectList.length==0}}">暂无。为方便再次查看，近期打开过的资料会显示在这里。</view>
 
   <block wx:for="{{SelectList}}" wx:key="index">
     <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
       <view class="lineWidth720"></view>
     </view>
-    <view class="panelItemSearch FlexColumn">
+    <view class="panelItemSearch FlexColumn"  bindtap='onSearchHistory' data-index="{{index}}">
       <view class="panelItemSearch1 FlexRow">
-        <view class="panelItemSearch11" bindtap='onSearchHistory' data-search="{{item.Key}}" data-searchtype="{{item.Type}}" data-author="{{item.Author}}">
+        <view class="panelItemSearch11">
           {{item.Key}}
         </view>
-        <view class="panelItemSearch12 FlexRow">
+        <view class="panelItemSearch12 FlexRow" wx:if="{{item.Type=='shici'}}">
           {{item.TypeName}}
         </view>
       </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>
+    <view class='lineFooter'></view>
   </block>
-  <view class='lineFooter'></view>
+  
   <view style='height:100rpx;'></view>
 </view>

pages/main/searchWeb.wxss

@@ -50,6 +50,16 @@
   margin-bottom: 32rpx;
 }
 
+.panelNull{
+  margin-top: -20rpx;
+  font-size:24rpx;
+  font-weight: 400;
+  color:#787878;
+  align-self: flex-start;
+  margin-left: 30rpx;
+
+}
+
 .panelItemSearch {
   width: 100%;
   min-height: 100rpx;
@@ -75,7 +85,7 @@
 
 
 .panelItemSearch .panelItemSearch12{
-  border:2rpx solid #0071EF;
+  border:1rpx solid #0071EF;
   font-size:20rpx;
   text-align: center;
   line-height: 34rpx;

pages/main/searchWeb1.js

@@ -6,18 +6,20 @@ const app = getApp();
 Page({
   data: {
     ListOther: [{
-      Key: '愛', Type: 'zici'
+      Key: '愛', Type: 'zici', TypeName: '字词'
     }, {
-      Key: '饕餮', Type: 'zici'
+      Key: '饕餮', Type: 'zici', TypeName: '字词'
     }, {
-      Key: '鸿鹄之志', Type: 'zici'
+      Key: '鸿鹄之志', Type: 'zici', TypeName: '字词'
     }, {
-      Key: '天净沙·秋思', Type: 'shici'
+      Key: '咏鹅', Type: 'shici', Author: '骆宾王', Dynasty: '唐', TypeName: '诗词'
     }, {
-      Key: 'success', Type: 'zici'
+      Key: '天净沙·秋思', Type: 'shici', Author: '马致远', Dynasty: '元', TypeName: '诗词'
     }, {
-      Key: 'Study hard and make progress every day.', Type: 'eng'
-    }
+      Key: 'success', Type: 'zici', TypeName: '字词'
+    },{
+        Key: 'Study hard and make progress every day.', Type: 'eng', TypeName: '外语'
+    },
     ]
   },
   onLoad: function () {
@@ -25,28 +27,11 @@ Page({
     var that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),
-      IsShowNull: false,
+      IsStart: true,
     });
-    app.globalData.SearchResultList = [];
-    app.globalData.SearchNull = 0;
     common.getStorageValue(that, "SearchTextList", [], function () {
     });
   },
-  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({
-        List: list,
-      });
-      app.globalData.SearchNull = 0;
-    }
-  },
   onKeyInput: function (e) {
     var search = e.detail.value;
     var that = this;
@@ -54,13 +39,22 @@ Page({
       SearchInfo: search,
     });
   },
+  onBindfocus:function(){
+    this.setData({
+      IsStart:true,
+      List:[],
+    });
+    wx.setNavigationBarTitle({
+      title: "搜索中"
+    });
+  },
   onSearch: function (e) {
     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;
-      
+
       that.searchResult(search);
 
       var arr = that.data.SearchTextList;
@@ -83,13 +77,21 @@ Page({
       })
     }
   },
-  onSearchSelect: function (e) {
-    var search = e.currentTarget.dataset.search;
-    var searchType = e.currentTarget.dataset.searchtype;
-    var author = e.currentTarget.dataset.author;
-    wx.navigateTo({
-      url: './searchWeb2?search=' + search + '&searchType=' + searchType + '&author=' + author,
-    });
+  onSearchHistory: function (e) {
+    var index = e.currentTarget.dataset.index;
+    var listtype = e.currentTarget.dataset.type;
+    var list = this.data.List;
+    if (listtype=="null")
+      list=this.data.ListOther;
+    var obj={};
+    for(var i=0;i<list.length;i++){
+      if (index==i){
+        obj=list[i];
+        break;
+      }
+    }
+    this.searchResult(obj.Key,obj.Type,obj.Author);
+    
   },
   close: function (e) {
     wx.navigateBack({
@@ -107,96 +109,72 @@ Page({
     wx.setStorageSync("SearchTextList", that.data.SearchTextList);
 
   },
-  searchResult: function (search, searchType, author,dynasty,content) {
+  searchResult: function (search, searchType, author) {
 
     wx.showLoading({
       title: '查询中',
     });
     var that = this;
 
-    var arr = wx.getStorageSync("SearchWord2");
-    if (!arr)
-      arr = [];
-    var obj = {};
-    obj.Key = search;
+    var url = 'GetMiaoguoAISearch?UserID=' + app.globalData.userInfo.UserID;
+    url += "&Word=" + search;
     if (searchType)
-      obj.Type = searchType;
-    else
-      obj.Type = "zici";
+      url += "&SearchType=" + searchType;
     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 
-      && arr[i].Type == searchType 
-      && arr[i].Author == author) {
-        obj.Value = arr[i].Value;
-        arr.splice(i, 1);
-        b = true;
-        break;
-      }
-    }
-    if (b) {
-      arr.unshift(obj);
-      wx.setStorageSync("SearchWord2", arr);
-      app.globalData.SearchItem=obj.Value;
-
+      url += "&Author=" + author;
+    main.getData(url, function (data) {
       wx.hideLoading();
-
-      wx.navigateTo({
-        url: './searchWeb2?back=3',
+      wx.setNavigationBarTitle({
+        title: "搜索结果"
       });
-    }
-    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);
+      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);
+        if (data.List) {
+          var len = 26;
+          var list = data.List;
+          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) + "...";
           }
+          that.setData({
+            List: list,
+            IsStart: false,
+          });
         }
         else {
-          app.globalData.SearchNull = 1;
-          app.globalData.SearchResultList = [];
-          wx.navigateBack({
-            delta: 1,
+          var obj = {};
+          obj.Key=search;
+          obj.Value = data;
+          if (data.CHN && data.CHN.Author)
+            obj.Author = data.CHN.Author;
+          if (data.CHN && data.CHN.Dynasty)
+            obj.Dynasty = data.CHN.Dynasty;
+          if (data.CHN && data.CHN.PeomContent) {
+            obj.Type = "shici";
+            obj.Content = data.CHN.PeomContent.join("").substr(0, 26);
+          }
+          else {
+            obj.Type = "zici";
+          }
+          main.updateSearchList(obj);
+
+          wx.navigateTo({
+            url: './searchWeb2?back=3',
           });
         }
-      });
-    }
+      }
+      else {
+        that.setData({
+          List: [],
+          IsStart: false,
+        });
+      }
+    });
+
   },
   onShareAppMessage: function () {
     return {

pages/main/searchWeb1.wxml

@@ -2,81 +2,111 @@
   <view class="panelSearch FlexRow">
     <view class="panelSearch1 FlexRow">
       <image class="universalpic_search_gray_30x30" src='../images/universalpic_search_gray_30x30.png' />
-      <input class='input' maxlength='50' auto-focus bindinput="onKeyInput" value="{{SearchInfo}}" />
+      <input class='input' maxlength='50' auto-focus bindinput="onKeyInput" value="{{SearchInfo}}" bindfocus="onBindfocus" />
     </view>
   </view>
   <view class='lineFooter'></view>
-  <view class='panelBtn FlexRow'>
-    <view class='text1' bindtap="close" data-idsave="false">取消</view>
-    <view class='line1'></view>
-    <view class='text2 text1' bindtap="onSearch" data-idsave="true">搜索</view>
-  </view>
-  <view class='lineFooter'></view>
 
-  <block wx:if="{{SearchTextList.length>0}}">
-    <view class="panelTitle FlexRow">
-      <view class="panelTitle1">搜索记录</view>
+  <!-- 搜索起始状态 -->
+  <block wx:if="{{IsStart}}">
+    <view class='panelBtn FlexRow'>
+      <view class='text1' bindtap="close" data-idsave="false">取消</view>
+      <view class='line1'></view>
+      <view class='text2 text1' bindtap="onSearch" data-idsave="true">搜索</view>
     </view>
-    <block wx:for="{{SearchTextList}}" wx:key="index">
-      <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
-        <view class="lineWidth720"></view>
+    <view class='lineFooter'></view>
+
+    <block wx:if="{{SearchTextList.length>0}}">
+      <view class="panelTitle FlexRow">
+        <view class="panelTitle1">搜索记录</view>
       </view>
-      <view class="panelItemSearch FlexRow">
-        <view class="panelItemSearch1">
+      <block wx:for="{{SearchTextList}}" wx:key="index">
+        <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
+          <view class="lineWidth720"></view>
         </view>
-        <view class="panelItemSearch2 FlexRow">
-          <view class="panelItemSearchText1" bindtap='onSearch' data-search="{{item}}">
-            {{item}}
+        <view class="panelItemSearch0 FlexRow">
+          <view class="panelItemSearch01">
           </view>
-          <view class="panelItemSearch21 FlexRow" bindtap='deleteItem' data-id="{{index}}">
-            <image src='../images/universalpic_del_gray_14x14.png' class="universalpic_del_gray_14x14" />
+          <view class="panelItemSearch02 FlexRow">
+            <view class="panelItemSearchText01" bindtap='onSearch' data-search="{{item}}">
+              {{item}}
+            </view>
+            <view class="panelItemSearch021 FlexRow" bindtap='deleteItem' data-id="{{index}}">
+              <image src='../images/universalpic_del_gray_14x14.png' class="universalpic_del_gray_14x14" />
+            </view>
           </view>
         </view>
-      </view>
 
+      </block>
+      <view class='lineFooter'></view>
     </block>
-    <view class='lineFooter'></view>
   </block>
 
-  <block wx:if="{{List.length==0}}">
+  <!-- 无资料匹配状态 -->
+  <block wx:if="{{!IsStart && List.length==0}}">
     <view class='panelNull FlexColumn'>
-      <view class="text3">无资料匹配</view>
+      <view class="text3">无匹配</view>
       <view class="text4">通过搜索汉字、词语、成语、诗词、英语单词，添加相关资料</view>
     </view>
     <view class="panelTitle FlexRow">
-      <view class="panelTitle1">换个搜搜看</view>
+      <view class="panelTitle1">参考资料</view>
     </view>
     <block wx:for="{{ListOther}}" wx:key="index">
       <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
         <view class="lineWidth720"></view>
       </view>
-      <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 class="panelItemSearch FlexColumn" bindtap='onSearchHistory' data-index="{{index}}"  data-type="null">
+        <view class="panelItemSearch1 FlexRow">
+          <view class="panelItemSearch11">
+            {{item.Key}}
+          </view>
+          <view class="panelItemSearch12 FlexRow" wx:if="{{item.Type=='shici'}}">
+            {{item.TypeName}}
+          </view>
+        </view>
+        <view class="panelItemSearch2 FlexRow" wx:if="{{item.Type=='zici'}}">
+          {{item.Remark}}
+        </view>
+        <view class="panelItemSearch2 FlexRow" wx:if="{{item.Type=='shici'}}">
+          {{item.Author}} {{item.Dynasty}}
+        </view>
+        <view class="panelItemSearch3 FlexRow" wx:if="{{item.Type=='shici'}}">
+          {{item.Content}}
         </view>
       </view>
-
     </block>
     <view class='lineFooter'></view>
   </block>
 
-  <block wx:if="{{List.length>0}}">
-    <view class="panelTitle FlexRow">
-      <view class="panelTitle1">请选择</view>
+  <block wx:if="{{!IsStart && List.length>0}}">
+    <view style='height:50rpx;'>
     </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 class="panelItemSearch FlexColumn" bindtap='onSearchHistory' data-index="{{index}}"  data-type="many">
+        <view class="panelItemSearch1 FlexRow">
+          <view class="panelItemSearch11">
+            {{item.Key}}
+          </view>
+          <view class="panelItemSearch12 FlexRow" wx:if="{{item.Type=='shici'}}">
+            {{item.TypeName}}
+          </view>
+        </view>
+        <view class="panelItemSearch2 FlexRow" wx:if="{{item.Type=='zici'}}">
+          {{item.Remark}}
+        </view>
+        <view class="panelItemSearch2 FlexRow" wx:if="{{item.Type=='shici'}}">
+          {{item.Author}} {{item.Dynasty}}
+        </view>
+        <view class="panelItemSearch3 FlexRow" wx:if="{{item.Type=='shici'}}">
+          {{item.Content}}
         </view>
-        <view class='Text2'>{{item.Content}}</view>
       </view>
     </block>
     <view class='lineFooter'></view>
   </block>
+
+
 </view>

pages/main/searchWeb1.wxss

@@ -125,7 +125,7 @@
 }
 
 
-.panelItemSearch {
+.panelItemSearch0 {
   width: 100%;
   justify-content: flex-start;
   font-size: 28rpx;
@@ -134,7 +134,7 @@
   background-color: #fff;
 }
 
-.panelItemSearch .panelItemSearch1 {
+.panelItemSearch0 .panelItemSearch01 {
   margin-left: 30rpx;
   font-weight: 400;
 }
@@ -146,20 +146,22 @@
   width:720rpx;
 }
 
-.panelItemSearch .panelItemSearchText1{
+.panelItemSearch0 .panelItemSearchText01{
   width:624rpx;
   font-size:28rpx;
   justify-content: flex-start;
+  height:100rpx;
+  line-height: 100rpx;
 }
 
 
-.panelItemSearch .panelItemSearchText11{
+.panelItemSearch0 .panelItemSearchText101{
   color:#787878;
   font-size:24rpx;
   margin-right: 10rpx;
 }
 
-.panelItemSearch .panelItemSearch21{
+.panelItemSearch0 .panelItemSearch021{
   width:96rpx;
   height:100rpx;
 }
@@ -168,3 +170,55 @@
   width:14rpx;
   height:14rpx;
 }
+
+
+.panelItemSearch {
+  width: 100%;
+  min-height: 134rpx;
+  background-color: #fff;
+  justify-content: flex-start;
+  align-items: flex-start;
+}
+
+.panelItemSearch .panelItemSearch1{
+  color: #1e1e1e;
+  font-weight: 400;
+  justify-content: space-between;
+  width:100%;
+}
+
+.panelItemSearch .panelItemSearch11{
+  width:624rpx;
+  font-size:28rpx;
+  font-weight: 400;
+  margin-left: 30rpx;
+  margin-top: 30rpx
+}
+
+
+.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
+}
+
+.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/searchWeb2.js

@@ -4,7 +4,6 @@ import main from '../../utils/main';
 const app = getApp();
 var back = 3;
 var hasStart = {};
-var searchType="",author="";
 
 Page({
   data: {
@@ -17,105 +16,18 @@ 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);
-    }
+
     if (options.back)
       back = Number(options.back);
 
+    this.getList();
+    
     hasStart = {};
 
   },
-  getList: function (search) {
-
-    wx.showLoading({
-      title: '查询中',
-    });
-    var that = this;
-    
-    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;
-      }
-    }
-    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=" + 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,
-          });
-        }
-      });
+  getList: function () {
+    if (app.globalData.SearchItem) {
+      this.getListFinished(app.globalData.SearchItem);
     }
   },
   getListFinished: function (data) {
@@ -257,7 +169,7 @@ Page({
               }
             }
             else {
-              if (item.Tag == "诗词原文") {
+              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");

pages/main/searchWeb2.wxml

@@ -127,7 +127,7 @@
       <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>
@@ -141,7 +141,7 @@
       <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.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">
@@ -159,7 +159,7 @@
       <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.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>

project.config.json

@@ -19,6 +19,8 @@
 		"hidedInDevtools": []
 	},
 	"isGameTourist": false,
+	"simulatorType": "wechat",
+	"simulatorPluginLibVersion": {},
 	"condition": {
 		"search": {
 			"current": -1,

sitemap.json

@@ -0,0 +1,7 @@
+{
+  "desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
+  "rules": [{
+  "action": "allow",
+  "page": "*"
+  }]
+}

utils/main.js

@@ -651,6 +651,28 @@ function saveTempImage(serverUrl, tempUrl) {
   wx.setStorageSync("TempImageList", list);
 }
 
+function updateSearchList(obj){
+  var arr = wx.getStorageSync("SearchWord2");
+  if (!arr)
+    arr = [];
+  for (var i = 0; i < arr.length; i++) {
+    if (arr[i].Key == obj.Key
+      && arr[i].Type == obj.Type
+      && arr[i].Author == obj.Author) {
+      obj.Value = arr[i].Value;
+      arr.splice(i, 1);
+      break;
+    }
+  }
+  arr.unshift(obj);
+
+  if (arr.length > 100) {
+    arr.pop();
+  }
+  wx.setStorageSync("SearchWord2", arr);
+  app.globalData.SearchItem = obj.Value;
+}
+
 function getPinyin(pinyin) {
   var result = [];
   var arr = getPinyinArray();
@@ -2172,4 +2194,5 @@ module.exports = {
   saveTempImage: saveTempImage,
   getTempImage: getTempImage,
   getTaskTodayList: getTaskTodayList,
+  updateSearchList: updateSearchList,
 }