.env.development

@@ -2,7 +2,7 @@ NODE_ENV = production
 
 VUE_APP_LINE_LIFF_ID = 1656907652-VJq33Pdg
 
-VUE_APP_BASE_URL = http://localhost:8080
+VUE_APP_BASE_URL = https://card.h888.fun
 
 VUE_APP_SEND_URL = https://liff.line.me/1657876696-564NGMxy
 
@@ -10,5 +10,4 @@ VUE_APP_API_URL = https://card.h888.fun/appapi/v1
 
 VUE_APP_IMAGE_URL = https://card.h888.fun/storage
 
-# 會員中心網址
+VUE_APP_MC_URL = https://liff.line.me/1657876696-MKYDJKgm
- = https://liff.line.me/1657876696-MKYDJKgm

.env.production

@@ -12,3 +12,4 @@ VUE_APP_API_URL = https://utel.vip/appapi/v1
 
 VUE_APP_IMAGE_URL = https://utel.vip/storage
 
+VUE_APP_MC_URL = https://liff.line.me/1656969446-nQYlz77R

.env.slash

@@ -11,3 +11,5 @@ VUE_APP_SEND_URL = https://liff.line.me/1661025693-veEM0lwZ
 VUE_APP_API_URL = https://card.slash1000.com/appapi/v1
 
 VUE_APP_IMAGE_URL = https://card.slash1000.com/storage
+
+VUE_APP_MC_URL = https://liff.line.me/1656907652-p38ddKzQ

.env.stage

@@ -11,3 +11,5 @@ VUE_APP_SEND_URL = https://liff.line.me/1656948609-BYr8Nynp
 VUE_APP_API_URL = https://utel.zltest.com.tw/appapi/v1
 
 VUE_APP_IMAGE_URL = https://utel.zltest.com.tw/storage
+
+VUE_APP_MC_URL = https://liff.line.me/1656948609-xMp7dWAz

.env.u168

@@ -11,3 +11,5 @@ VUE_APP_SEND_URL = https://liff.line.me/1656907652-VJq33Pdg
 VUE_APP_API_URL = https://u168.vip/appapi/v1
 
 VUE_APP_IMAGE_URL = https://u168.vip/storage
+
+VUE_APP_MC_URL = https://liff.line.me/1656907652-p38ddKzQ

package-lock.json

@@ -4019,9 +4019,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001502",
+      "version": "1.0.30001327",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001502.tgz",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001327.tgz",
-      "integrity": "sha512-AZ+9tFXw1sS0o0jcpJQIXvFTOB/xGiQ4OQ2t98QX3NDn2EZTSRBC801gxrsGgViuq2ak/NLkNgSNEPtCr5lfKg==",
+      "integrity": "sha512-1/Cg4jlD9qjZzhbzkzEaAC2JHsP0WrOc8Rd/3a3LuajGzGWR/hD7TVyvq99VqmTy99eVh8Zkmdq213OgvgXx7w==",
       "dev": true,
       "funding": [
         {
@@ -4031,10 +4031,6 @@
         {
           "type": "tidelift",
           "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
         }
       ]
     },
