diff --git a/src/api/index.js b/src/api/index.js index 12e160b..149f2aa 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -76,6 +76,9 @@ export const getMarquee = async () => ajax(`/ads/getMarquee`); //通訊錄 +export const getUserFaviList = async (params) => + ajax(`/UserFavi/getUserFaviList`, params , "GET"); + export const addUserFavi = async (params) => ajax(`/UserFavi/addUserFavi`, params , "POST"); diff --git a/src/views/Address/index.vue b/src/views/Address/index.vue index 0b72cbc..3b04f75 100644 --- a/src/views/Address/index.vue +++ b/src/views/Address/index.vue @@ -3,11 +3,50 @@ import liff from "@line/liff"; import { showToast,showSuccessToast } from 'vant'; +import { getUserFaviList, updateUserInfo, updateCard, searchConnection, addUserFavi, setUserNfcTpl } from '@/api' + import { onMounted, reactive, ref, toRefs, computed, watch } from 'vue' const setShowPicker = ref(false); +const selectVal1 = ref(0); +const selectVal2 = ref('a'); +const selectOpt1 = [ + { text: '全部商品', value: 0 }, + { text: '新款商品', value: 1 }, + { text: '活动商品', value: 2 }, +]; +const selectOpt2 = [ + { text: '默认排序', value: 'a' }, + { text: '好评排序', value: 'b' }, + { text: '销量排序', value: 'c' }, +]; + +const elitelist = ref([ + { + avatar:"https://fakeimg.pl/250x100/", + real_name:"樹林李敏鎬", + introduction:"test", + }, + { + avatar:"https://fakeimg.pl/250x100/", + real_name:"樹林李敏鎬", + introduction:"test", + }, + { + avatar:"https://fakeimg.pl/250x100/", + real_name:"樹林李敏鎬", + introduction:"test", + }, +]); + +// let res = await getUserFaviList(); +// if (res.code === 200) { +// elitelist.value.data = res.data; + +// console.log(elitelist) +// } @@ -28,23 +67,103 @@ const setShowPicker = ref(false); + - - - +
+ + + + + + + + + + + +
+
+
+
+
{{ item.real_name }}
+
@{{ item.introduction }}
+
+
+
+ +
+
+
+
+ +
+
+
diff --git a/src/views/Home/index.vue b/src/views/Home/index.vue index 8b04371..de49092 100644 --- a/src/views/Home/index.vue +++ b/src/views/Home/index.vue @@ -25,6 +25,7 @@ const cardStore = useCardStore(); const showShare = ref(false); const showNfcQrcode = ref(false); +const showQrcode = ref(false); const checked = ref(true); const imageUrl = ref(import.meta.env.VITE_APP_BASE_URL); @@ -134,33 +135,27 @@ const noticeClick = (num) => { window.open(url, "_blank"); }; -const handleAD = async () => { - - if(userInfo.value.status === 1){ - return; - } - let res; - res = await getMarquee(); - if (res.code === 200) { - noticeData.value = res.data; - } - - res = await getMovie(); +const handleAD = async () => { + console.log(userInfo.value); + if(userInfo.value.status !== 1){ + let res; + res = await getMarquee(); + if (res.code === 200) { + noticeData.value = res.data; + } - if (res.code === 200) { - adData.value = res.data; - if (sessionStorage.getItem("isAdShow") == null) { + res = await getMovie(); + if (res.code === 200) { + adData.value = res.data; popShow.value = true; } - } + } }; -// sessionStorage.setItem("isAdShow",false); + const popShow = ref(false); const modalClose = ref(false); const closeShow = () => { - sessionStorage.setItem("isAdShow", userInfo.value.level_name); - modalClose.value = true; }; @@ -218,6 +213,10 @@ const onSelect = (option) => { showShare.value = false; }; +const handleShow = () => { + showQrcode.value = true; +}; + const handleShowNfc = () => { showNfcQrcode.value = true; }; @@ -252,7 +251,6 @@ const handleLogout = () => { } sessionStorage.removeItem("token"); sessionStorage.removeItem("uid"); - sessionStorage.removeItem("isAdShow"); router.push("/login"); }; @@ -302,11 +300,11 @@ const handleLogout = () => {
{{ userInfo.company }}
-
+
@@ -351,15 +349,27 @@ const handleLogout = () => { - - - + + + - - - + + + @@ -424,7 +434,14 @@ const handleLogout = () => {
- +
+ +
+
+ +
diff --git a/src/views/Member/index.vue b/src/views/Member/index.vue index c971cbd..8aaef0b 100644 --- a/src/views/Member/index.vue +++ b/src/views/Member/index.vue @@ -797,6 +797,10 @@ const handleChangeTplSubmit = async() => {