Merge branch 'main' into dev

app/pages/liveRoom/index.client.vue

@@ -183,7 +183,7 @@ const tipOpen = () => {
         <paymentResults v-model:show="show1" type="error"/>
         <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">
-          <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="whitespace-nowrap">{{ t('live_room.start') }}</div>
         </div>

app/pages/login/index.vue

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

i18n/locales/en-US.json

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