diff --git a/src/api/index.js b/src/api/index.js
index 0ff48c4..83bcf10 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -85,3 +85,9 @@ export const getUserFaviList = async (params) =>
export const addUserFavi = async (params) =>
ajax(`/UserFavi/addUserFavi`, params , "POST");
+export const getUserCateList = async () =>
+ ajax(`/UserCate/getUserCateList`);
+
+export const updateUserCate = async (params) =>
+ ajax(`/UserCate/updateUserCate`, params , "POST");
+
diff --git a/src/assets/css/main.css b/src/assets/css/main.css
index 8065886..fddbdaa 100644
--- a/src/assets/css/main.css
+++ b/src/assets/css/main.css
@@ -541,8 +541,17 @@ h1, h2, h3, h4, h5, h6 {
}
/* ========================================= vant ============================================= */
+.van-nav-bar {
+ position: sticky;
+ top: 0;
+ z-index: 10001;
+}
+
.van-notice-bar {
+ position: sticky;
+ top: 78px;
font-size: 18px;
+ z-index: 10000;
}
.van-popup.van-toast {
@@ -704,6 +713,12 @@ h1, h2, h3, h4, h5, h6 {
object-fit: cover;
}
+.bottomBtnCnt {
+ padding: 15px;
+ background: -webkit-gradient(linear, left bottom, left top, from(#b2c4ce), color-stop(80%, #b2c4ce), color-stop(90%, rgba(178, 196, 206, 0.5)), to(rgba(178, 196, 206, 0)));
+ background: linear-gradient(to top, #b2c4ce 0%, #b2c4ce 80%, rgba(178, 196, 206, 0.5) 90%, rgba(178, 196, 206, 0) 100%);
+}
+
/*!
* Font Awesome Free 6.4.2 by @fontawesome - https://fontawesome.com
* License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
diff --git a/src/assets/sass/layout/_layout.scss b/src/assets/sass/layout/_layout.scss
index d179cf1..0ceec24 100644
--- a/src/assets/sass/layout/_layout.scss
+++ b/src/assets/sass/layout/_layout.scss
@@ -4,10 +4,21 @@
/* ========================================= vant ============================================= */
+
+.van-nav-bar{
+ position: sticky;
+ top:0;
+ z-index: 10001;
+}
+
.van-notice-bar{
+ position: sticky;
+ top:78px;
font-size: 18px;
+ z-index: 10000;
}
+
.van-popup{
&.van-toast{
display: flex;
@@ -153,6 +164,11 @@
}
}
+.bottomBtnCnt{
+ padding: 15px;
+ background: linear-gradient(to top,#b2c4ce 0%,#b2c4ce 80%,rgba(178,196,206,.5) 90%,rgba(178,196,206,0) 100%);
+}
+
diff --git a/src/views/Address/index.vue b/src/views/Address/index.vue
index 3b04f75..5b10e79 100644
--- a/src/views/Address/index.vue
+++ b/src/views/Address/index.vue
@@ -1,59 +1,208 @@
-
+
-
+
-
+
-
-
+
-
+
-
+
{{ item.real_name }}
-
@{{ item.introduction }}
+
@{{ item.line }}
+
+
+
@@ -105,65 +256,220 @@ const elitelist = ref([
+
+
+
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+
+
+
+
+ 前移
+ 後移
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增按鈕
+
+
+
+
+
+
+
+
+
diff --git a/src/views/Card/Edit.vue b/src/views/Card/Edit.vue
index 555bc67..76857a5 100644
--- a/src/views/Card/Edit.vue
+++ b/src/views/Card/Edit.vue
@@ -98,8 +98,7 @@ const sizeColumns = ref([
{ text: "5xl", value: "5xl" },
]);
-watch(
- () => form.value.title,
+watch(() => form.value.title,
(newVal) => {
form.value.json5.altText = newVal;
}
@@ -301,33 +300,33 @@ const handleSubmit = async () => {
-
-
-
- 商務卡片設定
-
-
-
-
-
-
-
-
-
-
+
+ 商務卡片設定
+
+
+
+
+
+
+
+
+
+
+
卡片設定
-
+
{
-
-
-
-
-
卡片設定
-
-
-
- 前移
- 後移
-
-
-
-
-
-
-
-
-
-
-
內容圖片設定
-
-
- 卡片設定
+
+
+
+ 前移
+ 後移
+
+
+
+
+
+
+
+
+
+
+ 內容圖片設定
+
+
+
+
+
-
-
-
![]()
-
- 點擊更換圖片
-
-
-
-
-
-

-
- 請上傳圖片
-
-
-
-
-
-
-
-
+
+
![]()
+
+ 點擊更換圖片
+
+
+
+
+
+

+
+ 請上傳圖片
+
+
+
+
+
+
-
-
-
卡片標題
+
-
+
卡片標題
+
+
-
+
+
-
-
+
+
+
+
-
-
-
-
-
-
-
-
- 卡片說明文字
+
+
-
+ 卡片說明文字
+
+
-
+
+
-
-
+
+
+
+
-
-
-
-
-
-
-
-
+
+
新增按鈕
新增分享按鈕
{
-
-
-
- 名片確認 & 建立
-
-
-
-
+
+
+
+ 名片確認 & 建立
+
+
+
+
diff --git a/src/views/Home/index.vue b/src/views/Home/index.vue
index de49092..fab089d 100644
--- a/src/views/Home/index.vue
+++ b/src/views/Home/index.vue
@@ -425,12 +425,14 @@ const handleLogout = () => {
-
-
- 發送名片
-
+
+
+
+ 發送名片
+
+
+
-
diff --git a/src/views/Member/index.vue b/src/views/Member/index.vue
index 64e6192..66ef757 100644
--- a/src/views/Member/index.vue
+++ b/src/views/Member/index.vue
@@ -32,8 +32,6 @@ const router = useRouter()
const form = ref({ addon: [] })
-const uInfoForm = ref({ addon: [] })
-
const genderChecked = ref()
const resourceActive = ref('1');
@@ -78,24 +76,16 @@ const crop = ref({
onMounted(async () => {
let userRes = await getUserInfo()
if (userRes.code === 200) {
- uInfoForm.value = userRes.data
- console.log("userRes:",userRes)
+ form.value = userRes.data
}
- // let userExtraRes = await getUserExtra()
- // console.log(userExtraRes.code)
- // if (userExtraRes.code === 200) {
- // // form.value = userExtraRes.data
- // console.log("userExtraRes:",userExtraRes)
- // }
-
//取得區域資料
let areaRes = await getAreaList()
if (areaRes.code === 200) {
areaColumns.value = areaRes.data
//取得區域名稱
if (areaRes.data.length > 0) {
- areaName.value = _.find(areaRes.data, { value: uInfoForm.value.area }).text
+ areaName.value = _.find(areaRes.data, { value: form.value.area }).text
}
}
@@ -106,7 +96,7 @@ onMounted(async () => {
workColumns.value = workRes.data
//取得工作性質名稱
if (workRes.data.length > 0) {
- workName.value = _.find(workRes.data, { value: uInfoForm.value.work }).text
+ workName.value = _.find(workRes.data, { value: form.value.work }).text
}
}
@@ -195,27 +185,10 @@ const onSubmit = async () => {
message: '資料更新中...',
forbidClick: true,
});
- // console.log(form.value,"test");
- let res = await updateCard(form.value)
- if (res.code === 200) {
- showSuccessToast('更新成功')
- router.push('/member')
- } else {
- showToast.fail('更新失敗')
- }
-};
-
-const userInfoSubmit = async (values) => {
- showLoadingToast({
- duration: 0,
- message: '資料更新中...',
- forbidClick: true,
- });
-
- let res = await updateUserInfo(values)
+ console.log(form.value,"test");
+ let res = await getUserInfo(form.value)
if (res.code === 200) {
showSuccessToast('更新成功')
- userStore.getUserData();
router.push('/member')
} else {
showToast.fail('更新失敗')
@@ -226,28 +199,13 @@ const searchChecked = ref(true);
const searchOnUpdateValue = (newValue) => {
showConfirmDialog({
title: '提醒',
- message: '是否切换开关?',
+ message: '是否切换開關?',
}).then(() => {
searchChecked.value = newValue;
});
};
-const userExtraSubmit = async (values) => {
- // showLoadingToast({
- // duration: 0,
- // message: '資料更新中...',
- // forbidClick: true,
- // });
- let res = await updateUserExtra(values)
- if (res.code === 200) {
- showSuccessToast('更新成功')
- // router.push('/member')
- } else {
- showFailToast('更新失敗')
- }
-};
-
// 區域
const showAreaPicker = ref(false);
const areaColumns = ref([]);
@@ -255,7 +213,7 @@ const areaName = ref('');
const onAreaConfirm = (value) => {
areaName.value = value.selectedOptions[0].text
- uInfoForm.area = value.selectedOptions[0].value
+ form.value.area = value.selectedOptions[0].value
showAreaPicker.value = false
}
@@ -266,45 +224,12 @@ const workName = ref('');
const onWorkConfirm = (value) => {
workName.value = value.selectedOptions[0].text
- uInfoForm.work = value.selectedOptions[0].value
+ form.value.work = value.selectedOptions[0].value
showAreaPicker.value = false
}
// END: 基本資料
-// START: 社群分享
-
-const userLinkSubmit = async (values) => {
- // showLoadingToast({
- // duration: 0,
- // message: '資料更新中...',
- // forbidClick: true,
- // });
- let res = await updateUserLink(values)
- if (res.code === 200) {
- showSuccessToast('更新成功')
- // router.push('/member')
- } else {
- showFailToast('更新失敗')
- }
-};
-
-const userAddonSubmit = async (values) => {
- // showLoadingToast({
- // duration: 0,
- // message: '資料更新中...',
- // forbidClick: true,
- // });
- console.log(form.value.addon)
- let res = await updateUserAddon(form.value.addon)
- if (res.code === 200) {
- showSuccessToast('更新成功')
- } else {
- showFailToast('更新失敗')
- }
-};
-
-// END: 社群分享
@@ -340,6 +265,7 @@ const handleSearch = async () => {
let res = await searchConnection(search.value);
if (res.code === 200) {
tab2list.value = res.data;
+ console.log(tab2list.value)
}
};
@@ -452,12 +378,12 @@ const handleChangeTplSubmit = async() => {
-
-
+
+
-
![]()
+
上傳圖片,預設為Line頭像
@@ -465,38 +391,38 @@ const handleChangeTplSubmit = async() => {
-
-
-
-
-
+
-
-
-
-
+
+
-
+
男
女
-
-
@@ -508,20 +434,10 @@ const handleChangeTplSubmit = async() => {
-
-
-
+
+
-
-
- 確認修改
-
-
-
-
-
-
-
+
人脈資訊
@@ -560,19 +476,19 @@ const handleChangeTplSubmit = async() => {
+
-
-
- 確認修改
-
+
+
+ 確認修改
-
-
+
+
-
-
+
+
@@ -580,23 +496,15 @@ const handleChangeTplSubmit = async() => {
+
-
-
- 確認修改
-
-
-
-
-
-
-
+
相關連結
-
+
新增連結
@@ -604,7 +512,7 @@ const handleChangeTplSubmit = async() => {
-
@@ -620,36 +528,14 @@ const handleChangeTplSubmit = async() => {
@click="onMoveBtn(1, idx)">
+
-
-
-
-
- 確認修改
-
+
+
+ 確認修改
-
-
+
+
@@ -744,37 +630,37 @@ const handleChangeTplSubmit = async() => {
-
-
+
+
+
-
-
- 確認修改
-
-
-
-
-
-
-
-
- NFC感應式版型切換
-
-
+
+
+
+ NFC感應式版型切換
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+ 確認修改
+
+
+
@@ -803,7 +689,8 @@ const handleChangeTplSubmit = async() => {
.member{
.content{
min-height: calc(100vh - 142px);
- }
+ padding-bottom: 0;
+ }
.cnt2 {
.van-list {
.list-item {
@@ -865,7 +752,7 @@ const handleChangeTplSubmit = async() => {
.cnt3 {
.block {
- height: 500px;
+ height: 110vw;
text-align: center;
background-color: #000;
padding: 20px 35px;
diff --git a/src/views/Send/index.vue b/src/views/Send/index.vue
index ffd6c29..702a1a6 100644
--- a/src/views/Send/index.vue
+++ b/src/views/Send/index.vue
@@ -205,7 +205,7 @@ const changeTpl = async (val) => {
-
+
名片分享
@@ -216,7 +216,7 @@ const changeTpl = async (val) => {
-
+
@@ -260,15 +260,17 @@ const changeTpl = async (val) => {
上面圖內「分享」無效,請點下列「分享」
-
-
-
- 分享好友
-
-
- 切換樣版
-
-
+
+
+
+
+ 分享好友
+
+
+ 切換樣版
+
+
+