Merge remote-tracking branch 'origin/main'

 import MinePageMoreFunctionModel from '../../viewmodel/MinePageMoreFunctionModel'
 import MinePageMoreFunctionModel from '../../viewmodel/MinePageMoreFunctionModel'
 import { WDRouterRule, WDRouterPage } from 'wdRouter'
 import { WDRouterRule, WDRouterPage } from 'wdRouter'
 import { Params } from 'wdBean';
 import { Params } from 'wdBean';
+import { ToastUtils } from 'wdKit/Index';
 
 
 @Component
 @Component
 export default struct MinePageMoreFunctionUI {
 export default struct MinePageMoreFunctionUI {
@@ -75,6 +76,8 @@ export default struct MinePageMoreFunctionUI {
               WDRouterRule.jumpWithPage(WDRouterPage.settingPage, params)
               WDRouterRule.jumpWithPage(WDRouterPage.settingPage, params)
             }else if (item.msg == "关于") { // 关于
             }else if (item.msg == "关于") { // 关于
               WDRouterRule.jumpWithPage(WDRouterPage.aboutPage)
               WDRouterRule.jumpWithPage(WDRouterPage.aboutPage)
+            }else if (item.msg == "意见反馈") { // 关于
+              ToastUtils.shortToast("待开发")
             }
             }
           })
           })
           .height('117lpx')
           .height('117lpx')

@@ -49,6 +49,7 @@ export struct OperRowListView {
   @State newsStatusOfUser: batchLikeAndCollectResult | undefined = undefined // 点赞、收藏状态
   @State newsStatusOfUser: batchLikeAndCollectResult | undefined = undefined // 点赞、收藏状态
   @State likeBean: Record<string, string> = {}
   @State likeBean: Record<string, string> = {}
   @State audioUrl: string= ''
   @State audioUrl: string= ''
+  @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
   needLike: boolean = true
   needLike: boolean = true
 
 
   async aboutToAppear() {
   async aboutToAppear() {
@@ -120,7 +121,7 @@ export struct OperRowListView {
     .backgroundColor(Color.White)
     .backgroundColor(Color.White)
     .padding({
     .padding({
       top: 10,
       top: 10,
-      bottom: 50
+      bottom: `${this.bottomSafeHeight}px`
     })
     })
   }
   }
 
 

@@ -95,7 +95,7 @@ class MinePageDatasModel{
     }
     }
     // this.moreData.push(new MinePageMoreFunctionModel("扫一扫",$r('app.media.mine_scan')))
     // this.moreData.push(new MinePageMoreFunctionModel("扫一扫",$r('app.media.mine_scan')))
     // this.moreData.push(new MinePageMoreFunctionModel("我的奖品",$r('app.media.mine_mygift')))
     // this.moreData.push(new MinePageMoreFunctionModel("我的奖品",$r('app.media.mine_mygift')))
-    // this.moreData.push(new MinePageMoreFunctionModel("意见反馈",$r('app.media.mine_suggest')))
+    this.moreData.push(new MinePageMoreFunctionModel("意见反馈",$r('app.media.mine_suggest')))
     this.moreData.push(new MinePageMoreFunctionModel("设置",$r('app.media.mine_setting')))
     this.moreData.push(new MinePageMoreFunctionModel("设置",$r('app.media.mine_setting')))
     this.moreData.push(new MinePageMoreFunctionModel("关于",$r('app.media.mine_about')))
     this.moreData.push(new MinePageMoreFunctionModel("关于",$r('app.media.mine_about')))
     return this.moreData
     return this.moreData