desc:搜索跳转 和 登录注销处理

@@ -101,4 +101,9 @@ export class SPHelper {
   //   preferences.clearSync()
   //   preferences.clearSync()
   //   preferences.flush()
   //   preferences.flush()
   // }
   // }
+
+  public  getPreferences(){
+    let preferences =  data_preferences.getPreferences(SPHelper.context, SPHelper.spFilename);
+    return preferences;
+  }
 }
 }

@@ -97,4 +97,6 @@ export class WDRouterPage {
   static broadcastPage = new WDRouterPage("phone", "ets/pages/broadcast/BroadcastPage");
   static broadcastPage = new WDRouterPage("phone", "ets/pages/broadcast/BroadcastPage");
   //搜索主页
   //搜索主页
   static searchPage = new WDRouterPage("wdComponent", "ets/pages/SearchPage");
   static searchPage = new WDRouterPage("wdComponent", "ets/pages/SearchPage");
+  //搜索人民号主页
+  static searchCreatorPage = new WDRouterPage("wdComponent", "ets/pages/SearchCreatorPage");
 }
 }

 import { WDRouterRule, WDRouterPage } from 'wdRouter'
 import { WDRouterRule, WDRouterPage } from 'wdRouter'
 import MinePagePersonalFunctionsItem from '../../viewmodel/MinePagePersonalFunctionsItem'
 import MinePagePersonalFunctionsItem from '../../viewmodel/MinePagePersonalFunctionsItem'
