From fca127b42b4d3cc1e97d7c77301bb789c120e665 Mon Sep 17 00:00:00 2001 From: Phoenix <64720302+Concur-max@users.noreply.github.com> Date: Fri, 16 May 2025 09:48:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BB=84=E4=BB=B6=EF=BC=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9ENCheckbox=E6=94=AF=E6=8C=81=EF=BC=8C=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E4=BC=98=E5=8C=96ContactModal.vue?= =?UTF-8?q?=E5=92=8CMultiSelectFooter.vue=E4=B8=AD=E7=9A=84=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components.d.ts | 1 + src/assets/image/excel-icon.png | Bin 1140 -> 0 bytes src/assets/image/file-icon.png | Bin 1109 -> 0 bytes src/assets/image/pdf-icon.png | Bin 1133 -> 0 bytes src/assets/image/ppt-icon.png | Bin 1127 -> 0 bytes src/assets/image/word-icon.png | Bin 1149 -> 0 bytes src/components/user/ContactModal.vue | 44 +++--------------- src/utils/auth.js | 2 +- src/views/message/inner/TalkItem.vue | 4 +- .../message/inner/panel/MultiSelectFooter.vue | 1 + .../message/inner/panel/PanelContent.vue | 3 +- 11 files changed, 12 insertions(+), 43 deletions(-) delete mode 100644 src/assets/image/excel-icon.png delete mode 100644 src/assets/image/file-icon.png delete mode 100644 src/assets/image/pdf-icon.png delete mode 100644 src/assets/image/ppt-icon.png delete mode 100644 src/assets/image/word-icon.png diff --git a/components.d.ts b/components.d.ts index 3a98618..029ff3b 100644 --- a/components.d.ts +++ b/components.d.ts @@ -50,6 +50,7 @@ declare module 'vue' { MixedMessage: typeof import('./src/components/talk/message/MixedMessage.vue')['default'] NAvatar: typeof import('naive-ui')['NAvatar'] NButton: typeof import('naive-ui')['NButton'] + NCheckbox: typeof import('naive-ui')['NCheckbox'] NEmpty: typeof import('naive-ui')['NEmpty'] NIcon: typeof import('naive-ui')['NIcon'] NImage: typeof import('naive-ui')['NImage'] diff --git a/src/assets/image/excel-icon.png b/src/assets/image/excel-icon.png deleted file mode 100644 index f831d060dfa47f63b0b619f4055ede22747f4245..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1140 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 diff --git a/src/assets/image/ppt-icon.png b/src/assets/image/ppt-icon.png deleted file mode 100644 index 2498d710f6763c8cf301391554b4cb14770376ef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1127 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-HD>U{UmRaSW-5 zdpp-ZM>JIA*nZ<_OD=6tP~2g_62Y)fG9tsLXHz3<+e}Rz(@hBv51E9CADh}}%I(X; z$)y;$ZNY|1XLw9aHwc&tiL34V9%J$`KFR68434Cr7c!S7Ef>joFI#Yy zV-N2-%5mj!=0*Egst%1Wa_0Fk-tbuQki%xtuO-tPI@fGoJ?+Kjf{SlTW;e)v6e=+5 zJ|6N!Vq>f7f-dejrc)+$zDkxtX7lbc)VMQlvu77cI6YrD;f(zjhNHh5;x^h{ZJwyF z@4VsM#_1c@FHrQ@v--!r{|O8m?z&D@7iX|>XLOU(IKc5oVH%Uhff)^jHtG#bJ)9E9 zi-!hRPK|MXe_maU)J3)HGxJW(zyIdvm+i0D?J~2`-~5DIFsFRZ)%WwiZDovjVa!&` z+IlZW`d47X##F8a49QH#KF(p_GEhs9InNoP$F%CAdYQ!g(#WIyFE6OhuMc?l*Ky4$ z;n*;iHRh`=W=^|XyDqn4f0M?6)=%r6i(C+hcu~Z~;kzZ#o-2bxr^J%AMeWuGc~%n^ zv0ZbRoP=|4^fO5@amV^GF6=aWv;0?K)VH{jwOX5hWD8cNeYE-;wo2#c(Z`1j!{fT= zy$;X3SbUei&8T00x8DA+t6nztM%y_y{9dv3n)Ihl|35oTz4u*T+ir?he?Rl5F6(Kc z96;4{HZ8SEx*jY-0<`Hsn0^i_OniO zjyoN>MTM!Us-*m)e%kCayMyzbIZ;4yEiZePCcH_{p9TLt=(qdLXWz?b}y+f+GW0XMZ>|vTK?Zwy|Px? zw6phs)7;2L`-Wc*VPE?HhM%uid+=_N(c3rEJ&rL{nq65IbU@`Y}aSW-5 zdpp-ZLnK||*!=QEh9XNuylgu%GK{>J+J>-f-238Sw{O}uTaB*|7Pbq``W9f*InP$3 zBO#P)ZFsJ7+5Xt(0G8?%Tep09;5z$m!(V3B&ZEsrLU$`qA9L#|{e0GB{vNf@PiFjl zR=e;0_tVCw-MULy2_y3z~n0`2Mlyd6T1i&iapx=P$?|D-)Bakby? zyta)j3uMuMzPJ7LF5!Tq8JAU$7js?E@ROdb^g{hg0gKU>Ju|%zBs|*YIVR7SQZ+pK+ZIOf@=?;u-AJXlZZ!knNA7owe z%8(=PmfUMg&+r-rrR-<7eG3?8y1b6Q&l6kiCom&#@uXee0+roNJthGSf*q|?+S>wQrhC&-@2gYM8J&$iPa2cp2$ed>jXfR}aTw&J0)Wa!pd^4j+ zg3keqdAtLoH6nt=b~`)vmAe@_?v z5%ehQZ!x3Ymt{o zK5akCW`Awgw^I&L(ejRd&nmv1zw^mqk$KA9Y2CHjaeMxnv*-(a`meCy7qiPd<_OLN z=X;#1er$a?>3Uk+3z_Bbj0GjnRvTZ}o#U`fB6H`G&p+6I32)EZc_LrwMf8shzYl@| zN57`M-|N`(Hp9MZX=O}lHEYpFyUZ=l$8;8MW!_$Cm#b3?^NxpYw5*oHxGfb+T>s zqt&T=b*w-0V^(eD>{-uVUryp(E813TD zki)lo^HN*i(Elt?x}*1M^ZWPa?!EkWOB~~7^RTwpeB~sPZ&I1{an^LB{Ts5MED72 diff --git a/src/components/user/ContactModal.vue b/src/components/user/ContactModal.vue index e2595ef..0729140 100644 --- a/src/components/user/ContactModal.vue +++ b/src/components/user/ContactModal.vue @@ -1,7 +1,5 @@ - - diff --git a/src/utils/auth.js b/src/utils/auth.js index 7fee090..7496763 100644 --- a/src/utils/auth.js +++ b/src/utils/auth.js @@ -18,7 +18,7 @@ export function isLoggedIn() { */ export function getAccessToken() { // return storage.get(AccessToken) || '' - return JSON.parse(localStorage.getItem('token'))||'46d71a72d8d845ad7ed23eba9bdde260e635407190c2ce1bf7fd22088e41682ea07773ec65cae8946d2003f264d55961f96e0fc5da10eb96d3a348c1664e9644ce2108c311309f398ae8ea1b8200bfd490e5cb6e8c52c9e5d493cbabb163368f8351420451a631dbfa749829ee4cda49b77b5ed2d3dced5d0f2b7dd9ee76ba5465c84a17c23af040cd92b6b2a4ea48befbb5c729dcdad0a9c9668befe84074cc24f78899c1d947f8e7f94c7eda5325b8ed698df729e76febb98549ef3482ae942fb4f4a1c92d21836fa784728f0c5483aab2760a991b6b36e6b10c84f840a6433a6ecc31dee36e8f1c6158818bc89d228655b2039673c1108d29c13b75d1fc2bfd3d1071f49b461822d6c2a320ae711492ac514d1a31043c8b7f2d10ff9e3869928844485d0ed575b936311797f3446e4a6c7ee1d9a63aba9445bc8b41c89143' + return JSON.parse(localStorage.getItem('token'))||'46d71a72d8d845ad7ed23eba9bdde260e635407190c2ce1bf7fd22088e41682ea07773ec65cae8946d2003f264d55961f96e0fc5da10eb96d3a348c1664e9644ce2108c311309f398ae8ea1b8200bfd490e5cb6e8c52c9e5d493cbabb163368f8351420451a631dbfa749829ee4cda49b77b5ed2d3dced5d0f2b7dd9ee76ba5465c84a17c23af040cd92b6b2a4ea48befbb5c729dcdad0a9c9668befe84074cc24f78899c1d947f8e7f94c7eda5325b8ed698df729e76febb98549ef3482ae942fb4f4a1c92d21836fa784728f0c5483aab2760a991b6b36e6b10c84f840a6433a6ecc31dee36e8f1c6158818bc89d22851b5e2f6cbf01ab4b3da6e3d06b57c8f750e106226a5a4b9d7fc1d381a54cb92375c09ba1fa8e5fde0392d919c2f2cbcc7e4e2eca8d9860749af00374b249f7d04e2bc43a1fa4e7d7384dde0212f0a5' } /** diff --git a/src/views/message/inner/TalkItem.vue b/src/views/message/inner/TalkItem.vue index 35318f5..fd26310 100644 --- a/src/views/message/inner/TalkItem.vue +++ b/src/views/message/inner/TalkItem.vue @@ -28,9 +28,9 @@ const labelColor=[ :userName="data?.name" :customStyle="{width:'42px',height:'42px'}">
{{ labelColor.find(x=>x.group_type===data.group_type)?.label }}
-
+
diff --git a/src/views/message/inner/panel/MultiSelectFooter.vue b/src/views/message/inner/panel/MultiSelectFooter.vue index bb91c36..0dffd0b 100644 --- a/src/views/message/inner/panel/MultiSelectFooter.vue +++ b/src/views/message/inner/panel/MultiSelectFooter.vue @@ -111,6 +111,7 @@ const onContactModal = (data: { id: number; type: number }[]) => { v-if="isShowContactModal" v-on:close="isShowContactModal = false" v-on:on-submit="onContactModal" + :forward-mode="forwardMode" />