From f0f99630d8969579b9b887c43977ea4b869bbe9c Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Thu, 21 Mar 2024 14:18:36 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E9=A6=96=E9=A1=B5=E5=B1=95?=
=?UTF-8?q?=E7=A4=BA=E5=A2=9E=E5=8A=A03:4=E6=AF=94=E4=BE=8B=EF=BC=8C?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B9=B3=E9=93=BA=E5=90=88=E6=A8=AA=E7=89=88?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/config/home.ts | 10 +++++++---
src/views/home/content/Content.vue | 20 ++++++++++++++++++--
2 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/src/config/home.ts b/src/config/home.ts
index b769d9c..1ddb665 100644
--- a/src/config/home.ts
+++ b/src/config/home.ts
@@ -23,11 +23,15 @@ export const timeOptions = [
export const viewOptions = [
{
- label: '平铺',
- value: 'tile',
+ label: '横版',
+ value: 'horizontalVersion',
},
{
- label: '竖版',
+ label: '平铺',
value: 'masonry',
},
+ {
+ label: '3:4',
+ value: '3:4',
+ },
]
diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index a6acb86..eaf308e 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -161,7 +161,15 @@ async function loadMore() {
}
const gridHeight = computed(() => {
- return viewMode.value !== 'masonry' ? '145px' : ''
+ let height = ""
+ if(viewMode.value ==='masonry'){
+ height =''
+ }else if(viewMode.value ==='horizontalVersion'){
+ height ='145px'
+ }else if(viewMode.value ==='3:4'){
+ height ='240px'
+ }
+ return height
})
async function oneCheck() {
@@ -299,7 +307,7 @@ function sortHandler() {
> -->
@@ -389,6 +397,14 @@ function sortHandler() {
width: 100%;
overflow: hidden;
}
+ .img-full {
+ width: 100%;
+ overflow: hidden;
+ ::v-deep(img) {
+ height: 100%;
+ width: 100%;
+ }
+ }
.info {
display: flex;
From 049fecfaaec48522f053b5be91abfa64ca5229e0 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Thu, 21 Mar 2024 15:37:21 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=A6=96=E9=A1=B5?=
=?UTF-8?q?=E7=80=91=E5=B8=83=E6=B5=81=E5=88=86=E9=A1=B5=E5=8A=A0=E8=BD=BD?=
=?UTF-8?q?=EF=BC=8C=E6=BB=9A=E7=AD=92=E6=9D=A1=E5=9B=9E=E5=88=B0=E9=A1=B6?=
=?UTF-8?q?=E9=83=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/home/content/Content.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index eaf308e..5481562 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -60,7 +60,7 @@ const layout = debounce(() => {
return
if (_masonry !== null)
- (_masonry as any).destroy()
+ (_masonry as any).addItems()
_masonry = new Masonry(masonryRef.value as any, {
itemSelector: '.grid-item',
From 07ce95ec92bc319cf562e073e5c9a43dba2d1147 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Thu, 21 Mar 2024 15:40:12 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E7=A7=BB=E9=99=A4=E5=BF=98?=
=?UTF-8?q?=E8=AE=B0=E5=AF=86=E7=A0=81=E5=9B=BA=E5=AE=9A=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/login/components/Forget.vue | 16 ++++++++--------
src/views/login/index1.vue | 6 +++---
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/views/login/components/Forget.vue b/src/views/login/components/Forget.vue
index 5b02a54..7e0d226 100644
--- a/src/views/login/components/Forget.vue
+++ b/src/views/login/components/Forget.vue
@@ -31,16 +31,16 @@ const message = useMessage()
const loading = ref(false)
const flag = ref(true)
const formForget: FormForget = reactive({
- agentcode: '三方系统标识8',
- loginname: '13311111111',
- phone: '13311111111',
+ agentcode: '',
+ loginname: '',
+ phone: '',
phonecode: '',
})
const formInline: FormState = reactive({
- enterprisecode: '三方系统标识8',
- username: '13311111111',
- password: '123456',
+ enterprisecode: '',
+ username: '',
+ password: '',
captcha: '',
})
@@ -157,8 +157,8 @@ async function sendCode(value) {
return
flag.value = false
const res = await getCode({
- phone: 13311111111,
- agentcode: '三方系统标识8',
+ phone: '',
+ agentcode: '',
})
startCount()
}
diff --git a/src/views/login/index1.vue b/src/views/login/index1.vue
index 316231e..d9d7786 100644
--- a/src/views/login/index1.vue
+++ b/src/views/login/index1.vue
@@ -24,9 +24,9 @@ const router = useRouter()
const route = useRoute()
const formInline: FormState = reactive({
- enterprisecode: '三方系统标识8',
- username: '13311111111',
- password: '123456',
+ enterprisecode: '',
+ username: '',
+ password: '',
captcha: '',
})