diff --git a/app/api/goods/index.js b/app/api/goods/index.js index 5540093..a2a5606 100644 --- a/app/api/goods/index.js +++ b/app/api/goods/index.js @@ -93,4 +93,12 @@ export async function orderQuery(data) { method: 'POST', data }) +} +export async function contractView(data) { + + return await request( { + url:'/api/v1/contract/contract-view', + method: 'POST', + data + }) } \ No newline at end of file diff --git a/app/components/itemDetail/index.vue b/app/components/itemDetail/index.vue index c67833c..eb55921 100644 --- a/app/components/itemDetail/index.vue +++ b/app/components/itemDetail/index.vue @@ -8,7 +8,20 @@ const props = defineProps({ default: null } }) -console.log(props.detailInfo) +const filteredPriceRules = computed(() => { + if (!props.detailInfo?.priceRules) return [] + + // 找到第一个price为空的索引 + const emptyIndex = props.detailInfo.priceRules.findIndex(item => !item.price) + + if (emptyIndex === -1) { + // 如果没有空价格,返回全部 + return props.detailInfo.priceRules + } else { + // 如果有空价格,只返回到空价格之前的数据 + return props.detailInfo.priceRules.slice(0, emptyIndex) + } +}) diff --git a/app/pages/signature/protocol/file/拍卖公告.docx b/app/pages/signature/protocol/file/拍卖公告.docx deleted file mode 100644 index 48120f0..0000000 Binary files a/app/pages/signature/protocol/file/拍卖公告.docx and /dev/null differ diff --git a/app/pages/signature/protocol/file/拍卖公章.png b/app/pages/signature/protocol/file/拍卖公章.png deleted file mode 100644 index 51dff08..0000000 Binary files a/app/pages/signature/protocol/file/拍卖公章.png and /dev/null differ diff --git a/app/pages/signature/protocol/file/拍卖规则.docx b/app/pages/signature/protocol/file/拍卖规则.docx deleted file mode 100644 index c6a5a05..0000000 Binary files a/app/pages/signature/protocol/file/拍卖规则.docx and /dev/null differ diff --git a/app/pages/signature/protocol/file/拍品移交确认书.docx b/app/pages/signature/protocol/file/拍品移交确认书.docx deleted file mode 100644 index d93c03c..0000000 Binary files a/app/pages/signature/protocol/file/拍品移交确认书.docx and /dev/null differ diff --git a/app/pages/signature/protocol/index.vue b/app/pages/signature/protocol/index.vue index 695e9a5..3513d42 100644 --- a/app/pages/signature/protocol/index.vue +++ b/app/pages/signature/protocol/index.vue @@ -1,76 +1,93 @@ +
+
+ 支付前需同意以下内容并签字 +
- \ No newline at end of file + + + + + + + +
+ + 同意并签字 + +
+
+ \ No newline at end of file diff --git a/app/pages/signature/protocol/jmxy/index.vue b/app/pages/signature/protocol/jmxy/index.vue deleted file mode 100644 index bbe14ef..0000000 --- a/app/pages/signature/protocol/jmxy/index.vue +++ /dev/null @@ -1,14 +0,0 @@ - - - \ No newline at end of file diff --git a/app/pages/signature/protocol/jmxz/index.vue b/app/pages/signature/protocol/jmxz/index.vue deleted file mode 100644 index fd279e4..0000000 --- a/app/pages/signature/protocol/jmxz/index.vue +++ /dev/null @@ -1,14 +0,0 @@ - - - \ No newline at end of file diff --git a/app/pages/signature/protocol/pdfView/index.vue b/app/pages/signature/protocol/pdfView/index.vue new file mode 100644 index 0000000..fc4a87d --- /dev/null +++ b/app/pages/signature/protocol/pdfView/index.vue @@ -0,0 +1,68 @@ + + + + + \ No newline at end of file diff --git a/app/pages/signature/protocol/pmbl/index.vue b/app/pages/signature/protocol/pmbl/index.vue deleted file mode 100644 index c5b68bf..0000000 --- a/app/pages/signature/protocol/pmbl/index.vue +++ /dev/null @@ -1,14 +0,0 @@ - - - \ No newline at end of file diff --git a/app/pages/signature/protocol/pmgg/index.vue b/app/pages/signature/protocol/pmgg/index.vue deleted file mode 100644 index b909ef2..0000000 --- a/app/pages/signature/protocol/pmgg/index.vue +++ /dev/null @@ -1,14 +0,0 @@ - - - \ No newline at end of file diff --git a/app/pages/signature/protocol/pmgz/index.vue b/app/pages/signature/protocol/pmgz/index.vue deleted file mode 100644 index 54a601b..0000000 --- a/app/pages/signature/protocol/pmgz/index.vue +++ /dev/null @@ -1,14 +0,0 @@ - - - \ No newline at end of file diff --git a/app/pages/signature/protocol/pmyjqrs/index.vue b/app/pages/signature/protocol/pmyjqrs/index.vue deleted file mode 100644 index bed6223..0000000 --- a/app/pages/signature/protocol/pmyjqrs/index.vue +++ /dev/null @@ -1,14 +0,0 @@ - - - \ No newline at end of file