Merge branch 'dev-songyang'

This commit is contained in:
songyang 2023-12-08 13:27:59 +08:00
commit 6b88074abd
2 changed files with 11 additions and 9 deletions

7
components.d.ts vendored
View File

@ -10,13 +10,10 @@ declare module 'vue' {
ElButton: typeof import('element-plus/es')['ElButton']
ElCarousel: typeof import('element-plus/es')['ElCarousel']
ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
ElCascader: typeof import('element-plus/es')['ElCascader']
ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
ElCol: typeof import('element-plus/es')['ElCol']
ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
ElDialog: typeof import('element-plus/es')['ElDialog']
ElEmpty: typeof import('element-plus/es')['ElEmpty']
ElForm: typeof import('element-plus/es')['ElForm']
ElFormItem: typeof import('element-plus/es')['ElFormItem']
ElIcon: typeof import('element-plus/es')['ElIcon']
@ -25,15 +22,11 @@ declare module 'vue' {
ElMenu: typeof import('element-plus/es')['ElMenu']
ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
ElOption: typeof import('element-plus/es')['ElOption']
ElPagination: typeof import('element-plus/es')['ElPagination']
ElProgress: typeof import('element-plus/es')['ElProgress']
ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
ElRow: typeof import('element-plus/es')['ElRow']
ElSelect: typeof import('element-plus/es')['ElSelect']
ElTable: typeof import('element-plus/es')['ElTable']
ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
ElTag: typeof import('element-plus/es')['ElTag']
ElUpload: typeof import('element-plus/es')['ElUpload']
EquipCard: typeof import('./src/components/equipCard.vue')['default']
EquipDetailTable: typeof import('./src/components/equipDetailTable.vue')['default']

View File

@ -394,9 +394,9 @@
<el-checkbox size="large" />
<div class="agreement">
我已阅读并同意相关条款内容
<span class="previewExample"></span>
<span class="previewExample" @click="serviceAgreement">服务协议</span>
<span class="previewExample">隐私协议</span>
<span class="previewExample" @click="privacyAgreement">隐私协议</span>
</div>
</el-col>
@ -652,6 +652,15 @@
emit('closeAuthenticationDialog', false)
}
/* 服务协议 */
const serviceAgreement = () => {
window.open('https://zlpt-1259760603.cos.ap-nanjing.myqcloud.com/serviceAgreement.pdf')
}
/* 隐私协议 */
const privacyAgreement = () => {
window.open('https://zlpt-1259760603.cos.ap-nanjing.myqcloud.com/privacyPolicy.pdf')
}
const options = reactive([
{
value: '选项1',