From 659820d000778815594cfec2ecf5bd96d8ad3ade Mon Sep 17 00:00:00 2001 From: weiwei Date: Fri, 1 Aug 2025 18:52:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BF=E5=AE=A2=E9=82=80=E7=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/integrated/meeting/index.vue | 328 +++++++++--------- .../integrated/meeting/my-reservations.vue | 324 +++++++++-------- src/pages/integrated/visitor/invitation.vue | 255 ++++++++------ .../integrated/visitor/invitationRecord.vue | 40 ++- src/pages/tabbar/integrated.vue | 2 +- src/{ => sheep}/components/MeetingTabbar.vue | 0 src/sheep/components/tabSearch.vue | 31 -- .../{tabbar => page}/invitation-select.png | Bin src/static/{tabbar => page}/invitation.png | Bin src/static/page/order-select.png | Bin 0 -> 699 bytes src/static/page/order.png | Bin 0 -> 677 bytes 11 files changed, 509 insertions(+), 471 deletions(-) rename src/{ => sheep}/components/MeetingTabbar.vue (100%) delete mode 100644 src/sheep/components/tabSearch.vue rename src/static/{tabbar => page}/invitation-select.png (100%) rename src/static/{tabbar => page}/invitation.png (100%) create mode 100644 src/static/page/order-select.png create mode 100644 src/static/page/order.png diff --git a/src/pages/integrated/meeting/index.vue b/src/pages/integrated/meeting/index.vue index a64fbbd..03c6b78 100644 --- a/src/pages/integrated/meeting/index.vue +++ b/src/pages/integrated/meeting/index.vue @@ -1,238 +1,234 @@ + diff --git a/src/pages/integrated/meeting/my-reservations.vue b/src/pages/integrated/meeting/my-reservations.vue index efa48b8..d428983 100644 --- a/src/pages/integrated/meeting/my-reservations.vue +++ b/src/pages/integrated/meeting/my-reservations.vue @@ -1,58 +1,51 @@ \ No newline at end of file + diff --git a/src/pages/integrated/visitor/invitation.vue b/src/pages/integrated/visitor/invitation.vue index a3d5032..20897c2 100644 --- a/src/pages/integrated/visitor/invitation.vue +++ b/src/pages/integrated/visitor/invitation.vue @@ -5,50 +5,40 @@ 访客邀约 访客邀约请填写以下信息 - + - + + + + - - - - - - - - - - - - - + + + - + + @@ -82,107 +73,173 @@ 提交 + + + + + + + 确认提交吗? + + + diff --git a/src/pages/integrated/visitor/invitationRecord.vue b/src/pages/integrated/visitor/invitationRecord.vue index e22caf4..74075b6 100644 --- a/src/pages/integrated/visitor/invitationRecord.vue +++ b/src/pages/integrated/visitor/invitationRecord.vue @@ -15,7 +15,7 @@ @scroll="pageHook.scroll" > @@ -105,7 +119,7 @@ const tabs = [ const state = reactive({ params: { checkStatus: tabs[0].value, - type: 1, // type为1:主动申请 type为2:邀约 type为3:后台创建 + type: 2, // type为1:主动申请 type为2:邀约 type为3:后台创建 }, }) const pageRef = ref(null) @@ -147,10 +161,10 @@ const query = (page: number, pagesize: number) => { pageHook.startPage(page, pagesize, false, state.params) } -const onTabChange = (e: number) => { - state.params.type = e + 1 - pageRef.value.reload(false) -} +// const onTabChange = (e: number) => { +// state.params.type = e + 1 +// pageRef.value.reload(false) +// } // 审核通过/拒绝 const visitorCheck = async (id: string, checkStatus: number | string) => { @@ -168,7 +182,11 @@ const visitorCheck = async (id: string, checkStatus: number | string) => { } // 查看详情 -const goDetail = (v) => { - router.jump("/pages/invitation/detail", { id: v.id, token: v.token }) +const goDetail = (v: any) => { + router.jump("/pages/integrated/visitor/detail", { id: v.id, token: v.token }) +} + +const goInvitation = () => { + uni.redirectTo({ url: "/pages/integrated/visitor/invitation" }) } diff --git a/src/pages/tabbar/integrated.vue b/src/pages/tabbar/integrated.vue index 4e94054..3cde773 100644 --- a/src/pages/tabbar/integrated.vue +++ b/src/pages/tabbar/integrated.vue @@ -58,7 +58,7 @@ const services = [ }, { name: "visitor", - label: "访客管理", + label: "访客邀约", icon: "/src/static/icon/visitor.png", url: "/pages/integrated/visitor/invitation", }, diff --git a/src/components/MeetingTabbar.vue b/src/sheep/components/MeetingTabbar.vue similarity index 100% rename from src/components/MeetingTabbar.vue rename to src/sheep/components/MeetingTabbar.vue diff --git a/src/sheep/components/tabSearch.vue b/src/sheep/components/tabSearch.vue deleted file mode 100644 index 8594796..0000000 --- a/src/sheep/components/tabSearch.vue +++ /dev/null @@ -1,31 +0,0 @@ - - - diff --git a/src/static/tabbar/invitation-select.png b/src/static/page/invitation-select.png similarity index 100% rename from src/static/tabbar/invitation-select.png rename to src/static/page/invitation-select.png diff --git a/src/static/tabbar/invitation.png b/src/static/page/invitation.png similarity index 100% rename from src/static/tabbar/invitation.png rename to src/static/page/invitation.png diff --git a/src/static/page/order-select.png b/src/static/page/order-select.png new file mode 100644 index 0000000000000000000000000000000000000000..6315da23063b32f95baf9e5dd667a8ddff07e474 GIT binary patch literal 699 zcmV;s0!00ZP)Px%bxA})R9HvtnZIijVHn51&wFuD+et#3g1D(`byX)3oE*fVi(nmuq6lgme=MEU z#DdTcI>kXy5L_HY#7PA=^&e0{kZW{Qv5>s)S5AAmOLEEG<=(48FWbX?pXd49_kDPh z%L!6`%5xkmjhpYCH1d^OFCFsZiK;%QfMq`>IlEdf-Sgv0)w~5b?Zwza7ZeBE6wT`p@H%sXW~eal$0BO6t?|T<9mR(L_xQ0kYF{s~B204$-vD9n zwMgKpi`>gCd&IOWI6sOc}aBbCSlMrc!M`1>|T_z0Eyb z0O$I}LBI&)Lz<)gtK}4c?P>CC&2XBYnY5b}m>>i{Gg;T4JQh{Ymct`$i9t8m_fQ)W z7Qi;fB7cX8Ul4V~2CP>@6I&fI&-0vNTdc8lY|U_NBU^&a2~46T3U@|!k(dEcPLglS z;Y@qD_s_s#;017!W9`*!xWfcm0Pc?h>*WY=48V>g`L;$PNiQp!0@#X;Ly8m*|3?n% z6%m}x8z{Cual@@USHrsKmonG5)3o(tf$Rsm-y+2}u^{;KWKO=(CFl6p>(Yz`w$L-T h5~*J5Px%Ur9tkR9HvtnZJwFKorNnZ;~z4vyy8Bu~XaAR;@&^vJi`F1W%I5iXsStT3u%; zoMd;WISb(g!Nx*FtW>a5{{a>3#8SnB-Oba$&E0G+xtrOYtUoU4Chxs@pZU&9CNm*8 zUTK=ngkktihcWZ3BuP%{cCXjFN<>SBeIZGb`?{@^dJAAqx22Tig0Ph{b-Uf!EX#!1 zArb8kg5b5jM?~-X{r)B07DCJmA#NDJi^JjYiEg)At%uBfShoj*!O_gJDfjC8olfUO5Cks`za=Tt8{kI(&i@6#%Tmhqa?5$DN}>UFt>HC) zFAA?R^JN3z5P+LT`MhA}6~n#&;J9I5WaiI?J%1>xE-%1a^zYr&0DG6T&|#zSKcVm{ zfD5jq%zTT8)<1eI>wmEpFqCYPRkM)+Q8enl#TgTGe0Gr1K-W6u%pG0)pR}C}sE+Tqf zXAS#ewdu#pLuZr7m(R`w?gQvfAmKcKS<84Y3QzP}D;@@J1Kt2z&g_QUpHMij;Rnv7 z8v$nl?6ZvbQWBQAytp;MUSzC$i&QtH+5i7r688XHnWmIwxrpda9LKj!Tj>dWnx+TB zFnkQ)7=V$#NYfYuGv_<=H$f1bi=ybuw!qVX8aId2PrY%I_>B7n34511O(R_M00000 LNkvXXu0mjf;WR>Q literal 0 HcmV?d00001