v0.0.1

.env.slash

@@ -2,17 +2,17 @@ NODE_ENV = production
 
 VUE_ENV = slash
 
-VUE_APP_BASE_URL = https://card.h888.fun 
+VUE_APP_BASE_URL = https://card.slash1000.com 
 
 VUE_APP_SEND_URL = https://liff.line.me/1657876696-564NGMxy
 
-VUE_APP_API_URL = https://card.h888.fun/appapi/v1
+VUE_APP_API_URL = https://card.slash1000.com/appapi/v1
 
-VUE_APP_SSO_URL = https://sso.h888.fun/api/v1 
+VUE_APP_SSO_URL = https://sso.slash1000.com/api/v1 
 
-VUE_APP_IMAGE_URL = https://card.h888.fun/storage
+VUE_APP_IMAGE_URL = https://card.slash1000.com/storage
 
-VUE_APP_DOMAIN = h888.fun
+VUE_APP_DOMAIN = slash1000.com
 
 VUE_APP_LINE_CLINE_ID = 1657876696
 

src/store/modules/user.js

@@ -24,6 +24,9 @@ export default {
       var res = await getUserInfo();
       if (res.code === 200) {
         context.commit("setUserInfo", res.data);
+        return true;
+      }else{
+        return false;
       }
     },
     async setUserTpl(context, payload) {

src/views/Card/Notice.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <van-nav-bar 
-      title="自製名片" 
+      title="商務卡片" 
       right-text="關閉"
       @click-right="$router.push('/')"
     />

src/views/Home/index.vue

@@ -224,8 +224,9 @@ const showNfcQrcode = ref(false);
 const imageUrl = ref(process.env.VUE_APP_IMAGE_URL);
 
 const userLevel = {
-  0: "未付費",
+  0: "未付費會員",
-  1: "已付費",
+  1: "付費會員",
+  2: "試用用戶"
 };
 
 const is_due = ref(false);
@@ -234,7 +235,10 @@ const showPwaInstall = ref(false);
 const deferredPrompt = ref(null);
 
 onBeforeMount(async () => {
-  store.dispatch("user/getUserInfo");
+  let res = await store.dispatch("user/getUserInfo");
+  if(!res){
+    router.push('/login')
+  }
 });
 
 onMounted(() => {
@@ -315,7 +319,7 @@ const handleLogout = () => {
 };
 
 const goShop = () => {
-  window.open("https://shop."+store.state.sso_domain+"/", "_blank");
+  window.open("https://shop."+store.state.sso_domain+"/m/card", "_blank");
 };
 
 const handlePwaInstall = () => {

src/views/Login/LineLogin.vue

@@ -1,58 +1,75 @@
-<template>
+<template></template>
-
-</template>
 
 <script setup>
-import axios from 'axios'
+import axios from "axios";
-import Cookies from 'js-cookie'
+import Cookies from "js-cookie";
+
+import { useRoute, useRouter } from "vue-router";
+import { useStore } from "vuex";
+import { linelogin } from "@/api/index";
 
-import { useRoute , useRouter } from 'vue-router'
+import { Toast } from "vant";
-import { useStore } from 'vuex'
-import { linelogin } from '@/api/index'
 
-import { Toast } from 'vant'
+const route = useRoute();
+const router = useRouter();
 
-const route = useRoute()
+const store = useStore();
-const router = useRouter()
 
-const store = useStore()
+const code = route.query.code;
 
-const code = route.query.code
+if (!code) {
+  router.replace("/login");
+} else {
+  const client_id = process.env.VUE_APP_LINE_CLINE_ID;
+
+  //判斷domain是否包含localhost
+  let redirect_uri = "";
+  if (store.state.domain.includes("localhost")) {
+    redirect_uri = "http://" + store.state.domain + ":8080/home/linelogin";
+  } else {
+    redirect_uri = "https://" + store.state.domain + "/home/linelogin";
+  }
 
-if(!code){
-    router.replace('/login')
-}else{
-    const client_id = process.env.VUE_APP_LINE_CLINE_ID
-    const redirect_uri = `https://${store.state.domain}/home/linelogin`
 
-    axios.post('https://api.line.me/oauth2/v2.1/token',new URLSearchParams({
+  axios
-        grant_type: 'authorization_code',
+    .post(
+      "https://api.line.me/oauth2/v2.1/token",
+      new URLSearchParams({
+        grant_type: "authorization_code",
         code: code,
         redirect_uri: redirect_uri,
         client_id: client_id,
-        client_secret: '2a7930d6143a00ff421812b942cde200'
+        client_secret: "2a7930d6143a00ff421812b942cde200",
-    }),{
+      }),
+      {
         headers: {
-            'content-type': 'application/x-www-form-urlencoded'
+          "content-type": "application/x-www-form-urlencoded",
+        },
       }
-    }).then(async (response) => {
+    )
-        let res = await linelogin({token:response.data.id_token})
+    .then(async (response) => {
-        if(res.code == 200){
+      let res = await linelogin({ token: response.data.id_token });
-            Cookies.set('token', res.data.token,{ expires: 365 ,domain: store.state.sso_domain})
+      if (res.code == 200) {
-            Cookies.set('uid', res.data.uid,{ expires: 365 ,domain: store.state.sso_domain})
+        Cookies.set("token", res.data.token, {
-            Toast('登入成功')
+          expires: 365,
-
+          domain: store.state.sso_domain,
-            router.push('/')
+        });
-        }else if(res.code == 201){
+        Cookies.set("uid", res.data.uid, {
-            sessionStorage.setItem('reg',JSON.stringify(response.data))
+          expires: 365,
-            router.push('/register')
+          domain: store.state.sso_domain,
+        });
+        Toast("登入成功");
+
+        router.push("/");
+      } else if (res.code == 201) {
+        sessionStorage.setItem("reg", JSON.stringify(response.data));
+        router.push("/register");
       }
     })
-    .catch(error =>{
+    .catch((error) => {
-        Toast('登入失敗')
+      Toast("登入失敗");
-        router.push('/login')
+      router.push("/login");
-    })
+    });
   // let res = await lineLogin(code)
 }
-
 </script>

src/views/Login/index.vue

@@ -185,7 +185,14 @@ const handleLogin = async () => {
 const handleLineLogin = async () => {
   // router.push('/')
   const client_id = process.env.VUE_APP_LINE_CLINE_ID;
-  const redirect_uri = 'https://' + domain.value + "/home/linelogin";
+  
+  //判斷domain是否包含localhost
+  let redirect_uri = '';
+  if(domain.value.includes('localhost')){
+    redirect_uri = 'http://' + domain.value + ":8080/home/linelogin";
+  }else{
+    redirect_uri = 'https://' + domain.value + "/home/linelogin";  
+  }
 
   let link = "https://access.line.me/oauth2/v2.1/authorize?";
   link = link + "response_type=code";

src/views/Register/index.vue

@@ -115,7 +115,8 @@ const validatorUrl = (val) => {
 };
 
 const leaveReg = () => {
-  window.location.replace("/error.html");
+  // window.location.replace("/error.html");
+  router.push('/login')
 };
 
 const onCrop = () => {

src/views/Send/index.vue

@@ -5,7 +5,7 @@
       <van-tabs :lazy-render="true" v-model:active="activeName">
         <van-tab title="我的名片" name="0">
         </van-tab>
-        <van-tab :title="state.card_title" name="1">
+        <van-tab :title="state.card_title" name="1" v-if="state.showCusCard">
         </van-tab>
         <van-tab :title="card.title" :name="card.id.toString()" v-for="card of state.vip_card" :key="card.id">
         </van-tab>
@@ -86,7 +86,7 @@ const userInfo = computed(() => {
 onMounted(async () => {
   await liff.init({ liffId: process.env.VUE_APP_LINE_LIFF_ID });
 
-  if (userInfo.value.level > 1) {
+  if (userInfo.value.level > 0) {
     let vipCardRes = await getVipCard({ userid: Cookies.get('uid') })
     state.value.vip_card = vipCardRes.data
   } else {
@@ -105,6 +105,7 @@ watch(() => userInfo.value.cus_card, function (newVal, oldVal) {
   if (userInfo.value.level > 0 && newVal.length > 0) {
     state.value.showCusCard = true
   }
+  
 }, { immediate: true })
 
 watch(() => userInfo.value.nc_template, function (newVal, oldVal) {
@@ -164,6 +165,12 @@ async function showFlex(id) {
   }
 }
 const sendEcard = async () => {
+  //禁止user level為0的用戶發送
+  if (userInfo.value.level === 0) {
+    Toast.fail('請先升級付費會員')
+    return
+  }
+
   let isMo = isMobile().any
   // window.location.href = 'https://liff.line.me/1657876696-564NGMxy?userid=sc63e7880cd0b65&cardid=1'
   if(isMo){