Compare commits

...

5 Commits
xingyy ... main

5 changed files with 31 additions and 11 deletions

View File

@ -93,7 +93,7 @@ export async function orderQuery(data) {
method: 'POST',
data
})
}
}
export async function contractView(data) {
return await request( {
@ -102,6 +102,14 @@ export async function contractView(data) {
data
})
}
export async function contractViewOnline(data) {
return await request( {
url:'/api/v1/contract/contract-view-online',
method: 'POST',
data
})
}
export async function createBuyOrderV3(data) {
return await request( {

View File

@ -24,6 +24,8 @@ router.beforeEach((to, from) => {
if (to.path==='/'){
hideMinWindow1()
}
console.log('路由跳转前', to.path)
//
if (routeHistory.value.includes(to.path)) {
slideDirection.value = 'slide-right'

View File

@ -16,6 +16,8 @@ const router = useRouter()
const pmblUrl = ref('') // URL
const jmxyUrl=ref('')//
const pmyjqrsUrl=ref('')//
const jmxzUrl=ref('')
const pmggUrl=ref('')
/**
* 根据签署顺序(number)返回不同的协议列表
* number = 1: 买家签署阶段展示竞买协议竞买须知拍卖公告拍卖规则
@ -25,12 +27,12 @@ const protocolList = computed(() => {
if (number.value === 1) {
return [
{ id: '4', title: t('signature.agreement.buyerAgreement'), pdfName: jmxyUrl.value, type: 'remote' },
{ id: '3', title: t('signature.agreement.buyerGuide'), pdfName: 'jmxz', type: 'local' },
{ id: '1', title: t('signature.agreement.notice'), pdfName: 'pmgg', type: 'local' },
{ id: '3', title: t('signature.agreement.buyerGuide'), pdfName: jmxzUrl.value, type: 'remote' },
{ id: '1', title: t('signature.agreement.notice'), pdfName: pmggUrl.value, type: 'remote' },
{ id: '2', title: t('signature.agreement.rules'), pdfName: 'pmgz', type: 'local' },
]
} else if (number.value === 2) {
return [
return [
{ id: '6', title: t('signature.agreement.transfer'), pdfName: pmyjqrsUrl.value, type: 'remote' },
{ id: '5', title: t('signature.agreement.record'), pdfName: pmblUrl.value, type: 'remote' }
]
@ -52,6 +54,8 @@ const protocolList = computed(() => {
jmxyUrl.value=res.data.ViewUrls?.jmxy1
pmblUrl.value=res.data.ViewUrls?.ppbl6
pmyjqrsUrl.value=res.data.ViewUrls?.ppqr5
jmxzUrl.value=res.data.ViewUrls?.jmxz2
pmggUrl.value=res.data.ViewUrls?.pmgg3
}
}
@ -62,7 +66,7 @@ const protocolList = computed(() => {
//
const handleCollapseChange = (name) => {
activeNames.value = name
if (['4','5','6'].includes(name) && !protocolList.value.find(x=>x.id===name)?.pdfName) {
if (['1','3','4','5','6'].includes(name) && !protocolList.value.find(x=>x.id===name)?.pdfName) {
fetchPmblPdf()
}
}

View File

@ -34,7 +34,9 @@ const form=ref({
const form1=ref({
idNum:'',
realName:'',
userExtend:{}
userExtend:{
address:''
}
})
const columns=ref([
{ text: t('realAuth.male'), value: 1 },

View File

@ -1,7 +1,7 @@
<script setup>
import {showToast,showLoadingToast } from 'vant';
import pdfView from './pdfView'
import { contractView } from "~/api/goods/index.js"
import { contractViewOnline } from "~/api/goods/index.js"
import { signOnline } from "~/api/goods/index.js"
import { authStore } from "~/stores/auth/index.js"
import {useI18n} from "vue-i18n";
@ -20,11 +20,13 @@ const router = useRouter()
const pmblUrl = ref('') // URL
const jmxyUrl=ref('')//
const pmyjqrsUrl=ref('')//
const jmxzUrl=ref('')
const pmggUrl=ref('')
//
const protocolList = computed(() => [
{ id: '1', title: $t('signature.agreement.notice'), pdfName: 'pmgg', type: 'local' },
{ id: '1', title: $t('signature.agreement.notice'), pdfName: pmggUrl.value, type: 'remote' },
{ id: '2', title: $t('signature.agreement.rules'), pdfName: 'pmgz', type: 'local' },
{ id: '3', title: $t('signature.agreement.buyerGuide'), pdfName: 'jmxz', type: 'local' },
{ id: '3', title: $t('signature.agreement.buyerGuide'), pdfName: jmxzUrl.value, type: 'remote' },
{ id: '4', title: $t('signature.agreement.buyerAgreement'), pdfName: jmxyUrl.value, type: 'remote' },
{ id: '5', title: $t('signature.agreement.record'), pdfName: pmblUrl.value, type: 'remote' },
{ id: '6', title: $t('signature.agreement.transfer'), pdfName: pmyjqrsUrl.value, type: 'remote' }
@ -33,7 +35,7 @@ const toast=ref(false)
// PDF
const fetchPmblPdf = async () => {
try {
const res = await contractView({
const res = await contractViewOnline({
auctionArtworkUuid: payment.value.auctionArtworkUuid,
phone:userInfo.value.telNum,
registerType:1,
@ -43,6 +45,8 @@ const fetchPmblPdf = async () => {
jmxyUrl.value=res.data.ViewUrls?.jmxy1
pmblUrl.value=res.data.ViewUrls?.ppbl6
pmyjqrsUrl.value=res.data.ViewUrls?.ppqr5
jmxzUrl.value=res.data.ViewUrls?.jmxz2
pmggUrl.value=res.data.ViewUrls?.pmgg3
}
} catch (error) {
}
@ -51,7 +55,7 @@ const fetchPmblPdf = async () => {
//
const handleCollapseChange = (name) => {
activeNames.value = name
if (['4','5','6'].includes(name) && !protocolList.value.find(x=>x.id===name)?.pdfName) {
if (['1','3','4','5','6'].includes(name) && !protocolList.value.find(x=>x.id===name)?.pdfName) {
fetchPmblPdf()
}
}