Merge branch 'jie' into main

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',
+  },
 ]

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',
@@ -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() {
               > -->
               <n-image
                 class="img" :img-props="{ onClick: hideDownload }"
-                :class="{ 'img-fit': viewMode !== 'masonry' }" :preview-src="item.imgUrl" :src="item.thumburl"
+                :class="{ 'img-fit': viewMode === 'horizontalVersion', 'img-full': viewMode === '3:4' }" :preview-src="item.imgUrl" :src="item.thumburl"
               />
               <div class="percent">
                 <SvgIcon size="42" name="tag" />
@@ -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;

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()
 }

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: '',
 })