Merge remote-tracking branch 'origin/main'

@@ -91,11 +91,9 @@ export default struct MinePagePersonFunctionUI {
         .height('117lpx')
         .height('117lpx')
       })
       })
     }
     }
-    // .rowsTemplate('1fr 1fr')
-    .rowsTemplate('1fr')
+    .rowsTemplate('1fr 1fr')
     .columnsTemplate('1fr 1fr 1fr 1fr')
     .columnsTemplate('1fr 1fr 1fr 1fr')
-    // .height('234lpx')
-    .height('167lpx')
+    .height('234lpx')
     .margin({top:'31lpx',left:'23lpx',right:'23lpx' })
     .margin({top:'31lpx',left:'23lpx',right:'23lpx' })
   }
   }
 }
 }

@@ -323,9 +323,10 @@ export struct SearchComponent {
         if(value.videoTotal!=0){
         if(value.videoTotal!=0){
           this.count.push("视频")
           this.count.push("视频")
         }
         }
-        if(value.activityTotal!=0){
-          this.count.push("活动")
-        }
+        //屏蔽活动
+        // if(value.activityTotal!=0){
+        //   this.count.push("活动")
+        // }
       }
       }
       this.isGetRequest = true
       this.isGetRequest = true
      this.resetSearch()
      this.resetSearch()

@@ -58,7 +58,7 @@ class MinePageDatasModel{
    * 包含名字和图标
    * 包含名字和图标
    */
    */
   getPersonalFunctionsData():MinePagePersonalFunctionsItem[]{
   getPersonalFunctionsData():MinePagePersonalFunctionsItem[]{
-    if(this.personalData.length === 7){
+    if(this.personalData.length === 5){
       return this.personalData
       return this.personalData
     }
     }
     this.personalData.push(new MinePagePersonalFunctionsItem("评论",$r('app.media.mine_comment_icon')))
     this.personalData.push(new MinePagePersonalFunctionsItem("评论",$r('app.media.mine_comment_icon')))
@@ -67,7 +67,7 @@ class MinePageDatasModel{
     // this.personalData.push(new MinePagePersonalFunctionsItem("历史",$r('app.media.mine_history_icon')))
     // this.personalData.push(new MinePagePersonalFunctionsItem("历史",$r('app.media.mine_history_icon')))
     this.personalData.push(new MinePagePersonalFunctionsItem("消息",$r('app.media.mine_msg_icon')))
     this.personalData.push(new MinePagePersonalFunctionsItem("消息",$r('app.media.mine_msg_icon')))
     // this.personalData.push(new MinePagePersonalFunctionsItem("留言板",$r('app.media.mine_msgboard_icon')))
     // this.personalData.push(new MinePagePersonalFunctionsItem("留言板",$r('app.media.mine_msgboard_icon')))
-    // this.personalData.push(new MinePagePersonalFunctionsItem("预约",$r('app.media.mine_order_icon')))
+    this.personalData.push(new MinePagePersonalFunctionsItem("预约",$r('app.media.mine_order_icon')))
     return this.personalData
     return this.personalData
   }
   }