scout666/liveh5-nuxt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'xingyy' into dev

Browse Source
This commit is contained in:
xingyy 2025-03-12 14:34:03 +08:00
commit 8a998fdb1f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/components/puzzleComponent/index.vue
View File

@ -1,11 +1,11 @@
<template> <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 <img
:src="options?.canvasSrc" :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" ref="bgImage"
@load="onImageLoad" @load="onImageLoad"
@error="onImageError" @error="onImageError"
@ -20,7 +20,7 @@
top: `${options?.blockY}px`, top: `${options?.blockY}px`,
left: `${moveX}px`, left: `${moveX}px`,
visibility: loaded ? 'visible' : 'hidden', visibility: loaded ? 'visible' : 'hidden',
width: `${options?.blockWidth}px`, height: `${options?.blockHeight}px` width: `${options?.blockWidth}px`, height: `${options?.blockHeight}px`
}" }"
> >
<transition name="fade-slide"> <transition name="fade-slide">

2
app/pages/login/index.vue
View File

@ -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"> <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> {{ $t('login.agreement') }}<span class="text-#3454AF " @click="$router.push('/privacyPolicy')">{{ $t('login.privacyPolicy') }}</span>
</div> </div>
<van-popup v-model:show="isShow" round teleport="body"> <van-popup v-model:show="isShow" round style="max-width: initial" teleport="body">
<PuzzleComponent <PuzzleComponent
v-if="isShow" v-if="isShow"
:options="captcha" :options="captcha"