From dc0d0e7a261ac190e2f032f8bac4824e636eb3c3 Mon Sep 17 00:00:00 2001
From: Wayne <wwayne.hsu@gmail.com>
Date: Tue, 27 Feb 2024 12:42:14 +0800
Subject: [PATCH] 0000998

---
 src/views/Card/Edit.vue      |   4 +-
 src/views/Card/Video.vue     |   2 +-
 src/views/Login/actLogin.vue | 147 ++++++++++++++++++-----------------
 3 files changed, 80 insertions(+), 73 deletions(-)

diff --git a/src/views/Card/Edit.vue b/src/views/Card/Edit.vue
index 7fc7b53..b09be4c 100644
--- a/src/views/Card/Edit.vue
+++ b/src/views/Card/Edit.vue
@@ -420,7 +420,7 @@ const handleSubmit = async () => {
           </van-cell>
 
           <van-popup v-model:show="showMovie" class="p-3" closeable>
-            <iframe width="375" height="215" src="https://www.youtube.com/embed/fjZsQ0Rh6yk" title="Utel電子名片教學"
+            <iframe width="375" height="215" src="https://www.youtube.com/embed/94q_MPZeU6s" title="Utel電子名片教學"
               frameborder="0"
               allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
               allowfullscreen></iframe>
@@ -523,7 +523,7 @@ const handleSubmit = async () => {
               }"><strong>卡片標題</strong></van-divider>
 
               <van-field v-model="form.json5.cards[form.page - 1].title" label="標題文字" id="vcard-title" input-align="right"
-                placeholder="連結(需輸入完整網址,http://..,https://...)" :rules="[{ required: true, message: '請填寫卡片標題文字' }]" />
+                placeholder="請填寫卡片標題文字" :rules="[{ required: true, message: '請填寫卡片標題文字' }]" />
 
               <van-field v-model="form.json5.cards[form.page - 1].titleSize" is-link readonly label="標題文字大小"
                 id="vcard-titleSize" input-align="right" placeholder="請輸入標題文字的色碼，如：#333333"
diff --git a/src/views/Card/Video.vue b/src/views/Card/Video.vue
index 3b0b753..825b211 100644
--- a/src/views/Card/Video.vue
+++ b/src/views/Card/Video.vue
@@ -1,7 +1,7 @@
 <template>
     <van-nav-bar title="教學影片" right-text="關閉" @click-right="$router.push('/card')" />
     <div class="yt-content">
-        <iframe width="375" height="215" src="https://www.youtube.com/embed/fjZsQ0Rh6yk" title="Utel電子名片教學"
+        <iframe width="375" height="215" src="https://www.youtube.com/embed/94q_MPZeU6s" title="Utel電子名片教學"
             frameborder="0"
             allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
             allowfullscreen></iframe>
diff --git a/src/views/Login/actLogin.vue b/src/views/Login/actLogin.vue
index 9e76709..3120888 100644
--- a/src/views/Login/actLogin.vue
+++ b/src/views/Login/actLogin.vue
@@ -1,97 +1,104 @@
 <script setup>
-import { login, bindCard } from "@/api";
+import { onBeforeMount } from "vue";
+import { showToast } from 'vant'
 
 import { useRouter, useRoute } from 'vue-router';
-
 const route = useRoute();
 const router = useRouter();
 
+import { login, bindCard } from "@/api";
+
+
 const liff = window.liff;
 
-try {
-    if (!liff.isLoggedIn()) liff.login({ redirectUri: window.location.href });
-} catch (err) {
-    console.log(`liff.state init error ${err}`);
-    showToast("登入失敗。請聯絡管理員");
-    router.push("/login");
-}
+onBeforeMount(async () => {
+    try {
+        if (!liff.isLoggedIn()) liff.login({ redirectUri: window.location.href });
+    } catch (err) {
+        console.log(`liff.state init error ${err}`);
+        showToast("登入失敗。請聯絡管理員");
+        return router.push("/login");
+    }
 
 
-if (!sessionStorage.getItem("token")) { // 未登入先要登入
-    const profile = await liff.getProfile();
+    if (!sessionStorage.getItem("token")) { // 未登入先要登入
+        const profile = await liff.getProfile();
 
-    const id_token = liff.getIDToken();
+        const id_token = liff.getIDToken();
 
-    let loginRes = await login({ line_id: profile.userId, token: id_token });
+        let loginRes = await login({ line_id: profile.userId, token: id_token });
 
-    if (loginRes.code === 200) {
-        if (route.query.act === "openright") {
-            showToast("您已經是本站會員");
-        }
-        sessionStorage.setItem("token", loginRes.data.token);
-        sessionStorage.setItem("uid", loginRes.data.uid);
-    } else if (loginRes.code === 202) { // 未綁定卡片
-        if (route.query.act === "openright") {
-            if (route.query.verify) {
-                //詢問是否綁定
-                Dialog.confirm({
-                    title: "卡片綁定",
-                    message: "確認是否綁定這張卡片",
-                })
-                    .then(async () => {
-                        //確認綁定
-                        let bindRes = await bindCard({
-                            uid: loginRes.data.uid,
-                            verify: route.query.verify,
-                        });
-                        if (bindRes.code === 200) {
-                            showSuccessToast("綁定成功");
-                        } else {
-                            showToast.fail("綁定失敗");
-                        }
+        if (loginRes.code === 200) {
+            if (route.query.act === "openright") {
+                showToast("您已經是本站會員");
+            }
+            sessionStorage.setItem("token", loginRes.data.token);
+            sessionStorage.setItem("uid", loginRes.data.uid);
+        } else if (loginRes.code === 202) { // 未綁定卡片
+            if (route.query.act === "openright") {
+                if (route.query.verify) {
+                    //詢問是否綁定
+                    Dialog.confirm({
+                        title: "卡片綁定",
+                        message: "確認是否綁定這張卡片",
                     })
-                    .catch(() => { });
+                        .then(async () => {
+                            //確認綁定
+                            let bindRes = await bindCard({
+                                uid: loginRes.data.uid,
+                                verify: route.query.verify,
+                            });
+                            if (bindRes.code === 200) {
+                                showSuccessToast("綁定成功");
+                            } else {
+                                showToast.fail("綁定失敗");
+                            }
+                        })
+                        .catch(() => { });
+                }
             }
-        }
 
-        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 || route.query.user_id) {
-                router.push({
+            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 || route.query.user_id) {
+                    return router.push({
+                        path: "/register",
+                        query: {
+                            verify: route.query.verify,
+                            user_id: route.query.user_id,
+                        },
+                    });
+                }
+            } else if (route.query.aid) { // 會員註冊
+                return router.push({
                     path: "/register",
                     query: {
-                        verify: route.query.verify,
-                        user_id: route.query.user_id,
+                        aid: route.query.aid,
                     },
                 });
+            } else {
+                showToast("請先註冊成為本站會員");
+                return router.push({
+                    path: "/register",
+                    query: { refer: route.query.refer },
+                });
             }
-        } else if (route.query.aid) { // 會員註冊
-            router.push({
-                path: "/register",
-                query: {
-                    aid: route.query.aid,
-                },
-            });
         } else {
-            showToast("請先註冊成為本站會員");
-            router.push({
-                path: "/register",
-                query: { refer: route.query.refer },
-            });
+            showToast("登入失敗。請聯絡管理員");
+            return router.push("/login");
         }
+    }
+
+    // 如果存在redirect，就跳轉
+    if (sessionStorage.getItem("redirect")) {
+        router.push(sessionStorage.getItem("redirect"));
+        sessionStorage.removeItem("redirect");
+        return;
     } else {
-        showToast("登入失敗。請聯絡管理員");
-        router.push("/login");
+        return router.push("/");
     }
-}
+});
 
-// 如果存在redirect，就跳轉
-if (sessionStorage.getItem("redirect")) {
-    router.push(sessionStorage.getItem("redirect"));
-    sessionStorage.removeItem("redirect");
-} else {
-    router.push("/");
-}
 </script>