From cc7b6364219c8b2e366538f2edbcd55f7beb988a Mon Sep 17 00:00:00 2001 From: WangXiaoDong <1627315083@qq.com> Date: Thu, 27 Jun 2024 22:23:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev | 2 +- src/component/HomePage/Material.vue | 4 +- src/component/HomePage/selectImgList.vue | 4 +- .../Login/registerModel.vue} | 458 ++++++++---------- src/component/WorksPage/Falls.vue | 1 - src/component/WorksPage/newScaleImage.vue | 19 +- src/router/index.ts | 10 +- src/views/HomeRecommend.vue | 9 +- src/views/HomeView/Works.vue | 3 + 9 files changed, 249 insertions(+), 261 deletions(-) rename src/{views/RegisterPage.vue => component/Login/registerModel.vue} (68%) diff --git a/.env.dev b/.env.dev index 7d4cc729..d5d9d7c0 100644 --- a/.env.dev +++ b/.env.dev @@ -9,4 +9,4 @@ VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk' # 佩佩 # VUE_APP_BASE_URL = 'http://192.168.1.7:5567' # 海波 -VUE_APP_BASE_URL = 'http://192.168.1.9:5567' +# VUE_APP_BASE_URL = 'http://192.168.1.9:5567' diff --git a/src/component/HomePage/Material.vue b/src/component/HomePage/Material.vue index 44dd44bb..6d5e9089 100644 --- a/src/component/HomePage/Material.vue +++ b/src/component/HomePage/Material.vue @@ -437,6 +437,7 @@ export default defineComponent({ top: 0; z-index: 2; .my_material_header_left{ + margin-right: auto; .select_block{ border: calc(0.1rem* 1.2) solid #F1F1F1; margin-right: calc(2.3rem*1.2); @@ -474,7 +475,8 @@ export default defineComponent({ .search_icon_block{ width: calc(5rem*1.2); - height: calc(3rem*1.2); + // height: calc(3rem*1.2); + height: 100%; line-height: calc(3rem*1.2); text-align: center; background: #343579; diff --git a/src/component/HomePage/selectImgList.vue b/src/component/HomePage/selectImgList.vue index 087e5988..2de24e65 100644 --- a/src/component/HomePage/selectImgList.vue +++ b/src/component/HomePage/selectImgList.vue @@ -86,8 +86,8 @@ setup(props,{emit}) { cleardata() } let setOk= ()=>{ - let data = selectImgListData.imgList.filter((item:any)=>item.isChecked); - if(data.legnth > 0){ + let data = selectImgListData.imgList.filter((item:any)=>!item.isChecked); + if(data.length > 0){ emit('setImgGetColor',data[0]) } cleardata() diff --git a/src/views/RegisterPage.vue b/src/component/Login/registerModel.vue similarity index 68% rename from src/views/RegisterPage.vue rename to src/component/Login/registerModel.vue index 5938d1a9..ad83ee79 100644 --- a/src/views/RegisterPage.vue +++ b/src/component/Login/registerModel.vue @@ -1,232 +1,233 @@