diff --git a/src/views/Login/actLogin.vue b/src/views/Login/actLogin.vue index f246a20..770c09b 100644 --- a/src/views/Login/actLogin.vue +++ b/src/views/Login/actLogin.vue @@ -87,6 +87,11 @@ if (!sessionStorage.getItem("token")) { // 未登入先要登入 } } -router.push(sessionStorage.getItem("redirect")); -sessionStorage.removeItem("redirect"); +// 如果存在redirect,就跳轉 +if (sessionStorage.getItem("redirect")){ + router.push(sessionStorage.getItem("redirect")); + sessionStorage.removeItem("redirect"); +}else{ + router.push("/"); +} diff --git a/src/views/Member/index.vue b/src/views/Member/index.vue index 6753a3e..0f56e8a 100644 --- a/src/views/Member/index.vue +++ b/src/views/Member/index.vue @@ -13,9 +13,9 @@ import { useRouter } from 'vue-router' import { showToast, showFailToast, showLoadingToast, showSuccessToast } from 'vant'; -import { getUserInfo, updateUserInfo, updateCard, searchConnection, addUserFavi, setUserNfcTpl } from '@/api' +import { getUserInfo, updateUserInfo, updateCard, searchConnection, addUserFavi, setUserNfcTpl } from '@/api' -import { updateUserExtra, updateUserLink, getUserExtra,updateUserAddon } from '@/api/user'; +import { updateUserExtra, updateUserLink, getUserExtra, updateUserAddon } from '@/api/user'; import { getAreaList, getWorkList } from '@/api/system'; import imgTp1 from '@/assets/images/tp/tp_1.jpg' @@ -76,7 +76,7 @@ const crop = ref({ onMounted(async () => { let userRes = await getUserInfo() if (userRes.code === 200) { - form.value = userRes.data + form.value = userRes.data } //取得區域資料 @@ -107,7 +107,7 @@ onMounted(async () => { // workName.value = '' // } const findRes = _.find(workRes.data, { value: form.value.work }) - if(findRes){ + if (findRes) { workName.value = findRes.text } } @@ -278,6 +278,11 @@ const tab2OnSearch = async () => { }; const handleSearch = async () => { + showLoadingToast({ + message: '人脈搜尋中...', + forbidClick: true, + }); + let res = await searchConnection(search.value); if (res.code === 200) { tab2list.value = res.data; @@ -360,7 +365,7 @@ const handleSelectTpl = (id) => { form.value.nfc_template = id } -const handleChangeTplSubmit = async() => { +const handleChangeTplSubmit = async () => { let res = await setUserNfcTpl(form.value.nfc_template); if (res.code === 200) { showSuccessToast('修改成功') @@ -394,7 +399,7 @@ const handleChangeTplSubmit = async() => { -
+
@@ -433,16 +438,18 @@ const handleChangeTplSubmit = async() => { - - + - + @@ -451,7 +458,7 @@ const handleChangeTplSubmit = async() => { - + @@ -500,9 +507,9 @@ const handleChangeTplSubmit = async() => { 確認修改
-
+
-
+
@@ -550,7 +557,7 @@ const handleChangeTplSubmit = async() => { 確認修改
-
+
@@ -560,22 +567,12 @@ const handleChangeTplSubmit = async() => { - + - +