From 822ba3c8816fedee6016a700fa5ab3d11fd36710 Mon Sep 17 00:00:00 2001 From: Wayne Date: Tue, 2 Jan 2024 04:31:56 +0800 Subject: [PATCH 1/4] =?UTF-8?q?nfc=E9=80=A3=E7=B5=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/card/card0.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/card/card0.js b/src/utils/card/card0.js index 5aab8db..67f25d3 100644 --- a/src/utils/card/card0.js +++ b/src/utils/card/card0.js @@ -362,7 +362,7 @@ function genCard(vcard) { "action": { "type": "uri", "label": "action", - "uri": "${vcard.nfcurl}&cardid=1" + "uri": "${vcard.nfcurl}" } } ] From 163ef7662670bc0fd4d98fbae774ce91f8c98fb7 Mon Sep 17 00:00:00 2001 From: Wayne Date: Tue, 2 Jan 2024 04:33:01 +0800 Subject: [PATCH 2/4] =?UTF-8?q?nfc=E9=80=A3=E7=B5=90=E5=8F=8Ahide=E7=89=88?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Send/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/Send/index.vue b/src/views/Send/index.vue index 35696af..d66cfc9 100644 --- a/src/views/Send/index.vue +++ b/src/views/Send/index.vue @@ -282,7 +282,7 @@ const changeTpl = async (val) => {
    • -
  • + From c9661a0dc04d24e8e505220d3e579c41aa28c5d1 Mon Sep 17 00:00:00 2001 From: Wayne Date: Wed, 3 Jan 2024 05:43:51 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9C=83=E5=93=A1=E9=96=8B=E9=80=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Home/index.vue | 5 +++-- src/views/Register/index.vue | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/views/Home/index.vue b/src/views/Home/index.vue index 13805e6..7ad0da7 100644 --- a/src/views/Home/index.vue +++ b/src/views/Home/index.vue @@ -82,12 +82,13 @@ onBeforeMount(async () => { sessionStorage.setItem("token", loginRes.data.token); sessionStorage.setItem("uid", loginRes.data.uid); } else if (loginRes.code === 201) { // 非會員 - if (route.query.act === "openright") { // 開卡 - if (route.query.verify) { + if (route.query.act === "openright") { // 開卡 + if (route.query.verify && route.query.user_id) { router.push({ path: "/register", query: { verify: route.query.verify, + user_id: route.query.user_id, }, }); diff --git a/src/views/Register/index.vue b/src/views/Register/index.vue index 0c2b95e..cf569e7 100644 --- a/src/views/Register/index.vue +++ b/src/views/Register/index.vue @@ -21,6 +21,7 @@ const route = useRoute(); const form = ref({ verify: route.query.verify || null, + user_id: route.query.user_id || null, aid: route.query.aid || undefined, }); @@ -33,7 +34,7 @@ const crop = ref({ img: null, }); -if (route.query.verify) { +if (route.query.verify || route.query.user_id) { title.value = "會員開通"; } From 7ff6f225ae38427b8c727d46657c0f8ebd715206 Mon Sep 17 00:00:00 2001 From: Wayne Date: Wed, 3 Jan 2024 06:10:21 +0800 Subject: [PATCH 4/4] 0000838 --- src/api/index.js | 3 +++ src/views/Home/index.vue | 32 +++++++++++++++++++++++++++----- src/views/Login/actLogin.vue | 10 +++++----- 3 files changed, 35 insertions(+), 10 deletions(-) diff --git a/src/api/index.js b/src/api/index.js index 8bbce82..703d947 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -7,6 +7,9 @@ export const login = async (params) => ajax(`/auth/login`, params, "POST"); export const bindCard = async (params) => ajax(`/auth/bindCard`, params, "POST"); +export const bindUser = async (params) => + ajax(`/auth/bindUser`, params, "POST"); + export const checkLineId = async (lineid) => ajax(`/auth/checkLineId`, { lineid }, "GET"); diff --git a/src/views/Home/index.vue b/src/views/Home/index.vue index 7ad0da7..7741478 100644 --- a/src/views/Home/index.vue +++ b/src/views/Home/index.vue @@ -11,9 +11,7 @@ import { useCardStore } from '@/store/card'; import { showToast, showSuccessToast, showConfirmDialog } from "vant"; import 'vant/es/toast/style'; -import { Dialog } from "vant"; - -import { login, bindCard, getMovie, getMarquee } from "@/api"; +import { login, bindCard, getMovie, getMarquee, bindUser } from "@/api"; import noUserImg from '@/assets/images/upload.jpg' @@ -59,9 +57,11 @@ onBeforeMount(async () => { if (route.query.act === "openright") { if (route.query.verify) { //詢問是否綁定 - Dialog.confirm({ + showConfirmDialog({ title: "卡片綁定", message: "確認是否綁定這張卡片", + confirmButtonText: "確認", + cancelButtonText: "取消", }) .then(async () => { //確認綁定 @@ -83,7 +83,7 @@ onBeforeMount(async () => { sessionStorage.setItem("uid", loginRes.data.uid); } else if (loginRes.code === 201) { // 非會員 if (route.query.act === "openright") { // 開卡 - if (route.query.verify && route.query.user_id) { + if (route.query.verify) { // 註冊 router.push({ path: "/register", query: { @@ -93,6 +93,28 @@ onBeforeMount(async () => { }); return; + }else if(route.query.user_id){ //綁定lineid + //詢問是否綁定 + showConfirmDialog({ + title: "會員綁定", + message: "確認是否綁定會員", + confirmButtonText: "確認", + cancelButtonText: "取消", + }) + .then(async () => { + //確認綁定 + let bindRes = await bindUser({ + line_id: profile.userId, + user_id: route.query.user_id, + }); + if (bindRes.code === 200) { + showSuccessToast("綁定成功"); + } else { + showFailToast("綁定失敗"); + return; + } + }) + .catch(() => { }); } } else if (route.query.aid) { // 會員註冊 router.push({ diff --git a/src/views/Login/actLogin.vue b/src/views/Login/actLogin.vue index 770c09b..9e76709 100644 --- a/src/views/Login/actLogin.vue +++ b/src/views/Login/actLogin.vue @@ -3,7 +3,7 @@ import { login, bindCard } from "@/api"; import { useRouter, useRoute } from 'vue-router'; -const route = useRoute(); +const route = useRoute(); const router = useRouter(); const liff = window.liff; @@ -58,14 +58,14 @@ if (!sessionStorage.getItem("token")) { // 未登入先要登入 sessionStorage.setItem("uid", loginRes.data.uid); } else if (loginRes.code === 201) { // 非會員 if (route.query.act === "openright") { // 開卡 - if (route.query.verify) { + if (route.query.verify || route.query.user_id) { router.push({ path: "/register", query: { verify: route.query.verify, + user_id: route.query.user_id, }, }); - } } else if (route.query.aid) { // 會員註冊 router.push({ @@ -88,10 +88,10 @@ if (!sessionStorage.getItem("token")) { // 未登入先要登入 } // 如果存在redirect，就跳轉 -if (sessionStorage.getItem("redirect")){ +if (sessionStorage.getItem("redirect")) { router.push(sessionStorage.getItem("redirect")); sessionStorage.removeItem("redirect"); -}else{ +} else { router.push("/"); }