Merge branch 'xingyy' into dev

app/components/puzzleComponent/index.vue

@@ -1,11 +1,11 @@
 <template>
-    <div class="m-auto bg-white p-10px rd-10px touch-none select-none">
+    <div class="m-auto bg-white p-15px rd-10px touch-none select-none">
-      <div class="relative w-full overflow-hidden bg-#f8f8f8 rd-10px">
+      <div class="relative w-full overflow-hidden bg-#f8f8f8 rd-10px"   :style="{ width: `${options?.canvasWidth}px`, height: `${options?.canvasHeight}px` }">
         <!-- 背景图 -->
         <img 
           :src="options?.canvasSrc" 
-          class="pointer-events-none"
+          class="pointer-events-none w-full h-full"
-          :style="{ width: `${options?.canvasWidth}px`, height: `${options?.canvasHeight}px` }"
+
           ref="bgImage" 
           @load="onImageLoad" 
           @error="onImageError"
@@ -20,7 +20,7 @@
             top: `${options?.blockY}px`,
             left: `${moveX}px`,
             visibility: loaded ? 'visible' : 'hidden',
-            width: `${options?.blockWidth}px`, height: `${options?.blockHeight}px` 
+            width: `${options?.blockWidth}px`, height: `${options?.blockHeight}px`
           }"
         >
         <transition name="fade-slide">

app/pages/login/index.vue

@@ -286,7 +286,7 @@ const onLeave =async (moveX, callback) => {
     <div v-if="!isKeyboardVisible" class="text-center text-14px absolute left-1/2 transform translate-x--1/2 bottom-20px">
       {{ $t('login.agreement') }}<span class="text-#3454AF " @click="$router.push('/privacyPolicy')">{{ $t('login.privacyPolicy') }}</span>
     </div>
-    <van-popup v-model:show="isShow" round   teleport="body">
+    <van-popup v-model:show="isShow" round style="max-width: initial"  teleport="body">
       <PuzzleComponent
           v-if="isShow"
       :options="captcha"