wizhi更新

uniapp/pages/nav/nav.vue

@@ -3,10 +3,18 @@
 		<!-- 顶部信息：融入页面背景，不再单独做彩色抬头 -->
 		<view class="head" :style="headPad">
 			<view class="head-row">
-				<text class="head-title">选择子系统</text>
-				<text class="head-count">{{ enabledCount }}/{{ cards.length }} 已开通</text>
+				<view>
+					<text class="head-eyebrow">YUNZE WORKSPACE</text>
+					<text class="head-title">工作台</text>
+				</view>
+				<view class="account-chip"><FaIcon name="user" color="#3478f6" :size="15" /><text>{{ user.account || '我的账号' }}</text></view>
 			</view>
-			<text class="head-sub">{{ user.tenant || '云泽平台' }}<text v-if="user.account"> · {{ user.account }}</text></text>
+			<view class="tenant-switch" @tap="chooseTenant">
+				<view class="tenant-mark"><FaIcon name="building" color="#ffffff" :size="19" /></view>
+				<view class="tenant-copy"><text class="tenant-label">当前租户</text><text class="tenant-name">{{ user.tenant || '云泽平台' }}</text></view>
+				<view class="tenant-action"><text>切换</text><FaIcon name="chevron-down" color="#3478f6" :size="12" /></view>
+			</view>
+			<text class="head-sub">选择一个业务系统，开始高效工作</text>
 		</view>
 
 		<view class="body">
@@ -53,7 +61,8 @@ import { mpHeadPad } from '@/utils/mpHead.js'
 
 const headPad = mpHeadPad()
 import { onShow } from '@dcloudio/uni-app'
-import { isLoggedIn } from '@/utils/auth.js'
+import { isLoggedIn, getTenants, getTid, setAuthTokens, setTid, setTenantName, getUser, setUser } from '@/utils/auth.js'
+import { switchTenant } from '@/api/auth.js'
 import { fetchHome } from '@/api/workspace.js'
 import { openMenu } from '@/utils/nav.js'
 import { getSubsystemByModule, goSubsystem } from '@/config/subsystems.js'
@@ -80,6 +89,8 @@ const loadError = ref('')
 const user = ref({})
 const modules = ref([])
 const menus = ref([])
+const tenants = ref(getTenants())
+const switchingTenant = ref(false)
 
 /** 叶子菜单（可直接跳转的功能页），已锁定的过滤掉 */
 const leafMenus = computed(() => menus.value.filter((m) => m.leaf !== false && !m.locked))
@@ -116,7 +127,6 @@ const cards = computed(() => {
 		})
 })
 
-const enabledCount = computed(() => cards.value.filter((c) => !c.locked).length)
 
 /* ==================== 数据加载 ==================== */
 
