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

Compare commits

base: scout666:60431c8aec19a33227c559248ddec47c593e681d
Branches Tags
scout666:main
scout666:cdf-dev
scout666:onlypay
scout666:dev
scout666:xingyy
scout666:wwt
scout666:qb
..
compare: scout666:1321652fd9f512ef1168766c3ac4bc3d70fa20b6
Branches Tags
scout666:cdf-dev
scout666:onlypay
scout666:main
scout666:dev
scout666:xingyy
scout666:wwt
scout666:qb

No commits in common. "60431c8aec19a33227c559248ddec47c593e681d" and "1321652fd9f512ef1168766c3ac4bc3d70fa20b6" have entirely different histories.
60431c8aec ... 1321652fd9

3 changed files with 3 additions and 9 deletions
Show Stats Expand all files Collapse all files

2
app/pages/liveRoom/index.client.vue
View File

@ -183,7 +183,7 @@ const tipOpen = () => {
<paymentResults v-model:show="show1" type="error"/> <paymentResults v-model:show="show1" type="error"/>
<div v-if="auctionData?.wsType==='newArtwork'" <div v-if="auctionData?.wsType==='newArtwork'"
class="w-344px h-31px rounded-4px absolute top-9px bg-[#151824]/45 backdrop-blur-[10px] backdrop-saturate-[180%] left-1/2 transform translate-x--1/2 flex text-#fff text-14px items-center px-12px line-height-none"> class="w-344px h-31px rounded-4px absolute top-9px bg-[#151824]/45 backdrop-blur-[10px] backdrop-saturate-[180%] left-1/2 transform translate-x--1/2 flex text-#fff text-14px items-center px-12px line-height-none">
<div class="mr-11px whitespace-nowrap">Lot{{ Number(auctionData.artwork.index+25000) }}</div> <div class="mr-11px whitespace-nowrap">LOT{{ Number(auctionData.artwork.index+25000) }}</div>
<div class="mr-10px truncate">{{ auctionData.artwork.name }}</div> <div class="mr-10px truncate">{{ auctionData.artwork.name }}</div>
<div class="whitespace-nowrap">{{ t('live_room.start') }}</div> <div class="whitespace-nowrap">{{ t('live_room.start') }}</div>
</div> </div>

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

@ -102,13 +102,7 @@ blockY:0
const getCode =async () => { const getCode =async () => {
isShow.value=true isShow.value=true
loadingRef.value.loading1=true loadingRef.value.loading1=true
const res=await userCaptcha({ const res=await userCaptcha(captcha.value)
canvasWidth:captcha.value.canvasWidth,
canvasHeight:captcha.value.canvasHeight,
blockWidth:captcha.value.blockWidth,
blockHeight:captcha.value.blockHeight,
place:captcha.value.place
})
if (res.status===0){ if (res.status===0){
captcha.value.canvasSrc=`data:image/png;base64,${res.data.canvasSrc}` captcha.value.canvasSrc=`data:image/png;base64,${res.data.canvasSrc}`
captcha.value.blockSrc=`data:image/png;base64,${res.data.blockSrc}` captcha.value.blockSrc=`data:image/png;base64,${res.data.blockSrc}`

2
i18n/locales/en-US.json
View File

@ -493,7 +493,7 @@
"detail": "Lot Details", "detail": "Lot Details",
"description": "Lot Description" "description": "Lot Description"
}, },
"lotDetail": "Lot Details", "lotDetail": "LOT Details",
"refresh": { "refresh": {
"success": "Refresh successful", "success": "Refresh successful",
"noMore": "No more data" "noMore": "No more data"