Merge remote-tracking branch 'origin/main'

 import router from '@ohos.router'
 import router from '@ohos.router'
-import { BreakpointSystem, NetworkUtil, StringUtils, ToastUtils } from 'wdKit'
+import { BreakpointSystem, DateTimeUtils, NetworkUtil, StringUtils, ToastUtils } from 'wdKit'
 import { ParamType, TrackConstants, Tracking } from 'wdTracking/Index'
 import { ParamType, TrackConstants, Tracking } from 'wdTracking/Index'
 import SearcherAboutDataModel from '../../model/SearcherAboutDataModel'
 import SearcherAboutDataModel from '../../model/SearcherAboutDataModel'
 import { SearchHistoryItem } from '../../viewmodel/SearchHistoryItem'
 import { SearchHistoryItem } from '../../viewmodel/SearchHistoryItem'
@@ -32,6 +32,7 @@ export struct SearchComponent {
   @State count:string[] = []
   @State count:string[] = []
   @State isGetRequest:boolean = false
   @State isGetRequest:boolean = false
   @Link fromTabName: string
   @Link fromTabName: string
+  @State sameSearch:number = 0 //再次搜索
 
 
   @StorageProp('currentBreakpoint') @Watch("currentChanged")currentBreakpoint: string = 'sm';
   @StorageProp('currentBreakpoint') @Watch("currentChanged")currentBreakpoint: string = 'sm';
   private breakpointSystem = new BreakpointSystem();
   private breakpointSystem = new BreakpointSystem();
@@ -175,7 +176,7 @@ export struct SearchComponent {
               this.getSearchHistoryData()
               this.getSearchHistoryData()
               this.getSearchInputResData(this.searchText)
               this.getSearchInputResData(this.searchText)
             }
             }
-          },percent:this.percent})
+          },percent:this.percent,sameSearch:this.sameSearch})
         } else {
         } else {
           //联想搜索
           //联想搜索
           SearchRelatedComponent({relatedSearchContentData:$relatedSearchContentsData,onGetSearchRes: (item): void => this.getSearchRelatedResData(item),searchText:this.searchText,percent:this.percent})
           SearchRelatedComponent({relatedSearchContentData:$relatedSearchContentsData,onGetSearchRes: (item): void => this.getSearchRelatedResData(item),searchText:this.searchText,percent:this.percent})
@@ -402,6 +403,7 @@ export struct SearchComponent {
       }
       }
       this.isGetRequest = true
       this.isGetRequest = true
       this.resetSearch()
       this.resetSearch()
+      this.sameSearch = DateTimeUtils.getTimeStamp()
     }).catch((err: Error) => {
     }).catch((err: Error) => {
       console.log(TAG, JSON.stringify(err))
       console.log(TAG, JSON.stringify(err))
       this.isGetRequest = true
       this.isGetRequest = true

@@ -29,6 +29,8 @@ export struct SearchResultComponent {
   onClickTryAgain?: () => void;
   onClickTryAgain?: () => void;
   @State isConnectNetwork : boolean = NetworkUtil.isNetConnected()
   @State isConnectNetwork : boolean = NetworkUtil.isNetConnected()
   @Prop percent:number = 1
   @Prop percent:number = 1
+  @Prop sameSearch:number = 0
+
 
 
   aboutToAppear(): void {
   aboutToAppear(): void {
     if (this.count.length === 0 && this.isGetRequest == true) {
     if (this.count.length === 0 && this.isGetRequest == true) {
@@ -137,7 +139,7 @@ export struct SearchResultComponent {
         Tabs({ barPosition: BarPosition.Start, controller: this.controller }) {
         Tabs({ barPosition: BarPosition.Start, controller: this.controller }) {
           ForEach(this.count, (item: string, index: number) => {
           ForEach(this.count, (item: string, index: number) => {
             TabContent() {
             TabContent() {
-              SearchResultContentComponent({ keywords: this.searchText, searchType: item })
+              SearchResultContentComponent({ keywords: this.searchText, searchType: item ,sameSearch:this.sameSearch,isCurrentShow:this.currentIndex === index})
             }.tabBar(this.TabBuilder(index, item))
             }.tabBar(this.TabBuilder(index, item))
             .layoutWeight(1)
             .layoutWeight(1)
           }, (item: string, index: number) => index.toString())
           }, (item: string, index: number) => index.toString())

@@ -51,7 +51,22 @@ export struct SearchResultContentComponent {
   @State moreWidth:number = 20
   @State moreWidth:number = 20
   @State listLeft: number = 0
   @State listLeft: number = 0
   @State isEnd: boolean = false
   @State isEnd: boolean = false
+  @Watch('updateData') @Prop sameSearch:number = 0
+  @Prop isCurrentShow:boolean = false;
 
 
+  updateData(){
+    if(this.isCurrentShow){
+      this.data_rmh = []
+
+      this.data.clearAllData()
+
+      this.curPageNum = 1
+      this.hasMore = true
+      this.isLoading = false
+      this.getNewSearchResultData()
+    }
+
+  }
 
 
   aboutToAppear(): void {
   aboutToAppear(): void {
     if (this.searchType == "全部") {
     if (this.searchType == "全部") {