?vN
zNU{185c;IOedfb=oZF3j0J!K?i$;$4`J?Zc;f8NcIam#%u%X_O3c@Q_w+&Imi2R~}
zrlK4IRRUG00divORm07pxt~B+uH&>40010At#9^fTXPk!sIbrRXQ(gCB*uE`d0q4v
z91b}D>f47_4%46ICMB>}+@kUp%heeaiaWd9wbddMCP-{v5swAiKVijCYQB8QYtDLf
zqH$dG?nT*?`|6)cUE4QdHSjim*mR16(};r^S=3i(5nwL*9d@>%EzM9v-XD=MV;k_i
zf4YCo%d2CUb^^HUl^6efu91g~X2HAV8zm4Kk8=a;(4G_DfBl1p6xKWt*w{Po{E=i}
zKv_z^JOoO93s@Hv!Rkho(fLwta}zG+F;E74;1OnAuKh&&-Q;P(tn9xUMzgq=pprnM
zctIFjWwXs{&%v^nLL|`G6G6jq-#>xj#ma61ZAz05SMNXV1OP0RAs+cw$~kJ*_^e?C
zL=BV-lmu-~X=O%-#WlQS`SNu2ZhcRSQ!=(9+nFI`{5G(L5NezQV*PK&YXsqu!R6{i
z(9V5b;C`Du&YLxBxNb1w9Z5hLK+sAYq0~8I>0HPC0d#jV_YNn91tV^P-DF1An0fjq
zesah2<9UaH007>2|D_FaPICj0LQ;Vv7lI%b860-^&N?hUf%`WN{=W7NEug@OyxHd~
zfee5|6^ZyFR|;|;6kWm59z)S*h(jwI$Hs3P3%@@?nP$Qex;Aj5EEkP0CUEp^Hs
zNz^HR3J+xL%xVe`W#O+-^4UZrP|l$WY|e=7lTZ4e@j8cv0IquXOIFTgxs5`VkWqzU
z2cteFLWZ!XO+)?1KlR+{9?P~i-ZY{@CSl}Kvd}`2Dq{E*kWP1Pb*~_*E`5~TA+(3v
zZ|>uLfLen3UDdSMWRel;9LF?Gn4lFs#v+r5kdYsYg;#VH2D?~ZbMcLj)W`eHw84U;
zb*ag7_{OM;G{~}C1u(!UCA76R<89M9hR^+MZO_ImKRaUqjDpA(2<(XT#m_*|@2K48
zpsH*koLjw%-_U{&fCJRXcymorbWYQXLRu9)@7i
ze0LLS9n*EJy85e7F8`{&z+H@FJa{@l1ZBUmbofC)yj0udaH;8c6RM@yUN0z%u^DBh
zXQEL*Hpjpyfrk4V=KzP10B-n;*KV1i?k83SY6xw>7mN^r$UqEZH)?5f{&CY5CSKj-
zm%`M^5MW(&s(2--+OtquAswt%f?Xb0VCSaMaU;#RcK}iNj%af8D}F;JmCn|)RYy-1
z%67HBRZg`jhN+mX1VvhepHZf(n*^<%zOz-ko!!$63wh-7J{460TEw0zgT=z+kP*=u
z?tL?+$wRrh>CR9v5++z!fTW|{Ju?@GFIQMp#44*BQ8bjL?4a_m|BfJ&-~a$1q~mG}
zarg0V@l=BM1(cs6v4p(|p-7lvm?2Cdcfs%F*n~a)uXp0;!%6^qm;d6bK5=^p3K)Wc
zFPdN_SkBQlg6-Nk?V~rZJ9Vn>{e_3LHVl3S6CoiBkcB2iA$tMc6J1VF4BC_}aI1NM
zgdn3ku9Ht{ehEx*&*M_f2!SGmz6CK9SbY@)Cu7DPeG&*9q8)q)2A({cAl@Zz(P1Tk
zt3Uh)dm7}f_l=jzVhJXOAw_N!!<6ttd-69=^}X-ivF#YGCk+nqco%KC(B&(#{;F(^
zf2;m@?plq-{}K6R$`51`RsaCx5Z|C)OLFuSp_RZ-b!!@gPA8SsU%Zv#vlb`%=QM_p
z62mzlQ=%s5X@`{n0AOCN`K`Jd%``zy0!O)DO;SUeTMToCEj@jU&%f}(WGe5wZB&k7
zwa6JzvQQI(Qt+8S5;A|(`-F;@2H6=mefCn>m2K~hhHY)NJR!WHwoa;HL~aB*ys1W<
zK>%3cAXd2al1rHfU_y($*kVUe?!RbarV;=#1gnIac#6p3U<-xPEj;W5Aoo6c-7J;I
ztZTur&yo#~0f145#ok;NG>-q>v!?dO_9&u?Z5B9Bcf-nwZ0s0-0m=}qR*rRh3jshT
zx>yC4En9|~k|xAKxA2aqNO%QB#q6Nab%leckh?gRDRL2lC$VEE7U@tMRB7H}CxB%i
zJbmqY5RhBl4zG9x
zvh4;64x%WA_XoXfVVn<)K@Gwtq=;MaLaW}r!Z{i4MS;V2j$~i77cCh=zTmJE005jk
z+kUm7P-l%teBnzc7%)cF;4#y9)vK3WJUCVNbf9|C>9gWkiC(`VbFr9N4I4$3MIAuZ
z%&ItoV&*WF89GclsrD=9op&C{wb>X(9{MD)l)NUEkpZQa&s15}fahW{Vu-Skq)G%a
zxil)6h6slExW|P6E_nXXZK=y1R1FCf3TRk`Ir)m&VXZZWp8tZ^Ow~P^ZPz}8G{(zX
zg>v$|_N=PK#248>T=o!*_5MY#W51Xu)zqPf93^lN2B6+NW>K(|N@wvL0g)P7d!wq1%R#3F-i8|S7RS)n%oM;A8U>M%^PVN59
zz@k@G0TZU%_XmNrqw*O6-0@tv@?R6>u8DG;EJZ;gF
z7H$4&K3(zKSk|o^(!j&MLt1VD7o;j20ahJS=ir>3^v>TGyy(QM`_`=ZA2Y>`8fSc1
zn0=n1N0I`8xh^88f#8
zkuKSfZtYt-Qn9$Q(j-48Rw^8c*->c>mK;S88#bE
zGVLHjh9ZH3C0{x0cir=fBcrOkO4%eEVLyZ*jdBH=P&6rna=!9$B>(_8%E&ir$W#%^
zsEvZzPq-4JpP18hrvW+FL{kHMX+%`vbO(#Rf|I9%{_G
z>f^Vr{=EYk?>y~}JfbmHpzGt5222KoZ$#KXL!U5}U^0oHf
z&(6gL)mk`lqNfZP>rO4aX%)>s?g1P*0abhhN2&k%Rmmq#im~eZj3zB~XD2jw;RD=ymyj0*5grY+tbDk)PhsP~8!|@<5E(3mjSy
z3$&C5TspMiQ0|khzxhrJ*^ZE8(H;CDqDs&wx_CQv0BGg2hG0zm0QeXJd|Q`93BBs`
z4B9ouCUD={fjL)RaOc_=AIP{rdirVCVEvl&2Gorv>cHdx76`eDhZ2Qrx*V%lN)wHU
zRyYVU<1`&Gzdi)8Z1LjJBW&|Ky%3~eB*sClg8?H^hGB&zR%2$i4&^>yJontzV7>XB
z)Hu{2Xc@1;i^6B!z?(}>HSBc}wx`q3z)`(xwcI%@v};536~x@z(mR;P9)M7YP4TF3
z|HCupT>YuLH@xsb#(u#WPrG(t)9N=4w6lydh4(-JUiAAshD@b!8Zo?{BFKCg7`{e;
zoI{_|jt!4)yuqLMYXZsIRTrjcIs?E+g4ESu@)Rn)NL4Y*G#^;{I|~oFKkjh}zCHt_
zMm-`U&ly{EQLW64H3Pxt&RqE}hGIRMfii!?(}cjVLqa(cRTz`vF+u<4M&H%{c;}<1
zAIR80e)=g_&d|}nG3+$YGSn;FDnh3k;P*Gm)WNEP$f4%i7-+Y?vvkp-5#ZN|04{&s
zqC1XFoBuQmnf4ir8e8-jgG7P(B>BvB_x~ljpYI^xi%*|*Q=c2X2U)epPp87y84oBk
zJIDH5!aheDH>s|KltX_QLk@;r*wE6!K#_BT)oKSH9vr&%3-_%#AWmTKeC%^+)?CLN
zx6muy)CPeosVmGsg6C)ifzb?on#-o2|NP72J?rBR!=L`ihfeF!zZv4;9sNC{I#AoA
zN7=m_7i@m?4gdJ6v#yz<+vwa>zmUQ&|7rxS8WoHLp;~?4>3JhAkzXy{DtrqR^9{TU
zGH37OcdBUBYIsy=#>0KHzxSy-SHEDggI~J%-}00z_MkF-KS6M|Jc#(!9CABY2@zX{_z#hTsD>W
zNq&0E*9Ve(HN*KnexT6EQcKMrekC(gB}XuBeH;7$>U$p&QKfpg49^k(5(`2K2aAlo
zLRe!$;s7!U*0eEW^}x{gK6l54NxO|lM~4j?0uzTFZ!3ro78I+mc6RWZNdlmcpnb!w
zPgbvW$U&ChRCwQgyWan+R_z~0IVBB_9tt@EKtO)wGZ4Ihp-o$nV9{lQ6`N%j{e27!
z0b&#x<*-on2q95I4j>bN^9&2vZ9RT;&pChkj3a-!uW^5A`If$4HS$M?>jSeBA>_tX
zT<1RW=S^ro#vFn=G5RIP0(Lk3$*h@YRwG@%Rvh4P0{!Ubi)JJH6{}8a6%@%K=ql6*
z4I`_{SkVWN2+n3OBU0Q-e3TkP@+~#v6ao7NBa71`0U+}{La3{v86}emnXfm
z#N|HTUr7Kdqk$4QfuL>($XlqjT5k6}_kE-z%!%J(4gdge{qf3|tQlN*LuL{dCWwe{
zY8hR^@bL*C3uS7RK#Df7TshCjG88S_LcdFqszHl@Hf69ODMgr&kigf+GEBRL
z*;aSW+P?XmcWAaWH_ceH=9E8Qv}jxR^Z(Wp!2kTW@Ai+LcIMAE
zr2{9Au)?w+Re;n&$ZPL}U}hD$cT{)?MJagxD6GCn0FhOc{sa`U2OuhmMgBfehNi_K
zA;2c$xKaQ~EL9;zP71?{9wk^1RCDy@ne=Yi^hZlhJLSspp8vO=
z007{9Ke+wGwR4|x%Qn+Hhy-Y;z$&2$1F3ZB@@`}8u=yh}(2;yuq>q_!oG27#mLXh%
z1b<%CJbkeWf*YJcV4=|ZP2&JS?DG&*9ZY2Xsz~A8mBc>I(d(QZlQ;kQeGBHlZ=z@a
ztyKc6@J}yWbpN~!kGy5J=2_}|;Z=(Sj)F@SS|C5N`)=?=(wSZC#Y7A=MISdgPa`jK5uiw=i6bJ?6HX%
zhiP*RwP+a|0r;tCbT61-l_giv+t{TH1+
zRs{&$AVH2fdA72DrQbc}(?i?Vy`#@b)4~T>2q9$L!PX;$6(3(3
ziKRRikro{^UK#YrjiNC)rZFMrvbd~|KUWT=rqREoWji4-h8&rail6kpiM>h}qdB2UYKLe8FL
z<4d^JYx?9j4FEK>h;s%;2oQmWx<3+Eq^~JCumRL%NENWTLmyO+MEi=_D<63A`=9l!
z4F~d^Pl$m1!27SgV~#oDgs*JoO{)T(R=6b-143eJ@b^G9qfZWAp#}``u8Wy`O3`OZ#m_uN%JeS
zx!G<&d_DkM7-1O4NOBX>uKd2qzN1H(UJjrmX8`a^w#+dUuj4s_$qka+_+9}{0Wn~;
zNEMhN*_LDSkq_+NzIM@}ARl;w0~{2*^WU#IY3B1@_UrSPguC_aE$l=13*7xkn3Y)cmMzZ07*qoM6N<$f}Q4YRR910
literal 0
HcmV?d00001
diff --git a/subpkg/pages/activity-detail/activity-detail.vue b/subpkg/pages/activity-detail/activity-detail.vue
index 3172803..511d65c 100644
--- a/subpkg/pages/activity-detail/activity-detail.vue
+++ b/subpkg/pages/activity-detail/activity-detail.vue
@@ -1,25 +1,25 @@
-
+
{{ detail.title }}
- {{ detail.time }}
+ {{ detail.startTime || formatTime(detail.start_time) }} - {{ detail.endTime || formatTime(detail.end_time) }}
- {{ detail.location }}
+ {{ detail.activityLocation || detail.activity_location }}
活动介绍/回顾
-
+
-
+
@@ -30,63 +30,351 @@
+ class="join-btn"
+ :class="getJoinBtnClass()"
+ @click="handleJoin"
+ >
+ {{ getJoinBtnText() }}
+
+
+
+
+
+
+
+
+ 姓名
+
+
+
+ 联系方式
+
+
+
+
+
+
+ 参加人数
+
+
+
+ {{ joinForm.personCountText || '请选择参加人数' }}
+
+
+
+
+
+
+
@@ -127,13 +415,14 @@ export default {
.rich-content {
background: #fff;
- padding: 10px 0;
+ padding: 10px;
.content-title{
position: relative;
font-size: 16px;
font-weight: bold;
color: #333;
padding-left: 12px;
+ margin-bottom: 20px;
&::before{
position: absolute;
left: 0;
@@ -145,6 +434,13 @@ export default {
background-color: #01a4fe;
}
}
+
+}
+.rich-text{
+ ::v-deep p{
+ line-height: 1.5;
+ margin: 15px 0;
+ }
}
.detail-bottom {
@@ -184,4 +480,147 @@ export default {
.disabled-btn {
background: #ccc !important;
}
-
+
+.modal-mask {
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ background: rgba(0, 0, 0, 0.5);
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ z-index: 1000;
+}
+
+.modal-content {
+ width: 85%;
+ background: #fff;
+ border-radius: 8px;
+ overflow: hidden;
+}
+
+.modal-header {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding: 15px;
+ border-bottom: 1px solid #f0f0f0;
+
+ .modal-title {
+ font-size: 16px;
+ font-weight: bold;
+ color: #333;
+ }
+
+ .close-icon {
+ color: #999;
+ }
+}
+
+.modal-body {
+ padding: 15px;
+}
+
+.form-item {
+ margin-bottom: 15px;
+
+ .form-label {
+ display: block;
+ font-size: 14px;
+ color: #333;
+ margin-bottom: 8px;
+ }
+
+ .form-input {
+ width: calc(100% - 25px);
+ height: 40px;
+ background: #f8f8f8;
+ border-radius: 8px;
+ padding: 0 12px;
+ font-size: 14px;
+ }
+
+ .select-wrapper {
+ width: calc(100% - 25px);
+ height: 40px;
+ background: #f8f8f8;
+ border-radius: 8px;
+ display: flex;
+ align-items: center;
+ padding: 0 12px;
+ font-size: 14px;
+ ::v-deep .picker-select{
+ width: 100%;
+ }
+
+ .select-value {
+ font-size: 14px;
+ color: #333;
+ width: 100%;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+
+ &::after {
+ content: '';
+ width: 0;
+ height: 0;
+ border-left: 5px solid transparent;
+ border-right: 5px solid transparent;
+ border-top: 5px solid #999;
+ }
+ }
+ }
+}
+
+.modal-footer {
+ display: flex;
+ border-top: 1px solid #f0f0f0;
+
+ .cancel-btn,
+ .submit-btn {
+ flex: 1;
+ height: 44px;
+ line-height: 44px;
+ text-align: center;
+ font-size: 15px;
+ border-radius: 0;
+ border: none;
+ margin: 0;
+ padding: 0;
+ &::after {
+ border: none;
+ border-radius: 0;
+ }
+ }
+
+ .cancel-btn {
+ background: #f5f5f5;
+ color: #666;
+ // border-right: 1px solid #f0f0f0;
+ }
+
+ .submit-btn {
+ background: #01a4fe;
+ color: #fff;
+ }
+}
+
+.get-phone-btn {
+ font-size: 12px;
+ color: #fff;
+ background-color: #01a4fe;
+ width: 90px;
+ border-radius: 20px;
+ padding: 10px;
+ border: none;
+ line-height: 1.2;
+ margin-left: 10px;
+
+ &::after {
+ border: none;
+ }
+}
+
\ No newline at end of file
diff --git a/subpkg/pages/activity-list/activity-list.vue b/subpkg/pages/activity-list/activity-list.vue
index 7875aca..cd7c3db 100644
--- a/subpkg/pages/activity-list/activity-list.vue
+++ b/subpkg/pages/activity-list/activity-list.vue
@@ -17,242 +17,189 @@
-
+
-
+
+
+
+ {{item.status}}
+
- {{ item.title }}
+
+ {{ item.title }}
+
- {{ item.time }}
+ {{ item.startTime }} - {{ item.endTime }}
-
+ {{ getBtnText(item.status) }}
+ -->
-
+
暂无{{ currentTab === 0 ? '进行中的活动' : '往期活动' }}~
+
+
+
+
+
\ No newline at end of file
diff --git a/subpkg/pages/booking-record/booking-record.vue b/subpkg/pages/booking-record/booking-record.vue
index 6c54ea7..79ff5e8 100644
--- a/subpkg/pages/booking-record/booking-record.vue
+++ b/subpkg/pages/booking-record/booking-record.vue
@@ -36,26 +36,29 @@
class="activity-item"
v-for="item in displayList"
:key="item.id"
- @click="toActivityDetail(item)"
>
- {{ item.area }}
+
- 开始时间：
+ 入馆日期
{{ item.startTime }}
-
+
+ 入馆时间
+ {{ item.startTime }}
+
+
+
+