0000998

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"

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>

src/views/Login/actLogin.vue

@@ -1,23 +1,27 @@
 <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 {
+onBeforeMount(async () => {
+    try {
         if (!liff.isLoggedIn()) liff.login({ redirectUri: window.location.href });
-} catch (err) {
+    } catch (err) {
         console.log(`liff.state init error ${err}`);
         showToast("登入失敗。請聯絡管理員");
-    router.push("/login");
-}
+        return router.push("/login");
+    }
 
 
-if (!sessionStorage.getItem("token")) { // 未登入先要登入
+    if (!sessionStorage.getItem("token")) { // 未登入先要登入
         const profile = await liff.getProfile();
 
         const id_token = liff.getIDToken();
@@ -59,7 +63,7 @@ if (!sessionStorage.getItem("token")) { // 未登入先要登入
         } else if (loginRes.code === 201) { // 非會員
             if (route.query.act === "openright") {  // 開卡
                 if (route.query.verify || route.query.user_id) {
-                router.push({
+                    return router.push({
                         path: "/register",
                         query: {
                             verify: route.query.verify,
@@ -68,7 +72,7 @@ if (!sessionStorage.getItem("token")) { // 未登入先要登入
                     });
                 }
             } else if (route.query.aid) { // 會員註冊
-            router.push({
+                return router.push({
                     path: "/register",
                     query: {
                         aid: route.query.aid,
@@ -76,22 +80,25 @@ if (!sessionStorage.getItem("token")) { // 未登入先要登入
                 });
             } else {
                 showToast("請先註冊成為本站會員");
-            router.push({
+                return router.push({
                     path: "/register",
                     query: { refer: route.query.refer },
                 });
             }
         } else {
             showToast("登入失敗。請聯絡管理員");
-        router.push("/login");
+            return router.push("/login");
+        }
     }
-}
 
-// 如果存在redirect，就跳轉
-if (sessionStorage.getItem("redirect")) {
+    // 如果存在redirect，就跳轉
+    if (sessionStorage.getItem("redirect")) {
         router.push(sessionStorage.getItem("redirect"));
         sessionStorage.removeItem("redirect");
-} else {
-    router.push("/");
-}
+        return;
+    } else {
+        return router.push("/");
+    }
+});
+
 </script>