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

---
 src/store/auth/index.js              |  4 +--
 src/views/confirm/size1920/index.vue | 38 ++++++++++++-----------
 src/views/details/size1920/index.vue | 45 +++++++++++++++-------------
 src/views/result/index.vue           |  1 -
 4 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/src/store/auth/index.js b/src/store/auth/index.js
index ab28866..307e801 100644
--- a/src/store/auth/index.js
+++ b/src/store/auth/index.js
@@ -79,13 +79,11 @@ export const useAuth=createGlobalState(()=>{
         formData1.append("file", file.file)
         formData1.append("type", 'image')
         const res=await uploadFile(formData1)
-        console.log(res,'res')
         if (res.status===0){
-
             item.picUrl=res.data
             if (e.onFinish){
                 e.onFinish()
-                item.imgList=[    {
+                item.imgList=[{
                     status: 'finished',
                     url: item.picUrl
                 },]
diff --git a/src/views/confirm/size1920/index.vue b/src/views/confirm/size1920/index.vue
index ac94459..f14e7cb 100644
--- a/src/views/confirm/size1920/index.vue
+++ b/src/views/confirm/size1920/index.vue
@@ -1,5 +1,6 @@
 <script setup>
 import {useAuth} from "@/store/auth/index.js";
+import {NScrollbar,NImage} from "naive-ui";
 
 const {clickApply,formData,openMask1,goBack} =useAuth()
 
@@ -27,27 +28,30 @@ const {clickApply,formData,openMask1,goBack} =useAuth()
         <div class="text-primary text-[14px] w-[62px] font-bold pl-15px">*性别</div>
         <div class="text-primary text-[14px]">{{formData.gender}}</div>
       </div>
-      <div class="w-[702px] h-[392px] bg-#F5F5F5 mt-[8.26px] mb-10px flex pt-[15px]">
-        <div :class="`flex w-full ${formData.works?.length>1&&index+1!==formData.works?.length?'border-b-1px border-b-[#D6E0E9] border-b-solid mb-50px pb-50px':''}` "  v-for="(item,index) of formData.works" :key="index">
-          <div class="text-primary text-14px font-bold shrink-0 w-[62px] pl-15px">*作品{{index+1}}</div>
-          <div>
-            <img class="w-[393px] h-[188px] object-contain" @click="openMask1(item.picUrl)" :src="item.picUrl" alt="">
-            <div class="flex text-primary text-[12px] mt-8px  w-50%">
-              <div class="font-bold w-100px">作品名称</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="">{{item.length}} <span class="ml-12px">cm</span></div>
+      <div class="w-[702px] h-[392px] bg-#F5F5F5 mt-[8.26px] mb-10px flex flex-col pt-[15px] overflow-y-auto">
+        <n-scrollbar>
+          <div :class="`flex w-full ${formData.works?.length>1&&index+1!==formData.works?.length?'border-b-1px border-b-[#D6E0E9] border-b-solid mb-19px pb-19px':''}` "  v-for="(item,index) of formData.works" :key="index">
+            <div class="text-primary text-14px font-bold shrink-0 w-[62px] pl-15px">*作品{{index+1}}</div>
+            <div>
+              <n-image class="w-[393px] h-[188px] object-contain"  :src="item.picUrl"/>
+              <div class="flex text-primary text-[12px] mt-8px  w-50%">
+                <div class="font-bold w-100px">作品名称</div>
+                <div class="">{{item.workName}}</div>
               </div>
-              <div class="flex w-50% ml-a">
-                <div class="w-100px">宽度</div>
-                <div class="">{{item.wide}} <span class="ml-12px">cm</span></div>
+              <div class="flex text-primary text-[12px] mt-20px">
+                <div class="flex w-50%">
+                  <div class="font-bold w-100px">长度</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="">{{item.wide}} <span class="ml-12px">cm</span></div>
+                </div>
               </div>
             </div>
           </div>
-        </div>
+        </n-scrollbar>
+
       </div>
       <div class="flex-center">
         <div class="text-primary text-16px w-240px h-39px flex justify-center cursor-pointer items-center bg-#fff shadow-[0_16px_16px_rgba(0,0,0,0.1)] rounded-60px z-999" @click="goBack">取消</div>
diff --git a/src/views/details/size1920/index.vue b/src/views/details/size1920/index.vue
index c306446..c8f82c5 100644
--- a/src/views/details/size1920/index.vue
+++ b/src/views/details/size1920/index.vue
@@ -1,6 +1,6 @@
 <script setup>
 import {useAuth} from "@/store/auth/index.js";
-import {NImage} from 'naive-ui'
+import {NImage,NScrollbar} from 'naive-ui'
 const {clickApply,detailData,openMask1,goBack} =useAuth()
 
 </script>
@@ -27,30 +27,33 @@ const {clickApply,detailData,openMask1,goBack} =useAuth()
         <div class="text-primary text-[14px] w-[62px] font-bold pl-15px">*性别</div>
         <div class="text-primary text-[14px]">{{detailData.gender}}</div>
       </div>
-      <div class="w-[702px] h-[392px] bg-#F5F5F5 mt-[8.26px] mb-10px flex pt-[15px]">
-        <div :class="`flex w-full ${detailData.worksInfo?.length>1&&index+1!==detailData.worksInfo?.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-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 text-primary text-[12px] mt-8px  w-50%">
-              <div class="font-bold w-100px">作品名称</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="">{{item.length}} <span class="ml-12px">cm</span></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="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 text-primary text-[12px] mt-8px  w-50%">
+                <div class="font-bold w-100px">作品名称</div>
+                <div class="">{{item.workName}}</div>
               </div>
-              <div class="flex w-50% ml-a">
-                <div class="w-100px">宽度</div>
-                <div class="">{{item.wide}} <span class="ml-12px">cm</span></div>
+              <div class="flex text-primary text-[12px] mt-20px">
+                <div class="flex w-50%">
+                  <div class="font-bold w-100px">长度</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="">{{item.wide}} <span class="ml-12px">cm</span></div>
+                </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="">
diff --git a/src/views/result/index.vue b/src/views/result/index.vue
index e24be13..d655983 100644
--- a/src/views/result/index.vue
+++ b/src/views/result/index.vue
@@ -20,7 +20,6 @@ const viewComponent = computed(() => {
     return size1920;
   }
 })
-localStorage.clear()
 </script>
 
 <template>