Merge remote-tracking branch 'origin/main'

@@ -155,9 +155,15 @@ function buildErrorMsg(httpStatus: number): string {
     case HttpStatusCode.HttpVersionNotSupported:
       message = "HTTP版本不受支持(505)";
       break;
-    default:
+    default:{
       // 网络连接故障
+      if(httpStatus != undefined){
         message = `连接出错(${httpStatus})!`;
+      }else{
+        message = `连接出错!`;
+      }
+    }
+
   }
   return message;
 }

@@ -211,12 +211,13 @@ export struct MorningEveningPaperComponent {
       }
       .height('100%')
 
-      PaperTitleComponent().margin({
-        top: this.topSafeHeight
-      })
+      PaperTitleComponent()
     }
     .width('100%')
     .height('100%')
+    .padding({
+      top: this.topSafeHeight
+    })
     // .backgroundColor(Color.Black)
     // .backgroundColor(this.pageInfoBean?.backgroundColor ?? Color.Black)
     .backgroundColor(this.mixedBgColor ?? Color.Black)

@@ -47,8 +47,10 @@ export struct MultiPictureDetailPageComponent {
   @State publishCommentModel: publishCommentModel = new publishCommentModel()
   @State operationButtonList: string[] = ['comment', 'like', 'collect', 'share']
   @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') as number;
+  @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') as number;
   @State windowHeight: number = AppStorage.get<number>('windowHeight') as number;
   @State currentOffset:number = 0
+  @State duration:number = 0
 
   //watch监听页码回调
   onCurrentPageNumUpdated(): void {
@@ -81,6 +83,7 @@ export struct MultiPictureDetailPageComponent {
     }
   }
 
+
   aboutToDisappear() {
 
   }
@@ -98,6 +101,7 @@ export struct MultiPictureDetailPageComponent {
   @Builder
   init() {
     if (this.contentDetailData.rmhPlatform == 1) {
+      if(!this.showDownload) {
         Row() {
           Row({ space: 8 }) {
             if (this.getImgUrl()){
@@ -221,7 +225,11 @@ export struct MultiPictureDetailPageComponent {
           middle: { anchor: "__container__", align: HorizontalAlign.Center }
         })
         .id('e_attention')
-      .visibility(!this.showDownload ? Visibility.Visible : Visibility.None)
+        .transition(TransitionEffect.OPACITY.animation({ duration: this.duration, curve: Curve.Ease }).combine(
+          TransitionEffect.translate({ x: 0, y: `-${this.topSafeHeight + 12}px` })
+        ))
+      }
+
     }
     if (this.contentDetailData?.photoList && this.contentDetailData?.photoList?.length > 0) {
       Swiper(this.swiperController) {
@@ -241,6 +249,9 @@ export struct MultiPictureDetailPageComponent {
             this.currentOffset = Math.abs(extraInfo.currentOffset)
           })
           .onTouch((event: TouchEvent) => {
+              if(this.duration === 0) {
+                this.duration = 500
+              }
               if(event.type === 1) {
                 // if(this.currentOffset > px2vp((this.windowHeight - item.height)/2 - 100)) {
                 if(this.currentOffset > 160) {
@@ -285,6 +296,7 @@ export struct MultiPictureDetailPageComponent {
         })
     }
     Column(){
+      if(!this.showDownload) {
         Column(){
           Row() {
             Scroll(this.scroller) {
@@ -354,7 +366,11 @@ export struct MultiPictureDetailPageComponent {
             operationButtonList: this.operationButtonList,
           })
         }
-      .visibility(!this.showDownload ? Visibility.Visible : Visibility.None)
+        .transition(TransitionEffect.OPACITY.animation({ duration: this.duration, curve: Curve.Ease }).combine(
+          TransitionEffect.translate({ x: 0, y: `-${this.bottomSafeHeight}px` })
+        ))
+      }
+      if(this.showDownload) {
         Column(){
           Row() {
             Flex({
@@ -391,7 +407,10 @@ export struct MultiPictureDetailPageComponent {
           }
           .width('100%')
         }
-      .visibility(this.showDownload ? Visibility.Visible : Visibility.None)
+        .transition(TransitionEffect.OPACITY.animation({ duration: this.duration, curve: Curve.Ease }).combine(
+          TransitionEffect.translate({ x: 0, y: `${this.bottomSafeHeight}px` })
+        ))
+      }
     }
     .zIndex(10)
     .id('e_swiper_bottom')

@@ -199,7 +199,9 @@ struct EditUserInfoPage {
   getAccountOwnerInfo(){
     EditInfoViewModel.queryAccountOwnerInfo(1,getContext(this)).then((editModel) => {
       this.listData = []
+      if (editModel.userExtend.headPhotoUrl) {
         this.headerImg = editModel.userExtend.headPhotoUrl
+      }
       this.currentUserInfo = editModel as editModel;
       this.listData.push(...EditInfoViewModel.getEditListInfo(editModel))
     });

@@ -22,6 +22,7 @@ import { HttpUrlUtils } from 'wdNetwork/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { PageRepository } from '../../repository/PageRepository';
 import { SpConstants } from 'wdConstant/Index';
+import { WDShare } from 'wdShare/Index';
 
 const TAG = 'OperRowListView';
 
@@ -49,13 +50,16 @@ export struct OperRowListView {
   @State interactData: InteractDataDTO = {} as InteractDataDTO
   @State newsStatusOfUser: batchLikeAndCollectResult | undefined = undefined // 点赞、收藏状态
   @State likeBean: Record<string, string> = {}
-  @State audioUrl: string= ''
+  @State audioUrl: string = ''
+  @State bgColor: ResourceColor = Color.White
   @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
   needLike: boolean = true
 
   // async aboutToAppear() {
   async onDetailUpdated() {
-    if (!this.contentDetailData) return
+    if (!this.contentDetailData) {
+      return
+    }
     const user_id = await SPHelper.default.get(SpConstants.USER_ID, '')
     if (user_id) {
       this.getInteractDataStatus()
@@ -123,7 +127,7 @@ export struct OperRowListView {
       .justifyContent(FlexAlign.Start)
     }
     .width('100%')
-    .backgroundColor(Color.White)
+    .backgroundColor(this.bgColor)
     .padding({
       top: 10,
       // bottom: `${this.bottomSafeHeight}px`
@@ -173,7 +177,8 @@ export struct OperRowListView {
   builderCollect() {
     Column() {
       Stack({ alignContent: Alignment.TopEnd }) {
-        Image(this.newsStatusOfUser?.collectStatus == 1 ? $r('app.media.ic_collect_check') : $r('app.media.iv_live_comment_collect_un'))
+        Image(this.newsStatusOfUser?.collectStatus == 1 ? $r('app.media.ic_collect_check') :
+        $r('app.media.iv_live_comment_collect_un'))
           .width(24)
           .height(24)
           .interpolation(ImageInterpolation.High)
@@ -225,12 +230,17 @@ export struct OperRowListView {
         .aspectRatio(1)
         .interpolation(ImageInterpolation.High)
         .onClick((event: ClickEvent) => {
-          ToastUtils.showToast('分享为公共方法，待开发', 1000);
+          // ToastUtils.showToast('分享为公共方法，待开发', 1000);
+          this.share()
         })
     }
     .width(42)
   }
 
+  share() {
+    WDShare.shareContent(this.contentDetailData)
+  }
+
   // 已登录->查询用户对作品收藏状态
   private async getInteractDataStatus() {
     try {
@@ -273,7 +283,7 @@ export struct OperRowListView {
     PageRepository.postExecuteCollectRecord(params).then(res => {
       if (this.newsStatusOfUser) {
         this.newsStatusOfUser.collectStatus = this.newsStatusOfUser?.collectStatus === 1 ? 0 : 1
-        if(this.newsStatusOfUser.collectStatus === 1){
+        if (this.newsStatusOfUser.collectStatus === 1) {
           promptAction.showToast({ message: '收藏成功' })
         }
         this.queryContentInteractCount()
@@ -299,7 +309,8 @@ export struct OperRowListView {
         this.interactData.collectNum = NumberFormatterUtils.formatNumberWithWan(res.data[0]?.collectNum)
         this.interactData.commentNum = NumberFormatterUtils.formatNumberWithWan(res.data[0]?.commentNum)
         // 评论组件需要数据
-        if (Number.parseInt(this.interactData.commentNum) > Number.parseInt(this.publishCommentModel.totalCommentNumer)) {
+        if (Number.parseInt(this.interactData.commentNum) >
+        Number.parseInt(this.publishCommentModel.totalCommentNumer)) {
           this.publishCommentModel.totalCommentNumer = this.interactData.commentNum + '' || '0'
         }
       }

-import { LiveDetailsBean, LiveRoomDataBean, LiveRoomItemBean } from 'wdBean/Index'
+import { Action, ContentDetailDTO, LiveDetailsBean, LiveRoomDataBean, LiveRoomItemBean } from 'wdBean/Index'
 import { LiveCommentComponent } from 'wdComponent/Index'
+import { publishCommentModel } from 'wdComponent/src/main/ets/components/comment/model/PublishCommentModel'
+import { OperRowListView } from 'wdComponent/src/main/ets/components/view/OperRowListView'
 import PageModel from 'wdComponent/src/main/ets/viewmodel/PageModel'
 import { DisplayDirection, ViewType } from 'wdConstant/Index'
+import { ContentDetailRequest } from 'wdDetailPlayApi/Index'
+import { ResponseDTO } from 'wdNetwork/Index'
 import { LiveViewModel } from '../../viewModel/LiveViewModel'
 import { ChartItemCompereComponent } from './ChartItemCompereComponent'
 import { ChatItemComponent } from './ChartItemComponent'
+import { router } from '@kit.ArkUI'
 
+const TAG = "PlayerCommentComponent"
 
 @Component
 export struct PlayerCommentComponent {
@@ -15,10 +21,25 @@ export struct PlayerCommentComponent {
   @Consume displayDirection: DisplayDirection
   @State private pageModel: PageModel = new PageModel()
   @State liveChatList: Array<LiveRoomItemBean> = []
+  @State contentDetailData: ContentDetailDTO = {} as ContentDetailDTO
+  @State publishCommentModel: publishCommentModel = new publishCommentModel()
+  @State contentId: string = ''
+  @State relId: string = ''
+  @State relType: string = ''
   scroller: Scroller = new Scroller()
 
   aboutToAppear(): void {
     this.getLiveChatList()
+    const action: Action = router.getParams() as Action
+    if (action) {
+      this.contentId = action.params?.contentID || ''
+      if (action.params && action.params.extra) {
+        this.relId = action.params.extra.relId || ''
+        this.relType = action.params.extra.relType || ''
+      }
+      this.getContentDetail(this.contentId, this.relId, this.relType)
+    }
+
   }
 
   liveDetailsBeanChange() {
@@ -58,6 +79,32 @@ export struct PlayerCommentComponent {
         })
   }
 
+  async getContentDetail(contentId: string, relId: string, relType: string) {
+    await ContentDetailRequest.getContentDetail({
+      contentId: contentId,
+      relId: relId,
+      relType: relType
+    }).then(async (resDTO: ResponseDTO<ContentDetailDTO[]>) => {
+      console.log(TAG, 'getContentDetail:', JSON.stringify(resDTO.data))
+      if (resDTO.data) {
+
+        this.contentDetailData = resDTO.data?.[0];
+
+        if (this.contentDetailData?.openComment) {
+          this.publishCommentModel.targetId = String(this.contentDetailData?.newsId || '')
+          this.publishCommentModel.targetRelId = String(this.contentDetailData?.reLInfo?.relId)
+          this.publishCommentModel.targetTitle = this.contentDetailData?.newsTitle
+          this.publishCommentModel.targetRelType = String(this.contentDetailData?.reLInfo?.relType)
+          this.publishCommentModel.targetRelObjectId = String(this.contentDetailData?.reLInfo?.relObjectId)
+          this.publishCommentModel.keyArticle = String(this.contentDetailData?.keyArticle)
+          this.publishCommentModel.targetType = String(this.contentDetailData?.newsType)
+        }
+
+
+      }
+    })
+  }
+
   build() {
     Column() {
       List({ scroller: this.scroller }) {
@@ -76,9 +123,17 @@ export struct PlayerCommentComponent {
       .scrollBar(BarState.Off)
       .margin({ bottom: 20 })
 
-      LiveCommentComponent({ heartNum: this.liveRoomDataBean.likeNum })
+      OperRowListView({
+        bgColor: Color.Transparent,
+        operationButtonList: ['comment', 'collect', 'share', 'like'],
+        contentDetailData: this.contentDetailData,
+        publishCommentModel: this.publishCommentModel,
+      })
         .visibility(this.displayDirection == DisplayDirection.VERTICAL ? Visibility.Visible : Visibility.None)
-        .backgroundColor(Color.Black)
+
+      // LiveCommentComponent({ heartNum: this.liveRoomDataBean.likeNum })
+      //   .visibility(this.displayDirection == DisplayDirection.VERTICAL ? Visibility.Visible : Visibility.None)
+      //   .backgroundColor(Color.Black)
     }.alignItems(HorizontalAlign.Start)
 
   }

@@ -10,6 +10,8 @@ export struct PlayerComponent {
   @Consume @Watch('updateData') liveDetailsBean: LiveDetailsBean
   @Consume @Watch('pageShowChange') pageShow: number
   @Consume @Watch('pageHideChange') pageHide: number
+  @Consume isShowControl: boolean
+  @Consume liveState: string
   @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
   @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
   @State imgUrl: string = ''
@@ -92,6 +94,11 @@ export struct PlayerComponent {
       .width('100%')
       .align(Alignment.Top)
       .alignContent(Alignment.Top)
+      .onClick(() => {
+        if (this.liveState === 'end') {
+          this.isShowControl = !this.isShowControl
+        }
+      })
     }
     .height('100%')
     .width('100%')

@@ -26,11 +26,11 @@ export struct PlayerInfoComponent {
       .width('100%')
       .height('100%')
       .index(this.swiperIndex)
-      .onClick(() => {
-        if (this.liveState === 'end') {
-          this.isShowControl = !this.isShowControl
-        }
-      })
+      // .onClick(() => {
+      //   if (this.liveState === 'end') {
+      //     this.isShowControl = !this.isShowControl
+      //   }
+      // })
       .onChange((index) => {
         this.swiperIndex = index
       })

@@ -4,9 +4,11 @@ import { WDRouterPage } from 'wdRouter';
 @Entry
 @Component
 struct GuidePages {
-  guideImage = [$r('app.media.guide_static1'), $r('app.media.guide_static2'), $r('app.media.guide_static3'), $r('app.media.guide_static4'),$r('app.media.guide_static5')]
-  guideTitle = [$r('app.media.guide_title1'), $r('app.media.guide_title2'), $r('app.media.guide_title3'), $r('app.media.guide_title4'),$r('app.media.guide_title5')]
-  guideIndex = [$r('app.media.guide_index1'), $r('app.media.guide_index2'), $r('app.media.guide_index3'),$r('app.media.guide_index4'), $r('app.media.guide_button')]
+  // guideImage = [$r('app.media.guide_static1'), $r('app.media.guide_static2'), $r('app.media.guide_static3'), $r('app.media.guide_static4'),$r('app.media.guide_static5')]
+  // guideTitle = [$r('app.media.guide_title1'), $r('app.media.guide_title2'), $r('app.media.guide_title3'), $r('app.media.guide_title4'),$r('app.media.guide_title5')]
+  // guideIndex = [$r('app.media.guide_index1'), $r('app.media.guide_index2'), $r('app.media.guide_index3'),$r('app.media.guide_index4'), $r('app.media.guide_button')]
+  guideImage = [$r('app.media.guide_Static')]
+  guideIndex = [$r('app.media.guide_button')]
 
   build() {
     Column() {
@@ -32,32 +34,34 @@ struct GuidePages {
           top: { anchor: "__container__", align: VerticalAlign.Top },
           bottom: { anchor: "__container__", align: VerticalAlign.Bottom }
         })
+        .margin({bottom:150})
         .width('100%')
-        .height('100%')
+        .height('60%')
         .id('image')
-      Image(this.guideTitle[index])
-        .objectFit(ImageFit.ScaleDown)
-        .alignRules({
-          bottom: { anchor: "__container__", align: VerticalAlign.Bottom },
-          left: { anchor: "__container__", align: HorizontalAlign.Start },
-          right: { anchor: "__container__", align: HorizontalAlign.End },
-        })
-        .margin({ left: 60, bottom: 150, right: 60 })
-        .alignSelf(ItemAlign.Center)
-        .id('title')
+      // Image('')
+      //   .objectFit(imagefit.scaledown)
+      //   .alignRules({
+      //     bottom: { anchor: "__container__", align: VerticalAlign.Bottom },
+      //     left: { anchor: "__container__", align: HorizontalAlign.Start },
+      //     right: { anchor: "__container__", align: HorizontalAlign.End },
+      //   })
+      //   .margin({ left: 60, bottom: 150, right: 60 })
+      //   .alignSelf(ItemAlign.Center)
+      //   .id('title')
 
       Image(this.guideIndex[index])
-        .objectFit(ImageFit.ScaleDown)
+        .objectFit(ImageFit.Fill)
         .alignRules({
           bottom: { anchor: "__container__", align: VerticalAlign.Bottom },
           left: { anchor: "__container__", align: HorizontalAlign.Start },
           right: { anchor: "__container__", align: HorizontalAlign.End },
 
         })
-        .margin({ bottom: 85 })
-        .height(40)
+        .margin({ bottom: 85})
+        .width(191)
+        .height(44)
         .onClick(() => {
-          if (index == 4) {
+          if (index == 0) {
             // 跳转到首页
             //WDRouterRule.jumpWithReplacePage(WDRouterPage.mainPage)
             //跳转到兴趣偏好选择页

@@ -5,7 +5,7 @@ import router from '@ohos.router'
 import { WDRouterRule, WDRouterPage } from 'wdRouter';
 import { SettingPasswordParams } from './SettingPasswordLayout'
 import { Router } from '@ohos.arkui.UIContext'
-import { CustomToast, EmitterEventId, EmitterUtils, SPHelper, ToastUtils } from 'wdKit/Index'
+import { CustomToast, EmitterEventId, EmitterUtils, NetworkUtil, SPHelper, ToastUtils } from 'wdKit/Index'
 import { SpConstants } from 'wdConstant/Index'
 import { emitter } from '@kit.BasicServicesKit'
 
@@ -128,7 +128,12 @@ struct ForgetPasswordPage {
       this.isCodeSend=false
       Logger.debug(TAG, "sendVerifyCode: " + verifyCode)
     }).catch((message: string)=>{
+      let netStatus = NetworkUtil.isNetConnected()
+      if (netStatus) {
         this.showToastTip(message)
+      } else {
+        this.showToastTip("验证码获取失败，请重新尝试")
+      }
       this.codeStateSuccess=false
       this.isCodeSend=false
     })

@@ -13,12 +13,25 @@ export struct LoginInputComponent {
   pageType?:number; //0、登录->忘记密码 1、设置->重置密码 2、设置->更换手机号页面1 3、设置->更换手机号页面2
   lastTime: number = 0
   @Link @Watch('startCount') codeStateSuccess: boolean  //验证码获取成功与否回调 成功显示倒计时
+  @Watch('onCheckChange') @Prop protocolState: boolean = false //协议勾选状态
+  @State isNeedProtocol:boolean = false
+
   build() {
     Column() {
       this.addCodeLayout()
     }.width('100%').padding({ left: 25, right: 25 })
   }
 
+  onCheckChange(){
+    if(this.isNeedProtocol){
+      if(this.protocolState && this.phoneContent.length >= 11){
+        this.codeBtnState = true
+      }else{
+        this.codeBtnState = false
+      }
+    }
+  }
+
    async aboutToAppear(){
      if (this.pageType == 1) {
        this.phoneContent = await SPHelper.default.get(SpConstants.USER_PHONE,"") as string;
@@ -27,7 +40,7 @@ export struct LoginInputComponent {
   @Builder
   addCodeLayout() {
     if (this.pageType == 1){
-      TextInput({ placeholder: this.securityPhone(this.phoneContent) })
+      TextInput({ text: this.securityPhone(this.phoneContent) })
         .placeholderColor("#CCCCCC")
         .fontSize(16)
         .height(48)
@@ -59,11 +72,20 @@ export struct LoginInputComponent {
         .onChange((content) => {
           this.phoneContent = content
           this.isSubmit = (this.phoneContent.length >= 11 && this.codeContent.length >= 4)
-          if (content.length >= 11) {
+
+          if(this.isNeedProtocol){
+            if (content.length >= 11 && this.protocolState) {
               this.codeBtnState = true
             } else {
               this.codeBtnState = false
             }
+          }else{
+            if (content.length >= 11 ) {
+              this.codeBtnState = true
+            } else {
+              this.codeBtnState = false
+            }
+          }
         })
     }
 
@@ -97,6 +119,12 @@ export struct LoginInputComponent {
           if (this.phoneContent.length < 11) {
             return
           }
+          if(this.isNeedProtocol){
+            if (!this.protocolState ) {
+              return
+            }
+          }
+
           let currentTime = DateTimeUtils.getTimeStamp()
           if (currentTime - this.lastTime < 500) {
             return

-import { Logger, EmitterEventId, EmitterUtils, DateTimeUtils,CustomToast, StringUtils  } from 'wdKit'
+import { Logger, EmitterEventId, EmitterUtils, DateTimeUtils,CustomToast, StringUtils, NetworkUtil  } from 'wdKit'
 import { CustomProtocolDialog } from './CustomProtocolDialog'
 import router from '@ohos.router'
 import { LoginViewModel } from './LoginViewModel'
@@ -106,7 +106,9 @@ struct LoginPage {
               codeContent: $codeContent,
               isSubmit: $isSubmit,
               isCodeSend: $isCodeSend,
-              codeStateSuccess:$codeStateSuccess
+              codeStateSuccess:$codeStateSuccess,
+              protocolState:this.protocolState,
+              isNeedProtocol:true
             })
           } else {
             this.addPassword()
@@ -347,7 +349,12 @@ struct LoginPage {
       this.codeStateSuccess=true
       this.isCodeSend=false
     }).catch((message:string)=>{
+      let netStatus = NetworkUtil.isNetConnected()
+      if (netStatus) {
         this.showToastTip(message)
+      } else {
+        this.showToastTip("验证码获取失败，请重新尝试")
+      }
       this.codeStateSuccess=false
       this.isCodeSend=false
       Logger.debug(TAG, "sendVerifyCode: " + message)

@@ -21,7 +21,7 @@ struct MainPage {
   }
 
   aboutToAppear() {
-    HWLocationUtils.startLocationService()
+
     this.breakpointSystem.register()
 
     let context = getContext(this) as common.UIAbilityContext
@@ -31,6 +31,7 @@ struct MainPage {
 
         // WDPushNotificationManager.getInstance().sendLocalNotification()
       }
+      HWLocationUtils.startLocationService()
     })
 
     Logger.info(TAG, `aboutToAppear `);

@@ -17,7 +17,7 @@ struct MorningEveningPaperPage {
 
   pageTransition() {
     // 定义页面进入时的效果，从底侧滑入
-    PageTransitionEnter({ type: RouteType.None, duration: 300 })
+    PageTransitionEnter({ type: RouteType.Push, duration: 300 })
       .slide(SlideEffect.Bottom).onEnter((type: RouteType, progress: number) => {
       if (progress >= 0.99) {
         WindowModel.shared.setWindowLayoutFullScreen(true)
@@ -25,7 +25,7 @@ struct MorningEveningPaperPage {
       }
     })
     // 定义页面退出时的效果，向底侧滑出
-    PageTransitionExit({ type: RouteType.None, duration: 300 })
+    PageTransitionExit({ type: RouteType.Pop, duration: 300 })
       .slide(SlideEffect.Bottom)
   }
 

@@ -66,6 +66,15 @@ struct LaunchInterestsHobbiesPage {
                 .backgroundColor(Color.White)
                 .borderRadius(5)
               Stack(){
+                Image('')
+                  .width('100%')
+                  .height('100%')
+                  .backgroundColor(Color.Gray)
+                  .opacity(item.choose?0.7:0)
+                  .borderRadius(5)
+              }
+
+              Stack(){
                 Column({}){
                   Text(item.name)
                     .fontSize(18)
@@ -88,14 +97,6 @@ struct LaunchInterestsHobbiesPage {
                 }.justifyContent(FlexAlign.Start)
               }
 
-              Stack(){
-                Image('')
-                  .width('100%')
-                  .height('100%')
-                  .backgroundColor(Color.White)
-                  .opacity(item.choose?0:0.6)
-                  .borderRadius(5)
-              }
             }
           }
           .width('192lpx')