Merge pull request #10 from bufanyun/v2.0

修改注册协议显示
This commit is contained in:
maxbad 2023-05-15 13:43:07 +08:00 committed by GitHub
commit 6977ac486a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 11 deletions

View File

@ -6,7 +6,7 @@
</p> </p>
<p align="center"> <p align="center">
<a href="https://goframe.org/pages/viewpage.action?pageId=1114119" target="_blank"> <a href="https://goframe.org/pages/viewpage.action?pageId=1114119" target="_blank">
<img src="https://img.shields.io/badge/goframe-2.3-green" alt="goframe"> <img src="https://img.shields.io/badge/goframe-2.4-green" alt="goframe">
</a> </a>
<a href="https://v3.vuejs.org/" target="_blank"> <a href="https://v3.vuejs.org/" target="_blank">
<img src="https://img.shields.io/badge/vue.js-vue3.x-green" alt="vue"> <img src="https://img.shields.io/badge/vue.js-vue3.x-green" alt="vue">

View File

@ -1,8 +1,12 @@
<template> <template>
<div> <div>
<n-checkbox v-model:checked="checked" class="text-14px">我已阅读并接受</n-checkbox> <n-checkbox v-model:checked="checked" class="text-12px">我已阅读并接受</n-checkbox>
<n-button :text="true" type="primary" @click="handleClickProtocol">用户协议</n-button> <n-button text type="primary" @click="handleClickProtocol" class="text-12px">
<n-button :text="true" type="primary" @click="handleClickPolicy">隐私权政策</n-button> 用户协议
</n-button>
<n-button text type="primary" @click="handleClickPolicy" class="text-12px">
隐私权政策
</n-button>
</div> </div>
</template> </template>
@ -44,7 +48,7 @@
</script> </script>
<style scoped> <style scoped>
.text-14px { .text-12px {
font-size: 14px; font-size: 12px;
} }
</style> </style>

View File

@ -118,13 +118,16 @@
:mask-closable="false" :mask-closable="false"
preset="dialog" preset="dialog"
:closable="false" :closable="false"
:title="modalTitle"
:style="{ :style="{
width: dialogWidth, width: dialogWidth,
position: 'top', position: 'top',
bottom: '15vw', bottom: '15vw',
}" }"
> >
<n-space justify="center">
<div class="agree-title">{{ agreeTitle }}</div>
</n-space>
<div v-html="modalContent"></div> <div v-html="modalContent"></div>
<n-divider /> <n-divider />
@ -168,7 +171,7 @@
const userStore = useUserStore(); const userStore = useUserStore();
const loading = ref(false); const loading = ref(false);
const showModal = ref(false); const showModal = ref(false);
const modalTitle = ref(''); const agreeTitle = ref('');
const modalContent = ref(''); const modalContent = ref('');
const { sendLabel, isCounting, loading: sendLoading, activateSend } = useSendCode(); const { sendLabel, isCounting, loading: sendLoading, activateSend } = useSendCode();
const agreement = ref(false); const agreement = ref(false);
@ -260,13 +263,13 @@
function handleClickProtocol() { function handleClickProtocol() {
showModal.value = true; showModal.value = true;
modalTitle.value = '用户协议'; agreeTitle.value = '用户协议';
modalContent.value = userStore.loginConfig?.loginProtocol as string; modalContent.value = userStore.loginConfig?.loginProtocol as string;
} }
function handleClickPolicy() { function handleClickPolicy() {
showModal.value = true; showModal.value = true;
modalTitle.value = '隐私权政策'; agreeTitle.value = '隐私权政策';
modalContent.value = userStore.loginConfig?.loginPolicy as string; modalContent.value = userStore.loginConfig?.loginPolicy as string;
} }
@ -276,4 +279,9 @@
} }
</script> </script>
<style lang="less" scoped></style> <style lang="less" scoped>
.agree-title {
font-size: 18px;
margin-bottom: 22px;
}
</style>