1`212

env/.env.test

@@ -2,4 +2,4 @@
 NODE_ENV = 'test'
 # 是否去除console 和 debugger
 VITE_DELETE_CONSOLE = false
-VITE_BASEURL = 'http://appointtest2.szjixun.cn'
+VITE_BASEURL = 'https://kid-art-test.szjixun.cn'

src/views/complete/size375/index.vue

@@ -15,7 +15,7 @@ function onConfirm(){
 </script>
 
 <template>
-  <div class="box-border relative w-[1920px] h-screen bg-no-repeat bg-cover bg-[url('@/assets/image/zu3237.png')] flex items-center flex-col container">
+  <div class="box-border relative w-[1920px] min-h-screen bg-no-repeat bg-cover bg-[url('@/assets/image/zu3237.png')] flex items-center flex-col container">
     <div class="content1"></div>
     <div class="content2">
       <div class="wrap1" style="margin-top: 0">

src/views/confirm/index.vue

@@ -16,7 +16,7 @@ const viewComponent = computed(() => {
     return size768;
   } else if (viewWidth <= 1500) {
     return size1440;
-  } else if (viewWidth <= 1920) {
+  } else if (viewWidth <= 1920 || viewWidth > 1920) {
     return size1920;
   }
 })

src/views/confirm/size1440/index.vue

@@ -6,7 +6,7 @@ const {clickApply,formData,openMask1,goBack} =useAuth()
 </script>
 
 <template>
-  <div class="box-border relative w-[1920px] h-screen bg-no-repeat bg-cover bg-[url('@/assets/image/dfa45@2x.png')] flex items-center flex-col">
+  <div class="box-border relative w-[1920px] min-h-screen bg-no-repeat bg-cover bg-[url('@/assets/image/dfa45@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="">
     </div>

src/views/confirm/size1920/index.vue

@@ -7,7 +7,7 @@ const {clickApply,formData,openMask1,goBack} =useAuth()
 </script>
 
 <template>
-  <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="box-border relative w-screen min-h-920px 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="">

src/views/confirm/size375/index.vue

@@ -12,7 +12,7 @@ const openMask=(src)=>{
 </script>
 
 <template>
-  <div class="box-border relative w-[1920px] h-screen bg-no-repeat bg-cover bg-[url('@/assets/image/zu3237.png')] flex items-center flex-col container">
+  <div class="box-border relative w-[1920px] min-h-screen bg-no-repeat bg-cover bg-[url('@/assets/image/zu3237.png')] flex items-center flex-col container">
     <div class="content1"></div>
     <div class="content2">
       <div class="wrap1" style="margin-top: 0">

src/views/confirm/size768/index.vue

@@ -6,7 +6,7 @@ const {clickApply,formData,openMask1,goBack} =useAuth()
 </script>
 
 <template>
-  <div class="box-border relative w-[1920px] h-screen bg-no-repeat bg-cover bg-[url('@/assets/image/gdz53@2x.png')] flex items-center flex-col">
+  <div class="box-border relative w-[1920px] min-h-screen bg-no-repeat bg-cover bg-[url('@/assets/image/gdz53@2x.png')] flex items-center flex-col">
     <div class="mb-[90px] mt-[303px]">
       <img class="w-[525px] h-[87px]" src="@/assets/image/zu3314@2x.png" alt="">
     </div>

src/views/details/index.vue

@@ -16,7 +16,7 @@ const viewComponent = computed(() => {
     return size768;
   } else if (viewWidth <= 1500) {
     return size1440;
-  } else if (viewWidth <= 1920) {
+  } else if (viewWidth <= 1920 || viewWidth > 1920) {
     return size1920;
   }
 })

src/views/details/size1440/index.vue

@@ -7,7 +7,7 @@ const {clickApply,openMask1,goBack,detailData} =useAuth()
 </script>
 
 <template>
-  <div class="box-border relative w-[1920px] h-screen bg-no-repeat bg-cover bg-[url('@/assets/image/dfa45@2x.png')] flex items-center flex-col">
+  <div class="box-border relative w-[1920px] min-min-h-screen bg-no-repeat bg-cover bg-[url('@/assets/image/dfa45@2x.png')] flex items-center flex-col">
     <div class="mb-[33px] mt-[176px]">
       <img class="w-[280px] h-[46px]" src="@/assets/image/zu3316@2x.png" alt="">
     </div>

src/views/details/size1920/index.vue

@@ -6,7 +6,7 @@ const {clickApply,detailData,openMask1,goBack} =useAuth()
 </script>
 
 <template>
-  <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="box-border relative w-screen min-h-920px 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/zu3316@2x.png" alt="">

src/views/details/size375/index.vue

@@ -10,7 +10,7 @@ const openMask=(src)=>{
 }
 </script>
 <template>
-  <div class="box-border relative w-[1920px] h-screen bg-no-repeat bg-cover bg-[url('@/assets/image/zu3237.png')] flex items-center flex-col">
+  <div class="box-border relative w-[1920px] min-h-screen bg-no-repeat bg-cover bg-[url('@/assets/image/zu3237.png')] flex items-center flex-col">
     <div class="mt-[143px] w-[1074px] h-[178px] bg-[url('@/assets/image/zu3316@2x.png')] bg-cover bg-no-repeat"></div>
     <div class="mt-[123px] w-[1654px] h-[2729px] bg-[url('@/assets/image/zu3186@2x.png')] bg-cover bg-no-repeat flex flex-col items-center px-[82px] pt-[200px] pb-[92px]">
       <div class="flex w-full items-center mt-[80px]">

src/views/details/size768/index.vue

@@ -17,7 +17,7 @@ const openMask=(src)=>{
 
 </script>
 <template>
-  <div class="box-border relative w-[1920px] h-screen bg-no-repeat bg-cover bg-[url('@/assets/image/gdz53@2x.png')] flex items-center flex-col">
+  <div class="box-border relative w-[1920px] min-h-screen bg-no-repeat bg-cover bg-[url('@/assets/image/gdz53@2x.png')] flex items-center flex-col">
     <div class="mt-[303px] w-[525px] h-[87px] bg-[url('@/assets/image/zu3316@2x.png')] bg-cover bg-no-repeat"></div>
     <div class="mt-[90px] w-[1173px] h-[1489px] bg-[url('@/assets/image/zu3327@2x.png')] bg-cover bg-no-repeat flex flex-col items-center px-[82px] pt-[200px] pt-[98px] pb-45px">
       <div class="flex w-full items-center">

src/views/entry/index.vue

@@ -1,16 +1,26 @@
 <script setup>
+import {computed} from 'vue'
 
+const mode=import.meta.env.MODE
+const qrCodeSrc=computed(()=>{
+  if (mode==='test'){
+    return new URL(`@/assets/image/testcnlogin.png`, import.meta.url).href
+  }else if (mode==='prod'){
+    return new URL(`@/assets/image/testcnlogin.png`, import.meta.url).href
+  }
+
+})
 </script>
 
 <template>
-  <div class="box-border relative w-screen h-screen bg-center bg-no-repeat bg-cover bg-[url('@/assets/image/gdz25@2x.png')] pt-1428px flex flex-col items-center">
+  <div class="box-border relative w-screen min-h-screen bg-center bg-no-repeat bg-cover bg-[url('@/assets/image/gdz25@2x.png')] pt-1428px flex flex-col items-center">
   <div class="w-881px h-87px rounded-46px bg-#fff text-56px font-bold flex-center">
     儿童美术征集活动
   </div>
     <div class="bg-[url('@/assets/image/df3231@2x.png')] w-1106px h-1188px bg-contain bg-no-repeat bg-center pt-56px flex flex-col items-center mt-492px">
         <div class="text-82px text-#fff leading-82px mb-40px">长按识别二维码开始报名</div>
         <div class="w-927px h-927px bg-#fff rounded-36px flex-center">
-          <img src="@/assets/image/tx12f@2x.png" alt="">
+          <img :src="qrCodeSrc" alt="">
         </div>
     </div>
     <div class="fixed bottom-0 right-0">

src/views/login/index.vue

@@ -16,7 +16,7 @@ const viewComponent = computed(() => {
     return size768;
   } else if (viewWidth <= 1500) {
     return size1440;
-  } else if (viewWidth <= 1920) {
+  } else if (viewWidth <= 1920 || viewWidth > 1920) {
     return size1920;
   }
 })

src/views/login/size1440/index.vue

@@ -4,7 +4,7 @@ const {clickSendCode,telNum,code,showTextCode ,clickLogin }= useAuth()
 </script>
 
 <template>
-<div class="box-border relative w-screen h-screen bg-center bg-no-repeat bg-cover bg-[url('@/assets/image/za3343@2x.png')] flex items-center flex-col">
+<div class="box-border relative w-screen min-h-screen bg-center bg-no-repeat bg-cover bg-[url('@/assets/image/za3343@2x.png')] flex items-center flex-col">
   <div class="flex items-center flex-col absolute transform translate-y-[-50%] top-[50%] right-[164px] ">
     <div class="">
       <img class="w-[280px] h-[46px] mb-[60px]" src="@/assets/image/zu3310@2x.png" alt="">

src/views/login/size1920/index.vue

@@ -5,7 +5,7 @@ const {clickSendCode,telNum,code,clickLogin}= useAuth()
 </script>
 
 <template>
-  <div class="box-border relative w-screen h-screen bg-center bg-no-repeat bg-cover bg-[url('@/assets/image/za3343@2x.png')] flex items-center flex-col">
+  <div class="box-border relative w-screen min-h-920px bg-center bg-no-repeat bg-cover bg-[url('@/assets/image/za3343@2x.png')] flex items-center flex-col">
     <div class="flex items-center flex-col absolute top-0 right-[164px]">
       <div class="">
         <img class="w-[210px] h-[35px] mt-[121px] mb-[45px]" src="@/assets/image/zu3310@2x.png" alt="">

src/views/login/size375/index.vue

@@ -3,7 +3,7 @@ import {useAuth} from "@/store/auth/index.js"
 const {clickSendCode,telNum,code,showTextCode ,clickLogin }= useAuth()
 </script>
 <template>
-  <div class="box-border relative w-screen h-screen bg-center bg-no-repeat bg-cover bg-[url('@/assets/image/gdz53@2x.png')]" style="">
+  <div class="box-border relative w-screen min-h-screen bg-center bg-no-repeat bg-cover bg-[url('@/assets/image/gdz53@2x.png')]" style="">
     <div  class="relative z-10 flex items-center flex-col">    <div class="content1 mb-[123px] shrink-0 "></div>
       <div class="content2 bg-cover w-[1654px] h-[1285px] bg-no-repeat bg-[url('@/assets/image/zu3270@2x.png')] pt-[241px] flex items-center flex-col">
         <div class="wrap1">

src/views/login/size768/index.vue

@@ -6,7 +6,7 @@ const {clickSendCode,telNum,code,showTextCode ,clickLogin }= useAuth()
 </script>
 
 <template>
-  <div class="box-border relative w-screen h-screen bg-center bg-no-repeat bg-cover bg-[url('@/assets/image/gdz53@2x.png')] flex items-center flex-col">
+  <div class="box-border relative w-screen min-h-screen bg-center bg-no-repeat bg-cover bg-[url('@/assets/image/gdz53@2x.png')] flex items-center flex-col">
     <div class="flex items-center flex-col relative z-10">
       <div class="">
         <img class="w-[525px] h-[87px] mt-[303px] mb-[100px]" src="@/assets/image/zu3310@2x.png" alt="">

src/views/result/index.vue

@@ -16,7 +16,7 @@ const viewComponent = computed(() => {
     return size768;
   } else if (viewWidth <= 1500) {
     return size1440;
-  } else if (viewWidth <= 1920) {
+  } else if (viewWidth <= 1920 || viewWidth > 1920) {
     return size1920;
   }
 })

src/views/result/size1440/index.vue

@@ -6,7 +6,7 @@ const {viewDetails} =useAuth()
 </script>
 
 <template>
-  <div class="box-border relative w-screen h-screen bg-center bg-no-repeat bg-cover bg-[url('@/assets/image/dfa45@2x.png')] flex items-center flex-col">
+  <div class="box-border relative w-screen min-h-screen bg-center bg-no-repeat bg-cover bg-[url('@/assets/image/dfa45@2x.png')] flex items-center flex-col">
     <div class="mt-176px mb-33px">
       <img src="@/assets/image/zu3311@2x.png" class="w-280px h-46px" alt="">
     </div>

src/views/result/size1920/index.vue

@@ -6,7 +6,7 @@ const {viewDetails} =useAuth()
 </script>
 
 <template>
-  <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="box-border relative w-screen min-h-920px bg-center bg-no-repeat bg-cover bg-[url('@/assets/image/zu3346@2x.png')] flex items-center flex-col">
     <div class="mt-123px mb-25px">
       <img src="@/assets/image/zu3311@2x.png" class="w-210px h-35px" alt="">
     </div>

src/views/result/size375/index.vue

@@ -6,7 +6,7 @@ const {viewDetails} =useAuth()
 </script>
 
 <template>
-  <div class="box-border relative w-screen h-screen bg-center bg-no-repeat bg-cover bg-[url('@/assets/image/gdz53@2x.png')] flex items-center flex-col">
+  <div class="box-border relative w-screen min-h-screen bg-center bg-no-repeat bg-cover bg-[url('@/assets/image/gdz53@2x.png')] flex items-center flex-col">
     <div class="mt-143px">
       <img src="@/assets/image/zu3311@2x.png" class="w-1074px h-178px" alt="">
     </div>

src/views/result/size768/index.vue

@@ -6,7 +6,7 @@ const {viewDetails} =useAuth()
 </script>
 
 <template>
-  <div class="box-border relative w-screen h-screen bg-center bg-no-repeat bg-cover bg-[url('@/assets/image/gdz53@2x.png')] flex items-center flex-col">
+  <div class="box-border relative w-screen min-h-screen bg-center bg-no-repeat bg-cover bg-[url('@/assets/image/gdz53@2x.png')] flex items-center flex-col">
       <div class="mt-303px">
         <img src="@/assets/image/zu3311@2x.png" class="w-525px h-87px" alt="">
       </div>

src/views/signup/index.vue

@@ -15,7 +15,7 @@ const viewComponent = computed(() => {
     return size768;
   } else if (viewWidth <= 1500) {
     return size1440;
-  } else if (viewWidth <= 1920) {
+  } else if (viewWidth <= 1920 || viewWidth > 1920) {
     return size1920;
   }
 })

src/views/signup/size1440/index.vue

@@ -6,7 +6,7 @@ const {formData,genderOptions,clickAddWorks,removeWorks,afterRead,goConfirm} =us
 </script>
 
 <template>
-  <div class="box-border relative w-screen h-screen bg-center bg-no-repeat bg-cover bg-[url('@/assets/image/dfa45@2x.png')] flex items-center flex-col">
+  <div class="box-border relative w-screen min-h-screen bg-center bg-no-repeat bg-cover bg-[url('@/assets/image/dfa45@2x.png')] flex items-center flex-col">
     <div class="absolute top-0 left-[193px]">
       <img src="@/assets/image/gdz47@2x.png" class="w-[316px] h-[391px]" alt="">
     </div>

src/views/signup/size1920/index.vue

@@ -6,7 +6,7 @@ const {clickApply,formData,genderOptions,clickAddWorks,removeWorks,afterRead,goC
 </script>
 
 <template>
-  <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="box-border relative w-screen min-h-920px bg-center bg-no-repeat bg-cover bg-[url('@/assets/image/zu3346@2x.png')] flex items-center flex-col">
     <div class="absolute top-0 left-[385px]">
       <img src="@/assets/image/gdz47@2x.png" class="w-[243px] h-[293px]" alt="">
     </div>

src/views/signup/size375/index.vue

@@ -11,7 +11,7 @@ function onConfirm(data){
 
 </script>
 <template>
-  <div class="box-border relative w-1920px h-screen bg-no-repeat bg-cover bg-[url('@/assets/image/zu3237.png')] flex items-center flex-col">
+  <div class="box-border relative w-1920px min-h-screen bg-no-repeat bg-cover bg-[url('@/assets/image/zu3237.png')] flex items-center flex-col">
     <div class="mt-143px w-1074px h-178px bg-cover bg-no-repeat bg-[url('@/assets/image/zu3311@2x.png')]"></div>
     <div class="absolute top-0 left-0 w-671px h-728px bg-cover">
       <img src="@/assets/image/gdz27.png" alt="">

src/views/signup/size768/index.vue

@@ -6,7 +6,7 @@ const {formData,genderOptions,clickAddWorks,removeWorks,goConfirm,deleteImg,afte
 </script>
 
 <template>
-  <div class="box-border relative w-screen h-screen bg-center bg-no-repeat bg-cover bg-[url('@/assets/image/gdz53@2x.png')] flex items-center flex-col">
+  <div class="box-border relative w-screen min-h-screen bg-center bg-no-repeat bg-cover bg-[url('@/assets/image/gdz53@2x.png')] flex items-center flex-col">
       <div class="absolute top-0 left-[70px]">
         <img src="@/assets/image/gdz47@2x.png" class="w-[610px] h-[668px]" alt="">
       </div>

src/views/vote/index.vue

@@ -9,7 +9,7 @@ if (route.query.uid){
 }
 </script>
 <template>
-  <div class="box-border relative w-[1920px] h-screen bg-no-repeat bg-cover bg-[url('@/assets/image/zu3237.png')] flex items-center flex-col">
+  <div class="box-border relative w-[1920px] min-h-screen bg-no-repeat bg-cover bg-[url('@/assets/image/zu3237.png')] flex items-center flex-col">
     <div class="mt-[143px] w-[1074px] h-[178px] bg-[url('@/assets/image/zu3318@2x.png')] bg-cover bg-no-repeat"></div>
     <div class="mt-[123px] w-[1654px] h-[2729px] bg-[url('@/assets/image/zu3186@2x.png')] bg-cover bg-no-repeat flex flex-col items-center ">
       <img :src="workData?.picUrl" @click="openMask(workData?.picUrl)" class="max-w-1362px max-h-1362px mt-404px rounded-20px object-contain" alt="">