diff --git a/pages/archive/bind-popup.vue b/pages/archive/bind-popup.vue index 8a17398..7b5759b 100644 --- a/pages/archive/bind-popup.vue +++ b/pages/archive/bind-popup.vue @@ -17,10 +17,10 @@ 姓名: {{ customer.maskName }} - + 手机号: {{ customer.mobile }} @@ -30,13 +30,13 @@ - - 以上档案都不对,可以: - 新增档案 - + + 以上档案都不对,可以: + 新增档案 + props.visible, n => { if (n) { - popup.value && popup.value.open() + popup.value && popup.value.open(); + if(props.customers && props.customers.length === 1 && props.customers[0] && props.customers[0]._id){ + id.value = props.customers[0]._id + } } else { popup.value && popup.value.close() } @@ -126,6 +129,6 @@ watch(() => props.visible, n => { } .popup-content-scroll { - max-height: 65vh; + max-height: 50vh; } \ No newline at end of file diff --git a/pages/archive/verify-name-popup.vue b/pages/archive/verify-name-popup.vue index 6d20332..a0ae604 100644 --- a/pages/archive/verify-name-popup.vue +++ b/pages/archive/verify-name-popup.vue @@ -8,9 +8,11 @@ 请输入所选档案的姓名进行验证 - - + + {{ nameSet.pre }} + {{ nameSet.middle }} + @@ -20,7 +22,7 @@ diff --git a/pages/login/agreement-popup.vue b/pages/login/agreement-popup.vue new file mode 100644 index 0000000..c5f4ce4 --- /dev/null +++ b/pages/login/agreement-popup.vue @@ -0,0 +1,80 @@ + + + + + \ No newline at end of file diff --git a/pages/login/login.vue b/pages/login/login.vue index 3e39656..7d7c584 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -30,7 +30,7 @@ @getphonenumber="getPhoneNumber"> 手机号快捷登录 - @@ -43,6 +43,7 @@ 《隐私政策》 + @@ -56,6 +57,7 @@ import { get, set } from "@/utils/cache"; import { toast } from "@/utils/widget"; import groupAvatar from "@/components/group-avatar.vue"; +import agreementPopup from "./agreement-popup.vue"; const env = __VITE_ENV__; const appid = env.MP_WX_APP_ID; @@ -64,6 +66,7 @@ const checked = ref(false); const redirectUrl = ref(""); const { account } = storeToRefs(useAccountStore()); const { login } = useAccountStore(); +const visible = ref(false) function attempRedirect(url) { return new Promise((resolve, reject) => { @@ -85,8 +88,9 @@ function attempSwitchTab(url) { }); } -function remind() { - toast("请先阅读并同意用户协议和隐私政策"); +function onAgree() { + visible.value = false; + checked.value = true; } function toAggreement(type) { @@ -102,7 +106,6 @@ function toHome() { } - async function bindTeam() { const res = await api('bindWxappWithTeam', { appid, corpId: team.value.corpId, teamId: team.value.teamId, openid: account.value.openid }); if (!res || !res.success) {