Compare commits
No commits in common. "main" and "xingyy" have entirely different histories.
@ -93,7 +93,7 @@ export async function orderQuery(data) {
|
|||||||
method: 'POST',
|
method: 'POST',
|
||||||
data
|
data
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
export async function contractView(data) {
|
export async function contractView(data) {
|
||||||
|
|
||||||
return await request( {
|
return await request( {
|
||||||
@ -102,14 +102,6 @@ export async function contractView(data) {
|
|||||||
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) {
|
export async function createBuyOrderV3(data) {
|
||||||
|
|
||||||
return await request( {
|
return await request( {
|
||||||
|
@ -24,8 +24,6 @@ router.beforeEach((to, from) => {
|
|||||||
if (to.path==='/'){
|
if (to.path==='/'){
|
||||||
hideMinWindow1()
|
hideMinWindow1()
|
||||||
}
|
}
|
||||||
console.log('路由跳转前', to.path)
|
|
||||||
|
|
||||||
// 如果是返回操作(在历史记录中找到目标路由)
|
// 如果是返回操作(在历史记录中找到目标路由)
|
||||||
if (routeHistory.value.includes(to.path)) {
|
if (routeHistory.value.includes(to.path)) {
|
||||||
slideDirection.value = 'slide-right'
|
slideDirection.value = 'slide-right'
|
||||||
|
@ -16,8 +16,6 @@ const router = useRouter()
|
|||||||
const pmblUrl = ref('') // 存储拍卖笔录的URL
|
const pmblUrl = ref('') // 存储拍卖笔录的URL
|
||||||
const jmxyUrl=ref('')//竞买协议
|
const jmxyUrl=ref('')//竞买协议
|
||||||
const pmyjqrsUrl=ref('')//拍卖移交确认书
|
const pmyjqrsUrl=ref('')//拍卖移交确认书
|
||||||
const jmxzUrl=ref('')
|
|
||||||
const pmggUrl=ref('')
|
|
||||||
/**
|
/**
|
||||||
* 根据签署顺序(number)返回不同的协议列表
|
* 根据签署顺序(number)返回不同的协议列表
|
||||||
* number = 1: 买家签署阶段,展示竞买协议、竞买须知、拍卖公告、拍卖规则
|
* number = 1: 买家签署阶段,展示竞买协议、竞买须知、拍卖公告、拍卖规则
|
||||||
@ -27,12 +25,12 @@ const protocolList = computed(() => {
|
|||||||
if (number.value === 1) {
|
if (number.value === 1) {
|
||||||
return [
|
return [
|
||||||
{ id: '4', title: t('signature.agreement.buyerAgreement'), pdfName: jmxyUrl.value, type: 'remote' },
|
{ id: '4', title: t('signature.agreement.buyerAgreement'), pdfName: jmxyUrl.value, type: 'remote' },
|
||||||
{ id: '3', title: t('signature.agreement.buyerGuide'), pdfName: jmxzUrl.value, type: 'remote' },
|
{ id: '3', title: t('signature.agreement.buyerGuide'), pdfName: 'jmxz', type: 'local' },
|
||||||
{ id: '1', title: t('signature.agreement.notice'), pdfName: pmggUrl.value, type: 'remote' },
|
{ id: '1', title: t('signature.agreement.notice'), pdfName: 'pmgg', type: 'local' },
|
||||||
{ id: '2', title: t('signature.agreement.rules'), pdfName: 'pmgz', type: 'local' },
|
{ id: '2', title: t('signature.agreement.rules'), pdfName: 'pmgz', type: 'local' },
|
||||||
]
|
]
|
||||||
} else if (number.value === 2) {
|
} else if (number.value === 2) {
|
||||||
return [
|
return [
|
||||||
{ id: '6', title: t('signature.agreement.transfer'), pdfName: pmyjqrsUrl.value, type: 'remote' },
|
{ id: '6', title: t('signature.agreement.transfer'), pdfName: pmyjqrsUrl.value, type: 'remote' },
|
||||||
{ id: '5', title: t('signature.agreement.record'), pdfName: pmblUrl.value, type: 'remote' }
|
{ id: '5', title: t('signature.agreement.record'), pdfName: pmblUrl.value, type: 'remote' }
|
||||||
]
|
]
|
||||||
@ -54,8 +52,6 @@ const protocolList = computed(() => {
|
|||||||
jmxyUrl.value=res.data.ViewUrls?.jmxy1
|
jmxyUrl.value=res.data.ViewUrls?.jmxy1
|
||||||
pmblUrl.value=res.data.ViewUrls?.ppbl6
|
pmblUrl.value=res.data.ViewUrls?.ppbl6
|
||||||
pmyjqrsUrl.value=res.data.ViewUrls?.ppqr5
|
pmyjqrsUrl.value=res.data.ViewUrls?.ppqr5
|
||||||
jmxzUrl.value=res.data.ViewUrls?.jmxz2
|
|
||||||
pmggUrl.value=res.data.ViewUrls?.pmgg3
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -66,7 +62,7 @@ const protocolList = computed(() => {
|
|||||||
// 监听折叠面板变化
|
// 监听折叠面板变化
|
||||||
const handleCollapseChange = (name) => {
|
const handleCollapseChange = (name) => {
|
||||||
activeNames.value = name
|
activeNames.value = name
|
||||||
if (['1','3','4','5','6'].includes(name) && !protocolList.value.find(x=>x.id===name)?.pdfName) {
|
if (['4','5','6'].includes(name) && !protocolList.value.find(x=>x.id===name)?.pdfName) {
|
||||||
fetchPmblPdf()
|
fetchPmblPdf()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -34,9 +34,7 @@ const form=ref({
|
|||||||
const form1=ref({
|
const form1=ref({
|
||||||
idNum:'',
|
idNum:'',
|
||||||
realName:'',
|
realName:'',
|
||||||
userExtend:{
|
userExtend:{}
|
||||||
address:''
|
|
||||||
}
|
|
||||||
})
|
})
|
||||||
const columns=ref([
|
const columns=ref([
|
||||||
{ text: t('realAuth.male'), value: 1 },
|
{ text: t('realAuth.male'), value: 1 },
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<script setup>
|
<script setup>
|
||||||
import {showToast,showLoadingToast } from 'vant';
|
import {showToast,showLoadingToast } from 'vant';
|
||||||
import pdfView from './pdfView'
|
import pdfView from './pdfView'
|
||||||
import { contractViewOnline } from "~/api/goods/index.js"
|
import { contractView } from "~/api/goods/index.js"
|
||||||
import { signOnline } 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";
|
||||||
@ -20,13 +20,11 @@ const router = useRouter()
|
|||||||
const pmblUrl = ref('') // 存储拍卖笔录的URL
|
const pmblUrl = ref('') // 存储拍卖笔录的URL
|
||||||
const jmxyUrl=ref('')//竞买协议
|
const jmxyUrl=ref('')//竞买协议
|
||||||
const pmyjqrsUrl=ref('')//拍卖移交确认书
|
const pmyjqrsUrl=ref('')//拍卖移交确认书
|
||||||
const jmxzUrl=ref('')
|
|
||||||
const pmggUrl=ref('')
|
|
||||||
// 协议列表数据
|
// 协议列表数据
|
||||||
const protocolList = computed(() => [
|
const protocolList = computed(() => [
|
||||||
{ id: '1', title: $t('signature.agreement.notice'), pdfName: pmggUrl.value, type: 'remote' },
|
{ id: '1', title: $t('signature.agreement.notice'), pdfName: 'pmgg', type: 'local' },
|
||||||
{ id: '2', title: $t('signature.agreement.rules'), pdfName: 'pmgz', type: 'local' },
|
{ id: '2', title: $t('signature.agreement.rules'), pdfName: 'pmgz', type: 'local' },
|
||||||
{ id: '3', title: $t('signature.agreement.buyerGuide'), pdfName: jmxzUrl.value, type: 'remote' },
|
{ id: '3', title: $t('signature.agreement.buyerGuide'), pdfName: 'jmxz', type: 'local' },
|
||||||
{ id: '4', title: $t('signature.agreement.buyerAgreement'), pdfName: jmxyUrl.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: '5', title: $t('signature.agreement.record'), pdfName: pmblUrl.value, type: 'remote' },
|
||||||
{ id: '6', title: $t('signature.agreement.transfer'), pdfName: pmyjqrsUrl.value, type: 'remote' }
|
{ id: '6', title: $t('signature.agreement.transfer'), pdfName: pmyjqrsUrl.value, type: 'remote' }
|
||||||
@ -35,7 +33,7 @@ const toast=ref(false)
|
|||||||
// 获取拍卖笔录PDF
|
// 获取拍卖笔录PDF
|
||||||
const fetchPmblPdf = async () => {
|
const fetchPmblPdf = async () => {
|
||||||
try {
|
try {
|
||||||
const res = await contractViewOnline({
|
const res = await contractView({
|
||||||
auctionArtworkUuid: payment.value.auctionArtworkUuid,
|
auctionArtworkUuid: payment.value.auctionArtworkUuid,
|
||||||
phone:userInfo.value.telNum,
|
phone:userInfo.value.telNum,
|
||||||
registerType:1,
|
registerType:1,
|
||||||
@ -45,8 +43,6 @@ const fetchPmblPdf = async () => {
|
|||||||
jmxyUrl.value=res.data.ViewUrls?.jmxy1
|
jmxyUrl.value=res.data.ViewUrls?.jmxy1
|
||||||
pmblUrl.value=res.data.ViewUrls?.ppbl6
|
pmblUrl.value=res.data.ViewUrls?.ppbl6
|
||||||
pmyjqrsUrl.value=res.data.ViewUrls?.ppqr5
|
pmyjqrsUrl.value=res.data.ViewUrls?.ppqr5
|
||||||
jmxzUrl.value=res.data.ViewUrls?.jmxz2
|
|
||||||
pmggUrl.value=res.data.ViewUrls?.pmgg3
|
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
}
|
}
|
||||||
@ -55,7 +51,7 @@ const fetchPmblPdf = async () => {
|
|||||||
// 监听折叠面板变化
|
// 监听折叠面板变化
|
||||||
const handleCollapseChange = (name) => {
|
const handleCollapseChange = (name) => {
|
||||||
activeNames.value = name
|
activeNames.value = name
|
||||||
if (['1','3','4','5','6'].includes(name) && !protocolList.value.find(x=>x.id===name)?.pdfName) {
|
if (['4','5','6'].includes(name) && !protocolList.value.find(x=>x.id===name)?.pdfName) {
|
||||||
fetchPmblPdf()
|
fetchPmblPdf()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user