@@ -18075,9 +18071,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001502",
+      "version": "1.0.30001327",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001502.tgz",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001327.tgz",
-      "integrity": "sha512-AZ+9tFXw1sS0o0jcpJQIXvFTOB/xGiQ4OQ2t98QX3NDn2EZTSRBC801gxrsGgViuq2ak/NLkNgSNEPtCr5lfKg==",
+      "integrity": "sha512-1/Cg4jlD9qjZzhbzkzEaAC2JHsP0WrOc8Rd/3a3LuajGzGWR/hD7TVyvq99VqmTy99eVh8Zkmdq213OgvgXx7w==",
       "dev": true
     },
     "case-sensitive-paths-webpack-plugin": {

src/views/Home.vue

@@ -7,9 +7,9 @@
       <van-tabs :lazy-render="true" v-model:active="activeName" v-show="user.level > 0">
         <van-tab title="我的名片" name="0">
         </van-tab>
-        <van-tab :title="state.card_title" name="1" v-if="state.showCusCard">
+        <van-tab :title="card_title" name="1" v-if="showCusCard">
         </van-tab>
-        <van-tab :title="card.title" :name="card.id.toString()" v-for="card of state.vip_card" :key="card.id">
+        <van-tab :title="card.title" :name="card.id.toString()" v-for="card of vip_card" :key="card.id">
         </van-tab>
       </van-tabs>
       <div class="flex-section" v-if="activeName != '0'">
@@ -32,7 +32,7 @@
         </div>
         <div class="btn-area" v-if="user.level > 0">
           <dl class="dl02">
-            <a :href="`${state.imgUrl}/${user.user_id}/${user.user_id}.vcf`">
+            <a :href="`${imgUrl}/${user.user_id}/${user.user_id}.vcf`">
               <div class="menu main">加入通訊錄</div>
             </a>
           </dl>
@@ -90,7 +90,7 @@
   </van-popup>
 </template>
 
-<script setup>
+<script>
 import dayjs from 'dayjs'
 import Cookies from 'js-cookie'
 
@@ -107,10 +107,9 @@ import { genVipCard } from '@/utils/vipcard'
 
 import { Toast } from 'vant'
 
-const token = encodeURIComponent(new URLSearchParams(window.location.search).get('params'))
+export default {
-const cardid = encodeURIComponent(new URLSearchParams(window.location.search).get('cardid'))
+  name: 'LineCard',
-const nouc = encodeURIComponent(new URLSearchParams(window.location.search).get('nouc'))
+  setup() {
-
     const state = reactive({
       imgUrl: process.env.VUE_APP_IMAGE_URL,
       user: {},
@@ -120,67 +119,28 @@ const state = reactive({
       flexContent: {}
     })
 
-const activeName = ref('0')
+    const activeName = ref('0');
-const cid = ref(null)
-const isIOs = ref(null)
-const flexRef = ref(null)
-const uc_temp = ref(null)
-const nolog = ref(encodeURIComponent(new URLSearchParams(window.location.search).get('nolog')))
-const showUserConn = ref(false)
-
-const handleAddFavorite = async (userid) => {
-  if (!Cookies.get('token')) {
-    return Toast('您尚未登入Slash會員中心，請按左上角Slash會員中心登入或加入')
-  }
-  const res = await addFavorite(state.user.user_id)
-  if (res.code === 200) {
-    return Toast('收藏成功')
-  }
-}
 
-const goSlash = () => {
+    let cid = ref(null)
-  window.location.href = 'https://card.slash1000.com/home/?refer=' + state.user.code
-}
 
-const goUC = (url) => {
+    let isIOs = ref(null)
-  showUserConn.value = false
-  window.location.href = url + '&nouc=1'
-}
 
-const saveConnection = async (data) => {
+    let flexRef = ref(null)
-  const connData = {
-    userid: data.user_id,
-    name: data.name,
-    nfcurl: data.nfcurl,
-    company: data.company,
-    title: data.title,
-    avatar: data.avatar,
-    time: dayjs().format('YYYY/MM/DD HH:mm')
-  }
 
-  let n_user_conn = []
 
-  if (localStorage.getItem('user_conn')) {
+    //取得user id
-    let i = 0
+    let token = encodeURIComponent(new URLSearchParams(window.location.search).get('params'))
-    const t_connData = JSON.parse(localStorage.getItem('user_conn')).filter(item => {
+    let cardid = encodeURIComponent(new URLSearchParams(window.location.search).get('cardid'))
-      i++
+    let nouc = encodeURIComponent(new URLSearchParams(window.location.search).get('nouc'))
-      return item.userid !== connData.userid && i < 5
+    let nolog = ref(encodeURIComponent(new URLSearchParams(window.location.search).get('nolog')))
-    })
 
-    n_user_conn = [connData, ...t_connData]
+    cid.value = cardid
-  } else {
-    n_user_conn = [connData]
-  }
 
-  localStorage.setItem('user_conn', JSON.stringify(n_user_conn))
+    //取得是否為iphone
+    var u = navigator.userAgent;
+    isIOs.value = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/);
 
-  if (Cookies.get('token')) {
+    const uc_temp = ref()    
-    const res = await uploadUserConnections(JSON.stringify(n_user_conn))
-    if (res.code === 200) {
-      uc_temp.value = n_user_conn
-    }
-  }
-}
 
     onBeforeMount(async () => {
 
@@ -192,18 +152,24 @@ onBeforeMount(async () => {
           return
         }
 
-    //開卡頁面
+        window.location.replace(`${process.env.VUE_APP_MC_URL}/?act=openright&verify=${chkRes.data.verify.toUpperCase()}`)
-    window.location.replace(`${process.env.VUE_APP_BASE_URL}/home/activation?params=${token}`)
         return
       }
 
-  const userid = chkRes.data
+      let userid = chkRes.data
 
-  const card1Res = await getCard({userid})
+      let params = {}
+
+      if (userid) {
+        params = { userid }
+      }
+
+      const card1Res = await getCard(params)
 
       if (card1Res.code !== 200) {
         Toast('操作錯誤')
         return
+        // window.location.replace('https://liff.line.me/1656948609-xMp7dWAz')
       }
 
       changeMeta({
@@ -221,37 +187,45 @@ onBeforeMount(async () => {
       }
 
       if (card1Res.data.nc_type > 2) {
-    const vipCardRes = await getVipCard({ userid: state.user.user_id })
+        let vipCardRes = await getVipCard({ userid: state.user.user_id })
 
         state.vip_card = vipCardRes.data.filter(item => item.nfc_show === 1)
       } else {
         state.vip_card = []
       }
 
-  if (nouc !== '1') {
+      //儲存人脈
+      if(nouc != '1'){
         saveConnection(card1Res.data)
       }
+
+
+
     })
 
-watch(() => activeName.value, (newVal, oldVal) => {
+      // activeName.value = '0'
+      watch(() => activeName.value, function (newVal, oldVal) {
         if (newVal !== oldVal) {
-    if (newVal>0) {
+          if (newVal) {
             showFlex(newVal)
           }
         }
       }, { immediate: true })
 
-const showFlex = async (id) => {
+
+    async function showFlex(id) {
+
       switch (id) {
         case '0':
           // let { card } = cardFactory({ tid: state.user.nc_template, vcard: state.user })
+
           // state.flexContent = JSON.parse(card)
           // flexRef.value.innerHTML = ''
           // flex2html("flex", JSON.parse(card))
           break
         case '1':
           if (state.user.level > 0) {
-        const card2Res = await getCusCard({ userid: state.user.user_id })
+            let card2Res = await getCusCard({ userid: state.user.user_id })
             if (card2Res.code === 200) {
               if (card2Res.data.cus_card) {
                 state.flexContent = genCard1(JSON.parse(card2Res.data.cus_card))
@@ -266,19 +240,25 @@ const showFlex = async (id) => {
           break
         default:
           if (state.user.nc_type > 2) {
-        const res = state.vip_card.find(item => item.id == id)
+            let res = state.vip_card.find(item => { return item.id == id })
             if (res.type === 0) {
               state.flexContent = genCard1(JSON.parse(res.content))
+
               await nextTick()
+
               flexRef.value.innerHTML = ''
               flex2html("flex", state.flexContent)
+
             } else {
               state.flexContent = genVipCard(JSON.parse(res.content))
+
               await nextTick()
+
               if (flexRef.value) {
                 flexRef.value.innerHTML = ''
               }
               flex2html("flex", state.flexContent)
+
             }
           } else {
             flexRef.value.innerHtml = ''
@@ -287,6 +267,46 @@ const showFlex = async (id) => {
       }
     }
 
+    //人脈紀錄
+    const showUserConn = ref(false)
+
+    async function saveConnection(data){
+      let connData = {
+        userid: data.user_id,
+        name: data.name,
+        nfcurl: data.nfcurl,
+        company: data.company,
+        title: data.title,
+        avatar: data.avatar,
+        time: dayjs().format('YYYY/MM/DD HH:mm')
+      }
+
+      let n_user_conn = []
+
+      if(localStorage.getItem('user_conn')){
+        //移除加入過的資料
+        let i = 0
+        let t_connData = JSON.parse(localStorage.getItem('user_conn')).filter(item=>{
+          i++
+          return item.userid !=connData.userid && i < 5
+        })
+
+        n_user_conn = [connData,...t_connData]
+      }else{
+        n_user_conn = [connData]
+      }
+
+      localStorage.setItem('user_conn',JSON.stringify(n_user_conn)) 
+
+      if(Cookies.get('token')){
+        let res = await uploadUserConnections(JSON.stringify(n_user_conn))
+        if(res.code === 200){
+          uc_temp.value = n_user_conn
+        }
+      }
+    }
+
+    
     const userConnections = computed(()=>{
       if(uc_temp.value && uc_temp.value.length > 0){
         return uc_temp.value 
@@ -294,10 +314,42 @@ const userConnections = computed(() => {
       return JSON.parse(localStorage.getItem('user_conn'))
     })
 
-const {user} = toRefs(state)
+    const goUC = (url)=>{
+      showUserConn.value = false
+      window.location.href = url + '&nouc=1'
+      // window.location.href = url
+    }
 
-</script>
+    const handleAddFavorite = async (userid)=>{
+      if(!Cookies.get('token')){
+        return Toast('您尚未登入Slash會員中心，請按左上角Slash會員中心登入或加入')
+      }
+      let res = await addFavorite(state.user.user_id)
+      if(res.code === 200){
+        return Toast('收藏成功')
+      }      
+    }
 
+    const goSlash=()=>{
+      window.location.href = 'https://card.slash1000.com/home/?refer=' + state.user.code
+    }
+
+    return {
+      ...toRefs(state),
+      showUserConn,
+      activeName,
+      cid,
+      nolog,
+      flexRef,
+      isIOs,
+      userConnections,
+      goUC,
+      goSlash,
+      handleAddFavorite
+    }
+  }
+}
+</script>
 <style lang="less" scoped>
 [v-cloak] {
   display: none;

vue.config.js

@@ -5,8 +5,7 @@ module.exports = {
   publicPath: ["production", "u168", "stage", "slash"].includes(process.env.VUE_ENV)
     ? "/card"
     : "/card",
-  outputDir:
+  outputDir: ["production", "u168", "slash"].includes(process.env.VUE_ENV)
-  ["production", "u168", "slash"].includes(process.env.VUE_ENV)
+      ? "../api/public/card"
-      ? "../build/card"
+      : "./dist"
-      : "./dist",
 };