@@ -138,6 +148,41 @@ async function load(force = false) {
 
 /* ==================== 交互 ==================== */
 
+function chooseTenant() {
+	const list = tenants.value
+	if (list.length <= 1) {		uni.showToast({ title: list.length ? '当前账号仅绑定一个租户' : '暂无可切换的租户', icon: 'none' })
+		return
+	}
+	if (switchingTenant.value) return
+	uni.showActionSheet({
+		itemList: list.map((tenant) => tenant.tenant_name || `企业${tenant.tid}`),
+		success: async ({ tapIndex }) => {
+			const tenant = list[tapIndex]
+			if (!tenant || String(tenant.tid) === String(getTid())) return
+			switchingTenant.value = true
+			uni.showLoading({ title: '正在切换...', mask: true })
+			try {
+				const res = await switchTenant({ tid: tenant.tid })
+				if (!res || !res.tokens) throw new Error((res && res.msg) || '切换租户失败')
+				setAuthTokens(res.tokens)
+				setTid(tenant.tid)
+				setTenantName(tenant.tenant_name || '')
+				const profile = getUser() || {}
+				const nextUser = { ...profile, tid: tenant.tid, tenant_name: tenant.tenant_name || '' }
+				setUser(nextUser)
+				user.value = { ...user.value, tenant: tenant.tenant_name || '', account: nextUser.account || user.value.account }
+				await load(true)
+				uni.showToast({ title: '已切换租户', icon: 'success' })
+			} catch (e) {
+				uni.showToast({ title: (e && e.message) || '切换失败，请重试', icon: 'none' })
+			} finally {
+				uni.hideLoading()
+				switchingTenant.value = false
+			}
+		}
+	})
+}
+
 /**
  * 点击子系统卡片 → 进入该子系统独立页面组（带自己的 tabbar）。
  * 未在 config/subsystems.js 注册的模块，降级为直接打开 Web 端该模块首页。
@@ -189,42 +234,80 @@ onShow(() => {
 /* ============ 顶部信息（融入页面背景） ============ */
 .head {
 	flex-shrink: 0;
-	padding: calc(var(--status-bar-height, 44px) + 32rpx) $page-padding-x 12rpx;
+	padding: calc(var(--status-bar-height, 44px) + 32rpx) $page-padding-x 28rpx;
 	/* #ifdef MP-WEIXIN */
-	/* 小程序端 --status-bar-height 固定 25px，需真实状态栏(env)+胶囊避让 */
 	padding-top: calc(env(safe-area-inset-top, 25px) + 96rpx);
 	/* #endif */
-	background: $color-bg-page;
+	background: linear-gradient(145deg, #eaf3ff 0%, #f5f9ff 58%, #ffffff 100%);
+	border-bottom: 1rpx solid #e5efff;
 }
 
 .head-row {
 	display: flex;
-	align-items: baseline;
+	align-items: center;
 	justify-content: space-between;
 	gap: 16rpx;
 }
 
+.head-eyebrow {
+	display: block;
+	margin-bottom: 8rpx;
+	font-size: 18rpx;
+	font-weight: 700;
+	letter-spacing: 3rpx;
+	color: #6e9de5;
+}
+
 .head-title {
-	font-size: 42rpx;
-	font-weight: 600;
-	color: $color-text;
+	display: block;
+	font-size: 44rpx;
+	font-weight: 700;
+	color: #17345f;
 	letter-spacing: 1rpx;
 }
 
-.head-count {
-	font-size: 23rpx;
-	color: $color-text-muted;
-	flex-shrink: 0;
+.account-chip {
+	display: flex;
+	align-items: center;
+	gap: 9rpx;
+	padding: 12rpx 17rpx;
+	border-radius: 30rpx;
+	background: rgba(255,255,255,.85);
+	color: #526b8d;
+	font-size: 22rpx;
 }
 
+.tenant-switch {
+	display: flex;
+	align-items: center;
+	margin-top: 28rpx;
+	padding: 20rpx 22rpx;
+	border: 1rpx solid #dceaff;
+	border-radius: 18rpx;
+	background: #ffffff;
+	box-shadow: 0 8rpx 24rpx rgba(47, 110, 196, .08);
+}
+
+.tenant-mark {
+	width: 64rpx;
+	height: 64rpx;
+	border-radius: 16rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	background: linear-gradient(145deg, #69a5ff, #3478f6);
+}
+
+.tenant-copy { flex: 1; min-width: 0; margin-left: 16rpx; }
+.tenant-label { display: block; font-size: 20rpx; color: #8a9bb3; }
+.tenant-name { display: block; margin-top: 5rpx; font-size: 27rpx; font-weight: 600; color: #203b62; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.tenant-action { display: flex; align-items: center; gap: 8rpx; color: #3478f6; font-size: 22rpx; font-weight: 600; }
+
 .head-sub {
 	display: block;
-	margin-top: 8rpx;
+	margin-top: 22rpx;
 	font-size: 23rpx;
-	color: $color-text-muted;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
+	color: #8295b0;
 }
 
 /* ============ 内容区 ============ */
@@ -233,7 +316,8 @@ onShow(() => {
 	min-height: 0;
 	overflow-y: auto;
 	-webkit-overflow-scrolling: touch;
-	padding: 8rpx $page-padding-x 0;
+	padding: 20rpx $page-padding-x 0;
+	background: #f5f8fd;
 }
 
 /* ============ 失败提示 ============ */
@@ -300,7 +384,9 @@ onShow(() => {
 
 .portal-card {
 	@include card;
-	padding: 40rpx 16rpx 34rpx;
+	padding: 34rpx 16rpx 30rpx;
+	border: 1rpx solid #e6eef9;
+	box-shadow: 0 6rpx 20rpx rgba(38, 86, 150, .045);
 	display: flex;
 	flex-direction: column;
 	align-items: center;