feat(意见反馈)：UI调整3

@@ -123,7 +123,8 @@ function handleJsCallReceiveH5Data(data: Message) {
             height: item.height,
             height: item.height,
             picPath: item.pic,
             picPath: item.pic,
             picDesc: '',
             picDesc: '',
-            itemType:2
+            itemType:2,
+            id:0
           }
           }
           return photo
           return photo
         })
         })

@@ -4,6 +4,7 @@
 
 
 // 【图文、图集稿件正文图片】图片信息数组
 // 【图文、图集稿件正文图片】图片信息数组
 export interface PhotoListBean {
 export interface PhotoListBean {
+  id: number;
   height: number;
   height: number;
   width: number;
   width: number;
   picPath: string;
   picPath: string;

@@ -19,6 +19,7 @@ const TAG = 'FeedBackActivity'
 @Entry
 @Entry
 @Component
 @Component
 export struct FeedBackActivity {
 export struct FeedBackActivity {
+  @State textNumLabel: string = '0/500';
   contact: string = "";
   contact: string = "";
   email: string = "";
   email: string = "";
   //UI
   //UI
@@ -82,17 +83,19 @@ export struct FeedBackActivity {
               .width(CommonConstants.FULL_WIDTH)
               .width(CommonConstants.FULL_WIDTH)
               .margin({ left: $r('app.float.vp_16'), top: $r('app.float.vp_12') })
               .margin({ left: $r('app.float.vp_16'), top: $r('app.float.vp_12') })
               Stack({ alignContent: Alignment.BottomEnd }) {
               Stack({ alignContent: Alignment.BottomEnd }) {
-              TextInput({ placeholder: $r('app.string.feedback_comments') })
+                TextArea({ placeholder: $r('app.string.feedback_comments') })
                   .width(CommonConstants.FULL_WIDTH)
                   .width(CommonConstants.FULL_WIDTH)
                   .height(CommonConstants.FULL_HEIGHT)
                   .height(CommonConstants.FULL_HEIGHT)
+                  .padding({bottom:96})
                   .backgroundColor($r('app.color.color_F5F5F5'))
                   .backgroundColor($r('app.color.color_F5F5F5'))
                   .align(Alignment.TopStart)
                   .align(Alignment.TopStart)
                   .onChange((value) => {
                   .onChange((value) => {
                     // Logger.debug(TAG, "onChange" + value + "/" + this.passwordContent)
                     // Logger.debug(TAG, "onChange" + value + "/" + this.passwordContent)
                     this.contact = value
                     this.contact = value
+                    this.textNumLabel = value.length+"/500"
                   })
                   })
                 GridRow({
                 GridRow({
-                columns:3,
+                  columns:5,
                 }) {
                 }) {
 
 
                   ForEach(this.pics, (feedbackImageItem: PhotoListBean, index: number) => {
                   ForEach(this.pics, (feedbackImageItem: PhotoListBean, index: number) => {
@@ -114,35 +117,57 @@ export struct FeedBackActivity {
                             .width(60)
                             .width(60)
                             .height(60)
                             .height(60)
                             .borderRadius($r('app.float.margin_1'))
                             .borderRadius($r('app.float.margin_1'))
+                            .onClick(async (event: ClickEvent) => {
+                              if(await FastClickUtil.isMinDelayTime()){
+                                return
+                              }
+                              //查看图片 fixme 去除添加按钮
+                              ProcessUtils.gotoMultiPictureListPage(this.pics, index)
+                            })
                           Image($r('app.media.icon_feekback_delete'))
                           Image($r('app.media.icon_feekback_delete'))
                             .width(24)
                             .width(24)
                             .height(24)
                             .height(24)
                             .borderRadius($r('app.float.margin_1'))
                             .borderRadius($r('app.float.margin_1'))
-                      }
-                      .width(60)
-                      .height(60)
                             .onClick(async (event: ClickEvent) => {
                             .onClick(async (event: ClickEvent) => {
                               if(await FastClickUtil.isMinDelayTime()){
                               if(await FastClickUtil.isMinDelayTime()){
                                 return
                                 return
                               }
                               }
-                        //查看图片 fixme 去除添加按钮
-                        ProcessUtils.gotoMultiPictureListPage(this.pics, index)
+
+                              let temp: PhotoListBean[] = [] as PhotoListBean[]
+                              temp.length = this.pics.length - 1;
+                              let tempIndex = 0;
+                              for (let index = 0; index < this.pics.length; index++) {
+                                const element = this.pics[index];
+                                if(!StringUtils.isEmpty(element.picPath) && element.id != feedbackImageItem.id){
+                                  temp[tempIndex] = element;
+                                  tempIndex = tempIndex+1
+                                }
+                              }
+                              if(tempIndex < 3){
+                                temp[tempIndex] = this.addPic
+                              }
+                              this.pics = temp
                             })
                             })
                         }
                         }
+                        .width(60)
+                        .height(60)
+                      }
                     }
                     }
                   })
                   })
                 }
                 }
-              .width(CommonConstants.FULL_WIDTH)
                 .margin({bottom: $r('app.float.vp_12'), right: $r('app.float.vp_12'),left: $r('app.float.vp_12')})
                 .margin({bottom: $r('app.float.vp_12'), right: $r('app.float.vp_12'),left: $r('app.float.vp_12')})
-              Text('0/500')
+                Text(this.textNumLabel)
                   .margin({bottom: $r('app.float.vp_12'), right: $r('app.float.vp_11')})
                   .margin({bottom: $r('app.float.vp_12'), right: $r('app.float.vp_11')})
               }
               }
               .height(200)
               .height(200)