-import router from '@ohos.router'
 
 
 @Component
 @Component
 export default struct MinePagePersonFunctionUI {
 export default struct MinePagePersonFunctionUI {
   @Link personalData:MinePagePersonalFunctionsItem[]
   @Link personalData:MinePagePersonalFunctionsItem[]
   @Prop isLogin:boolean
   @Prop isLogin:boolean
-  @Consume('isLogin')@Watch('loginChange') loginState:Record<string,string>
-  loginChange(){
-    if(this.loginState){
-      this.isLogin=true
-    }else{
-      this.isLogin=false
-    }
-  }
 
 
   build() {
   build() {
     Grid(){
     Grid(){

-import { Logger, UserDataLocal } from 'wdKit'
+import { Logger, StringUtils, UserDataLocal } from 'wdKit'
 import { WDRouterPage, WDRouterRule } from 'wdRouter'
 import { WDRouterPage, WDRouterRule } from 'wdRouter'
 import MinePageDatasModel from '../../model/MinePageDatasModel'
 import MinePageDatasModel from '../../model/MinePageDatasModel'
 const TAG = "MinePageUserSimpleInfoUI"
 const TAG = "MinePageUserSimpleInfoUI"
@@ -12,20 +12,13 @@ export default struct MinePageUserSimpleInfoUI {
   @State levelHead:string = ""
   @State levelHead:string = ""
   @State levelId:number = 0
   @State levelId:number = 0
 
 
-
-  @Consume('isLogin') @Watch('loginChange') loginState:Record<string,string>
-  loginChange(){
-    Logger.debug("isLogin",'MinePageUserSimpleInfoUI')
-    if(this.loginState){
-      this.isLogin=true
-    }else {
-      this.isLogin=false
-    }
-  }
   loginStateChange(){
   loginStateChange(){
     if(this.isLogin){
     if(this.isLogin){
       this.getUserInfo()
       this.getUserInfo()
       this.getUserLevel()
       this.getUserLevel()
+    }else{
+      this.headPhotoUrl = ""
+      this.levelHead = ""
     }
     }
   }
   }
 
 
@@ -33,17 +26,20 @@ export default struct MinePageUserSimpleInfoUI {
     Row(){
     Row(){
       //头像
       //头像
       Stack(){
       Stack(){
-        Image(this.headPhotoUrl)
+        Image(this.headPhotoUrl==""?$r('app.media.default_head'):this.headPhotoUrl)
           .alt($r('app.media.default_head'))
           .alt($r('app.media.default_head'))
           .width('100lpx')
           .width('100lpx')
           .height('100lpx')
           .height('100lpx')
           .objectFit(ImageFit.Cover)
           .objectFit(ImageFit.Cover)
           .borderRadius(50)
           .borderRadius(50)
-        Image(this.levelHead)
-          .width('130lpx')
-          .height('130lpx')
-          .objectFit(ImageFit.Cover)
-          .borderRadius(50)
+
+        if(StringUtils.isNotEmpty(this.levelHead)){
+          Image(this.levelHead)
+            .width('130lpx')
+            .height('130lpx')
+            .objectFit(ImageFit.Cover)
+            .borderRadius(50)
+        }
       }.width('130lpx')
       }.width('130lpx')
       .height('130lpx')
       .height('130lpx')
       .alignContent(Alignment.Center)
       .alignContent(Alignment.Center)

@@ -4,11 +4,10 @@ import MinePageMoreFunctionModel from '../../viewmodel/MinePageMoreFunctionModel
 import MinePageDatasModel from '../../model/MinePageDatasModel'
 import MinePageDatasModel from '../../model/MinePageDatasModel'
 import MinePageUserSimpleInfoUI from '../mine/MinePageUserSimpleInfoUI'
 import MinePageUserSimpleInfoUI from '../mine/MinePageUserSimpleInfoUI'
 import MinePagePersonFunctionUI from '../mine/MinePagePersonFunctionUI'
 import MinePagePersonFunctionUI from '../mine/MinePagePersonFunctionUI'
-import MinePageCardUI from '../mine/MinePageCardUI'
-import MinePageCreatorFunctionUI from '../mine/MinePageCreatorFunctionUI'
 import MinePageMoreFunctionUI from '../mine/MinePageMoreFunctionUI'
 import MinePageMoreFunctionUI from '../mine/MinePageMoreFunctionUI'
 import { SPHelper, StringUtils } from 'wdKit'
 import { SPHelper, StringUtils } from 'wdKit'
 import { SpConstants } from 'wdConstant'
 import { SpConstants } from 'wdConstant'
+import dataPreferences from '@ohos.data.preferences';
 
 
 const TAG = 'MinePageComponent';
 const TAG = 'MinePageComponent';
 
 
@@ -24,12 +23,29 @@ export struct MinePageComponent {
   @State creatorData:MinePageCreatorFunctionsItem[] = []
   @State creatorData:MinePageCreatorFunctionsItem[] = []
   @State moreData:MinePageMoreFunctionModel[] = []
   @State moreData:MinePageMoreFunctionModel[] = []
   scroller: Scroller = new Scroller()
   scroller: Scroller = new Scroller()
+  preferences: dataPreferences.Preferences | null = null;
 
 
   aboutToAppear(){
   aboutToAppear(){
     this.getUserLogin()
     this.getUserLogin()
     this.getFunctionData()
     this.getFunctionData()
+    this.addLoginStatusObserver()
   }
   }
 
 
+  async addLoginStatusObserver(){
+    this.preferences = await SPHelper.default.getPreferences();
+    let observer = (key: string) => {
+      if(key == SpConstants.USER_ID){
+        if(StringUtils.isEmpty(SPHelper.default.getSync(SpConstants.USER_ID,""))){
+          this.isLogin = false
+        }else {
+          this.isLogin = true
+        }
+      }
+    }
+    this.preferences.on('change', observer);
+  }
+
+
   getFunctionData(){
   getFunctionData(){
     //个人功能数据
     //个人功能数据
     this.personalData = MinePageDatasModel.getPersonalFunctionsData()
     this.personalData = MinePageDatasModel.getPersonalFunctionsData()

@@ -4,6 +4,7 @@ import { ContentDTO,
 import { LiveInfoDTO } from 'wdBean/src/main/ets/bean/detail/LiveInfoDTO'
 import { LiveInfoDTO } from 'wdBean/src/main/ets/bean/detail/LiveInfoDTO'
 import { VoiceInfoDTO } from 'wdBean/src/main/ets/bean/detail/VoiceInfoDTO'
 import { VoiceInfoDTO } from 'wdBean/src/main/ets/bean/detail/VoiceInfoDTO'
 import { LazyDataSource, StringUtils, ToastUtils } from 'wdKit/Index'
 import { LazyDataSource, StringUtils, ToastUtils } from 'wdKit/Index'
+import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'
 import SearcherAboutDataModel from '../../model/SearcherAboutDataModel'
 import SearcherAboutDataModel from '../../model/SearcherAboutDataModel'
 import { CreatorDetailRequestItem } from '../../viewmodel/CreatorDetailRequestItem'
 import { CreatorDetailRequestItem } from '../../viewmodel/CreatorDetailRequestItem'
 import { SearchResultContentData } from '../../viewmodel/SearchResultContentData'
 import { SearchResultContentData } from '../../viewmodel/SearchResultContentData'
@@ -20,9 +21,8 @@ export struct SearchResultContentComponent{
   @State searchType:string = ""
   @State searchType:string = ""
   @State data: LazyDataSource<ContentDTO> = new LazyDataSource();
   @State data: LazyDataSource<ContentDTO> = new LazyDataSource();
   @State data_rmh: SearchRmhDescription[] = []
   @State data_rmh: SearchRmhDescription[] = []
-  @State count:number = 0;
+  @State count:number = -1;
   @State isLoading:boolean = false
   @State isLoading:boolean = false
-  @State isLoading2:boolean = false
   @State hasMore:boolean = true
   @State hasMore:boolean = true
   curPageNum:number = 1;
   curPageNum:number = 1;
 
 
@@ -80,6 +80,7 @@ export struct SearchResultContentComponent{
       }).catch((err:Error)=>{
       }).catch((err:Error)=>{
         console.log(TAG,JSON.stringify(err))
         console.log(TAG,JSON.stringify(err))
         this.isLoading = false
         this.isLoading = false
+        this.count = this.count===-1?0:this.count
       })
       })
     }
     }
   }
   }
@@ -155,7 +156,7 @@ export struct SearchResultContentComponent{
           vImageUrl: "",
           vImageUrl: "",
           screenType: "",
           screenType: "",
           source: StringUtils.isEmpty(value.data.creatorName) ? value.data.sourceName : value.data.creatorName,
           source: StringUtils.isEmpty(value.data.creatorName) ? value.data.sourceName : value.data.creatorName,
-          objectId: "",
+          objectId: value.data.id,
           objectType: value.data.type,
           objectType: value.data.type,
           channelId: value.data.channelId,
           channelId: value.data.channelId,
           relId: value.data.relId,
           relId: value.data.relId,
@@ -196,6 +197,7 @@ export struct SearchResultContentComponent{
     }).catch((err:Error)=>{
     }).catch((err:Error)=>{
       console.log(TAG,"请求失败")
       console.log(TAG,"请求失败")
       this.isLoading = false
       this.isLoading = false
+      this.count = this.count===-1?0:this.count
     })
     })
   }
   }
 
 
@@ -235,16 +237,24 @@ export struct SearchResultContentComponent{
               })
               })
 
 
               ListItem(){
               ListItem(){
-                Text("查看更多")
-                  .height('180lpx')
-                  .textAlign(TextAlign.Center)
-                  .width('77lpx')
-                  .backgroundColor($r('app.color.color_EDEDED'))
-                  .fontColor($r('app.color.color_9E9E9E'))
-                  .borderRadius({topLeft:'4lpx',bottomLeft:'4lpx'})
+                Column(){
+                  Text("查看更多")
+                    .width('19lpx')
+                    .fontSize('19lpx')
+                    .fontWeight('400lpx')
+                    .lineHeight('27lpx')
+                    .fontColor($r('app.color.color_9E9E9E'))
+                }.borderRadius({topLeft:'4lpx',bottomLeft:'4lpx'})
+                .height('180lpx')
+                .width('77lpx')
+                .backgroundColor($r('app.color.color_EDEDED'))
+                .justifyContent(FlexAlign.Center)
+
               }.height('100%')
               }.height('100%')
               .margin({left:'23lpx'})
               .margin({left:'23lpx'})
-
+              .onClick(()=>{
+                WDRouterRule.jumpWithPage(WDRouterPage.searchCreatorPage)
+              })
             }
             }
             .cachedCount(6)
             .cachedCount(6)
             .edgeEffect(EdgeEffect.Spring)
             .edgeEffect(EdgeEffect.Spring)
