Переглянути джерело

fix:
1. 修改意见反馈接口
2. 修改我的页面下部分UI
3. 修改模范事件下展开详情的动画

YuJing 1 тиждень тому
батько
коміт
d3580fbdba

+ 1 - 1
commons/basic/src/main/ets/apis/YTUserRequest.ets

@@ -177,7 +177,7 @@ export class YTUserRequest extends YTRequest {
 
   //问题反馈
   static questionBack(des: string, createBy: string) {
-    YTUserRequest.post<null, ReqString>(`/warehouseBack/saveQuestion`, {
+    YTUserRequest.post<null, ReqString>(`/api/military/feedback/add`, {
       'backQuestion': des,
       'mobile': createBy,
       'createTime': new YTDate().formatDate('-', true),

+ 29 - 26
features/feature/src/main/ets/view/ThirdView.ets

@@ -210,34 +210,37 @@ struct HeroItem{
         .padding({left: 13, right: 13, top: 5})
 
         Column(){
-          Column({space: 6}){
-            this.fontComp('英雄事迹')
+          if(this.isOpen) {
+            Column({space: 6}){
+              this.fontComp('英雄事迹')
 
-            Text(this.data.heroicDeeds)
+              Text(this.data.heroicDeeds)
+                .width("100%")
+                .fontSize(12)
+                .fontWeight(400)
+                .lineHeight(20)
+
+              this.fontComp('精神内涵')
+
+              Row({space: 12}){
+                ForEach(this.data.type?.split('、'), (item: string, index) => {
+                  Text(item)
+                    .fontSize(12)
+                    .fontWeight(400)
+                    .borderRadius(5)
+                    .fontColor('#52886F')
+                    .backgroundColor('#F2F2F2')
+                    .padding({left: 13, top: 6, right: 13, bottom: 6})
+                })
+              }
               .width("100%")
-              .fontSize(12)
-              .fontWeight(400)
-              .lineHeight(20)
-
-            this.fontComp('精神内涵')
-
-            Row({space: 12}){
-              ForEach(this.data.type?.split('、'), (item: string, index) => {
-                Text(item)
-                  .fontSize(12)
-                  .fontWeight(400)
-                  .borderRadius(5)
-                  .fontColor('#52886F')
-                  .backgroundColor('#F2F2F2')
-                  .padding({left: 13, top: 6, right: 13, bottom: 6})
-              })
+              .justifyContent(FlexAlign.Start)
+              .padding({bottom: 37})
             }
-            .width("100%")
-            .justifyContent(FlexAlign.Start)
-            .padding({bottom: 37})
+            .transition(TransitionEffect.OPACITY
+              .combine(TransitionEffect.translate({ y: -50 }))
+              .animation({ duration: 350, curve: Curve.Friction}))
           }
-          .height(this.isOpen ? '' : 0)
-          // .backgroundColor(Color.Black)
 
           Row({space: 7}){
             Text(this.isOpen ? '收起详情' : '展开详情')
@@ -276,10 +279,10 @@ struct HeroItem{
             .each((item) => {
               Image($r('app.media.icon_hero_flower'))
                 .width(36)
-                .aspectRatio(1)
                 .zIndex(999)
-                .position({ x: `${item.item.x}%`, y: item.item.y })
+                .aspectRatio(1)
                 .opacity(this.flowerAnimation ? 1 : 0)
+                .position({ x: `${item.item.x}%`, y: item.item.y })
             })
             .key((item) => JSON.stringify(item))
         }

+ 5 - 5
features/user/src/main/ets/views/Mine_.ets

@@ -1,4 +1,4 @@
-import { BasicType, IBestToast, userInfo, UserInfo, YTAvoid, YTHeader, YTLog, yTRouter } from 'basic'
+import { BasicType, IBestToast, YTAvoid, YTLog, yTRouter } from 'basic'
 import { common, Want } from '@kit.AbilityKit'
 import { BusinessError } from '@kit.BasicServicesKit'
 import { BUNDLE_NAME } from 'BuildProfile'
@@ -103,7 +103,7 @@ export struct Mine_ {
                   }
                 }
                 .width('100%')
-                .backgroundColor(`#EEEEEE`)
+                .backgroundColor(Color.White)
                 .borderRadius(20)
                 .justifyContent(FlexAlign.SpaceBetween)
                 .padding({ top: 20, left: 16, right: 16, bottom: 20 })
@@ -116,7 +116,7 @@ export struct Mine_ {
           .width('100%')
           .height('100%')
         }
-        .backgroundColor(Color.White)
+        // .backgroundColor(Color.White)
         .width('100%')
         .height(550)
         .borderRadius({ topRight: 32 })
@@ -125,11 +125,11 @@ export struct Mine_ {
       }
       .width("100%")
       .height('100%')
+      .padding({top: this.safeTop})
       .alignItems(HorizontalAlign.Center)
+      .linearGradient({colors: [['#7FF9C3', 0], ['#FFFFFF', 0.94]]})
     }
     .hideTitleBar(true)
-    .padding({top: this.safeTop})
-    .backgroundColor(Color.White)
   }
 
   async shareData() {