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

Compare commits

base: scout666:ae040fb280f86b168be30219ca1226689c39545d
Branches Tags
scout666:main
scout666:cdf-dev
scout666:onlypay
scout666:dev
scout666:xingyy
scout666:wwt
scout666:qb
..
compare: scout666:9c725735aff82fc8f00d3b6c8412640a86e98d0e
Branches Tags
scout666:cdf-dev
scout666:onlypay
scout666:main
scout666:dev
scout666:xingyy
scout666:wwt
scout666:qb

No commits in common. "ae040fb280f86b168be30219ca1226689c39545d" and "9c725735aff82fc8f00d3b6c8412640a86e98d0e" have entirely different histories.
ae040fb280 ... 9c725735af

2 changed files with 4 additions and 19 deletions
Show Stats Expand all files Collapse all files

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

@ -147,7 +147,7 @@ const tipOpen = () => {
<div class="min-w-50px">{{auctionData?.nowAuctionPrice?.nextPrice}}</div> <div class="min-w-50px">{{auctionData?.nowAuctionPrice?.nextPrice}}</div>
</div> </div>
<div v-if="quoteStatus&&auctionData?.nowAuctionPrice?.nowPrice&&auctionData?.nowAuctionPrice?.nowPrice!=='0'" class="mt-10px mb-10px"> <div v-if="quoteStatus&&auctionData?.nowAuctionPrice&&auctionData?.nowAuctionPrice?.nowPrice!=='0'" class="mt-10px mb-10px">
<van-button @click.stop="goBuy" color="#FFB25F" class="w-344px !h-[40px]"> <van-button @click.stop="goBuy" color="#FFB25F" class="w-344px !h-[40px]">
<div>{{ <div>{{
`${t('live_room.confirm')} ${auctionData?.nowAuctionPrice?.currency} ${auctionData?.nowAuctionPrice?.nowPrice ?? 0}` `${t('live_room.confirm')} ${auctionData?.nowAuctionPrice?.currency} ${auctionData?.nowAuctionPrice?.nowPrice ?? 0}`

21
app/pages/signature/protocol/index.vue
View File

@ -1,7 +1,6 @@
<script setup> <script setup>
import pdfView from './pdfView' import pdfView from './pdfView'
import { contractView } from "~/api/goods/index.js" import { contractView } from "~/api/goods/index.js"
import { signOnline } from "~/api/goods/index.js"
import { authStore } from "~/stores/auth/index.js" import { authStore } from "~/stores/auth/index.js"
import {useI18n} from "vue-i18n"; import {useI18n} from "vue-i18n";
@ -46,24 +45,10 @@ const handleCollapseChange = (name) => {
} }
} }
const goSignature = async () => { const goSignature = () => {
const res = await signOnline({ router.push({
auctionArtworkUuid:payment.value.auctionArtworkUuid path: '/signature/panel'
}) })
if (res.status===0){
if(res.data.signType==='fdd'){
window.location.href = res.data.fddVerifyUrl
}else{
router.push({
path: '/signature/panel'
})
}
}
console.log('goSignature')
// router.push({
// path: '/signature/panel'
// })
} }
</script> </script>