From e4b9ea534ac3791c18394250cdb4789b534c02f9 Mon Sep 17 00:00:00 2001 From: Wayne Date: Thu, 16 Nov 2023 12:30:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E8=83=8D=E8=B3=87?= =?UTF-8?q?=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bun.lockb | Bin 178446 -> 178931 bytes src/App.vue | 32 +-- src/api/index.js | 4 +- src/router/index.js | 2 +- src/views/Home/index.vue.bak | 449 ----------------------------------- src/views/Member/index.vue | 83 ++++--- vite.config.js | 2 +- 7 files changed, 72 insertions(+), 500 deletions(-) delete mode 100644 src/views/Home/index.vue.bak diff --git a/bun.lockb b/bun.lockb index 6c8a776283a0a7e0e82c7677e57fb7f9079eae96..2f1765790de0fc6586a5292410335cc0a740198b 100755 GIT binary patch delta 8926 zcmeI2d30699mnszff7K%P6&&EfB}L82%zjj2s^S9ARfvt`y$99f-h(R6Su#}}#o3`3Yj~rQQi?a3eeeaj!Yn$d&kNQ{UzxmDFd3Txj z<~Lb+t<3e$%dAdrG$${s?ci0_Do*-sleo&q_LaJPYRid^J;n^|S^ww9Hs-WBKlYI4 zC>>ifG~R2T{o4HMG0~5YpEY~@EXO&pI;Kuc^wp;`?(V4Pc0RDb){keFZsjRri<6`I#GKWiI81C$C=`Sl9bhE)UYYvupen&D3} z5C?TU$Q-3!@b=31fUN0e{W_{)41=;T*4j&}z&tBU)&G1eOVw_HmC@jyRdK<+tD*IT72S4aORjns6DH7!ha%B|o9Yp;n7-KOp4U6|^F?6i8R%6qIV z)!Fuf?5~1Sq^f>@$QsuAd}H8^j20hRstR{j7j2Y-Vfz!gxE>dO7y z^oHpzRDK?v>b{mm)n5#%%TU4P{K{0qPzsGh)gT_Nh&DsjaZ6Mkbg=p^s518Kn16e#FXBbu_}tQVnP{D$^JaCD92g{GTeV9lQ z`Ey?65QqK@)v(`id2;k5I;ywoE&D)k=^SR2}})^aiTe@wS!kph{A8)f4e08)K`R8&uSPgH)rtiCX-t0xGKE~82-eEnOv#f!XZ{W@0Va+vbr0Ocn$F9>qVfB$J z(?YXHs{9vOyQfS8<|ox{e+E_mOQP(z8~M;W==)y_+2o}~kw*T#uZ8OCqm#5a(xoY0 z3l*=0iq}H_wg%Gcp*4|ajN-LWc%CX=3nlS5=!qy^3pwA)+NgLfRP-WEKU0g>LXm4A zE=Xu?q@OLtYoX$`kk&?Z^-vVHNGh-wuZ8~iS}1sPSBC2xNZ&nUQ=doItjS-Pb<;^Z zIiSJ4H=CqsQvrr4 zLpp3WZ3j&APiMQ812gP7IAT?msrrL;n{Bo#*luDAoziSov30bz3S9FS3NWrlmGaCM zOTIIH@;{1AO`f$#_qKOkzh91fpFcCl9p}Y4{@ENivC<^Yq!oH5EQY6}{5v^ra^iaI zu}~f2pa#@}+MwGP4|P31J=a|tIL%pp1AAaQybL=)n|DJ&TYG~+%iVs^AL>9|NPv3K z3wlEz=m81})C7fC9|HwqXTlVi3W}OHf<%wlh$2n*Lz5^!BhRgo(whoJsTJCahq{me zTJS4Op^(M`coM2W)hK^=o|{~CD{Z!c9=n%e2ki7O=ea{;o+GPG)wa;i@dqAt6Nit) z)&&%K*HfuIizToOw4HDQ-h*GmPS73JlbQ_L`Pv7sz)si&yI~j%_dhu5#wUy+n*?1T z4N{;5OygAg0i5Ld)sDHzfp&a?0hIeeUr?Yf5fq3~kY+e!zz7%#qd~E#A)w%3KZu43 zpg`{%@FpCDU9cBkh5evSg$Lk4Xaj9M?wt0vIzea94&F~;0c?erU<-_eaWEbxz(kk~ zQ(!7ggXwp{_qaIM<5&Yp5{Ux9E0O< z0^WmPf@0Qh!(mVeu@kCoDD9y2S7dV_nL#iZ(m^luaA2Nxw11ZdU11x8TnFnx8^jA? z5olBS2^d7jNt{3tHiB`^G?)&W1!lsB)a&j46cjH00=`saT`}dWa1E}*DL4&hLDRrP z(2@K&1~DEUg~vd9dD{2Wf?12_p3oh%Pwc}+co9~@D$w+yo$E|k49~!i^d+zamcl2T zBp?0+ci=8)QgLA-9Z!PE&<7rdwNxv@uBf|*Pa1Ru?FmkU>F_aibwCq-GIcMZEubZ6 z`(;dTjGB}?;yj5Ce??wg``a-*{ zOjDVQk5|mR5*%Tb7N z8JDk6(=0iK%B+6p-0>NHYK%A0f4#ZavdkyCETkSS{cFv=G{1F%8hT_@5bhqAV& Zcte)>wPtvg-Ijjcjb1|5jV!O4`!81MMb7{L delta 8624 zcmeI1d2m(L9mnr|L5)$uCcMM~30qh!K?p_G5Fmhn3Hz2|lzo#WksXDH8wEF@x8$N0 z9S8`r)}jWgk$p*Pr&UIvDy6k(>C^&Zt+k5u^S$p!`y4YFaLV+L=1e~Kd(Q8i^E>Bm z=jHtFr=KM}bs=GSdefsH?Z5Ew^ZC1$tPMT>Vb4Zcc@GsN966TT`iaiD@&m5~PDtd740dTacd)pcJDK$HmYwFh^AbcL8-^vO$t+0zE+OdxBC~ zs&>7C+Nf%xIadC*G8HxG4{|)f8cOA8kd@0)*K58k#p}4ND#TAx>!ENHjJ96VTVS@8 zr5a_9m8I%8&&pS#u2-_GaXVd{1#lxQ26_Di;yz-!o<}OXYvHwR_HS+6PU^T)lc1pKDxC(^v!2qQJ*D)%9{#guM|f z;v*V(gSC*VyvfQ^O?)%Rz73RORrT8gYg8MOKWgPzRsUn4_Qy?6I8G#R{GJ)!M=Qgh z;d(d+N>W|PPfb5J{Ss9>7q7a{38)6DjOx^@m{vn?pqzxNeOF4Q>r6RVm~J`L5jz&Zr#m8?news`RowU}uwW?2iVva>np zTI$sFsy~LR{S&CBupHIR@KOGpRUEXuzJzMZFQa-0_NvlUm*5a(`FqRdsgc8@7^Lr@ zYVfYG;Y8KgMm&Q}R%gR#q z%Td`|y)wo7xG2dxy)ub+!f^&-RmETq`hmJfh5xe3uTD|3oMQgb-odn{V$k%aSw*bM zlyCO()b+L&hP^int9m!DkB`)%*HY{CKhWT^ey0iOZ75{o)zOWp9@ZVG-lCt|36-b1 zz9pgP_+%&rhHq;XOmA9!d8!+C%-TtHpN^ZJKvnfF2Mv7E%BQqw$nXKG4u3?IVpaCj zR{x>ZOV#g;m19+}>&Ir7s@*wMZ_{U}{QccD@;Mp3eqWj4BB~^nBbVNCP)UcYRJppI ze!4Z)Q2DEAeoP~QK{KjFh3b;6fm9vpSh+0K#OqV9ff`ynsmf`n{5CebRQ9H3Zx-0O z|Iy4hRRgEfKo41mpy4%AJ%42lpqY1MV2$0`CLq-rbV2o$--)VSFRTA9dZW%XM~=KY zFNTA+p`W=cOLf5qTfJ1n53#aTcX|{m(^#{Yr#g*$X{SfCAkMiJ2{OTX&Y(gA%#1?6K;47oUxur9%wC4! zqI(;i?6u$03=GCAb8n-Ep<+wpMK4grmZoA$qpgjWiHa=^3$KtX@u+Ucy-hCXZ!`- z-9GOA;?nN!oCbdCP2g`c z$IQ0b+USM#%(lgBdRgn3Z7ViqwQ*EbOMbUoJ8k;bMcYN3pPErS!j{%q!B2HifUdnV zq@S5hvCNS&kan0&zcUH}DJfv8F4~daflYp2F`I(TomEMC6^+vu7+u3X)_E63WfP$v zd3AUV<pf_1PSUVy_Vg$LcVab2la zELsnrg5C|FAt<8%2rLFg+Ydu2{0cUJZmJ&6=CB!mTVN|}fQ|4X@OU}HAkV*e&`r6u zDcP>j4O&7gn8Hvk;{41*ZhE92`CL#CTH&llumBXw7zV>(1l$cHL6Mq4pb%Ov+yGTT z@50OQ3h3kRM%WD7U^^(({sU+OZJ`|y-|y-)A)|o5zWnG#$pUQ#^)YT9tbw)gJdB1h zFc!wc1eoO4JM7koOedQU1#lnCfSE80x@8yQV17c$f&2VKj^ZMVb0S32oni z-LMDt!ag_v2jMW3!Y@E!-`7HX5P6-9qHCQ|{nOqQ?&Dl?p)d4@0Wc5-gWl_5FdX!? zs~coP5tCI^;Kwi@?uQ3p4$OrC^36DkO(~qEwP0$T-|UE+5IISm7J$Eig0266FF+C5 z^Y95=fM3IJ;2qFHkO`g0k74|=Fb?$nNguuRrA%8=ZBOrn9-t4bh2X;~coLq{w?wTV z`sSfP%V1!P_;$pz5buXGn|rt`w6#AvX+i8weO9*)Z?qXzn;Hb>l8nI z!X20AkIx9TPH3ysC9P`ZugeH!`yXY5Mu(4>akgGX64Ps&ncA}Ogqu`6r*-J|M~mOz I6$-om0 - + - - + + \ No newline at end of file diff --git a/src/api/index.js b/src/api/index.js index 8693fe2..12e160b 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -25,8 +25,8 @@ export const setUserTpl = async (tpl) => export const toggleSendWithAD = async (type) => ajax(`/user/toggleSendWithAD`, { type }, "POST"); -export const searchConnection = async (type) => - ajax(`/user/searchConnection`, { type }, "POST"); +export const searchConnection = async (params) => + ajax(`/user/searchConnection`, params, "POST"); export const setUserNfcTpl = async (tpl) => ajax(`/user/setUserNfcTpl`, { tpl }, "POST"); diff --git a/src/router/index.js b/src/router/index.js index b4aa399..471b2b4 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -131,7 +131,7 @@ const routes = [ ]; const router = createRouter({ - history: createWebHistory(import.meta.env.BASE_URL), + history: createWebHistory('/home'), routes, }); diff --git a/src/views/Home/index.vue.bak b/src/views/Home/index.vue.bak deleted file mode 100644 index f22462c..0000000 --- a/src/views/Home/index.vue.bak +++ /dev/null @@ -1,449 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/views/Member/index.vue b/src/views/Member/index.vue index 3e5c350..749b5f2 100644 --- a/src/views/Member/index.vue +++ b/src/views/Member/index.vue @@ -191,33 +191,49 @@ const searchOnUpdateValue = (newValue) => { }); }; -const tab2result = ref(''); +// START: 人脈資源 + +const search = ref({ + type: 0, + keyword: '', +}) + +const tab2result = ref('你所需要的資源'); const tab2showPicker = ref(false); const tab2columns = [ - { text: '台北', value: 'Taipei' }, - { text: '桃園', value: 'Taoyuan' }, - { text: '台中', value: 'Taichung' }, - { text: '彰化', value: 'Changhua' }, - { text: '高雄', value: 'Kaohsiung' }, + { text: '你所需要的資源', value: 0 }, + { text: '你能提供的資源', value: 1 }, ]; +const tab2OnConfirm = ({ selectedOptions }) => { + tab2result.value = selectedOptions[0].text; + search.value.type = selectedOptions[0].value; + tab2showPicker.value = false; + handleSearch(); +}; + +const tab2OnSearch = async () => { + handleSearch(); +}; + +const handleSearch = async () => { + let res = await searchConnection(search.value); + if(res.code===200){ + tab2list.value = res.data; + } + + // res = await addUserFavi({uf_user_id:form.value.user_id}); + // // console.log(res); + // if(res.code===200){ + // tab2AddFriend.value = res.data; + // } +}; + const tab2list = ref([]); const tab2Loading = ref(false); const tab2Finished = ref(false); const tab2TodoLists = ref([]); const tab2AddFriend = ref([]); -onBeforeMount(async () => { - let res = await searchConnection(); - if(res.code===200){ - tab2list.value = res.data; - } - - res = await addUserFavi({uf_user_id:form.value.user_id}); - // console.log(res); - if(res.code===200){ - tab2AddFriend.value = res.data; - } -}); const tab2ListonLoad = () => { // 异步更新数据 @@ -237,16 +253,21 @@ const tab2ListonLoad = () => { // }, 1000); }; -const tab2OnConfirm = ({ selectedOptions }) => { - tab2result.value = selectedOptions[0]?.text; - tab2showPicker.value = false; -}; +const handleAddFavi = async (user_id) => { + let res = await addUserFavi({uf_user_id:user_id}); + if(res.code===200){ + return showToast({ + message: '已加入好友', + duration: 1000, + }); + } + return showToast({ + message: '加入失敗', + duration: 1000, + }); +} +// END: 人脈資源 -const tab2searchValue = ref(''); -const tab2OnSearch = () => { - // tab2TodoLists = tab2list.filter(tab2searchValue); - // console.log(tab2TodoLists) -}; const tab3list = ref([]); onBeforeMount(async () => { @@ -635,8 +656,8 @@ onBeforeMount(async () => { is-link readonly name="picker" - border="false" - placeholder="縣市" + :border="false" + placeholder="請選擇" @click="tab2showPicker = true" /> @@ -649,7 +670,7 @@ onBeforeMount(async () => { @@ -695,7 +716,7 @@ onBeforeMount(async () => { -
+
我能分享的資源
diff --git a/vite.config.js b/vite.config.js index 9da377d..56281ee 100644 --- a/vite.config.js +++ b/vite.config.js @@ -7,7 +7,7 @@ import { resolve } from 'path'; // https://vitejs.dev/config/ export default defineConfig(({ mode }) => { return { - base: '/home', + base: './', server: { host: '0.0.0.0', port: 5173,