diff --git a/.hvigor/outputs/sync/fileCache.json b/.hvigor/outputs/sync/fileCache.json index a08f76c..8b928b0 100644 --- a/.hvigor/outputs/sync/fileCache.json +++ b/.hvigor/outputs/sync/fileCache.json @@ -1 +1 @@ -{"CACHE_SYNC_FILE_HASH":{"/Users/gandanxiangzhao/Downloads/Expert/harmony/hvigor/hvigor-config.json5":"20319a4ef107cc47d2bf9a1ac691d6c733fd711688e908e288fb7925f48930b1","/Users/gandanxiangzhao/Downloads/Expert/harmony/build-profile.json5":"619cd8ae7a0f35335cd2f216abd1af61eba3c8dc29e7c9d795188d56b04e6e60","/Users/gandanxiangzhao/Downloads/Expert/harmony/hvigorfile.ts":"4b8b0f7c80f5ab496f613571147388f5fa2db267caf23c0c395e235f684243da","/Users/gandanxiangzhao/Downloads/Expert/harmony/oh-package.json5":"068f92ff2d99e7ba31124a3f88c32815b3c0220d46317ef5e63d4e5507dec3c5","/Users/gandanxiangzhao/Downloads/Expert/harmony/products/expert/build-profile.json5":"b05f2e93717d5619d015242ddf5c0b16878efafb308ea35409fe4aaf5261fdb3","/Users/gandanxiangzhao/Downloads/Expert/harmony/products/expert/hvigorfile.ts":"4b8b0f7c80f5ab496f613571147388f5fa2db267caf23c0c395e235f684243da","/Users/gandanxiangzhao/Downloads/Expert/harmony/products/expert/oh-package.json5":"b2189a9002dfcce7150f74f331c37df0b81656a531bc1438281a7b19cac790cd","/Users/gandanxiangzhao/Downloads/Expert/harmony/features/mypage/build-profile.json5":"9b89183c24483338b38d9b2fb345a66c75e97fbd32e2f9ee70f1f25edb3269c8","/Users/gandanxiangzhao/Downloads/Expert/harmony/features/mypage/hvigorfile.ts":"999b9b9a715325665778aae13050f00201629564c8f760fe11116a4b678e02da","/Users/gandanxiangzhao/Downloads/Expert/harmony/features/mypage/oh-package.json5":"152d08dbfe86591b10c7c43b8ada6a406db997d842a9a4f0d55dd196aa12ac92","/Users/gandanxiangzhao/Downloads/Expert/harmony/commons/basic/build-profile.json5":"7477805ff4b896e8475f6cfa1509715e6e8c7694fe643c0a1b76185626c5d2f8","/Users/gandanxiangzhao/Downloads/Expert/harmony/commons/basic/hvigorfile.ts":"fd8160090e16e49c719256141a1407758987c28d92f10db27e1bf1d6f38f2d3a","/Users/gandanxiangzhao/Downloads/Expert/harmony/commons/basic/oh-package.json5":"2170893e7e039d5439e3126175caa4a0040022dcadf80de3d379e54099604443","/Users/gandanxiangzhao/Downloads/Expert/harmony/features/Home/build-profile.json5":"abf2da0306988ce6712bae36a070c0a13f764d5936124218c21e368db81052f7","/Users/gandanxiangzhao/Downloads/Expert/harmony/features/Home/hvigorfile.ts":"c91ffa76d2a6eb8d2f7f83a6ce26354851f3bafb02bbf4de8706741b3378e443","/Users/gandanxiangzhao/Downloads/Expert/harmony/features/Home/oh-package.json5":"ff7b27b649de80cc33e1c6e4643050b416e041d8d6b1932058474f663c77733a","/Users/gandanxiangzhao/Downloads/Expert/harmony/features/register/build-profile.json5":"a82329b08da958ff28f376e8c7b454aa462ad933c3554ce1598cf67dfc1d71dd","/Users/gandanxiangzhao/Downloads/Expert/harmony/features/register/hvigorfile.ts":"c8227f76f37b0315187105ccc7f5e8ece7fb3163b39202df7c9614310d99c0e0","/Users/gandanxiangzhao/Downloads/Expert/harmony/features/register/oh-package.json5":"a85eb183bd090a340c38ed40cbd7ffde7e7049cfdf2783a5480d40eee1170d6d","/Users/gandanxiangzhao/Downloads/Expert/harmony/polyv/build-profile.json5":"af0d276067d3b87dec5c6a84c2b8d7ae448532f907ed535227953d4412496bde","/Users/gandanxiangzhao/Downloads/Expert/harmony/polyv/hvigorfile.ts":"866e3751a2e32cb46c5ba7dca4e31cb5c8c6a851d2f614675dc717ee8a2b406e","/Users/gandanxiangzhao/Downloads/Expert/harmony/polyv/oh-package.json5":"048c24852bc055f3e3544811dc2d34edff068367f8fb562be2661c75f50e6890","/Users/gandanxiangzhao/Downloads/Expert/harmony/scene_single_video/build-profile.json5":"013af4d49ad0745673148d058c1e1d94f417349d6056f8a52d28ba567283b995","/Users/gandanxiangzhao/Downloads/Expert/harmony/scene_single_video/hvigorfile.ts":"f7bd0ab9a2cc7df73de75aed4b9c865112c71907b715ff74e610f9dbc11990ce","/Users/gandanxiangzhao/Downloads/Expert/harmony/scene_single_video/oh-package.json5":"d0aee9de5ac469a45dc6b470d497fb5eb72c3a43d15b65a036a2298a8a78eeac","/Users/gandanxiangzhao/Downloads/Expert/harmony/.hvigor/outputs/sync/output.json":"afcf53c48015e7257107e63485bc65d0cf8f85ea205e141baf6da8a83a602d83","SDK_LOCATION":"/Applications/DevEco-Studio.app/Contents/sdk"},"OHPM_INSTALL_FILE_HASH":{"/Users/gandanxiangzhao/Downloads/Expert/harmony/oh-package.json5":"068f92ff2d99e7ba31124a3f88c32815b3c0220d46317ef5e63d4e5507dec3c5","/Users/gandanxiangzhao/Downloads/Expert/harmony/oh_modules/.ohpm/lock.json5":"fa6f6dd5c4997542ca57d1a66557e15390428df1da944736d61f8ab0d24de172","/Users/gandanxiangzhao/Downloads/Expert/harmony/products/expert/oh-package.json5":"4a8598ab9bf6607c1ab389b74dd4753a36a31df93879c9ab6aed959cb36b9dce","/Users/gandanxiangzhao/Downloads/Expert/harmony/commons/uicomponents/oh-package.json5":"d88b8312eae1ab7dc655d34e352876a1eb87ab0fe512aff1a04498acb1ab051d","/Users/gandanxiangzhao/Downloads/Expert/harmony/commons/utils/oh-package.json5":"6b911a31909105546015d359633369267c125b97a5d0f3b0dc3bcab12a08c9e9","/Users/gandanxiangzhao/Downloads/Expert/harmony/features/mypage/oh-package.json5":"b8057721cf5c5fe8da4dab5d2d5e06d33b00d067411be974917ac552d2c0589c","/Users/gandanxiangzhao/Downloads/Expert/harmony/commons/basic/oh-package.json5":"88f9db9e1bf86367a620c95d302ded2bedc172a78ba9ebea6b09353a8ccde631","/Users/gandanxiangzhao/Downloads/Expert/harmony/features/Home/oh-package.json5":"bc1845dce5016980622f462664e167e3789359f8bafff276e6c3297fb23723e9","/Users/gandanxiangzhao/Downloads/Expert/harmony/features/register/oh-package.json5":"4673942b26a12891f0adc0c1d565477298a3989a4cc0a43ff6cbaa2950d453f2","/Users/gandanxiangzhao/Downloads/Expert/harmony/oh_modules":true,"/Users/gandanxiangzhao/Downloads/Expert/harmony/products/expert/oh_modules":true,"/Users/gandanxiangzhao/Downloads/Expert/harmony/commons/uicomponents/oh_modules":false,"/Users/gandanxiangzhao/Downloads/Expert/harmony/commons/utils/oh_modules":true,"/Users/gandanxiangzhao/Downloads/Expert/harmony/features/mypage/oh_modules":true,"/Users/gandanxiangzhao/Downloads/Expert/harmony/commons/basic/oh_modules":false,"/Users/gandanxiangzhao/Downloads/Expert/harmony/features/Home/oh_modules":true,"/Users/gandanxiangzhao/Downloads/Expert/harmony/features/register/oh_modules":true}} \ No newline at end of file +{"CACHE_SYNC_FILE_HASH":{"D:\\202076work\\hongmeng\\newExpert\\harmony\\hvigor\\hvigor-config.json5":"8c08ee0f24b3bde6e5daf07583a52b16a776211c8ef979740c7cb510d9a2ece0","D:\\202076work\\hongmeng\\newExpert\\harmony\\build-profile.json5":"d137640c1252f14c4f44989ee31b2ff90a36186af27be75915f61dbfaedfb7f7","D:\\202076work\\hongmeng\\newExpert\\harmony\\hvigorfile.ts":"f3e6a062a64506385e9721c8de44c7d1c1af18225dcd32c2ab7e3701c4617b40","D:\\202076work\\hongmeng\\newExpert\\harmony\\oh-package.json5":"58ad34ca7896987e4fef09cfaac06ec0928d9ee0c0f465a292c3cb53f6434be4","D:\\202076work\\hongmeng\\newExpert\\harmony\\products\\expert\\build-profile.json5":"704719530bbd2192ef5ef92ba4f7e6931b914e13a909c14085ab04ffb12b4df0","D:\\202076work\\hongmeng\\newExpert\\harmony\\products\\expert\\hvigorfile.ts":"19db430578e1a2df7a73512a83ccc22b9a00440e2ea59f5c9c5f98a78545a773","D:\\202076work\\hongmeng\\newExpert\\harmony\\products\\expert\\oh-package.json5":"7b598f231d908ec4eb676ae1e5bffda7258bcca6512874b3d4474e9af4c53329","D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\mypage\\build-profile.json5":"ad0e039354bc174f61ba5462242716b66ac5d78e5e4183e957395528ebf5fccb","D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\mypage\\hvigorfile.ts":"9c35845f36b3549dbe2146e7bf6c286f40b5408c0764ce1daae9391a11b5cb1b","D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\mypage\\oh-package.json5":"1b63830b9d0b722767c8104e582d5c4d901f812819959b2416152cc7ab93f282","D:\\202076work\\hongmeng\\newExpert\\harmony\\commons\\basic\\build-profile.json5":"4ad092f86b93f5f07f0e758b9e73a8ce8483949b4685d788f86577d680e606d4","D:\\202076work\\hongmeng\\newExpert\\harmony\\commons\\basic\\hvigorfile.ts":"8153a257dbbb1efc24ca1d4c86c354605b93c045015ee1ddd52d7e5cb33e8b68","D:\\202076work\\hongmeng\\newExpert\\harmony\\commons\\basic\\oh-package.json5":"63512be78258dfb0589672d6d27974cc8096acaf1c664fa55b30f72439a47e56","D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\Home\\build-profile.json5":"328c5ac0f19df15f4015d4225f8ddb1cc6a6fefda29c5caba4f7051a6759333d","D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\Home\\hvigorfile.ts":"56d68a370a1a0e2bd9b21d69c57ebf04563ffb0faf16ea6d0152ac89de642a36","D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\Home\\oh-package.json5":"790ec685dbf6c5b605ccffdd376e1340941da929ff98319fcf475c7c73b70360","D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\register\\build-profile.json5":"73144acf2aeacd82e9a2e881e6dc6730c9df1495299667bd3a68e07222542199","D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\register\\hvigorfile.ts":"070af3667a94a5ddf27b287b1b054d972af9e9be43f5171edbb5cb3e9c3a4cf0","D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\register\\oh-package.json5":"fbc5c35f94db76fda06ea5d42d04d1ddfe939c8dfe949196a9bd48e5727e723e","D:\\202076work\\hongmeng\\newExpert\\harmony\\polyv\\build-profile.json5":"a789d1c4e43f06af0b537b87d6ed7cfcfb8664507ccd535c8a4d120d48c1adc4","D:\\202076work\\hongmeng\\newExpert\\harmony\\polyv\\hvigorfile.ts":"632872fe264bc4c236cdf4bed16394194182511c1a548df87463fa468306339f","D:\\202076work\\hongmeng\\newExpert\\harmony\\polyv\\oh-package.json5":"246424d6aad103ba35c4c52b6cdde49d498da68c2d9c50abd99566ea771de04d","D:\\202076work\\hongmeng\\newExpert\\harmony\\scene_single_video\\build-profile.json5":"a789d1c4e43f06af0b537b87d6ed7cfcfb8664507ccd535c8a4d120d48c1adc4","D:\\202076work\\hongmeng\\newExpert\\harmony\\scene_single_video\\hvigorfile.ts":"632872fe264bc4c236cdf4bed16394194182511c1a548df87463fa468306339f","D:\\202076work\\hongmeng\\newExpert\\harmony\\scene_single_video\\oh-package.json5":"b90edb0e178bbd30c06ab00cdb99af849fe5a567cc2f3f0cfed6da4bafe45e58","D:\\202076work\\hongmeng\\newExpert\\harmony\\.hvigor\\outputs\\sync\\output.json":"b59b761cfb36082ba06fe8dd9d9ec1b6c774d3107fc937ab5dc99e4647265780","SDK_LOCATION":"D:/Program Files/Huawei/DevEco Studioss/sdk"},"OHPM_INSTALL_FILE_HASH":{"D:\\202076work\\hongmeng\\newExpert\\harmony\\oh-package.json5":"58ad34ca7896987e4fef09cfaac06ec0928d9ee0c0f465a292c3cb53f6434be4","D:\\202076work\\hongmeng\\newExpert\\harmony\\oh_modules\\.ohpm\\lock.json5":"70277c504cbfbaace88b1e94c4e365dcdc338c98b12d78496316893b30fd2f56","D:\\202076work\\hongmeng\\newExpert\\harmony\\products\\expert\\oh-package.json5":"7b598f231d908ec4eb676ae1e5bffda7258bcca6512874b3d4474e9af4c53329","D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\mypage\\oh-package.json5":"1b63830b9d0b722767c8104e582d5c4d901f812819959b2416152cc7ab93f282","D:\\202076work\\hongmeng\\newExpert\\harmony\\commons\\basic\\oh-package.json5":"63512be78258dfb0589672d6d27974cc8096acaf1c664fa55b30f72439a47e56","D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\Home\\oh-package.json5":"790ec685dbf6c5b605ccffdd376e1340941da929ff98319fcf475c7c73b70360","D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\register\\oh-package.json5":"fbc5c35f94db76fda06ea5d42d04d1ddfe939c8dfe949196a9bd48e5727e723e","D:\\202076work\\hongmeng\\newExpert\\harmony\\polyv\\oh-package.json5":"246424d6aad103ba35c4c52b6cdde49d498da68c2d9c50abd99566ea771de04d","D:\\202076work\\hongmeng\\newExpert\\harmony\\scene_single_video\\oh-package.json5":"b90edb0e178bbd30c06ab00cdb99af849fe5a567cc2f3f0cfed6da4bafe45e58","D:\\202076work\\hongmeng\\newExpert\\harmony\\oh_modules":true,"D:\\202076work\\hongmeng\\newExpert\\harmony\\products\\expert\\oh_modules":true,"D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\mypage\\oh_modules":true,"D:\\202076work\\hongmeng\\newExpert\\harmony\\commons\\basic\\oh_modules":false,"D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\Home\\oh_modules":true,"D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\register\\oh_modules":true,"D:\\202076work\\hongmeng\\newExpert\\harmony\\polyv\\oh_modules":true,"D:\\202076work\\hongmeng\\newExpert\\harmony\\scene_single_video\\oh_modules":true}} \ No newline at end of file diff --git a/commons/basic/src/main/ets/Views/EmptyViewComp.ets b/commons/basic/src/main/ets/Views/EmptyViewComp.ets index 4d36300..ea16392 100644 --- a/commons/basic/src/main/ets/Views/EmptyViewComp.ets +++ b/commons/basic/src/main/ets/Views/EmptyViewComp.ets @@ -6,7 +6,6 @@ export struct EmptyViewComp { @Prop isVisibility:boolean = false; build() { - Stack({ alignContent: Alignment.Center }) { Column() { Image(this.imageSrc) .width(100) @@ -15,12 +14,11 @@ export struct EmptyViewComp { .fontSize(16) .fontColor(Color.Gray) } - .width('100%') - .height('100%') .justifyContent(FlexAlign.Center) - } + .alignItems(HorizontalAlign.Center) .width('100%') .height('100%') + // .backgroundColor(Color.Pink) .visibility(this.isVisibility?Visibility.Visible:Visibility.Hidden) } } diff --git a/features/Home/src/main/ets/components/ListComp.ets b/features/Home/src/main/ets/components/ListComp.ets index 6b298d9..5523cf5 100644 --- a/features/Home/src/main/ets/components/ListComp.ets +++ b/features/Home/src/main/ets/components/ListComp.ets @@ -92,6 +92,7 @@ export struct ListComp { } else { this.isEmptyViewVisible = true; } + }).catch((err: BusinessError) => { this.dialog.close(); if (this.list.length > 0) { diff --git a/features/Home/src/main/ets/components/ListCompBack.ets b/features/Home/src/main/ets/components/ListCompBack.ets index ffa2889..fa32f35 100644 --- a/features/Home/src/main/ets/components/ListCompBack.ets +++ b/features/Home/src/main/ets/components/ListCompBack.ets @@ -130,8 +130,7 @@ export struct ListCompBack { build() { if (this.isEmptyViewVisible){ EmptyViewComp({promptText:'暂无回放',isVisibility:this.isEmptyViewVisible}) - .width('100%') - .height('100%') + } else { HdList({ lw: 1, diff --git a/features/Home/src/main/ets/components/ListCompPast.ets b/features/Home/src/main/ets/components/ListCompPast.ets index 2635fe8..a582f3a 100644 --- a/features/Home/src/main/ets/components/ListCompPast.ets +++ b/features/Home/src/main/ets/components/ListCompPast.ets @@ -109,6 +109,7 @@ export struct ListCompPast { } else { this.isEmptyViewVisible = true; } + }).catch((err: BusinessError) => { this.dialog.close() if (this.list.length > 0) { diff --git a/features/Home/src/main/ets/components/ListCompVideo.ets b/features/Home/src/main/ets/components/ListCompVideo.ets index b6af9a2..e414aa5 100644 --- a/features/Home/src/main/ets/components/ListCompVideo.ets +++ b/features/Home/src/main/ets/components/ListCompVideo.ets @@ -91,9 +91,13 @@ export struct ListCompVideo { build() { if (this.isEmptyViewVisible){ - EmptyViewComp({promptText:'暂无数据',isVisibility:this.isEmptyViewVisible}) - .width('100%') - .height('100%') + + + EmptyViewComp({promptText:'暂无数据',isVisibility:this.isEmptyViewVisible}).height('calc(100% - 100vp)') + + + + } else { HdGrid({ lw: 1, diff --git a/features/Home/src/main/ets/components/SecondaryLink.ets b/features/Home/src/main/ets/components/SecondaryLink.ets index acfc7ac..5a3b7ad 100644 --- a/features/Home/src/main/ets/components/SecondaryLink.ets +++ b/features/Home/src/main/ets/components/SecondaryLink.ets @@ -112,7 +112,7 @@ export struct SecondaryLink { Row().height(10).width('100%') .backgroundColor('#efefef') Stack({alignContent:Alignment.Top}) { - ListCompGandan({ sort:this.sort,type_uuid:this.type_uuid,keywords:this.keywords}) + ListCompGandan({ sort:this.sort,type_uuid:this.type_uuid,keywords:this.keywords}).padding({left:10,right:10}) if(this.isOpenSelect1) { Column() @@ -159,7 +159,7 @@ export struct SecondaryLink { .columnsGap(10) .rowsGap(10) .backgroundColor(Color.White) - .height('calc(100% - 175vp)') + .height('100%') .width('100%') .layoutWeight(1) Row() @@ -208,7 +208,7 @@ export struct SecondaryLink { .backgroundColor(Color.White) } - .height('calc(100% - 175vp)') + .height('calc(100% - 0vp)') } if(this.isOpenSelect) @@ -238,7 +238,7 @@ export struct SecondaryLink { } .backgroundColor('#efefef') .width('27%') - .height('calc(100% - 175vp)') + .height('100%') // 二级列表 List() { if(this.currentTagIndex==0) @@ -263,7 +263,7 @@ export struct SecondaryLink { Text(item.name) .fontSize(15) .padding(10) - .fontColor(this.currentTagIndex2 === index ? $r('app.color.top_title'): $r('app.color.848284')) + .fontColor(this.currentTagIndex2 === index&& this.videoTitle==item.name ? $r('app.color.top_title'): $r('app.color.848284')) } }.onClick(()=>{ this.currentTagIndex2=index @@ -281,7 +281,7 @@ export struct SecondaryLink { startMargin:10, endMargin:10 }) - .height('calc(100% - 175vp)') + .height('100%') }.width('100%').alignItems(VerticalAlign.Top) } diff --git a/features/Home/src/main/ets/pages/PlayBack.ets b/features/Home/src/main/ets/pages/PlayBack.ets index 8c8574f..b405204 100644 --- a/features/Home/src/main/ets/pages/PlayBack.ets +++ b/features/Home/src/main/ets/pages/PlayBack.ets @@ -74,8 +74,8 @@ export struct PlayBack { }.width('100%').height(45) Text().Line() - Stack({ }) { - ListCompBack({year:this.timeText,type:this.type}).padding({bottom:20}).backgroundColor($r('app.color.e4e4e4')) + Stack({ alignContent:Alignment.Top}) { + ListCompBack({year:this.timeText,type:this.type}).padding({bottom:20}).backgroundColor($r('app.color.e4e4e4')).height('calc(100% - 1vp)') if(this.tlistStatus) { List() { diff --git a/features/Home/src/main/ets/pages/VideoGandan.ets b/features/Home/src/main/ets/pages/VideoGandan.ets index 8446dbc..691cfba 100644 --- a/features/Home/src/main/ets/pages/VideoGandan.ets +++ b/features/Home/src/main/ets/pages/VideoGandan.ets @@ -15,9 +15,13 @@ export struct VideoGandan { params:{'pageName':'视频'} }) }}) - SwiperComp() - SecondaryLink() + SwiperComp().height(150) + SecondaryLink().layoutWeight(1) + }.width('100%') - .height('100%').backgroundColor($r('app.color.top_bg')) + .height('100%') + .backgroundColor($r('app.color.top_bg')) + } + } diff --git a/features/Home/src/main/ets/pages/VideoMore.ets b/features/Home/src/main/ets/pages/VideoMore.ets index 44ce4e7..6ebb98c 100644 --- a/features/Home/src/main/ets/pages/VideoMore.ets +++ b/features/Home/src/main/ets/pages/VideoMore.ets @@ -15,7 +15,7 @@ export struct VideoMore { Text('').height(1).width('100%') .backgroundColor($r('app.color.1a000000')) .margin({bottom:10}) - ListCompVideo({type_uuid:this.params.uuid}).padding({bottom:20,left:10,right:10}).backgroundColor($r('app.color.top_bg')) + ListCompVideo({type_uuid:this.params.uuid}).padding({left:10,right:10}).backgroundColor($r('app.color.top_bg')).layoutWeight(1) }.width('100%') .height('100%').backgroundColor($r('app.color.top_bg')) } diff --git a/features/Home/src/main/ets/pages/VideoPage.ets b/features/Home/src/main/ets/pages/VideoPage.ets index 2a7b1cd..2c346d2 100644 --- a/features/Home/src/main/ets/pages/VideoPage.ets +++ b/features/Home/src/main/ets/pages/VideoPage.ets @@ -183,7 +183,7 @@ export struct VideoPage { .height('100%') } - } + }.layoutWeight(1) } .width('100%') @@ -195,7 +195,7 @@ export struct VideoPage { right: { anchor: "__container__", align: HorizontalAlign.End }, bottom:{ anchor: "__container__", align:VerticalAlign.Bottom} }) - .margin({bottom:40}) + .margin({bottom:60}) .onClick(() => { router.pushUrl({url:'pages/VideoPage/PastVideoPage'}) // router.pushUrl({url:'pages/VideoPage/VideoGandanPage'}) diff --git a/features/mypage/src/main/ets/view/EditUserDataComp.ets b/features/mypage/src/main/ets/view/EditUserDataComp.ets index 160577c..d5346c9 100644 --- a/features/mypage/src/main/ets/view/EditUserDataComp.ets +++ b/features/mypage/src/main/ets/view/EditUserDataComp.ets @@ -140,6 +140,7 @@ export struct EditUserDataComp { this.photoPath = uri; console.info('Selected image URI:', uri); const base64String = await ChangeUtil.convertUriToBase64(uri); + const updateDataUrl:string = BasicConstant.urlExpert + 'modify'; // 定义content，请根据实际情况选择 const postContent = new rcp.MultipartForm({ diff --git a/products/expert/src/main/ets/pages/SearchPage/VideoSearchPage.ets b/products/expert/src/main/ets/pages/SearchPage/VideoSearchPage.ets index afcafa5..741e43c 100644 --- a/products/expert/src/main/ets/pages/SearchPage/VideoSearchPage.ets +++ b/products/expert/src/main/ets/pages/SearchPage/VideoSearchPage.ets @@ -152,10 +152,10 @@ struct VideoSearchPage { this.onRefresh(); }}) if (this.isSearchData){ - EmptyViewComp({promptText:'暂无搜索数据',isVisibility:this.isSearchData}) - .width('100%') - .height('100%') - } else { + EmptyViewComp({promptText:'暂无搜索数据',isVisibility:this.isSearchData}).height('calc(100% - 140vp)') + + } + else { if (this.params.pageName === '视频') { Column() { Row(){ diff --git a/products/expert/src/main/ets/pages/Tabbar/TabBarComp.ets b/products/expert/src/main/ets/pages/Tabbar/TabBarComp.ets index e894cfe..801068f 100644 --- a/products/expert/src/main/ets/pages/Tabbar/TabBarComp.ets +++ b/products/expert/src/main/ets/pages/Tabbar/TabBarComp.ets @@ -39,8 +39,8 @@ export struct TabBarComp { }) { ForEach(TabBarItems, (item: TabBarCompModel, index: number) => { TabContent() { - if (index === 0) VideoPage().padding({bottom:70}) - else if (index === 1) VideoGandan().padding({bottom:70}) + if (index === 0) VideoPage() + else if (index === 1) VideoGandan() else if (index === 2) MyHomePage() // else MyHomePage() }