@@ -252,14 +262,6 @@ export struct SearchResultContentComponent{
             .listDirection(Axis.Horizontal)
             .listDirection(Axis.Horizontal)
             .width('100%')
             .width('100%')
             .height('219lpx')
             .height('219lpx')
-            .onReachEnd(()=>{
-              if(!this.isLoading2){
-                this.isLoading2 = true
-                //进入更多关注页
-                ToastUtils.shortToast("进入更多关注页")
-
-              }
-            })
 
 
             Divider()
             Divider()
               .width('100%')
               .width('100%')

@@ -2,7 +2,6 @@ import router from '@ohos.router'
 import { Params } from 'wdBean';
 import { Params } from 'wdBean';
 import { StringUtils } from 'wdKit';
 import { StringUtils } from 'wdKit';
 import { WDRouterPage, WDRouterRule } from 'wdRouter';
 import { WDRouterPage, WDRouterRule } from 'wdRouter';
-import { CardParser } from '../components/CardParser';
 import { HomePageBottomComponent } from '../components/mine/home/HomePageBottomComponent';
 import { HomePageBottomComponent } from '../components/mine/home/HomePageBottomComponent';
 import MinePageDatasModel from '../model/MinePageDatasModel';
 import MinePageDatasModel from '../model/MinePageDatasModel';
 
 
@@ -53,100 +52,100 @@ struct MineHomePage {
         Scroll() {
         Scroll() {
           Column() {
           Column() {
             //用户信息区域
             //用户信息区域
-              Row() {
-                Stack(){
-                  Image(this.headPhotoUrl)
-                    .alt($r('app.media.default_head'))
-                    .width('100lpx')
-                    .height('100lpx')
-                    .objectFit(ImageFit.Auto)
-                    .borderRadius(50)
-                  Image(this.levelHead)
-                    .width('130lpx')
-                    .height('130lpx')
-                    .objectFit(ImageFit.Cover)
-                }.onClick(()=>{
-                  let params: Params = {
-                    pageID: "531267787833221"//sit 测试用 512157124138245
-                  }
-                  WDRouterRule.jumpWithPage(WDRouterPage.otherNormalUserHomePagePage,params)
-                }).width('135lpx')
-                .height('135lpx')
-
-                Column() {
-                  Row() {
-                    Text(`${this.userName}`)
-                      .fontColor($r('app.color.white'))
-                      .maxLines(1)
-                      .textOverflow({ overflow: TextOverflow.Ellipsis })
-                      .fontSize('38lpx')
-                      .lineHeight('50lpx')
-                      .fontWeight('500lpx')
-
-                    Text(`等级${this.levelId}`)
-                      .textAlign(TextAlign.Center)
-                      .fontColor($r('app.color.color_ED2800'))
-                      .backgroundColor($r('app.color.white'))
-                      .fontSize('19lpx')
-                      .width('96lpx')
-                      .height('35lpx')
-                      .margin({ left: '10lpx' })
-                    Blank()
-                  }.width('507lpx')
+            Row() {
+              Stack(){
+                Image(this.headPhotoUrl)
+                  .alt($r('app.media.default_head'))
+                  .width('100lpx')
+                  .height('100lpx')
+                  .objectFit(ImageFit.Auto)
+                  .borderRadius(50)
+                Image(this.levelHead)
+                  .width('130lpx')
+                  .height('130lpx')
+                  .objectFit(ImageFit.Cover)
+              }.onClick(()=>{
+                let params: Params = {
+                  pageID: "531267787833221"//sit 测试用 512157124138245
+                }
+                WDRouterRule.jumpWithPage(WDRouterPage.otherNormalUserHomePagePage,params)
+              }).width('135lpx')
+              .height('135lpx')
 
 
+              Column() {
+                Row() {
+                  Text(`${this.userName}`)
+                    .fontColor($r('app.color.white'))
+                    .maxLines(1)
+                    .textOverflow({ overflow: TextOverflow.Ellipsis })
+                    .fontSize('38lpx')
+                    .lineHeight('50lpx')
+                    .fontWeight('500lpx')
+
+                  Text(`等级${this.levelId}`)
+                    .textAlign(TextAlign.Center)
+                    .fontColor($r('app.color.color_ED2800'))
+                    .backgroundColor($r('app.color.white'))
+                    .fontSize('19lpx')
+                    .width('96lpx')
+                    .height('35lpx')
+                    .margin({ left: '10lpx' })
+                  Blank()
+                }.width('507lpx')
+
+                Row() {
                   Row() {
                   Row() {
-                    Row() {
-                      Text(`${this.browseNum}`)
-                        .textStyle()
-                      Text("阅读")
-                        .textStyle2()
-                    }
-                    .margin({ right: '15lpx' })
-
-                    Divider()
-                      .height('19lpx')
-                      .width('2lpx')
-                      .color($r('app.color.white'))
-                      .vertical(true)
-                      .opacity(0.4)
-                    Row() {
-                      Text(`${this.commentNum}`)
-                        .textStyle()
-                      Text("评论")
-                        .textStyle2()
-                    }.margin({ right: '15lpx', left: '15lpx' })
-
-                    Divider()
-                      .height('19lpx')
-                      .width('2lpx')
-                      .color($r('app.color.white'))
-                      .vertical(true)
-                      .opacity(0.4)
-                    Row() {
-                      Text(`${this.attentionNum}`)
-                        .textStyle()
-                      Text("关注")
-                        .textStyle2()
-                    }.margin({ left: '15lpx' })
-                  }.margin({ top: '23lpx' })
-                }.alignItems(HorizontalAlign.Start)
-                .margin({ left: '32lpx' })
-              }
-              .onAreaChange((oldValue: Area, newValue: Area) => {
-                if (this.firstPositionY === 0) {
-                  this.firstPositionY = newValue.globalPosition.y as number
-                }else{
-                  let persent = (this.firstPositionY - Number(newValue.globalPosition.y)) / (this.firstPositionY * 0.3)
-                  if(persent > 1){
-                    persent = 1
+                    Text(`${this.browseNum}`)
+                      .textStyle()
+                    Text("阅读")
+                      .textStyle2()
                   }
                   }
-                  this.tileOpacity = persent
+                  .margin({ right: '15lpx' })
+
+                  Divider()
+                    .height('19lpx')
+                    .width('2lpx')
+                    .color($r('app.color.white'))
+                    .vertical(true)
+                    .opacity(0.4)
+                  Row() {
+                    Text(`${this.commentNum}`)
+                      .textStyle()
+                    Text("评论")
+                      .textStyle2()
+                  }.margin({ right: '15lpx', left: '15lpx' })
+
+                  Divider()
+                    .height('19lpx')
+                    .width('2lpx')
+                    .color($r('app.color.white'))
+                    .vertical(true)
+                    .opacity(0.4)
+                  Row() {
+                    Text(`${this.attentionNum}`)
+                      .textStyle()
+                    Text("关注")
+                      .textStyle2()
+                  }.margin({ left: '15lpx' })
+                }.margin({ top: '23lpx' })
+              }.alignItems(HorizontalAlign.Start)
+              .margin({ left: '32lpx' })
+            }
+            .onAreaChange((oldValue: Area, newValue: Area) => {
+              if (this.firstPositionY === 0) {
+                this.firstPositionY = newValue.globalPosition.y as number
+              }else{
+                let persent = (this.firstPositionY - Number(newValue.globalPosition.y)) / (this.firstPositionY * 0.3)
+                if(persent > 1){
+                  persent = 1
                 }
                 }
-              })
-              .backgroundColor($r('app.color.color_transparent'))
-              .height('184lpx')
-              .width('100%')
-              .padding({ left: '35lpx' })
+                this.tileOpacity = persent
+              }
+            })
+            .backgroundColor($r('app.color.color_transparent'))
+            .height('184lpx')
+            .width('100%')
+            .padding({ left: '35lpx' })
             //用户简介区域
             //用户简介区域
             Column() {
             Column() {
               Row() {
               Row() {
@@ -183,46 +182,21 @@ struct MineHomePage {
 
 
             Divider().width('100%').height('12lpx').color($r('app.color.color_F5F5F5')).strokeWidth('12lpx')
             Divider().width('100%').height('12lpx').color($r('app.color.color_F5F5F5')).strokeWidth('12lpx')
 
 
-            Column(){
-              Column() {
-                // 页签
-                Row({ space: 7 }) {
-                  Scroll() {
-                    Row() {
-                      this.TabBuilder(0,"评论")
-                      this.TabBuilder(1,"关注")
-                    }
-                    .justifyContent(FlexAlign.Start)
-                  }
-                  .align(Alignment.Start)
-                  .scrollable(ScrollDirection.Horizontal)
-                  .scrollBar(BarState.Off)
-                  .width('90%')
-                  .padding({left:'31lpx'})
-                }
-                .alignItems(VerticalAlign.Bottom)
-                .width('100%')
-              }
-              .alignItems(HorizontalAlign.Start)
-              .width('100%')
-
-              //tab 页面
-              Tabs({controller: this.controller}) {
-                TabContent() {
-                  HomePageBottomComponent({style:0})
-                }
-                TabContent() {
-                  HomePageBottomComponent({style:1})
-                }
-              }
-              .backgroundColor($r('app.color.white'))
-              .animationDuration(0)
-              .onChange((index: number) => {
-                this.currentIndex = index
-              })
-              .vertical(false)
-              .barHeight(0)
+            //tab 页面
+            Tabs({controller: this.controller}) {
+              TabContent() {
+                HomePageBottomComponent({style:0})
+              }.tabBar(this.TabBuilder(0,"评论"))
+              TabContent() {
+                HomePageBottomComponent({style:1})
+              }.tabBar(this.TabBuilder(1,"关注"))
             }
             }
+            .backgroundColor($r('app.color.white'))
+            .animationDuration(0)
+            .onChange((index: number) => {
+              this.currentIndex = index
+            })
+            .vertical(false)
           }.width("100%")
           }.width("100%")
         }
         }
         .edgeEffect(EdgeEffect.None)
         .edgeEffect(EdgeEffect.None)
@@ -232,8 +206,8 @@ struct MineHomePage {
       }
       }
     }.width('100%')
     }.width('100%')
     .layoutWeight(1)
     .layoutWeight(1)
-  }
 
 
+  }
   @Builder MineHomeTitleTransparent() {
   @Builder MineHomeTitleTransparent() {
     RelativeContainer() {
     RelativeContainer() {
       //标题栏目
       //标题栏目
@@ -291,35 +265,35 @@ struct MineHomePage {
         .onClick(() => {
         .onClick(() => {
           router.back()
           router.back()
         })
         })
-        Image(`${this.headPhotoUrl}`)
-          .alt($r('app.media.default_head'))
-          .width('60lpx')
-          .height('60lpx')
-          .objectFit(ImageFit.Auto)
-          .id("head_icon")
-          .borderRadius(50)
-          .alignRules({
-            center: { anchor: "__container__", align: VerticalAlign.Center },
-            left: { anchor: "back_icon", align: HorizontalAlign.End }
-          })
-          .margin({ left: '31lpx' })
-          .onClick(() => {
-            router.back()
-          })
-
-        Text(`${this.userName}`)
-          .height('42lpx')
-          .maxLines(1)
-          .id("title")
-          .fontSize('35lpx')
-          .fontWeight('400lpx')
-          .fontColor($r('app.color.color_222222'))
-          .lineHeight('42lpx')
-          .alignRules({
-            center: { anchor: "__container__", align: VerticalAlign.Center },
-            left: { anchor: "head_icon", align: HorizontalAlign.End }
-          })
-          .margin({ left: '12lpx' })
+      Image(`${this.headPhotoUrl}`)
+        .alt($r('app.media.default_head'))
+        .width('60lpx')
+        .height('60lpx')
+        .objectFit(ImageFit.Auto)
+        .id("head_icon")
+        .borderRadius(50)
+        .alignRules({
+          center: { anchor: "__container__", align: VerticalAlign.Center },
+          left: { anchor: "back_icon", align: HorizontalAlign.End }
+        })
+        .margin({ left: '31lpx' })
+        .onClick(() => {
+          router.back()
+        })
+
+      Text(`${this.userName}`)
+        .height('42lpx')
+        .maxLines(1)
+        .id("title")
+        .fontSize('35lpx')
+        .fontWeight('400lpx')
+        .fontColor($r('app.color.color_222222'))
+        .lineHeight('42lpx')
+        .alignRules({
+          center: { anchor: "__container__", align: VerticalAlign.Center },
+          left: { anchor: "head_icon", align: HorizontalAlign.End }
+        })
+        .margin({ left: '12lpx' })
 
 
       Text("编辑资料")
       Text("编辑资料")
         .height('42lpx')
         .height('42lpx')
@@ -368,9 +342,9 @@ struct MineHomePage {
       this.currentIndex = index
       this.currentIndex = index
       this.controller.changeIndex(this.currentIndex)
       this.controller.changeIndex(this.currentIndex)
     })
     })
-    .height('77lpx')
-    .width('70lpx')
-    .margin({right:'29lpx'})
+    .height('100%')
+    .width('100%')
+    .margin({right:'9lpx'})
   }
   }
 
 
   /**
   /**

@@ -14,7 +14,7 @@ struct OtherNormalUserHomePage {
   @State params:Params =  router.getParams() as Params;
   @State params:Params =  router.getParams() as Params;
   @Watch('change') @State curUserId: string = '-1';
   @Watch('change') @State curUserId: string = '-1';
 
 
-   onPageShow() {
+  onPageShow() {
     this.curUserId = this.params?.pageID;
     this.curUserId = this.params?.pageID;
   }
   }
 
 
@@ -172,51 +172,24 @@ struct OtherNormalUserHomePage {
               .width('100%')
               .width('100%')
               .backgroundColor($r('app.color.white'))
               .backgroundColor($r('app.color.white'))
             }
             }
-
             //间隔符
             //间隔符
             Divider().width('100%').height('12lpx').color($r('app.color.color_F5F5F5')).strokeWidth('12lpx')
             Divider().width('100%').height('12lpx').color($r('app.color.color_F5F5F5')).strokeWidth('12lpx')
 
 
-            Column(){
-              Column() {
-                // 页签
-                Row({ space: 7 }) {
-                  Scroll() {
-                    Row() {
-                      this.TabBuilder(0,"评论")
-                      this.TabBuilder(1,"关注")
-                    }
-                    .justifyContent(FlexAlign.Start)
-                  }
-                  .align(Alignment.Start)
-                  .scrollable(ScrollDirection.Horizontal)
-                  .scrollBar(BarState.Off)
-                  .width('90%')
-                  .padding({left:'31lpx'})
-                }
-                .alignItems(VerticalAlign.Bottom)
-                .width('100%')
-              }
-              .backgroundColor($r('app.color.white'))
-              .alignItems(HorizontalAlign.Start)
-              .width('100%')
-
-              //tab 页面
-              Tabs({controller: this.controller}) {
-                TabContent() {
-                  OtherHomePageBottomCommentComponent({curUserId:this.curUserId,levelHead:this.levelHead,commentNum:$commentNum})
-                }
-                TabContent() {
-                  OtherHomePageBottomFollowComponent({curUserId:this.curUserId})
-                }
-              }
-              .backgroundColor($r('app.color.white'))
-              .animationDuration(0)
-              .onChange((index: number) => {
-                this.currentIndex = index
-              })
-              .vertical(false)
-              .barHeight(0)
+            //tab 页面
+            Tabs({controller: this.controller}) {
+              TabContent() {
+                OtherHomePageBottomCommentComponent({curUserId:this.curUserId,levelHead:this.levelHead,commentNum:$commentNum})
+              }.tabBar(this.TabBuilder(0,"评论"))
+              TabContent() {
+                OtherHomePageBottomFollowComponent({curUserId:this.curUserId})
+              }.tabBar(this.TabBuilder(1,"关注"))
             }
             }
+            .backgroundColor($r('app.color.white'))
+            .animationDuration(0)
+            .onChange((index: number) => {
+              this.currentIndex = index
+            })
+            .vertical(false)
           }.width("100%")
           }.width("100%")
         }
         }
         .edgeEffect(EdgeEffect.None)
         .edgeEffect(EdgeEffect.None)
@@ -327,9 +300,9 @@ struct OtherNormalUserHomePage {
       this.currentIndex = index
       this.currentIndex = index
       this.controller.changeIndex(this.currentIndex)
       this.controller.changeIndex(this.currentIndex)
     })
     })
-    .height('77lpx')
-    .width('70lpx')
-    .margin({right:'29lpx'})
+    .height('100%')
+    .width('100%')
+    .margin({right:'9lpx'})
   }
   }
 
 
 
 

+import { CustomTitleUI } from '../components/reusable/CustomTitleUI';
+
+@Entry
+@Component
+struct SearchCreatorPage {
+
+  build() {
+    Row() {
+      Column() {
+        CustomTitleUI({titleName:"全部结果"})
+
+      }
+      .width('100%')
+    }
+    .height('100%')
+  }
+}

@@ -13,6 +13,7 @@
     "components/page/BrowsingHistoryPage",
     "components/page/BrowsingHistoryPage",
     "components/page/MyCollectionListPage",
     "components/page/MyCollectionListPage",
     "pages/OtherNormalUserHomePage",
     "pages/OtherNormalUserHomePage",
-    "pages/SearchPage"
+    "pages/SearchPage",
+    "pages/SearchCreatorPage"
   ]
   ]
 }
 }