From 29902bed56180c2e4be549ab41c2ca026d3b6704 Mon Sep 17 00:00:00 2001 From: Pine Date: Tue, 1 Sep 2026 23:11:18 +0800 Subject: [PATCH] =?UTF-8?q?feat(mini):=20=E7=A7=BB=E9=99=A4=E8=BD=BD?= =?UTF-8?q?=E4=BD=93=E9=A1=B5=E9=9D=A2+tab=E5=8C=BA=E5=85=A8tab=E5=9B=BA?= =?UTF-8?q?=E5=AE=9A=E4=B8=8D=E8=A2=AB=E4=B8=8B=E6=8B=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 所有tab页加 disableScroll:true，禁止页面级下拉，ScrollView内部独立滚动，tab区无论选中哪个都固定不被下拉 2. 移除大厅社区tab底部两个按钮（发帖+实体社区载体），发帖已由右上角+发布承担 3. 移除独立社区页底部的载体按钮 4. 移除首页入驻按钮 5. 我的页面：移除我的园区/园区端/创业载体等载体入口，OPC认证独立保留 6. app.config.js 移除载体相关页面注册： pages-extra: park-apply/park-transfer/my-park/parks/park-detail pages-op: park-companies/park-transfers/park-screens/park-tasks/park-screen-ctl/park-users --- miniprogram/src/app.config.js | 13 +-- .../src/pages-extra/community/index.jsx | 5 - miniprogram/src/pages/booking/index.config.js | 2 +- miniprogram/src/pages/content/index.config.js | 2 +- miniprogram/src/pages/hall/index.config.js | 2 +- miniprogram/src/pages/hall/index.jsx | 4 - miniprogram/src/pages/index/index.jsx | 1 - miniprogram/src/pages/mine/index.config.js | 2 +- miniprogram/src/pages/mine/index.jsx | 105 ++---------------- 9 files changed, 22 insertions(+), 114 deletions(-) diff --git a/miniprogram/src/app.config.js b/miniprogram/src/app.config.js index 1b6e002..2e15be3 100644 --- a/miniprogram/src/app.config.js +++ b/miniprogram/src/app.config.js @@ -11,24 +11,23 @@ export default { root: 'pages-extra', pages: [ 'test/index', 'policy/index', 'plan/index', 'survey/index', - 'event-detail/index', 'scan/index', 'park-apply/index', 'cert-apply/index', - 'park-transfer/index', 'content-detail/index', 'tasks/index', 'task-detail/index', - 'scan-login/index', 'my-bookings/index', 'my-tasks/index', 'my-park/index', + 'event-detail/index', 'scan/index', 'cert-apply/index', + 'content-detail/index', 'tasks/index', 'task-detail/index', + 'scan-login/index', 'my-bookings/index', 'my-tasks/index', 'my-cert/index', 'compute/index', 'pay/index', 'pay-qr/index', 'event-edit/index', 'my-events/index', 'hall-talents/index', 'hall-talent-detail/index', 'hall-jobs/index', 'hall-job-detail/index', 'hall-services/index', 'hall-service-detail/index', 'community/index', 'community-post/index', 'community-post-detail/index', 'hall-task-publish/index', 'hall-service-publish/index', 'hall-job-publish/index', - 'talent-edit/index', 'parks/index', 'park-detail/index' + 'talent-edit/index' ] }, { root: 'pages-op', pages: [ 'ops-dashboard/index', 'ops-parks/index', 'ops-content/index', 'ops-tasks/index', - 'ops-users/index', 'ops-companies/index', 'park-companies/index', 'park-transfers/index', - 'ent-company/index', 'ent-members/index', 'park-screens/index', 'park-tasks/index', - 'park-screen-ctl/index', 'park-users/index' + 'ops-users/index', 'ops-companies/index', + 'ent-company/index', 'ent-members/index' ] } ], diff --git a/miniprogram/src/pages-extra/community/index.jsx b/miniprogram/src/pages-extra/community/index.jsx index f6062d6..869d35d 100644 --- a/miniprogram/src/pages-extra/community/index.jsx +++ b/miniprogram/src/pages-extra/community/index.jsx @@ -60,11 +60,6 @@ export default function Community() { ))} - - - - - ); } diff --git a/miniprogram/src/pages/booking/index.config.js b/miniprogram/src/pages/booking/index.config.js index 00aeddc..b6e60d7 100644 --- a/miniprogram/src/pages/booking/index.config.js +++ b/miniprogram/src/pages/booking/index.config.js @@ -1 +1 @@ -export default { navigationBarTitleText: '活动', navigationStyle: 'custom' }; +export default { navigationBarTitleText: '活动', navigationStyle: 'custom', disableScroll: true }; diff --git a/miniprogram/src/pages/content/index.config.js b/miniprogram/src/pages/content/index.config.js index b5ac1b3..dea5d44 100644 --- a/miniprogram/src/pages/content/index.config.js +++ b/miniprogram/src/pages/content/index.config.js @@ -1 +1 @@ -export default { navigationBarTitleText: '资讯中心', navigationStyle: 'custom' }; +export default { navigationBarTitleText: '资讯中心', navigationStyle: 'custom', disableScroll: true }; diff --git a/miniprogram/src/pages/hall/index.config.js b/miniprogram/src/pages/hall/index.config.js index 4f510b0..f3e3f0c 100644 --- a/miniprogram/src/pages/hall/index.config.js +++ b/miniprogram/src/pages/hall/index.config.js @@ -1 +1 @@ -export default { navigationBarTitleText: '大厅', navigationStyle: 'custom' }; +export default { navigationBarTitleText: '大厅', navigationStyle: 'custom', disableScroll: true }; diff --git a/miniprogram/src/pages/hall/index.jsx b/miniprogram/src/pages/hall/index.jsx index 17f75d8..0462f9a 100644 --- a/miniprogram/src/pages/hall/index.jsx +++ b/miniprogram/src/pages/hall/index.jsx @@ -257,10 +257,6 @@ function CommunityPane({ topic, onTopic }) { 赞 {p.likeCount || 0}评论 {p.commentCount || 0} ))} - - - - ); } diff --git a/miniprogram/src/pages/index/index.jsx b/miniprogram/src/pages/index/index.jsx index 416c7a9..162a7c5 100644 --- a/miniprogram/src/pages/index/index.jsx +++ b/miniprogram/src/pages/index/index.jsx @@ -30,7 +30,6 @@ export default function Index() { - diff --git a/miniprogram/src/pages/mine/index.config.js b/miniprogram/src/pages/mine/index.config.js index 9a22a17..a9717d2 100644 --- a/miniprogram/src/pages/mine/index.config.js +++ b/miniprogram/src/pages/mine/index.config.js @@ -1 +1 @@ -export default { navigationBarTitleText: '我的', navigationStyle: 'custom' }; +export default { navigationBarTitleText: '我的', navigationStyle: 'custom', disableScroll: true }; diff --git a/miniprogram/src/pages/mine/index.jsx b/miniprogram/src/pages/mine/index.jsx index 34a484c..12d3632 100644 --- a/miniprogram/src/pages/mine/index.jsx +++ b/miniprogram/src/pages/mine/index.jsx @@ -4,7 +4,6 @@ import { useState, useEffect } from 'react'; import { useTabIndex } from '@/utils/tab'; import { isAuthed, getUser, logout, wxLogin, phoneLogin, bindPhone, sendCode, wxPhoneBind, updateProfile, getMe } from '@/utils/auth'; import { getMyBookings, parseIso } from '@/utils/booking'; -import { getMyAdmission } from '@/utils/parks'; import { API_BASE } from '@/utils/api'; import { ensureUploadSize } from '@/utils/upload'; import CountdownBox from '@/components/CountdownBox'; @@ -25,7 +24,6 @@ export default function Mine() { useTabIndex(4); const [user, setUser] = useState(getUser()); const [bookings, setBookings] = useState([]); - const [admission, setAdmission] = useState([]); // 我的园区入驻记录 const [loaded, setLoaded] = useState(false); const [busy, setBusy] = useState(false); const [err, setErr] = useState(''); @@ -57,10 +55,6 @@ export default function Mine() { const d = await getMyBookings(); setBookings((d && d.list) || []); } catch { /* 保留上次列表，避免重进闪空 */ } - try { - const a = await getMyAdmission(); - setAdmission(Array.isArray(a) ? a : []); - } catch { /* 保留上次 */ } finally { setLoaded(true); } }; Taro.useDidShow(() => { refresh(); }); @@ -393,62 +387,18 @@ export default function Mine() { › - {/* 我的园区：未入驻 → 申请入驻 + OPC认证；已入驻 → 园区信息 + OPC认证 + 转园 */} + {/* OPC 认证 */} - PARK - 我的园区 + CERT + OPC 认证 + + Taro.navigateTo({ url: '/pages-extra/cert-apply/index' })}> + + 认证申请 + 提交或查看 OPC 超级个体认证材料 + + › - {(() => { - const ad = admission[0] || {}; - const st = String(ad.status || ad.audit_status || '').toLowerCase(); - const admitted = ['approved', 'verified', 'admitted'].includes(st) || ['已入驻', '通过', 'approved'].includes(ad.status); - if (!admitted) { - return ( - <> - Taro.navigateTo({ url: '/pages-extra/park-apply/index' })}> - - 申请入驻 - 暂未入驻园区，提交入驻申请 - - › - - Taro.navigateTo({ url: '/pages-extra/cert-apply/index' })}> - - OPC 认证 - 提交或查看 OPC 超级个体认证材料 - - › - - - ); - } - const name = ad.tenant_name || ad.park_name || ad.company_name || ad.company || '已入驻园区'; - return ( - <> - Taro.navigateTo({ url: '/pages-extra/my-park/index' })}> - - {name} - {ad.region ? `区域：${ad.region} · ` : ''}查看入驻状态与园区信息 - - › - - Taro.navigateTo({ url: '/pages-extra/cert-apply/index' })}> - - OPC 认证 - 提交或查看 OPC 超级个体认证材料 - - › - - Taro.navigateTo({ url: '/pages-extra/park-transfer/index' })}> - - 转园申请 - 申请转入其他创业园区 - - › - - - ); - })()} {/* 运营端菜单：账号类型 operator（叠加制，OPC 基础身份之上） */} {(user.capabilities || []).includes('operator') && ( @@ -480,47 +430,16 @@ export default function Mine() { )} - {/* 园区端菜单：账号类型 carrier（载体方 / 园区运营） */} - {(user.capabilities || []).includes('carrier') && ( - <> - - PARK-OPS - 园区端 - - {[ - { t: '屏幕绑定', s: '绑定园区大屏设备到本园区', url: '/pages-op/park-screens/index' }, - { t: '任务查询', s: '查询本园区相关任务进度', url: '/pages-op/park-tasks/index' }, - { t: '屏幕控制', s: '大屏内容轮播与远程控制', url: '/pages-op/park-screen-ctl/index' }, - { t: '企业管理', s: '本园区入驻企业查看与编辑', url: '/pages-op/park-companies/index' }, - { t: '用户管理', s: '本园区成员与入驻企业管理', url: '/pages-op/park-users/index' }, - { t: '转园审核', s: '转出/转入两级审核', url: '/pages-op/park-transfers/index' } - ].map((m) => ( - Taro.navigateTo({ url: m.url })} - > - - {m.t} - {m.s} - - › - - ))} - - )} - {/* 通用：活动发布（所有登录账号可发布，提交后审核） */} {user && ( <> EVENT - 活动与载体 + 活动 {[ { t: '发布活动', s: '发布新活动，提交后进入审核', url: '/pages-extra/event-edit/index' }, - { t: '我的活动', s: '我的活动与审核状态', url: '/pages-extra/my-events/index' }, - { t: '创业载体', s: '全省园区载体列表与园区详情', url: '/pages-extra/parks/index' } + { t: '我的活动', s: '我的活动与审核状态', url: '/pages-extra/my-events/index' } ].map((m) => ( Taro.navigateTo({ url: m.url })}>