From 3bcf637c8356d3187f3fbe3ca044cfe5667aa34c Mon Sep 17 00:00:00 2001
From: xingyy <373639591@qq.com>
Date: Tue, 13 Aug 2024 16:46:03 +0800
Subject: [PATCH] 1`212

---
 src/store/auth/index.js              |  2 +-
 src/views/details/size1440/index.vue | 15 +++++++++---
 src/views/details/size1920/index.vue | 36 ++++++++++++++++++----------
 src/views/details/size768/index.vue  | 29 ++++++++++++++++------
 src/views/signup/size1920/index.vue  |  8 +++++--
 5 files changed, 65 insertions(+), 25 deletions(-)

diff --git a/src/store/auth/index.js b/src/store/auth/index.js
index 307e801..7429914 100644
--- a/src/store/auth/index.js
+++ b/src/store/auth/index.js
@@ -51,7 +51,7 @@ export const useAuth=createGlobalState(()=>{
     const formData=useStorage('formData',{
         name:'',
         age:'',
-        gender:'',
+        gender:undefined,
         works:[
             {
                 imgList:[],
diff --git a/src/views/details/size1440/index.vue b/src/views/details/size1440/index.vue
index abcd92e..660d55c 100644
--- a/src/views/details/size1440/index.vue
+++ b/src/views/details/size1440/index.vue
@@ -1,5 +1,6 @@
 <script setup>
 import {useAuth} from "@/store/auth/index.js";
+import {NImage} from "naive-ui";
 
 const {clickApply,openMask1,goBack,detailData} =useAuth()
 
@@ -26,12 +27,14 @@ const {clickApply,openMask1,goBack,detailData} =useAuth()
         <div class="text-primary text-[19px] w-[83px] font-bold pl-15px">*性别</div>
         <div class="text-primary text-[19px]">{{detailData.gender}}</div>
       </div>
-      <div class="w-[936px] h-[597px] bg-#F5F5F5 mt-[8.26px] mb-20px flex pt-[15px]">
+      <div class="w-[936px] h-[597px] bg-#F5F5F5 mt-[8.26px] mb-20px flex flex-col pt-[15px] overflow-y-auto">
         <div :class="`flex w-full ${detailData.works?.length>1&&index+1!==detailData.works?.length?'border-b-1px border-b-[#D6E0E9] border-b-solid mb-50px pb-50px':''}` "  v-for="(item,index) of detailData?.worksInfo" :key="index">
           <div class="text-primary text-19px font-bold shrink-0 w-[83px] pl-15px">*作品{{index+1}}</div>
           <div>
         <div class="flex">
-          <div><img class="w-[393px] h-[188px] object-contain" @click="openMask1(item.picUrl)" :src="item.picUrl" alt=""></div>
+          <div>   <n-image
+              :src="item.picUrl.replace('https', 'http')"
+          /></div>
           <div class="shrink-0 ml-16px mt-83px">
             <img v-if="item.status === 3" src="@/assets/image/zu3222@2x.png" class="w-[105px] h-[105px]" alt="" />
             <img v-if="item.status === 1" src="@/assets/image/zu3220@2x.png" class="w-[105px] h-[105px]" alt="" />
@@ -64,5 +67,11 @@ const {clickApply,openMask1,goBack,detailData} =useAuth()
 </template>
 
 <style scoped lang="scss">
-
+:deep(.n-image){
+  img{
+    max-width: 393px;
+    max-height: 188px;
+    object-fit: contain!important;
+  }
+}
 </style>
diff --git a/src/views/details/size1920/index.vue b/src/views/details/size1920/index.vue
index c8f82c5..70fffd5 100644
--- a/src/views/details/size1920/index.vue
+++ b/src/views/details/size1920/index.vue
@@ -9,7 +9,7 @@ const {clickApply,detailData,openMask1,goBack} =useAuth()
   <div class="box-border relative w-screen h-screen bg-center bg-no-repeat bg-cover bg-[url('@/assets/image/zu3346@2x.png')] flex items-center flex-col">
 
     <div class="mb-[33px] mt-[176px]">
-      <img class="w-[280px] h-[46px]" src="@/assets/image/zu3314@2x.png" alt="">
+      <img class="w-[280px] h-[46px]" src="@/assets/image/zu3316@2x.png" alt="">
     </div>
     <div class="absolute top-0 left-[385px]">
       <img class="w-[235px] h-[293px]" src="@/assets/image/gdz47@2x.png" alt="">
@@ -29,31 +29,37 @@ const {clickApply,detailData,openMask1,goBack} =useAuth()
       </div>
       <div class="w-[702px] h-[440px] bg-#F5F5F5 mt-[8.26px] mb-10px flex flex-col pt-[15px] overflow-y-auto">
         <n-scrollbar>
-          <div :class="`flex w-full ${detailData.worksInfo?.length>1&&index+1!==detailData.worksInfo?.length?'border-b-1px border-b-[#D6E0E9] border-b-solid mb-20px pb-20px':''}` "  v-for="(item,index) of detailData.worksInfo" :key="index">
+          <div :class="`flex w-full pb-20px ${detailData.worksInfo?.length>1&&index+1!==detailData.worksInfo?.length?'border-b-1px border-b-[#D6E0E9] border-b-solid mb-20px':''}` "  v-for="(item,index) of detailData.worksInfo" :key="index">
             <div class="text-primary text-14px font-bold shrink-0 w-[62px] pl-15px">*作品{{index+1}}</div>
             <div>
-              <n-image
-                  class="w-295px h-141px"
-                  :src="item.picUrl.replace('https', 'http')"
-              />
+           <div class="flex">
+             <n-image
+
+                 :src="item.picUrl.replace('https', 'http')"
+             />
+             <div class="shrink-0 ml-12px mt-62px">
+               <img v-if="item.status === 3" src="@/assets/image/zu3222@2x.png" class="w-[79px] h-[79px]" alt="" />
+               <img v-if="item.status === 1" src="@/assets/image/zu3220@2x.png" class="w-[79px] h-[79px]" alt="" />
+               <img v-if="item.status === 2" src="@/assets/image/zdw221@2x.png" class="w-[79px] h-[79px]" alt="" />
+             </div>
+           </div>
               <div class="flex text-primary text-[12px] mt-8px  w-50%">
-                <div class="font-bold w-100px">作品名称</div>
+                <div class="font-bold w-75px">作品名称</div>
                 <div class="">{{item.workName}}</div>
               </div>
               <div class="flex text-primary text-[12px] mt-20px">
-                <div class="flex w-50%">
-                  <div class="font-bold w-100px">长度</div>
+                <div class="flex w-50% mr-59px">
+                  <div class="font-bold w-75px">长度</div>
                   <div class="">{{item.length}} <span class="ml-12px">cm</span></div>
                 </div>
                 <div class="flex w-50% ml-a">
-                  <div class="w-100px">宽度</div>
+                  <div class="w-75px">宽度</div>
                   <div class="">{{item.wide}} <span class="ml-12px">cm</span></div>
                 </div>
               </div>
             </div>
           </div>
         </n-scrollbar>
-
       </div>
       <div class="absolute bottom-0 right-0 ">
         <img class="w-876px h-385px" src="@/assets/image/dfdc46@2x.png" alt="">
@@ -63,5 +69,11 @@ const {clickApply,detailData,openMask1,goBack} =useAuth()
 </template>
 
 <style scoped lang="scss">
-
+:deep(.n-image){
+  img{
+   max-width: 295px;
+    max-height: 141px;
+    object-fit: contain!important;
+  }
+}
 </style>
diff --git a/src/views/details/size768/index.vue b/src/views/details/size768/index.vue
index 7751d36..51644bd 100644
--- a/src/views/details/size768/index.vue
+++ b/src/views/details/size768/index.vue
@@ -5,6 +5,7 @@ const {detailData} =useAuth()
 import "vant/es/image-preview/style";
 import { showImagePreview } from 'vant';
 import useImgModalPopup from "@/components/imgModal/imgModal.js";
+import {NImage} from "naive-ui";
 const {showImgModal}= useImgModalPopup()
 const openMask=(src)=>{
   showImgModal({url:src})
@@ -37,13 +38,18 @@ const openMask=(src)=>{
             <div v-for="(item, index) in detailData?.worksInfo" :key="index" class="mb-[45px] flex  items-start w-full">
               <div class="text-[35px] w-[200px] font-bold text-[#2B69A1] pt-18px">作品{{ index + 1 }}</div>
               <div class="relative w-[1147px]">
-                <img class="w-738px h-353px object-contain" @click="openMask(item.picUrl.replace('https', 'http'))" :src="item.picUrl.replace('https', 'http')" alt="" />
-                <!--  未入围  -->
-                <img v-if="item.status === 3" src="@/assets/image/zu3222@2x.png" class="w-[404px] h-[404px] absolute top-0 right-0" alt="" />
-                <!--  待定 -->
-                <img v-if="item.status === 1" src="@/assets/image/zu3220@2x.png" class="w-[404px] h-[404px] absolute top-0 right-0" alt="" />
-                <!--  入围  -->
-                <img v-if="item.status === 2" src="@/assets/image/zdw221@2x.png" class="w-[404px] h-[404px] absolute top-0 right-0" alt="" />
+            <div class="flex items-start">
+              <n-image
+
+                  :src="item.picUrl.replace('https', 'http')"
+              />
+              <!--  未入围  -->
+              <img v-if="item.status === 3" src="@/assets/image/zu3222@2x.png" class="w-[198px] h-[198px]" alt="" />
+              <!--  待定 -->
+              <img v-if="item.status === 1" src="@/assets/image/zu3220@2x.png" class="w-[198px] h-[198px]" alt="" />
+              <!--  入围  -->
+              <img v-if="item.status === 2" src="@/assets/image/zdw221@2x.png" class="w-[198px] h-[198px]" alt="" />
+            </div>
                 <div class="flex flex-col mt-[20px]">
                   <div class="flex items-center">
                     <div class="mr-[65px] text-[30px] font-bold text-[#2B69A1] w-122px">作品名称</div>
@@ -77,3 +83,12 @@ const openMask=(src)=>{
     </div>
   </div>
 </template>
+<style scoped lang="scss">
+:deep(.n-image){
+  img{
+    max-width: 738px;
+    max-height: 353px;
+    object-fit: contain!important;
+  }
+}
+</style>
diff --git a/src/views/signup/size1920/index.vue b/src/views/signup/size1920/index.vue
index 65f3953..96b7e0a 100644
--- a/src/views/signup/size1920/index.vue
+++ b/src/views/signup/size1920/index.vue
@@ -105,6 +105,9 @@ const {clickApply,formData,genderOptions,clickAddWorks,removeWorks,afterRead,goC
   </div>
 </template>
 <style scoped lang="scss">
+:deep(.n-upload-file-info .n-image img){
+  object-fit: contain!important;
+}
 :deep(.n-base-selection-placeholder__inner){
   color: rgb(131, 162, 195)!important;
 }
@@ -112,18 +115,19 @@ const {clickApply,formData,genderOptions,clickAddWorks,removeWorks,afterRead,goC
   background: #DCE5E9!important;
 }
 :deep(.n-upload){
-
+  background-size: contain;
   border:none;
   width: 295px;
   height: 141px;
 }
 :deep(.n-upload-file.n-upload-file--success-status.n-upload-file--image-card-type){
-
+  background-size: contain;
   border:none;
   width: 295px;
   height: 141px;
 }
 :deep(.n-upload-trigger.n-upload-trigger--image-card){
+  background-size: contain;
   border:none;
   width: 295px;
   height: 141px;