diff --git a/src/router/index.js b/src/router/index.js
index fd28cfa..a63ff10 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -95,12 +95,12 @@ const routes = [
component: () => import("../views/Auth/GetAuth.vue"),
meta: { keepAlive: true },
},
- {
- path: "/auth/edit",
- name: "AuthEdit",
- component: () => import("../views/Auth/Edit.vue"),
- meta: { keepAlive: true },
- },
+ // {
+ // path: "/auth/edit",
+ // name: "AuthEdit",
+ // component: () => import("../views/Auth/Edit.vue"),
+ // meta: { keepAlive: true },
+ // },
{
path: "/auth/preview",
name: "AuthPreview",
diff --git a/src/views/Auth/Edit.vue b/src/views/Auth/Edit.vue
deleted file mode 100644
index 2859148..0000000
--- a/src/views/Auth/Edit.vue
+++ /dev/null
@@ -1,1038 +0,0 @@
-
-
-
-
-
-
- 會員編號:{{$route.query.user_id}}
-
-
-
-
-
- 預覽
-
-
-
-
-
-
-
-
-
-
-
- 與我的名片切換時顯示的文字。
-
-
-
-
-
- 與我的名片切換時顯示的文字。
-
-
-
-
-
-
-
-
-
-
-
-
- 20:13 1:1 6:8。
-
-
-
-
-
-
- 連結(需輸入完整網址,http://..,https://...)
-
-
-
-
-
-
- 請填寫卡片標題。
-
-
-
-
-
-
- 請填寫卡片說明。
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
- 請複製匯出的資料,或貼上之前的資料並點一下「匯入」按鈕。
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/Auth/GetAuth.vue b/src/views/Auth/GetAuth.vue
index 3ce2752..29c0142 100644
--- a/src/views/Auth/GetAuth.vue
+++ b/src/views/Auth/GetAuth.vue
@@ -14,7 +14,7 @@ onMounted(async()=>{
})
const handleEdit = (user_id)=>{
- router.push({path:'/auth/edit',query:{user_id: user_id}});
+ router.push({path:'/card',query:{user_id: user_id}});
}
@@ -44,7 +44,7 @@ const handleEdit = (user_id)=>{
| {{v.user_id}} |
{{v.auth_time}} |
- 刪除 |
+ 編輯 |
diff --git a/src/views/Card/Edit.vue b/src/views/Card/Edit.vue
index b09be4c..cab2447 100644
--- a/src/views/Card/Edit.vue
+++ b/src/views/Card/Edit.vue
@@ -2,23 +2,24 @@
import Footer from "@/components/Footer.vue";
import FlexView from "@/components/FlexView.vue";
-import { ref, watch, computed, nextTick } from "vue";
+import { ref, onMounted , watch, computed, nextTick } from "vue";
import { useCardStore } from '@/store/card'
-import { useRouter } from "vue-router";
+import { useRouter,useRoute } from "vue-router";
import axios from "axios";
import _ from "lodash";
import { showToast, showLoadingToast, showSuccessToast, showFailToast } from "vant";
-import { onMounted } from "vue";
+import { getCusCard, updateCusCard } from "@/api";
const URL = window.URL || window.webkitURL;
const cardStore = useCardStore();
+const route = useRoute();
const router = useRouter();
const showNfc = ref(false);
@@ -82,11 +83,25 @@ const defaultTheme = {
isShow: true
}
-
-onMounted(() => {
- if (cardStore.cusCard.cus_card && cardStore.cusCard.cus_card.length > 0) {
- form.value = JSON.parse(cardStore.cusCard.cus_card);
+const userid = ref(route.query.user_id || null)
+
+onMounted(async () => {
+
+ // 判斷query參數是否有userid
+ if(userid.value){
+ let res = await getCusCard( {userid: userid.value} )
+
+ if(res.code===200){
+ if(res.data.cus_card && res.data.cus_card.length>0){
+ form.value = JSON.parse(res.data.cus_card)
+ }
+ }
+ }else{
+ if (cardStore.cusCard.cus_card && cardStore.cusCard.cus_card.length > 0) {
+ form.value = JSON.parse(cardStore.cusCard.cus_card);
+ }
}
+
});
const sizeColumns = ref([
@@ -355,7 +370,13 @@ const onDescSizeConfirm = ({ selectedOptions }) => {
};
const handleSubmit = async () => {
- let user_id = sessionStorage.getItem("uid");
+ let user_id;
+
+ if(!userid.value){
+ user_id= sessionStorage.getItem("uid");
+ }else{
+ user_id = userid.value;
+ }
showLoadingToast({
duration: 0,
@@ -367,31 +388,43 @@ const handleSubmit = async () => {
card_title: form.value.title,
show_cus: form.value.showNfc,
cus_card: JSON.stringify(form.value),
+ user_id: user_id,
};
- let res = cardStore.updateCusCard(cusCard);
-
- if (res) {
- showSuccessToast("建立成功");
- } else {
- showFailToast("建立失敗");
+ if(!userid.value){
+ let res = cardStore.updateCusCard(cusCard);
+ if (res) {
+ showSuccessToast("建立成功");
+ } else {
+ showFailToast("建立失敗");
+ }
+ router.push("/card");
+
+ }else{
+ let res = await updateCusCard(cusCard);
+ if (res.code === 200) {
+ showSuccessToast("建立成功");
+ } else {
+ showFailToast("建立失敗");
+ }
+ router.push("/auth/getauth");
}
- // let res = await updateCusCard(cusCard);
+};
- // if (res.code === 200) {
- // cardStore.cusCard = cusCard;
- // showSuccessToast("建立成功");
- // } else {
- // showToast.fail("建立失敗");
- // }
- router.push("/card");
+const goBack = () => {
+ if(!userid.value){
+ router.push('/')
+ }else{
+ router.push('/auth/getauth')
+ }
};
+
-
+
商務卡片設定
@@ -411,7 +444,7 @@ const handleSubmit = async () => {
卡片設定
-
+
教學影片
{
allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
allowfullscreen>
-
+
diff --git a/src/views/Register/index.vue b/src/views/Register/index.vue
index cf569e7..6e6e607 100644
--- a/src/views/Register/index.vue
+++ b/src/views/Register/index.vue
@@ -7,8 +7,7 @@ import store from "@/store";
import router from "@/router";
import { useRoute } from "vue-router";
-import { showToast } from "vant";
-import { showLoadingToast,showSuccessToast } from 'vant';
+import { showToast, showLoadingToast,showSuccessToast } from 'vant';
import { Cropper } from "vue-advanced-cropper";
import "vue-advanced-cropper/dist/style.css";
@@ -120,11 +119,11 @@ const onSubmit = async () => {
const id_token = liff.getIDToken();
- showLoadingToast({
- duration: 0,
- message: "資料傳送中...",
- forbidClick: true,
- });
+ // showLoadingToast({
+ // duration: 0,
+ // message: "資料傳送中...",
+ // forbidClick: true,
+ // });
let regRes = await register({
line_id: profile.userId,
@@ -133,7 +132,9 @@ const onSubmit = async () => {
token: id_token,
...form.value,
});
- console.log(regRes.code,"regRes.code")
+
+ console.log("regRes.code",regRes)
+
if (regRes.code === 500) {
if (liff.isLoggedIn()) {
liff.logout();