From e7d3a0f37624bad8a8801278cf31819c3f7f1a6e Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Thu, 10 Sep 2026 19:46:53 +0800
Subject: [PATCH] 1

---
 components/tab-bar/homeGroupPending.vue | 1096 +++++++++++++++++++++++
 components/tab-bar/myCenter.vue         |   16 +-
 components/tab-bar/postList.vue         |   40 +-
 components/tab-bar/release.vue          |   63 +-
 components/tab-bar/tab-bar.vue          |   88 +-
 5 files changed, 1241 insertions(+), 62 deletions(-)
 create mode 100644 components/tab-bar/homeGroupPending.vue

diff --git a/components/tab-bar/homeGroupPending.vue b/components/tab-bar/homeGroupPending.vue
new file mode 100644
index 0000000..6ffc96c
--- /dev/null
+++ b/components/tab-bar/homeGroupPending.vue
@@ -0,0 +1,1096 @@
+<template>
+	<view class="pending-page" :class="{'store-scene': isStoreScene, 'pending-page--embedded': embedded}">
+		<!-- 嵌入吸顶改用 fixed，占位避免列表上跳 -->
+		<view
+			class="pending-chrome-holder"
+			v-if="embedded && stickyActive"
+			:style="'height:' + chromeHeight + 'px;'"
+		></view>
+		<view
+			class="pending-chrome"
+			:class="{
+				'pending-chrome--fixed': !embedded,
+				'pending-chrome--sticky': embedded && stickyActive
+			}"
+			:style="chromeStyle"
+		>
+			<view class="nav-row" v-if="!embedded">
+				<view class="back-btn" @tap="back">
+					<uni-icons type="left" size="28" :color="searchIconColor"></uni-icons>
+				</view>
+				<view class="nav-title">加入立即省钱</view>
+			</view>
+			<view class="earn-guide" v-else>
+				<view class="earn-guide-light"></view>
+				<view class="earn-guide-icon">拼</view>
+				<text class="earn-guide-main">附近待成团</text>
+				<text class="earn-guide-tag">马上拼成更省钱</text>
+			</view>
+
+			<view class="tab-card">
+				<view class="tab-item" v-for="item in tabs" :key="item.scene"
+					:class="{'tab-item-active': scene === item.scene}" @tap="switchScene(item.scene)">
+					<text>{{item.label}}</text>
+				</view>
+			</view>
+
+			<view class="search-row">
+				<view class="search-card">
+					<view class="search-box">
+						<uni-icons type="search" size="18" :color="searchIconColor"></uni-icons>
+						<input type="text" v-model="query.keyWord" confirm-type="search" placeholder="搜索商品或商家"
+							@confirm="searchGroup" />
+						<view class="search-btn" @tap="searchGroup">搜索</view>
+					</view>
+				</view>
+				<view class="seckill-entry" @tap="goSeckillGroup">
+					<view class="heat-dot heat-dot-a"></view>
+					<view class="heat-dot heat-dot-b"></view>
+					<view class="seckill-entry-light"></view>
+					<view class="seckill-entry-info">
+						<view class="seckill-entry-title">秒杀团</view>
+					</view>
+					<view class="seckill-entry-btn">抢</view>
+				</view>
+			</view>
+		</view>
+		<view class="hero-holder" v-if="!embedded"></view>
+		<view class="hero-holder hero-holder--embedded" v-else></view>
+
+		<view class="list-wrap">
+			<view class="empty-card" v-if="groupList.length === 0 && loadStatus !== 'loading'">
+				<view class="empty-icon">拼</view>
+				<view class="empty-title">暂时没有待成团</view>
+				<view class="empty-sub">换个关键词试试，或者稍后再来看看新发起的团</view>
+			</view>
+
+			<view class="group-card" v-for="(item,index) in groupList" :key="item.id" @tap="joinGroup(item)">
+				<view class="rank-pill">热拼 {{index + 1}}</view>
+				<view class="shop-row">
+					<view class="shop-img">
+						<image :src="item.uiShopIcon" mode="aspectFill"></image>
+						<view class="scene-mark">{{isStoreScene ? '团' : '饭'}}</view>
+					</view>
+					<view class="shop-info">
+						<view class="shop-name">{{item.uiShopName}}</view>
+						<view class="product-name">{{item.uiProductName}}</view>
+						<view class="tag-row">
+							<text>{{item.uiShopType}}</text>
+							<text>{{item.uiTargetMembers}}人成团</text>
+							<text>还差{{item.uiMissingMembers}}人</text>
+						</view>
+					</view>
+				</view>
+
+				<view class="product-row">
+					<image :src="item.uiProductImage" mode="aspectFill"></image>
+					<view class="product-copy">
+						<view class="price-row">
+							<text class="group-label">拼团价</text>
+							<text class="price">¥{{item.uiGroupPrice}}</text>
+						</view>
+						<view class="progress-bar">
+							<view class="progress-inner" :style="item.uiProgressStyle || ''"></view>
+						</view>
+						<view class="progress-copy">{{item.uiCurrentMembers}}人已拼 · 点击参与这一团</view>
+					</view>
+				</view>
+
+				<view class="card-bottom">
+					<view class="time-copy">{{item.uiExpireText}}</view>
+					<view class="join-btn">{{isStoreScene ? '参与到店团' : '参与拼饭局'}}</view>
+				</view>
+			</view>
+
+			<uni-load-more :status="loadStatus" v-if="groupList.length > 0" />
+		</view>
+	</view>
+</template>
+
+<script>
+	import { requireLoginToCurrentPage } from '@/utils/authRedirect.js'
+
+	export default {
+		name: 'homeGroupPending',
+		props: {
+			embedded: {
+				type: Boolean,
+				default: false
+			},
+			stickyTop: {
+				type: Number,
+				default: 0
+			},
+			stickyActive: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				scene: 'takeaway',
+				tabs: [{
+					label: '饭团',
+					scene: 'takeaway'
+				}, {
+					label: '团购',
+					scene: 'storeGroup'
+				}],
+				loadStatus: 'more',
+				totalPages: 1,
+				query: {
+					regionId: '',
+					status: 0,
+					isFace: 0,
+					merchantType: 1,
+					pageNumber: 1,
+					pageSize: 10,
+					keyWord: ''
+				},
+				groupList: [],
+				chromeHeight: 160
+			}
+		},
+		computed: {
+			isStoreScene() {
+				return this.scene === 'storeGroup'
+			},
+			searchIconColor() {
+				return this.isStoreScene ? '#f0642f' : '#08735d'
+			},
+			chromeStyle() {
+				if (!this.embedded) return ''
+				const top = Number(this.stickyTop) || 0
+				if (this.stickyActive) {
+					// 与首页 daimai-box(95%) 对齐，盖在 sticky-cover 之上
+					return 'top:' + top + 'px;left:2.5%;width:95%;'
+				}
+				return 'top:' + top + 'px;'
+			}
+		},
+		watch: {
+			stickyActive(val) {
+				if (!val) {
+					this.$nextTick(() => this.measureChrome())
+				}
+			}
+		},
+		mounted() {
+			if (this.embedded) {
+				this.$nextTick(() => {
+					setTimeout(() => this.measureChrome(), 80)
+				})
+			}
+		},
+		methods: {
+			measureChrome() {
+				if (!this.embedded || this.stickyActive) return
+				const query = uni.createSelectorQuery().in(this)
+				query.select('.pending-chrome').boundingClientRect(rect => {
+					if (rect && rect.height) {
+						this.chromeHeight = Math.ceil(rect.height)
+					}
+				}).exec()
+			},
+			init(option) {
+				this.scene = this.normalizeScene(option && option.scene)
+				this.query.merchantType = this.isStoreScene ? 2 : 1
+				this.query.keyWord = ''
+				this.query.pageNumber = 1
+				this.totalPages = 1
+				this.groupList = []
+				this.loadStatus = 'more'
+				this.initRegion()
+				this.$nextTick(() => {
+					setTimeout(() => this.measureChrome(), 80)
+				})
+			},
+			loadMore() {
+				if (this.loadStatus === 'loading' || this.query.pageNumber >= this.totalPages) return
+				this.query.pageNumber += 1
+				this.getGroupList()
+			},
+			normalizeScene(scene) {
+				return scene === 'storeGroup' ? 'storeGroup' : 'takeaway'
+			},
+			initRegion() {
+				const area = uni.getStorageSync('area')
+				if (!area) {
+					this.tui.toast('请先选择区域')
+					return
+				}
+				try {
+					const areaInfo = typeof area === 'string' ? JSON.parse(area) : area
+					this.query.regionId = areaInfo.id || ''
+				} catch (e) {
+					this.query.regionId = ''
+				}
+				if (!this.query.regionId) {
+					this.tui.toast('请先选择区域')
+					return
+				}
+				this.getGroupList()
+			},
+			searchGroup() {
+				this.query.pageNumber = 1
+				this.totalPages = 1
+				this.groupList = []
+				this.getGroupList()
+			},
+			switchScene(scene) {
+				const nextScene = this.normalizeScene(scene)
+				if (this.scene === nextScene) return
+				this.scene = nextScene
+				this.query.merchantType = this.isStoreScene ? 2 : 1
+				this.query.keyWord = ''
+				this.query.pageNumber = 1
+				this.totalPages = 1
+				this.groupList = []
+				this.loadStatus = 'more'
+				this.getGroupList()
+			},
+			getGroupList() {
+				if (!this.query.regionId) return
+				this.loadStatus = 'loading'
+				this.tui.request('/mall/admin/orderGroup/page', 'POST', this.query, false, false).then((res) => {
+					if (res.code == 200) {
+						const result = res.result || {}
+						const list = Array.isArray(result.records) ? result.records.map(item => this.formatGroupItem(item)) : []
+						if (this.query.pageNumber === 1) {
+							this.groupList = list
+						} else {
+							this.groupList = [...this.groupList, ...list]
+						}
+						this.totalPages = result.pages || result.totalPages || 1
+						this.loadStatus = this.query.pageNumber >= this.totalPages ? 'nomore' : 'more'
+					} else {
+						this.loadStatus = 'nomore'
+						this.tui.toast(res.message)
+					}
+				}).catch(() => {
+					this.loadStatus = 'nomore'
+				})
+			},
+			joinGroup(item) {
+				if (!requireLoginToCurrentPage()) return
+				const shopItem = item.shopItem || {}
+				if (!shopItem.id) {
+					this.tui.toast('商家信息缺失，暂时无法参团')
+					return
+				}
+				const sceneQuery = this.isStoreScene ? '&orderScene=storeGroup' : ''
+				const shopItemStr = encodeURIComponent(JSON.stringify(shopItem))
+				uni.navigateTo({
+					url: '/package2/group/groupBuySingle?type=shop&item=' + shopItemStr +
+						'&groupId=' + item.id +
+						'&targetMembers=' + (item.targetMembers || 2) +
+						'&isFaceToFace=0' + sceneQuery
+				})
+			},
+			goSeckillGroup() {
+				if (!requireLoginToCurrentPage()) return
+				uni.navigateTo({
+					url: '/package3/seckill/seckillGroup'
+				})
+			},
+			getShopIcon(item) {
+				return (item.shopItem && item.shopItem.shopIcon) || item.productPicture || '/static/images/img/shangpintu.png'
+			},
+			formatGroupItem(item) {
+				return {
+					...item,
+					uiShopIcon: this.getShopIcon(item),
+					uiProductImage: item.productPicture || this.getShopIcon(item),
+					uiShopName: this.getShopName(item),
+					uiProductName: item.productName || '热门拼团',
+					uiShopType: this.getShopType(item),
+					uiTargetMembers: item.targetMembers || 2,
+					uiCurrentMembers: item.currentMembers || 0,
+					uiMissingMembers: this.missingMembers(item),
+					uiGroupPrice: this.formatPrice(item.groupPrice),
+					uiExpireText: this.formatExpireText(item),
+					uiProgressStyle: this.buildProgressStyle(item)
+				}
+			},
+			getShopName(item) {
+				return (item.shopItem && item.shopItem.shopName) || item.shopName || '未知商家'
+			},
+			getShopType(item) {
+				const shopItem = item.shopItem || {}
+				return shopItem.shopTypeTitle || (shopItem.shopTakeaway && shopItem.shopTakeaway.type) || (this.isStoreScene ? '团购' : '美食')
+			},
+			missingMembers(item) {
+				const target = Number(item.targetMembers || 2)
+				const current = Number(item.currentMembers || 0)
+				return Math.max(target - current, 0)
+			},
+			buildProgressStyle(item) {
+				const target = Number(item.targetMembers || 2)
+				const current = Number(item.currentMembers || 0)
+				const percent = target > 0 ? Math.min(100, Math.max(12, Math.round(current / target * 100))) : 12
+				return 'width: ' + percent + '%;'
+			},
+			formatPrice(price) {
+				const num = Number(price || 0)
+				return num ? num.toFixed(2) : '--'
+			},
+			formatExpireText(item) {
+				if (!item.expireTime) return '24小时内成团'
+				const expire = new Date(item.expireTime).getTime()
+				const diff = expire - Date.now()
+				if (isNaN(expire) || diff <= 0) return '即将结束'
+				const hours = Math.floor(diff / 3600000)
+				const minutes = Math.floor((diff % 3600000) / 60000)
+				return hours > 0 ? '剩余约' + hours + '小时' + minutes + '分' : '剩余约' + minutes + '分'
+			},
+			back() {
+				uni.navigateBack()
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.pending-page {
+		min-height: 100vh;
+		padding-bottom: 140rpx;
+		background:
+			radial-gradient(circle at 12% 8%, rgba(197, 255, 153, 0.5), transparent 34%),
+			radial-gradient(circle at 90% 18%, rgba(175, 255, 231, 0.48), transparent 36%),
+			linear-gradient(180deg, #f6ffea 0%, #f7fff9 42%, #fff9ef 100%);
+		color: #06382f;
+		box-sizing: border-box;
+	}
+
+	.pending-page--embedded {
+		min-height: auto;
+		padding-bottom: 40rpx;
+		background: transparent;
+	}
+
+	/* 嵌入首页时外层已有 daimai-box(95%)，去掉组件内二次缩进，与上方广告区对齐 */
+	.pending-page--embedded .pending-chrome {
+		padding-left: 0;
+		padding-right: 0;
+	}
+
+	.pending-page--embedded .list-wrap {
+		width: 100%;
+	}
+
+	.store-scene {
+		background:
+			radial-gradient(circle at 82% 120rpx, rgba(255, 241, 210, 0.86) 0, rgba(255, 241, 210, 0) 260rpx),
+			radial-gradient(circle at 10% 260rpx, rgba(255, 190, 185, 0.3) 0, rgba(255, 190, 185, 0) 240rpx),
+			linear-gradient(180deg, #ffd0b8 0%, #ffe6d6 260rpx, #fff7ef 560rpx, #fffaf6 100%);
+		color: #3f2618;
+	}
+
+	.pending-page--embedded.store-scene {
+		background: transparent;
+	}
+
+	.pending-chrome {
+		width: 100%;
+		box-sizing: border-box;
+		padding: 0 26rpx 22rpx;
+	}
+
+	.pending-chrome--fixed {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		z-index: 1000;
+		padding: 88rpx 26rpx 22rpx;
+		background: rgba(247, 255, 249, 0.94);
+		box-shadow: 0 12rpx 30rpx rgba(20, 115, 88, 0.08);
+		backdrop-filter: blur(18rpx);
+	}
+
+	.store-scene .pending-chrome--fixed {
+		background: rgba(255, 249, 243, 0.96);
+		box-shadow: 0 12rpx 30rpx rgba(178, 102, 48, 0.1);
+	}
+
+	.pending-chrome-holder {
+		width: 100%;
+		box-sizing: border-box;
+	}
+
+	.pending-chrome--sticky {
+		/* 小程序组件内 sticky 不可靠，嵌入首页改用 fixed */
+		position: fixed;
+		right: auto;
+		z-index: 98;
+		padding-top: 16rpx;
+		padding-bottom: 18rpx;
+		box-sizing: border-box;
+		background: rgba(246, 255, 251, 0.98);
+		box-shadow: 0 12rpx 28rpx rgba(20, 115, 88, 0.1);
+		backdrop-filter: blur(16rpx);
+	}
+
+	.store-scene .pending-chrome--sticky {
+		background: rgba(255, 249, 243, 0.98);
+		box-shadow: 0 12rpx 28rpx rgba(178, 102, 48, 0.1);
+	}
+
+	.pending-title {
+		height: 56rpx;
+		margin-top: 8rpx;
+		color: #073d33;
+		font-size: 32rpx;
+		font-weight: 900;
+		line-height: 56rpx;
+	}
+
+	.store-scene .pending-title {
+		color: #3f2618;
+	}
+
+	.earn-guide {
+		height: 64rpx;
+		margin: 8rpx 0 0;
+		padding: 0 12rpx 0 18rpx;
+		box-sizing: border-box;
+		border-radius: 16rpx;
+		background:
+			radial-gradient(circle at 10% 0%, rgba(255, 255, 255, 0.9) 0, rgba(255, 255, 255, 0) 74rpx),
+			linear-gradient(90deg, rgba(236, 255, 248, 0.98) 0%, rgba(255, 252, 237, 0.98) 58%, rgba(255, 238, 226, 0.98) 100%);
+		border: 1px solid rgba(255, 255, 255, 0.88);
+		box-shadow: 0 10rpx 24rpx rgba(74, 151, 111, 0.08), inset 0 1rpx 0 rgba(255, 255, 255, 0.9);
+		display: flex;
+		align-items: center;
+		position: relative;
+		overflow: hidden;
+	}
+
+	.store-scene .earn-guide {
+		background:
+			radial-gradient(circle at 10% 0%, rgba(255, 255, 255, 0.92) 0, rgba(255, 255, 255, 0) 74rpx),
+			linear-gradient(90deg, rgba(255, 244, 236, 0.98) 0%, rgba(255, 248, 236, 0.98) 58%, rgba(255, 236, 220, 0.98) 100%);
+		box-shadow: 0 10rpx 24rpx rgba(178, 102, 48, 0.08), inset 0 1rpx 0 rgba(255, 255, 255, 0.9);
+	}
+
+	.earn-guide-light {
+		width: 180rpx;
+		height: 100rpx;
+		background: linear-gradient(105deg, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.74) 48%, rgba(255, 255, 255, 0) 100%);
+		position: absolute;
+		top: -18rpx;
+		left: -210rpx;
+		transform: rotate(12deg);
+		animation: seckillEntrySweep 5.2s ease-in-out infinite;
+	}
+
+	.earn-guide-icon {
+		width: 48rpx;
+		height: 48rpx;
+		margin-right: 12rpx;
+		border-radius: 14rpx;
+		background: linear-gradient(135deg, #e8ffb8, #b8ffe9);
+		color: #08735d;
+		font-size: 26rpx;
+		font-weight: 900;
+		line-height: 48rpx;
+		text-align: center;
+		position: relative;
+		z-index: 1;
+	}
+
+	.store-scene .earn-guide-icon {
+		background: linear-gradient(135deg, #ff9a72 0%, #ffd38a 100%);
+		color: #fff;
+	}
+
+	.earn-guide-main {
+		color: #0c6958;
+		font-size: 26rpx;
+		font-weight: 900;
+		letter-spacing: 1rpx;
+		position: relative;
+		z-index: 1;
+		white-space: nowrap;
+	}
+
+	.store-scene .earn-guide-main {
+		color: #3f2618;
+	}
+
+	.earn-guide-tag {
+		height: 36rpx;
+		margin-left: auto;
+		padding: 0 12rpx;
+		border-radius: 999rpx;
+		color: #ff7a3f;
+		font-size: 22rpx;
+		font-weight: 900;
+		line-height: 36rpx;
+		position: relative;
+		z-index: 1;
+		white-space: nowrap;
+	}
+
+	.hero-holder {
+		width: 100%;
+		height: 396rpx;
+	}
+
+	.hero-holder--embedded {
+		height: 0;
+	}
+
+	.nav-row {
+		position: relative;
+		display: flex;
+		align-items: center;
+		height: 64rpx;
+	}
+
+	.back-btn {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 64rpx;
+		height: 64rpx;
+		border-radius: 999rpx;
+		background: rgba(255, 255, 255, 0.96);
+		border: 1rpx solid rgba(255, 255, 255, 0.82);
+		box-shadow: 0 8rpx 18rpx rgba(0, 45, 29, 0.08);
+		box-sizing: border-box;
+		flex-shrink: 0;
+	}
+
+	.nav-title {
+		position: absolute;
+		left: 50%;
+		width: 220rpx;
+		height: 64rpx;
+		color: #073d33;
+		font-size: 34rpx;
+		font-weight: 900;
+		line-height: 64rpx;
+		text-align: center;
+		transform: translateX(-50%);
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.store-scene .nav-title {
+		color: #3f2618;
+	}
+
+	.tab-card {
+		display: flex;
+		height: 76rpx;
+		margin-top: 24rpx;
+		padding: 8rpx;
+		border-radius: 999rpx;
+		background: rgba(255, 255, 255, 0.72);
+		box-shadow: inset 0 0 0 1rpx rgba(255, 255, 255, 0.82);
+		box-sizing: border-box;
+	}
+
+	.tab-item {
+		flex: 1;
+		height: 60rpx;
+		border-radius: 999rpx;
+		color: rgba(7, 61, 51, 0.56);
+		font-size: 27rpx;
+		font-weight: 900;
+		line-height: 60rpx;
+		text-align: center;
+	}
+
+	.tab-item-active {
+		background: linear-gradient(90deg, #dcff9c, #baffec);
+		color: #08735d;
+		box-shadow: 0 10rpx 24rpx rgba(13, 114, 82, 0.14);
+	}
+
+	.store-scene .tab-item {
+		color: rgba(84, 43, 22, 0.56);
+	}
+
+	.store-scene .tab-item-active {
+		background: linear-gradient(135deg, #ff7444 0%, #ffae53 100%);
+		color: #fff;
+		box-shadow: 0 10rpx 24rpx rgba(255, 126, 39, 0.2);
+	}
+
+	.search-row {
+		width: 100%;
+		margin: 18rpx auto 0;
+		display: flex;
+		align-items: center;
+	}
+
+	.search-card {
+		flex: 1;
+		min-width: 0;
+		margin-right: 14rpx;
+		height: 60rpx;
+		padding: 0;
+		border-radius: 999rpx;
+		background: rgba(255, 255, 255, 0.76);
+		box-shadow: 0 18rpx 42rpx rgba(20, 115, 88, 0.12);
+		box-sizing: border-box;
+		position: relative;
+		z-index: 3;
+	}
+
+	.store-scene .search-card {
+		box-shadow: 0 18rpx 42rpx rgba(178, 102, 48, 0.12);
+	}
+
+	.search-box {
+		height: 60rpx;
+		padding: 0 12rpx;
+		border-radius: 999rpx;
+		background: #fff;
+		display: flex;
+		align-items: center;
+	}
+
+	.search-box input {
+		flex: 1;
+		min-width: 0;
+		height: 60rpx;
+		margin-left: 10rpx;
+		font-size: 22rpx;
+		color: #243d36;
+	}
+
+	.search-btn {
+		width: 74rpx;
+		height: 38rpx;
+		border-radius: 999rpx;
+		background: linear-gradient(90deg, #dcff9c, #baffec);
+		color: #08735d;
+		font-size: 20rpx;
+		font-weight: 900;
+		line-height: 38rpx;
+		text-align: center;
+	}
+
+	.store-scene .search-btn {
+		background: linear-gradient(135deg, #ff7444 0%, #ffae53 100%);
+		color: #fff;
+	}
+
+	.seckill-entry {
+		width: 172rpx;
+		height: 60rpx;
+		padding: 0 10rpx;
+		border-radius: 999rpx;
+		border: 1rpx solid rgba(255, 255, 255, 0.52);
+		background:
+			radial-gradient(circle at 18% 4%, rgba(255, 255, 255, 0.55) 0, rgba(255, 255, 255, 0) 76rpx),
+			linear-gradient(135deg, #ff4b27 0%, #ff8b18 48%, #ffd257 100%);
+		box-shadow: 0 16rpx 30rpx rgba(255, 91, 39, 0.24), 0 0 40rpx rgba(255, 188, 80, 0.26);
+		box-sizing: border-box;
+		display: flex;
+		align-items: center;
+		flex-shrink: 0;
+		position: relative;
+		overflow: hidden;
+	}
+
+	.seckill-entry:active {
+		transform: scale(0.96);
+	}
+
+	.seckill-entry-light {
+		width: 190rpx;
+		height: 120rpx;
+		background: linear-gradient(105deg, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.76) 46%, rgba(255, 255, 255, 0) 100%);
+		position: absolute;
+		top: -20rpx;
+		left: -220rpx;
+		transform: rotate(12deg);
+		animation: seckillEntrySweep 4.8s ease-in-out infinite;
+	}
+
+	.seckill-entry-info {
+		flex: 1;
+		min-width: 0;
+		padding-left: 14rpx;
+		position: relative;
+		z-index: 1;
+		color: #fff;
+	}
+
+	.seckill-entry-title {
+		font-size: 26rpx;
+		font-weight: 900;
+		line-height: 60rpx;
+		letter-spacing: 1rpx;
+		text-shadow: 0 3rpx 8rpx rgba(183, 35, 0, 0.24);
+	}
+
+	.seckill-entry-btn {
+		width: 42rpx;
+		height: 42rpx;
+		border-radius: 50%;
+		background: #fff;
+		color: #ff3d18;
+		font-size: 24rpx;
+		font-weight: 900;
+		line-height: 42rpx;
+		text-align: center;
+		position: relative;
+		z-index: 1;
+		box-shadow: 0 8rpx 18rpx rgba(158, 32, 0, 0.22);
+		animation: seckillBtnBeat 2.8s ease-in-out infinite;
+	}
+
+	.heat-dot {
+		width: 12rpx;
+		height: 12rpx;
+		position: absolute;
+		border-radius: 50%;
+		background: rgba(255, 255, 255, 0.92);
+		box-shadow: 0 0 16rpx rgba(255, 255, 255, 0.88);
+		z-index: 1;
+		animation: heatParticle 3.2s ease-in-out infinite;
+	}
+
+	.heat-dot-a {
+		left: 28rpx;
+		top: 18rpx;
+	}
+
+	.heat-dot-b {
+		right: 64rpx;
+		bottom: 16rpx;
+		animation-delay: 0.5s;
+	}
+
+	.list-wrap {
+		width: 94%;
+		margin: 0 auto;
+		position: relative;
+		z-index: 1;
+	}
+
+	.empty-card,
+	.group-card {
+		border-radius: 34rpx;
+		background: rgba(255, 255, 255, 0.86);
+		box-shadow: 0 18rpx 44rpx rgba(19, 91, 70, 0.12);
+		border: 1rpx solid rgba(255, 255, 255, 0.86);
+		box-sizing: border-box;
+	}
+
+	.store-scene .empty-card,
+	.store-scene .group-card {
+		box-shadow: 0 16rpx 34rpx rgba(178, 102, 48, 0.12);
+		border-color: rgba(255, 221, 188, 0.72);
+	}
+
+	.empty-card {
+		min-height: 460rpx;
+		padding-top: 110rpx;
+		text-align: center;
+	}
+
+	.empty-icon {
+		width: 100rpx;
+		height: 100rpx;
+		margin: 0 auto 22rpx;
+		border-radius: 34rpx;
+		background: linear-gradient(135deg, #e8ffb8, #b8ffe9);
+		color: #08735d;
+		font-size: 34rpx;
+		font-weight: 900;
+		line-height: 100rpx;
+	}
+
+	.store-scene .empty-icon {
+		background: linear-gradient(135deg, #ff9a72 0%, #ffd38a 100%);
+		color: #fff;
+	}
+
+	.empty-title {
+		font-size: 30rpx;
+		font-weight: 900;
+	}
+
+	.empty-sub {
+		width: 78%;
+		margin: 14rpx auto 0;
+		color: rgba(0, 35, 28, 0.56);
+		font-size: 24rpx;
+		line-height: 38rpx;
+	}
+
+	.group-card {
+		margin-bottom: 22rpx;
+		padding: 20rpx 18rpx 18rpx;
+		position: relative;
+		overflow: hidden;
+	}
+
+	.rank-pill {
+		position: absolute;
+		right: 18rpx;
+		top: 18rpx;
+		z-index: 2;
+		padding: 5rpx 13rpx;
+		border-radius: 999rpx;
+		background: rgba(219, 255, 157, 0.72);
+		color: #08735d;
+		font-size: 18rpx;
+		font-weight: 900;
+	}
+
+	.store-scene .rank-pill {
+		background: #fff0dc;
+		color: #e96632;
+	}
+
+	.shop-row {
+		display: flex;
+	}
+
+	.shop-img {
+		width: 168rpx;
+		height: 168rpx;
+		flex-shrink: 0;
+		border-radius: 30rpx;
+		overflow: hidden;
+		position: relative;
+		background: #f4fff3;
+		box-shadow: 0 14rpx 28rpx rgba(20, 75, 57, 0.14);
+	}
+
+	.shop-img image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.scene-mark {
+		width: 42rpx;
+		height: 42rpx;
+		border-radius: 50%;
+		background: rgba(255, 255, 255, 0.92);
+		color: #ff5a35;
+		font-size: 22rpx;
+		font-weight: 900;
+		line-height: 42rpx;
+		text-align: center;
+		position: absolute;
+		left: 10rpx;
+		top: 10rpx;
+	}
+
+	.shop-info {
+		flex: 1;
+		min-width: 0;
+		padding-left: 20rpx;
+		box-sizing: border-box;
+	}
+
+	.shop-name {
+		padding-right: 92rpx;
+		font-size: 33rpx;
+		line-height: 42rpx;
+		font-weight: 900;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.product-name {
+		margin-top: 10rpx;
+		color: rgba(0, 35, 28, 0.58);
+		font-size: 24rpx;
+		line-height: 34rpx;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.store-scene .product-name {
+		color: #876247;
+	}
+
+	.tag-row {
+		margin-top: 16rpx;
+		overflow: hidden;
+	}
+
+	.tag-row text {
+		display: inline-block;
+		margin: 0 8rpx 8rpx 0;
+		padding: 5rpx 10rpx;
+		border-radius: 12rpx;
+		background: rgba(184, 255, 225, 0.62);
+		color: #08735d;
+		font-size: 20rpx;
+		font-weight: 900;
+	}
+
+	.store-scene .tag-row text {
+		background: #fff0dc;
+		color: #d65f2c;
+	}
+
+	.product-row {
+		margin-top: 18rpx;
+		padding: 14rpx;
+		border-radius: 26rpx;
+		background: rgba(255, 250, 237, 0.72);
+		display: flex;
+	}
+
+	.store-scene .product-row {
+		background: #fff7ee;
+	}
+
+	.product-row image {
+		width: 110rpx;
+		height: 110rpx;
+		border-radius: 22rpx;
+		background: #fff;
+		flex-shrink: 0;
+	}
+
+	.product-copy {
+		flex: 1;
+		min-width: 0;
+		padding-left: 16rpx;
+		box-sizing: border-box;
+	}
+
+	.price-row {
+		height: 42rpx;
+		display: flex;
+		align-items: center;
+	}
+
+	.group-label {
+		margin-right: 10rpx;
+		padding: 4rpx 9rpx;
+		border-radius: 10rpx;
+		background: #fff0dc;
+		color: #b4572d;
+		font-size: 19rpx;
+		font-weight: 900;
+	}
+
+	.price {
+		color: #f0441f;
+		font-size: 30rpx;
+		font-weight: 900;
+	}
+
+	.progress-bar {
+		height: 14rpx;
+		margin-top: 16rpx;
+		border-radius: 999rpx;
+		background: rgba(214, 239, 210, 0.8);
+		overflow: hidden;
+	}
+
+	.progress-inner {
+		height: 100%;
+		border-radius: 999rpx;
+		background: linear-gradient(90deg, #a6ffea 0%, #e3ff96 100%);
+	}
+
+	.store-scene .progress-inner {
+		background: linear-gradient(90deg, #ff7444 0%, #ffd16e 100%);
+	}
+
+	.progress-copy {
+		margin-top: 10rpx;
+		color: rgba(0, 35, 28, 0.52);
+		font-size: 21rpx;
+		font-weight: 800;
+	}
+
+	.store-scene .progress-copy {
+		color: #8f715b;
+	}
+
+	.card-bottom {
+		height: 58rpx;
+		margin-top: 16rpx;
+		padding-top: 12rpx;
+		border-top: 1rpx solid rgba(20, 90, 70, 0.08);
+		display: flex;
+		align-items: center;
+	}
+
+	.time-copy {
+		flex: 1;
+		color: rgba(0, 35, 28, 0.58);
+		font-size: 22rpx;
+		font-weight: 800;
+	}
+
+	.store-scene .time-copy {
+		color: #8f715b;
+	}
+
+	.join-btn {
+		width: 160rpx;
+		height: 50rpx;
+		border-radius: 999rpx;
+		background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));
+		color: #08735d;
+		font-size: 24rpx;
+		font-weight: 900;
+		line-height: 50rpx;
+		text-align: center;
+		box-shadow: 0 12rpx 24rpx rgba(13, 114, 82, 0.16);
+	}
+
+	.store-scene .join-btn {
+		background: linear-gradient(135deg, #ff7444 0%, #ff9f38 100%);
+		color: #fff;
+		box-shadow: 0 12rpx 24rpx rgba(255, 126, 39, 0.24);
+	}
+
+	@keyframes seckillEntrySweep {
+		0% {
+			left: -220rpx;
+			opacity: 0;
+		}
+		38% {
+			opacity: 0;
+		}
+		58% {
+			opacity: 1;
+		}
+		100% {
+			left: 220rpx;
+			opacity: 0;
+		}
+	}
+
+	@keyframes seckillBtnBeat {
+		0%,
+		100% {
+			transform: scale(1);
+		}
+		50% {
+			transform: scale(1.1);
+		}
+	}
+
+	@keyframes heatParticle {
+		0%,
+		100% {
+			opacity: 0.5;
+			transform: translateY(0) scale(1);
+		}
+		50% {
+			opacity: 1;
+			transform: translateY(-6rpx) scale(1.2);
+		}
+	}
+</style>
diff --git a/components/tab-bar/myCenter.vue b/components/tab-bar/myCenter.vue
index d466cc8..63602e2 100644
--- a/components/tab-bar/myCenter.vue
+++ b/components/tab-bar/myCenter.vue
@@ -16,7 +16,7 @@
 							</view>
 							<view class="school-row" hover-class="tap-soft" hover-stay-time="80"
 								@tap.stop="navigatorTo('qiehuan')">{{schoolName1}} ›</view>
-							<view class="identity-pill" @tap.stop="navigatorTo('qiehuan')">切换校区</view>
+							<view class="identity-pill" @tap.stop="navigatorTo('qiehuan')">切换区域</view>
 						</view>
 					</view>
 					<!-- <view class="ticket-card" hover-class="tap-soft" hover-stay-time="80" @tap="navigatorTo('blindBox')">
@@ -42,7 +42,7 @@
 				<view class="legal-btn fade-up" hover-class="tap-soft" hover-stay-time="80"
 					style="animation-delay: 280ms;" @tap="openOfficialAccountPopup">
 					<text class="legal-dot"></text>
-					<text>关注公众号，可实时接收ie/校园圈/二手消息</text>
+					<text>关注公众号，可实时接收ie/圈子/二手消息</text>
 					<text class="legal-arrow">›</text>
 				</view>
 				
@@ -155,7 +155,7 @@
 			<view class="official-account-card" @tap.stop>
 				<view class="official-account-close" @tap="closeOfficialAccountPopup">×</view>
 				<view class="official-account-title">关注公众号</view>
-				<view class="official-account-desc">关注后，可实时接收 i/e、校园圈、校园二手消息提醒</view>
+				<view class="official-account-desc">关注后，可实时接收 i/e、圈子、二手消息提醒</view>
 				<image
 					show-menu-by-longpress
 					class="official-account-qr"
@@ -221,13 +221,13 @@
 				<view class="area-popup-glow area-popup-glow-a"></view>
 				<view class="area-popup-glow area-popup-glow-b"></view>
 				<view class="campus-area-header">
-					<view class="campus-area-kicker">选择你的校园半径</view>
-					<view class="campus-area-title">你现在在哪个校区？</view>
+					<view class="campus-area-kicker">选择你的区域半径</view>
+					<view class="campus-area-title">你现在在哪个区域？</view>
 					<view class="campus-area-subtitle">选定后，会优先展示附近同学正在拼的内容。</view>
 				</view>
 				<view class="campus-area-search">
 					<text class="area-search-icon">⌕</text>
-					<input v-model="areaKeyword" confirm-type="search" placeholder="搜索学校 / 校区 / 区域"
+					<input v-model="areaKeyword" confirm-type="search" placeholder="搜索区域、学校"
 						placeholder-class="area-search-placeholder" />
 				</view>
 				<scroll-view scroll-y class="campus-area-list">
@@ -240,7 +240,7 @@
 						<view class="area-item-action">进入</view>
 					</view>
 					<view class="campus-area-empty" v-if="filteredAreaList.length === 0">
-						<view class="area-empty-title">没找到这个校区</view>
+						<view class="area-empty-title">没找到这个区域</view>
 						<view class="area-empty-desc">换个关键词试试，比如学校简称或区域名</view>
 					</view>
 				</scroll-view>
@@ -387,7 +387,7 @@
 					action: 'planet'
 				}, {
 					type: 'school',
-					title: '学院奖金',
+					title: '排位奖金',
 					subPre: '',
 					subEm: '有现金奖励哦',
 					subPost: '',
diff --git a/components/tab-bar/postList.vue b/components/tab-bar/postList.vue
index 4f7511f..ebe6f10 100644
--- a/components/tab-bar/postList.vue
+++ b/components/tab-bar/postList.vue
@@ -3,11 +3,11 @@
 		<view class="fixed-header" :style="{ paddingTop: statusBarTop + 'px' }">
 			<view class="brand-row">
 				<view class="brand">
-					<text class="brand-main">校园二手</text>
+					<text class="brand-main">{{brandMainText}}</text>
 					<text class="brand-sub">鱼塘</text>
 					<view class="brand-fish">≋</view>
 				</view>
-				<view class="brand-slogan">物尽其用 · 让校园更美好</view>
+				<view class="brand-slogan">{{brandSloganText}}</view>
 			</view>
 			<view class="search-bar">
 				<uni-icons type="search" size="19" color="#8d9693"></uni-icons>
@@ -204,6 +204,12 @@
 	}
 
 	export default {
+		props: {
+			socialMode: {
+				type: Boolean,
+				default: false
+			}
+		},
 		data() {
 			return {
 				menuButtonInfo: {},
@@ -257,6 +263,24 @@
 			}
 		},
 		computed: {
+			isSocialArea() {
+				return !!this.socialMode
+			},
+			brandMainText() {
+				return this.isSocialArea ? '同城二手' : '校园二手'
+			},
+			brandSloganText() {
+				return this.isSocialArea ? '物尽其用 · 让同城更便捷' : '物尽其用 · 让校园更美好'
+			},
+			defaultUserName() {
+				return this.isSocialArea ? '同城好友' : '校园同学'
+			},
+			defaultRegionName() {
+				return this.isSocialArea ? '本区' : '本校'
+			},
+			fishBadgeText() {
+				return this.isSocialArea ? '同城二手' : '校园二手'
+			},
 			categories() {
 				return this.baseCategories.concat(this.categoryList.map(item => item.name))
 			},
@@ -580,7 +604,7 @@
 			},
 			normalizeRecords(records, isWant) {
 				const area = this.getArea()
-				const fallbackRegionName = area.title || area.name || uni.getStorageSync('schoolName') || '本校'
+				const fallbackRegionName = area.title || area.name || uni.getStorageSync('schoolName') || this.defaultRegionName
 				return (Array.isArray(records) ? records : []).map(item => {
 					const images = this.parseJsonList(item.images)
 					const tags = this.parseJsonList(item.tags)
@@ -593,9 +617,9 @@
 						originalPrice: item.originPrice,
 						xiangyao: item.likeCount || 0,
 						browseCount: item.browseCount || 0,
-						distance: item.distance || '本校',
+						distance: item.distance || this.defaultRegionName,
 						icon: item.userAvatar || 'https://jewel-shop.oss-cn-beijing.aliyuncs.com/f7227759d693497a8beab87ff437a875.png',
-						shopName: item.userName || '校园同学',
+						shopName: item.userName || this.defaultUserName,
 						regionName: item.regionName || item.schoolName || item.areaName || fallbackRegionName,
 						tags: tags.length ? tags : (item.negotiable == 1 ? ['可小刀'] : []),
 						category: item.categoryName || '',
@@ -691,7 +715,7 @@
 				})
 			},
 			async goPublish(type) {
-				const verified = await this.ensureVerified('发布校园二手信息')
+				const verified = await this.ensureVerified(this.isSocialArea ? '发布二手信息' : '发布校园二手信息')
 				if (!verified) return
 				uni.navigateTo({
 					url: '/package1/tabbar/fishRelease?type=' + (type || 'sell')
@@ -704,7 +728,7 @@
 				})
 			},
 			async goFishSessions() {
-				const verified = await this.ensureVerified('查看校园二手聊天')
+				const verified = await this.ensureVerified(this.isSocialArea ? '查看二手聊天' : '查看校园二手聊天')
 				if (!verified) return
 				uni.navigateTo({
 					url: '/package2/IdleTrad/sessionList'
@@ -723,7 +747,7 @@
 					profile: profile || {},
 					actionText,
 					authDialog: {
-						badge: '校园二手',
+						badge: this.fishBadgeText,
 						title: '实名认证',
 						content: actionText + '前需完成实名认证。半径里不会存储您的实名信息。',
 						steps: []
diff --git a/components/tab-bar/release.vue b/components/tab-bar/release.vue
index 6afc109..006afff 100644
--- a/components/tab-bar/release.vue
+++ b/components/tab-bar/release.vue
@@ -1,15 +1,15 @@
-<template>
+<template>
 	<view class="campus-page">
 		<view class="header" :style="{ paddingTop: statusBarHeight + 'px' }">
 			<view class="brand-line">
-				<text class="brand">校园热榜</text>
+				<text class="brand">{{brandTitle}}</text>
 				<text class="eating">热议中</text>
 			</view>
-			<view class="subtitle">每天都有新鲜事，全校都在聊</view>
+			<view class="subtitle">{{brandSubtitle}}</view>
 			<view class="search-line">
 				<view class="search-box">
 					<uni-icons type="search" size="19" color="#8a9692"></uni-icons>
-					<input class="search-input" v-model.trim="keyword" placeholder="搜索校园热议、关键词" placeholder-class="placeholder" confirm-type="search" @confirm="search" />
+					<input class="search-input" v-model.trim="keyword" :placeholder="searchPlaceholder" placeholder-class="placeholder" confirm-type="search" @confirm="search" />
 					<view class="search-button" @tap="search">搜索</view>
 				</view>
 				<view class="release-fab" @tap="goPublish">
@@ -36,7 +36,7 @@
 				<view
 					class="category-card"
 					:class="{ active: activeCategory === item.tone }"
-					v-for="item in channels"
+					v-for="item in displayChannels"
 					:key="item.tone"
 					@tap="selectCategory(item.tone)"
 				>
@@ -107,7 +107,7 @@
 						<image class="avatar" :src="displayAvatar(item)" mode="aspectFill"></image>
 						<view class="author-main">
 							<view class="author">{{displayName(item)}}</view>
-							<view class="time">{{item.createTime || ''}} · <text class="time-category">{{item.categoryName || '本校'}}</text></view>
+							<view class="time">{{item.createTime || ''}} · <text class="time-category">{{item.categoryName || '本区域'}}</text></view>
 						</view>
 						<view class="partner-action" v-if="canUsePartnerChat(item)" @tap.stop="goChat(item)">搭一下</view>
 					</view>
@@ -249,6 +249,12 @@
 	const releaseIconDownloading = {}
 
 	export default {
+		props: {
+			socialMode: {
+				type: Boolean,
+				default: false
+			}
+		},
 		data() {
 			return {
 				statusBarHeight: 24,
@@ -285,6 +291,37 @@
 			}
 		},
 		computed: {
+			isSocialArea() {
+				return !!this.socialMode
+			},
+			brandTitle() {
+				return this.isSocialArea ? '同城热榜' : '校园热榜'
+			},
+			brandSubtitle() {
+				return this.isSocialArea ? '每天都有新鲜事，同城都在聊' : '每天都有新鲜事，全校都在聊'
+			},
+			searchPlaceholder() {
+				return this.isSocialArea ? '搜索同城热议、关键词' : '搜索校园热议、关键词'
+			},
+			circleName() {
+				return this.isSocialArea ? '同城圈' : '校园圈'
+			},
+			defaultUserName() {
+				return this.isSocialArea ? '半径好友' : '半径同学'
+			},
+			displayChannels() {
+				if (!this.isSocialArea) return this.channels
+				return this.channels.map((item) => {
+					const next = Object.assign({}, item)
+					if (item.tone === 'wall') {
+						next.name = '同城墙'
+						next.desc = '新鲜事'
+					} else if (item.tone === 'daily') {
+						next.desc = '吃饭逛街'
+					}
+					return next
+				})
+			},
 			headerHeight() {
 				return this.statusBarHeight + (uni.upx2px ? uni.upx2px(204) : 102)
 			},
@@ -305,8 +342,8 @@
 			},
 			sectionTitle() {
 				if (this.activeCategory === 'mine') return '我的圈子'
-				const item = this.channels.find(row => row.tone === this.activeCategory)
-				return item ? item.name : '校园圈'
+				const item = this.displayChannels.find(row => row.tone === this.activeCategory)
+				return item ? item.name : this.circleName
 			},
 			sectionSubTitle() {
 				if (this.postSortType === 'hot') return '按点赞和评论综合热度排序'
@@ -696,7 +733,7 @@
 				try { return JSON.parse(item.tags) || [] } catch (e) { return [] }
 			},
 			displayName(item) {
-				return item && item.userName ? item.userName : '半径同学'
+				return item && item.userName ? item.userName : this.defaultUserName
 			},
 			isAnonymousItem(item) {
 				if (!item) return false
@@ -709,6 +746,8 @@
 					|| item.isAnonymous === '1'
 					|| item.isAnonymous === 'true'
 					|| item.userName === '半径同学'
+					|| item.userName === '半径好友'
+					|| item.userName === this.defaultUserName
 			},
 			displayAvatar(item) {
 				if (this.isAnonymousItem(item)) return this.defaultAvatar
@@ -734,13 +773,13 @@
 				uni.navigateTo({ url: '/package1/post/postDetail?id=' + item.id + '&source=campus' })
 			},
 			async goPublish() {
-				const ok = await this.ensureVerified('发布校园圈内容')
+				const ok = await this.ensureVerified(this.isSocialArea ? '发布同城圈内容' : '发布校园圈内容')
 				if (!ok) return
 				uni.navigateTo({ url: '/package1/campus/campusRelease?type=' + (this.activeCategory === 'wall' || this.activeCategory === 'mine' ? 'wall' : this.activeCategory) })
 			},
 			async goChat(item) {
 				if (!this.canUsePartnerChat(item)) return
-				const ok = await this.ensureVerified('联系校园圈搭子')
+				const ok = await this.ensureVerified(this.isSocialArea ? '联系同城圈搭子' : '联系校园圈搭子')
 				if (!ok) return
 				createCampusChatSession(item.id).then(session => {
 					if (!session || !session.sessionId) return
@@ -797,7 +836,7 @@
 				return ensureIeVerifiedBeforeAction({
 					profile: profile || {},
 					actionText,
-					authDialog: { badge: '校园圈', title: '实名认证', desc: actionText + '前需完成实名认证' },
+					authDialog: { badge: this.circleName, title: '实名认证', desc: actionText + '前需完成实名认证' },
 					reload: getIeProfile,
 					requireProfileSetup: false
 				})
diff --git a/components/tab-bar/tab-bar.vue b/components/tab-bar/tab-bar.vue
index f2e114a..518ac9d 100644
--- a/components/tab-bar/tab-bar.vue
+++ b/components/tab-bar/tab-bar.vue
@@ -1,25 +1,25 @@
 <template>
 	<view class="tabbar-box">
-		<view class="bar-box" @click="clickBar(index)" v-for="(item,index) in tabList" :key="index" hover-class="none">
-			<view class="red-dot" v-if="index == 0 && indexZhipaiCount > 0">
+		<view class="bar-box" @click="clickBar(index)" v-for="(item,index) in displayTabs" :key="item.pageIndex" hover-class="none">
+			<view class="red-dot" v-if="item.pageIndex == 0 && indexZhipaiCount > 0">
 				{{formatBadgeCount(indexZhipaiCount)}}
 			</view>
-			<view class="red-dot" v-if="index == 1 && indexWorkerCount > 0">
+			<view class="red-dot" v-if="item.pageIndex == 1 && indexWorkerCount > 0">
 				{{formatBadgeCount(indexWorkerCount)}}
 			</view>
-			<view class="red-dot" v-if="index == 2 && indexCampusCount > 0">
+			<view class="red-dot" v-if="item.pageIndex == 2 && indexCampusCount > 0">
 				{{formatBadgeCount(indexCampusCount)}}
 			</view>
-			<view class="red-dot" v-if="index == 3 && indexFishCount > 0">
+			<view class="red-dot" v-if="item.pageIndex == 3 && indexFishCount > 0">
 				{{formatBadgeCount(indexFishCount)}}
 			</view>
-			<view class="red-dot" v-if="index == 4 && indexMyCount > 0">
+			<view class="red-dot" v-if="item.pageIndex == 4 && indexMyCount > 0">
 				{{formatBadgeCount(indexMyCount)}}
 			</view>
-			<view class="img-box" v-if="index != 2" :class="item.shaking?'shaking':''">
+			<view class="img-box" v-if="item.pageIndex != 2" :class="item.shaking?'shaking':''">
 				<img :src="item.isCheck?item.tabIconSelect:item.tabIcon" alt="" />
 			</view>
-			<view class="img-box uni-tab-icon" v-if="index == 2" :class="item.shaking?'shaking':''">
+			<view class="img-box uni-tab-icon" v-if="item.pageIndex == 2" :class="item.shaking?'shaking':''">
 				<uni-icons type="pyq" size="25" :color="item.isCheck?'#48D1CC':'#30363d'"></uni-icons>
 			</view>
 			<view class="text-box" :style="{color:item.isCheck?'#48D1CC':'#000'}">
@@ -35,30 +35,36 @@
 			return {
 				tabList: [{
 					tabName: '首页',
+					pageIndex: 0,
 					tabIcon: '/static/images/tabbar/shouye1.png',
 					tabIconSelect: '/static/images/tabbar/shouye.png',
 					isCheck: true,
 					shaking:false
 				}, {
 					tabName: '配送',
+					pageIndex: 1,
+					hideInSocial: true,
 					tabIcon: '/static/images/tabbar/peisong1.png',
 					tabIconSelect: '/static/images/tabbar/peisong.png',
 					isCheck: false,
 					shaking:false
 				}, {
 					tabName: '校园圈',
+					pageIndex: 2,
 					tabIcon: '/static/images/tabbar/xiaoyuan.png',
 					tabIconSelect: '',
 					isCheck: false,
 					shaking:false
 				}, {
 					tabName: '鱼塘',
+					pageIndex: 3,
 					tabIcon: '/static/images/tabbar/xianyu1.png',
 					tabIconSelect: '/static/images/tabbar/xianyu.png',
 					isCheck: false,
 					shaking:false
 				}, {
 					tabName: '我的',
+					pageIndex: 4,
 					tabIcon: '/static/images/tabbar/wode1.png',
 					tabIconSelect: '/static/images/tabbar/wode.png',
 					isCheck: false,
@@ -81,22 +87,36 @@
 				type: Number,
 				default: true
 			},
-			//选中tab的下标
+			//选中tab的下标（页面逻辑下标）
 			currentIndex: {
 				type: Number,
 				default: 0
+			},
+			socialMode: {
+				type: Boolean,
+				default: false
+			}
+		},
+		computed: {
+			displayTabs() {
+				if (!this.socialMode) return this.tabList
+				return this.tabList
+					.filter((item) => !item.hideInSocial)
+					.map((item) => {
+						if (item.pageIndex === 2) {
+							return Object.assign({}, item, { tabName: '同城圈' })
+						}
+						return item
+					})
 			}
 		},
 		watch: {
 			//监听currentIndex变化
 			currentIndex(newVal) {
-				for (let i = 0; i < this.tabList.length; i++) {
-					if (newVal == i) {
-						this.tabList[i].isCheck = true
-					} else {
-						this.tabList[i].isCheck = false
-					}
-				}
+				this.syncTabCheck(newVal)
+			},
+			socialMode() {
+				this.syncTabCheck(this.currentIndex)
 			}
 		},
 		mounted() {
@@ -104,6 +124,7 @@
 			uni.$on('fishUnreadChange', this.setFishUnreadCounts)
 			uni.$on('campusUnreadChange', this.setCampusUnreadCounts)
 			this.setDeliveryStatusCounts(uni.getStorageSync('deliveryStatusCounts') || {})
+			this.syncTabCheck(this.currentIndex)
 		},
 		beforeDestroy() {
 			uni.$off('deliveryStatusCountsChange', this.setDeliveryStatusCounts)
@@ -111,6 +132,11 @@
 			uni.$off('campusUnreadChange', this.setCampusUnreadCounts)
 		},
 		methods: {
+			syncTabCheck(pageIndex) {
+				for (let i = 0; i < this.tabList.length; i++) {
+					this.tabList[i].isCheck = this.tabList[i].pageIndex == pageIndex
+				}
+			},
 			hasLogin() {
 				const token = uni.getStorageSync('hiver_token')
 				return !!(token && typeof token === 'string' && token.trim() && token !== 'null' && token !== 'undefined')
@@ -149,25 +175,19 @@
 				}
 				this.getWorkerCounts()
 			},
-			//点击tab切换
+			//点击tab切换：发射页面逻辑下标
 			clickBar(index) {
-				for (let i = 0; i < this.tabList.length; i++) {
-					if (index == i) {
-						this.$emit('tab-index', i);
-						this.getWorkerCounts()
-						this.tabList[i].isCheck = true
-						if (this.tabList[i].shaking) return
-
-						this.tabList[i].shaking = true
-
-						setTimeout(() => {
-							this.tabList[i].shaking = false
-						}, 500)
-					} else {
-						this.tabList[i].isCheck = false
-						this.$forceUpdate()
-					}
-				}
+				const item = this.displayTabs[index]
+				if (!item) return
+				const pageIndex = item.pageIndex
+				this.$emit('tab-index', pageIndex);
+				this.getWorkerCounts()
+				this.syncTabCheck(pageIndex)
+				if (item.shaking) return
+				item.shaking = true
+				setTimeout(() => {
+					item.shaking = false
+				}, 500)
 			},
 			getWorkerCounts(){
 				const now = Date.now()