-            .width('100%')
-            .margin({ left: $r('app.float.vp_16'), top: $r('app.float.vp_12'), right: $r('app.float.vp_16') })
+              .width('90%')
+              .margin({ top: $r('app.float.vp_12') })
               .backgroundColor($r('app.color.color_F5F5F5'))
               .backgroundColor($r('app.color.color_F5F5F5'))
               .borderRadius(4)
               .borderRadius(4)
 
 
+
+
+
             Text($r('app.string.feedback_email'))
             Text($r('app.string.feedback_email'))
               .fontColor($r('app.color.color_222222'))
               .fontColor($r('app.color.color_222222'))
               .fontSize($r('app.float.font_size_14'))
               .fontSize($r('app.float.font_size_14'))
@@ -154,7 +179,6 @@ export struct FeedBackActivity {
                 .fontColor($r('app.color.color_222222'))
                 .fontColor($r('app.color.color_222222'))
                 .fontSize($r('app.float.font_size_14'))
                 .fontSize($r('app.float.font_size_14'))
                 .fontWeight(FontWeight.Bold)
                 .fontWeight(FontWeight.Bold)
-                .margin({ left: $r('app.float.vp_12') })
               TextInput({ placeholder: $r('app.string.feedback_hideemail') })
               TextInput({ placeholder: $r('app.string.feedback_hideemail') })
                 .width(CommonConstants.FULL_WIDTH)
                 .width(CommonConstants.FULL_WIDTH)
                 .height(CommonConstants.FULL_HEIGHT)
                 .height(CommonConstants.FULL_HEIGHT)
@@ -165,8 +189,9 @@ export struct FeedBackActivity {
                 })
                 })
             }
             }
             .height(44)
             .height(44)
-            .margin({ left: $r('app.float.vp_16'), right: $r('app.float.vp_12'), top: $r('app.float.margin_16') })
+            .width('90%')
             .backgroundColor($r('app.color.color_F5F5F5'))
             .backgroundColor($r('app.color.color_F5F5F5'))
+            .margin({top: $r('app.float.margin_16') })
             .borderRadius(4)
             .borderRadius(4)
             Blank().layoutWeight(1)
             Blank().layoutWeight(1)
           }
           }
@@ -225,21 +250,23 @@ export struct FeedBackActivity {
           // 其中包含Array<string>类型的photoUris，为返回图库选择后的媒体文件的uri数组；还包含boolean类型的isOriginalPhoto，指示返回图库选择后的媒体文件是否为原图。
           // 其中包含Array<string>类型的photoUris，为返回图库选择后的媒体文件的uri数组；还包含boolean类型的isOriginalPhoto，指示返回图库选择后的媒体文件是否为原图。
           // 声明变量array，其取值为PhotoSelectResult中的数组。
           // 声明变量array，其取值为PhotoSelectResult中的数组。
           array = PhotoSelectResult['photoUris'];
           array = PhotoSelectResult['photoUris'];
+          let startIndex = this.pics.length-1;
           let totalLen = this.pics.length+array.length;
           let totalLen = this.pics.length+array.length;
           if(totalLen > 3){
           if(totalLen > 3){
             totalLen = 3
             totalLen = 3
           }
           }
           this.pics.length = totalLen;
           this.pics.length = totalLen;
-          let startIndex = this.pics.length-1;
 
 
           array.forEach((value) => {
           array.forEach((value) => {
             let pic: PhotoListBean = {itemType:2,picPath:value} as PhotoListBean
             let pic: PhotoListBean = {itemType:2,picPath:value} as PhotoListBean
+            pic.id = startIndex
             this.pics[startIndex] = pic
             this.pics[startIndex] = pic
             startIndex = startIndex+1;
             startIndex = startIndex+1;
             mediaFlag = true;
             mediaFlag = true;
             Logger.info(TAG, `select image/video uri: ${value}`);
             Logger.info(TAG, `select image/video uri: ${value}`);
           })
           })
           if(this.pics.length<3){
           if(this.pics.length<3){
+            this.addPic.id = startIndex
             this.pics[this.pics.length-1]=this.addPic;
             this.pics[this.pics.length-1]=this.addPic;
           }
           }
         }
         }

@@ -41,7 +41,8 @@ export struct Card19Component {
               height: item.height,
               height: item.height,
               picPath: item.fullUrl,
               picPath: item.fullUrl,
               picDesc: '',
               picDesc: '',
-              itemType:2
+              itemType:2,
+              id:0
             }
             }
             return photo
             return photo
           })
           })