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

---
 package1/address/addAddress.vue   |  2 +-
 package1/buyFood/buyFood.vue      | 79 +++++++++++++++++++++++++++----
 package1/campus/campusRelease.vue | 39 +++++++++++----
 package1/order/orderConfirm.vue   |  8 ++--
 package1/order/orderDetail.vue    |  2 +-
 package1/post/postDetail.vue      | 65 ++++++++++++++++++++-----
 package1/runErrand/runErrand.vue  |  4 +-
 package1/tabbar/fishRelease.vue   | 50 ++++++++++++++++---
 8 files changed, 205 insertions(+), 44 deletions(-)

diff --git a/package1/address/addAddress.vue b/package1/address/addAddress.vue
index f9121ea..4f1e632 100644
--- a/package1/address/addAddress.vue
+++ b/package1/address/addAddress.vue
@@ -220,7 +220,7 @@
 				if (!/^1[3-9]\d{9}$/.test(this.addressForm.receiverPhone)) return this.tui.toast('请输入有效的11位手机号码');
 				this.addressForm.userId = uni.getStorageSync('id');
 				this.addressForm.regionId = this.getCurrentRegionId();
-				if (!this.addressForm.regionId) return this.tui.toast('请先选择校区');
+				if (!this.addressForm.regionId) return this.tui.toast('请先选择区域');
 				const url = this.addressForm.id ? "/app/userAddress/edit" : "/app/userAddress/save";
 				this.addressSubmitting = true;
 				this.tui.request(url, "POST", this.addressForm, false, true).then((res) => {
diff --git a/package1/buyFood/buyFood.vue b/package1/buyFood/buyFood.vue
index 175d554..7a5bcaa 100644
--- a/package1/buyFood/buyFood.vue
+++ b/package1/buyFood/buyFood.vue
@@ -2,7 +2,11 @@
 	<!-- 代买饭页 -->
 	<page-meta :page-style="addressBookVisible ? 'overflow: hidden;' : 'overflow: visible;'"></page-meta>
 	<view class="page1" :class="{'store-group-checkout': isStoreGroupOrder, 'page1--locked': addressBookVisible}">
-		<view class="checkout-fixed-header" :class="{'checkout-fixed-header--store': isStoreGroupOrder, 'checkout-fixed-header--paying': payPopupVisible || commissionPopupVisible}">
+		<view class="checkout-fixed-header" :class="{
+			'checkout-fixed-header--store': isStoreGroupOrder,
+			'checkout-fixed-header--paying': payPopupVisible || commissionPopupVisible,
+			'checkout-fixed-header--pintuan': pintuanPopupVisible
+		}">
 			<view class="title">
 				<view class="title-sreach">
 					<view class="back-btn" @tap="back" :style="{'top': menuButtonInfo.top +'px'}">
@@ -21,7 +25,7 @@
 						<view class="verify-icon">核</view>
 						<view>
 							<view class="verify-title">到店核销</view>
-							<view class="verify-sub">同校热拼</view>
+							<view class="verify-sub">好友热拼</view>
 						</view>
 					</view>
 					<!-- <view class="store-float-tag tag-a">拼团价</view>
@@ -103,7 +107,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="delivery-card" v-if="isPaotui">
+		<view class="delivery-card" v-if="isPaotui && !isSocialArea">
 			<view class="delivery-head">
 				<view class="delivery-title">
 					配送员
@@ -393,7 +397,7 @@
 				<view class="delivery-closed-icon">
 					<uni-icons type="info-filled" size="28" color="#0b9b73"></uni-icons>
 				</view>
-				<view class="delivery-closed-title">当前校区暂未开启配送</view>
+				<view class="delivery-closed-title">当前区域暂未开启配送</view>
 				<view class="delivery-closed-desc">本店目前只能选择到店消费，关闭提示后会为你自动切换到到店标签。</view>
 				<view class="delivery-closed-btn" @tap="closeDeliveryClosedPopup">知道了</view>
 			</view>
@@ -622,11 +626,13 @@
 				isSeckillOrder: false,
 				payPopupVisible: false,
 				commissionPopupVisible: false,
+				pintuanPopupVisible: false,
 				baseDeliveryFee: 0,
 				deliveryEnabled: 1,
 				deliverySwitchChecked: false,
 				deliverySwitchLoading: false,
-				deliveryClosedPopupVisible: false
+				deliveryClosedPopupVisible: false,
+				areaKind: 1
 			}
 		},
 		components: {
@@ -646,6 +652,7 @@
 			}
 		},
 		onLoad(option) {
+			this.syncAreaKind();
 			this.orderScene = option.orderScene || '';
 			if (option.shopItem) {
 				this.shopItem = JSON.parse(decodeURIComponent(option.shopItem));
@@ -673,9 +680,13 @@
 			if (this.supportShopDelivery) {
 				this.selected = 'shopDelivery';
 			}
+			this.applySocialDeliveryDefaults();
 			this.fetchCoupons();
 		},
 		computed: {
+			isSocialArea() {
+				return Number(this.areaKind) === 2;
+			},
 			goodsAmountCalc() {
 				if (this.isGroupBuy && this.groupItem) {
 					if(this.groupItem.item.moreBuyData){
@@ -801,6 +812,7 @@
 		},
 		watch: {},
 		onShow() {
+			this.syncAreaKind();
 			this.isNavigatingToWorkerList = false;
 			this.menuButtonInfo = uni.getMenuButtonBoundingClientRect()
 			const keepAddressBookOpen = uni.getStorageSync('keepAddressBookOpen') === '1';
@@ -821,12 +833,19 @@
 			let pendingWorker = uni.getStorageSync('pendingAssignWorker');
 			if (pendingWorker) {
 				uni.removeStorageSync('pendingAssignWorker');
-				this.assignedWorker = pendingWorker;
-				this.selected = 'zhiding';
-				this.refreshDeliveryTimeByModeChange();
+				if (!this.isSocialArea) {
+					this.assignedWorker = pendingWorker;
+					this.selected = 'zhiding';
+					this.refreshDeliveryTimeByModeChange();
+				}
 			}
+			this.applySocialDeliveryDefaults();
 
 			uni.$on('updateDeliveryWorker', (worker) => {
+				if (this.isSocialArea) {
+					this.applySocialDeliveryDefaults();
+					return;
+				}
 				this.assignedWorker = worker;
 				this.selected = 'zhiding';
 				this.refreshDeliveryTimeByModeChange();
@@ -926,6 +945,31 @@
 				if (isNaN(amount)) return '0';
 				return amount.toFixed(2).replace(/\.?0+$/, '');
 			},
+			syncAreaKind(areaObj) {
+				let area = areaObj;
+				if (!area) {
+					try {
+						const cached = uni.getStorageSync('area');
+						area = cached ? (typeof cached === 'string' ? JSON.parse(cached) : cached) : null;
+					} catch (e) {
+						area = null;
+					}
+				}
+				const kind = area ? Number(area.areaKind) : 1;
+				this.areaKind = kind === 2 ? 2 : 1;
+			},
+			applySocialDeliveryDefaults() {
+				if (!this.isSocialArea || !this.isPaotui) return;
+				this.assignedWorker = null;
+				// 商家自配送：沿用商家配送费，不改成不指定
+				if (this.supportShopDelivery) {
+					this.selected = 'shopDelivery';
+					return;
+				}
+				this.selected = 'buzhiding';
+				const minFee = this.getMinimumCommissionAmount();
+				this.customCommission = this.formatCommissionValue(minFee);
+			},
 			validateCustomCommission(commission) {
 				const minAmount = this.getMinimumCommissionAmount();
 				if (isNaN(commission) || commission < minAmount) {
@@ -954,7 +998,10 @@
 						const fee = parseFloat(res.result);
 						this.baseDeliveryFee = isNaN(fee) ? 0 : fee;
 					}
-				}).catch(() => {});
+					this.applySocialDeliveryDefaults();
+				}).catch(() => {
+					this.applySocialDeliveryDefaults();
+				});
 			},
 			shouldCheckDeliverySwitch() {
 				return !this.isStoreGroupOrder;
@@ -1201,10 +1248,18 @@
 					return;
 				}
 
+				if (this.isSocialArea && this.isPaotui) {
+					this.applySocialDeliveryDefaults();
+				}
+
 				if (this.isPaotui && this.selected === 'buzhiding' && !isJoiningFaceToFace) {
 					let comm = parseFloat(this.customCommission);
 					//没有输入佣金，直接弹出输入框 
 					if(isNaN(comm)){
+						if (this.isSocialArea) {
+							this.tui.toast('配送费获取失败，请稍后重试');
+							return;
+						}
 						this.openCommissionPopup();
 						return;
 					}
@@ -1396,6 +1451,7 @@
 				}
 			},
 			onPintuanPopupChange(e) {
+				this.pintuanPopupVisible = !!(e && e.show);
 				if(!e.show){
 					this.goPayOrderConfirm();
 				}
@@ -1719,6 +1775,11 @@
 		z-index: 100;
 	}
 
+	/* uni-popup 默认 z-index:99，低于顶部固定头会挡住拼团弹窗顶部 */
+	.checkout-fixed-header--pintuan {
+		z-index: 90;
+	}
+
 	.pay-popup-header-mask {
 		position: absolute;
 		left: 0;
diff --git a/package1/campus/campusRelease.vue b/package1/campus/campusRelease.vue
index 45fa3df..119ce2e 100644
--- a/package1/campus/campusRelease.vue
+++ b/package1/campus/campusRelease.vue
@@ -3,13 +3,13 @@
 		<view class="nav" :style="{ paddingTop: statusBarTop + 'px' }">
 			<view class="back" @tap="back"><uni-icons type="left" size="23" color="#173b32"></uni-icons></view>
 			<view>
-				<view class="nav-title">{{isEdit ? '编辑校园圈' : '发布校园圈'}}</view>
+				<view class="nav-title">{{pageTitle}}</view>
 				<view class="nav-sub">实名发布，内容和图片会进行安全审核</view>
 			</view>
 		</view>
 		<scroll-view scroll-y class="form-scroll" :style="{ paddingTop: navHeight + 'px' }">
 			<view class="type-tabs">
-				<view class="type-tab" :class="{ active: form.postType === 'wall' }" @tap="chooseType('wall')">校园墙</view>
+				<view class="type-tab" :class="{ active: form.postType === 'wall' }" @tap="chooseType('wall')">{{wallTabName}}</view>
 				<view class="type-tab" :class="{ active: form.partnerType === 'game' }" @tap="chooseType('game')">游戏搭子</view>
 				<view class="type-tab" :class="{ active: form.partnerType === 'daily' }" @tap="chooseType('daily')">日常搭子</view>
 				<view class="type-tab" :class="{ active: form.partnerType === 'sport' }" @tap="chooseType('sport')">运动搭子</view>
@@ -19,7 +19,7 @@
 				<view class="anonymous-row">
 					<view>
 						<view class="anonymous-title">匿名发布</view>
-						<view class="anonymous-desc">开启后统一显示默认头像和“半径同学”</view>
+						<view class="anonymous-desc">开启后统一显示默认头像和“{{anonymousName}}”</view>
 					</view>
 					<switch :checked="form.anonymous" color="#34c7a2" @change="toggleAnonymous" />
 				</view>
@@ -146,10 +146,27 @@
 					contactWechat: '',
 					contactPhone: '',
 					anonymous: false
-				}
+				},
+				areaKind: 1
 			}
 		},
 		computed: {
+			isSocialArea() {
+				return Number(this.areaKind) === 2
+			},
+			pageTitle() {
+				if (this.isSocialArea) return this.isEdit ? '编辑同城圈' : '发布同城圈'
+				return this.isEdit ? '编辑校园圈' : '发布校园圈'
+			},
+			wallTabName() {
+				return this.isSocialArea ? '同城墙' : '校园墙'
+			},
+			anonymousName() {
+				return this.isSocialArea ? '半径好友' : '半径同学'
+			},
+			circleName() {
+				return this.isSocialArea ? '同城圈' : '校园圈'
+			},
 			navHeight() {
 				return this.statusBarTop + uni.upx2px(120)
 			},
@@ -173,6 +190,7 @@
 			}
 		},
 		onLoad(options = {}) {
+			this.syncAreaKind()
 			if (options.type && options.type !== 'wall') this.chooseType(options.type)
 			if (options.id) {
 				this.editId = options.id
@@ -189,6 +207,11 @@
 			back() {
 				uni.navigateBack()
 			},
+			syncAreaKind(areaObj) {
+				let area = areaObj || this.getArea()
+				const kind = area ? Number(area.areaKind) : 1
+				this.areaKind = kind === 2 ? 2 : 1
+			},
 			getArea() {
 				const area = uni.getStorageSync('area')
 				if (!area) return {}
@@ -241,7 +264,7 @@
 						targetCount: detail.targetCount || '',
 						contactWechat: detail.contactWechat || '',
 						contactPhone: detail.contactPhone || '',
-						anonymous: detail.userName === '半径同学' && !detail.userAvatar
+						anonymous: (detail.userName === '半径同学' || detail.userName === '半径好友') && !detail.userAvatar
 					}
 					this.applyEditCategory()
 				})
@@ -355,8 +378,8 @@
 				const profile = await getIeProfile().catch(() => null)
 				const ok = await ensureIeVerifiedBeforeAction({
 					profile: profile || {},
-					actionText: '发布校园圈内容',
-					authDialog: { badge: '校园圈', title: '实名认证', desc: '发布、评论和聊天前需要完成实名认证' },
+					actionText: this.isSocialArea ? '发布同城圈内容' : '发布校园圈内容',
+					authDialog: { badge: this.circleName, title: '实名认证', desc: '发布、评论和聊天前需要完成实名认证' },
 					reload: getIeProfile,
 					requireProfileSetup: false
 				})
@@ -410,7 +433,7 @@
 			getSubmitUserProfile() {
 				if (this.form.anonymous) {
 					return {
-						userName: '半径同学',
+						userName: this.anonymousName,
 						userAvatar: ''
 					}
 				}
diff --git a/package1/order/orderConfirm.vue b/package1/order/orderConfirm.vue
index ede74d3..e93c2e0 100644
--- a/package1/order/orderConfirm.vue
+++ b/package1/order/orderConfirm.vue
@@ -52,11 +52,11 @@
 				<view class="thanks-copy">
 					<view class="thanks-title">感谢你的信任与支持！</view>
 					<view class="thanks-line"></view>
-					<view class="thanks-desc">探索更多校园精彩生活</view>
+					<view class="thanks-desc">探索更多精彩生活</view>
 					<view class="thanks-tags">
 						<text>发现好玩</text>
 						<text>赚取福利</text>
-						<text>结识同好</text>
+						<text>探索趣味</text>
 					</view>
 				</view>
 			</view>
@@ -124,7 +124,7 @@
 					url: '/package5/planet/index'
 				}, {
 					key: 'adventure',
-					name: '学院排位赛',
+					name: '排位赛赢现金',
 					tag: '每日排位挑战',
 					icon: '榜',
 					image: 'https://jewel-shop.oss-cn-beijing.aliyuncs.com/809f3c10f908480c9d65f0d487bce472.png',
@@ -140,7 +140,7 @@
 					url: '/package4/ieBrowser/index'
 				}, {
 					key: 'release',
-					name: '校园新鲜事',
+					name: '圈内新鲜事',
 					tag: '找搭子一起玩',
 					icon: '圈',
 					image: 'https://jewel-shop.oss-cn-beijing.aliyuncs.com/4e0db9059a5c44c495c95e63aebcd84c.png',
diff --git a/package1/order/orderDetail.vue b/package1/order/orderDetail.vue
index e8e4cc5..fe067a8 100644
--- a/package1/order/orderDetail.vue
+++ b/package1/order/orderDetail.vue
@@ -1462,7 +1462,7 @@
 			callPlatformService() {
 				let regionId = this.getCurrentRegionId();
 				if (!regionId) {
-					this.tui.toast("请选择校区");
+					this.tui.toast("请选择区域");
 					return;
 				}
 				let that = this;
diff --git a/package1/post/postDetail.vue b/package1/post/postDetail.vue
index 0133cc9..c55f4f7 100644
--- a/package1/post/postDetail.vue
+++ b/package1/post/postDetail.vue
@@ -2,7 +2,7 @@
 	<view class="detail-page">
 		<view class="nav" :style="{ paddingTop: statusBarTop + 'px' }">
 			<view class="back" @tap="back"><uni-icons type="left" size="24" color="#18372f"></uni-icons></view>
-			<view class="nav-title">{{post && post.postType === 'partner' ? '搭子详情' : '校园墙详情'}}</view>
+			<view class="nav-title">{{pageTitle}}</view>
 			<view class="nav-right"></view>
 		</view>
 		<scroll-view scroll-y class="content-scroll" :style="{ paddingTop: navHeight + 'px' }" @scrolltolower="loadMoreComments">
@@ -11,7 +11,7 @@
 					<image class="avatar" :src="displayAvatar(post)" mode="aspectFill"></image>
 					<view class="author-main">
 						<view class="author">{{displayName(post)}}<text>已实名</text></view>
-						<view class="meta">{{post.createTime || ''}} · {{post.regionName || '本校'}}</view>
+						<view class="meta">{{post.createTime || ''}} · {{post.regionName || defaultRegionName}}</view>
 					</view>
 				</view>
 				<view class="title-row">
@@ -82,7 +82,7 @@
 			<view class="comment-popup">
 				<view class="popup-title">{{replyTarget.id ? '回复评论' : '发表评论'}}</view>
 				<view class="popup-desc">评论内容会进行审核，请友善交流</view>
-				<textarea v-model.trim="commentText" maxlength="200" :placeholder="replyTarget.id ? '回复 ' + (replyTarget.userName || '校园同学') : '说点什么...'" />
+				<textarea v-model.trim="commentText" maxlength="200" :placeholder="replyTarget.id ? '回复 ' + (replyTarget.userName || defaultUserName) : '说点什么...'" />
 				<view class="anonymous-comment-row">
 					<text>匿名评论</text>
 					<switch :checked="commentAnonymous" color="#34c7a2" @change="toggleCommentAnonymous" />
@@ -140,10 +140,27 @@
 				defaultAvatar: 'https://jewel-shop.oss-cn-beijing.aliyuncs.com/f7227759d693497a8beab87ff437a875.png',
 				defaultShareImage: 'https://jewel-shop.oss-cn-beijing.aliyuncs.com/f7227759d693497a8beab87ff437a875.png',
 				likeLocked: false,
-				imageSizeMap: {}
+				imageSizeMap: {},
+				areaKind: 1
 			}
 		},
 		computed: {
+			isSocialArea() {
+				return Number(this.areaKind) === 2
+			},
+			pageTitle() {
+				if (this.post && this.post.postType === 'partner') return '搭子详情'
+				return this.isSocialArea ? '同城墙详情' : '校园墙详情'
+			},
+			circleName() {
+				return this.isSocialArea ? '同城圈' : '校园圈'
+			},
+			defaultUserName() {
+				return this.isSocialArea ? '半径好友' : '半径同学'
+			},
+			defaultRegionName() {
+				return this.isSocialArea ? '本区域' : '本校'
+			},
 			navHeight() { return this.statusBarTop + uni.upx2px(104) },
 			imageList() { return this.post && this.post.imageList ? this.post.imageList : [] },
 			tagList() { return this.post && this.post.tagList ? this.post.tagList : [] },
@@ -154,6 +171,7 @@
 			}
 		},
 		onLoad(options = {}) {
+			this.syncAreaKind()
 			this.id = options.id || ''
 			if (uni.getMenuButtonBoundingClientRect) this.statusBarTop = uni.getMenuButtonBoundingClientRect().top || this.statusBarTop
 			this.loadDetail()
@@ -172,6 +190,19 @@
 		},
 		methods: {
 			back() { uni.navigateBack() },
+			syncAreaKind(areaObj) {
+				let area = areaObj
+				if (!area) {
+					try {
+						const cached = uni.getStorageSync('area')
+						area = cached ? (typeof cached === 'string' ? JSON.parse(cached) : cached) : null
+					} catch (e) {
+						area = null
+					}
+				}
+				const kind = area ? Number(area.areaKind) : 1
+				this.areaKind = kind === 2 ? 2 : 1
+			},
 			loadDetail() {
 				getCampusPostDetail(this.id).then(post => {
 					this.post = post
@@ -236,7 +267,7 @@
 				return 'width:' + width + 'rpx;height:' + height + 'rpx;max-width:' + maxWidth + 'rpx;max-height:' + maxHeight + 'rpx;'
 			},
 			displayName(item) {
-				return item && item.userName ? item.userName : '半径同学'
+				return item && item.userName ? item.userName : this.defaultUserName
 			},
 			isAnonymousItem(item) {
 				if (!item) return false
@@ -249,6 +280,8 @@
 					|| item.isAnonymous === '1'
 					|| item.isAnonymous === 'true'
 					|| item.userName === '半径同学'
+					|| item.userName === '半径好友'
+					|| item.userName === this.defaultUserName
 			},
 			displayAvatar(item) {
 				if (this.isAnonymousItem(item)) return this.defaultAvatar
@@ -257,8 +290,14 @@
 			stripHtml(html = '') { return String(html).replace(/<[^>]+>/g, '') },
 			buildShareInfo() {
 				const isPartner = this.post && this.post.postType === 'partner'
-				const title = this.post && this.post.title ? this.post.title : (isPartner ? '校园搭子' : '校园圈内容')
-				const prefix = isPartner ? '同学正在找搭子：' : '校园圈：'
+				const title = this.post && this.post.title
+					? this.post.title
+					: (isPartner
+						? (this.isSocialArea ? '同城搭子' : '校园搭子')
+						: (this.isSocialArea ? '同城圈内容' : '校园圈内容'))
+				const prefix = isPartner
+					? (this.isSocialArea ? '好友正在找搭子：' : '同学正在找搭子：')
+					: (this.isSocialArea ? '同城圈：' : '校园圈：')
 				const targetPath = `/package1/post/postDetail?id=${this.id || ''}&source=campus`
 				return {
 					title: prefix + title,
@@ -271,13 +310,13 @@
 				return ensureIeVerifiedBeforeAction({
 					profile: profile || {},
 					actionText,
-					authDialog: { badge: '校园圈', title: '实名认证', desc: actionText + '前需完成实名认证' },
+					authDialog: { badge: this.circleName, title: '实名认证', desc: actionText + '前需完成实名认证' },
 					reload: getIeProfile,
 					requireProfileSetup: false
 				})
 			},
 			async focusComment() {
-				const ok = await this.ensureVerified('评论校园圈内容')
+				const ok = await this.ensureVerified(this.isSocialArea ? '评论同城圈内容' : '评论校园圈内容')
 				if (!ok) return
 				this.replyTarget = {}
 				this.commentText = ''
@@ -285,7 +324,7 @@
 				this.$refs.commentPopup.open()
 			},
 			async replyComment(item) {
-				const ok = await this.ensureVerified('评论校园圈内容')
+				const ok = await this.ensureVerified(this.isSocialArea ? '评论同城圈内容' : '评论校园圈内容')
 				if (!ok) return
 				this.replyTarget = item || {}
 				this.commentText = ''
@@ -304,7 +343,7 @@
 					uni.showToast({ title: '请输入评论内容', icon: 'none' })
 					return
 				}
-				const ok = await this.ensureVerified('评论校园圈内容')
+				const ok = await this.ensureVerified(this.isSocialArea ? '评论同城圈内容' : '评论校园圈内容')
 				if (!ok) return
 				this.commentSubmitting = true
 				try {
@@ -388,7 +427,7 @@
 			},
 			async goChat() {
 				if (!this.canUsePartnerChat) return
-				const ok = await this.ensureVerified('联系校园圈搭子')
+				const ok = await this.ensureVerified(this.isSocialArea ? '联系同城圈搭子' : '联系校园圈搭子')
 				if (!ok) return
 				createCampusChatSession(this.id).then(session => {
 					if (!session || !session.sessionId) return
@@ -398,7 +437,7 @@
 			getSubmitCommentProfile() {
 				if (this.commentAnonymous) {
 					return {
-						userName: '半径同学',
+						userName: this.defaultUserName,
 						userAvatar: ''
 					}
 				}
diff --git a/package1/runErrand/runErrand.vue b/package1/runErrand/runErrand.vue
index 8a4f1cd..753e714 100644
--- a/package1/runErrand/runErrand.vue
+++ b/package1/runErrand/runErrand.vue
@@ -555,7 +555,7 @@
 			},
 			buildShareInfo() {
 				return {
-					title: '代取快递/校园跑腿，下楼前先叫同学帮忙',
+					title: '代取快递/跑腿',
 					path: buildHomeSharePath(SHARE_TARGET_PATH),
 					imageUrl: 'https://jewel-shop.oss-cn-beijing.aliyuncs.com/f7227759d693497a8beab87ff437a875.png'
 				}
@@ -601,7 +601,7 @@
 				if (isNaN(commission) || commission < minAmount) {
 					const baseFee = parseFloat(this.baseDeliveryFee);
 					if (!isNaN(baseFee) && baseFee > 0) {
-						this.tui.toast(`当前校区基础配送费为${this.formatAmountText(minAmount)}元，配送佣金不能低于${this.formatAmountText(minAmount)}元`, 1500);
+						this.tui.toast(`当前区域基础配送费为${this.formatAmountText(minAmount)}元，配送佣金不能低于${this.formatAmountText(minAmount)}元`, 1500);
 					} else {
 						this.warnPopup = 'psyj';
 						this.$refs.warnPopup.open();
diff --git a/package1/tabbar/fishRelease.vue b/package1/tabbar/fishRelease.vue
index 27575e7..bd0f9df 100644
--- a/package1/tabbar/fishRelease.vue
+++ b/package1/tabbar/fishRelease.vue
@@ -5,7 +5,7 @@
 			<view class="back" @tap="back">
 				<uni-icons type="left" size="22" color="#18372f"></uni-icons>
 			</view>
-			<view class="header-title">{{isEdit ? '编辑校园二手' : '发布校园二手'}}</view>
+			<view class="header-title">{{pageTitle}}</view>
 			<view class="header-sub">实名发布，线下面交，请勿提前转账</view>
 			<view class="tabs">
 				<view class="tab" :class="{ active: publishType == 'sell', disabled: isEdit }" @tap="switchType('sell')">出售</view>
@@ -183,10 +183,21 @@
 					wechat: '',
 					phone: '',
 					tags: ['可小刀']
-				}
+				},
+				areaKind: 1
 			}
 		},
 		computed: {
+			isSocialArea() {
+				return Number(this.areaKind) === 2
+			},
+			pageTitle() {
+				if (this.isSocialArea) return this.isEdit ? '编辑同城二手' : '发布同城二手'
+				return this.isEdit ? '编辑校园二手' : '发布校园二手'
+			},
+			fishBadgeText() {
+				return this.isSocialArea ? '同城二手' : '校园二手'
+			},
 			categoryNames() {
 				return this.categories.map(item => item.name)
 			},
@@ -202,6 +213,7 @@
 			}
 		},
 		onLoad(options) {
+			this.syncAreaKind()
 			if (options && (options.type == 'want' || options.type == 'sell')) {
 				this.publishType = options.type
 			}
@@ -253,6 +265,30 @@
 				}
 				return area
 			},
+			syncAreaKind(areaObj) {
+				const area = areaObj || this.getArea()
+				const kind = area ? Number(area.areaKind) : 1
+				this.areaKind = kind === 2 ? 2 : 1
+				this.tagOptions = this.isSocialArea
+					? ['可小刀', '当天可取', '门口自提', '可送上门', '急出', '九成新']
+					: ['可小刀', '当天可取', '宿舍自提', '可送宿舍', '急出', '九成新']
+			},
+			normalizeFishTag(tag) {
+				const map = {
+					宿舍自提: '门口自提',
+					可送宿舍: '可送上门',
+					门口自提: '宿舍自提',
+					可送上门: '可送宿舍'
+				}
+				if (!this.isSocialArea) {
+					if (tag === '门口自提') return '宿舍自提'
+					if (tag === '可送上门') return '可送宿舍'
+					return tag
+				}
+				if (tag === '宿舍自提') return '门口自提'
+				if (tag === '可送宿舍') return '可送上门'
+				return tag
+			},
 			loadCategories() {
 				const area = this.getArea()
 				listFishCategories(area.id || '').then(list => {
@@ -271,7 +307,9 @@
 			applyEditDetail(detail) {
 				const contact = this.parseJsonObject(detail.contactInfo)
 				const imageList = detail.imageList && detail.imageList.length ? detail.imageList : this.parseJsonList(detail.images)
-				const tagList = this.publishType == 'sell' ? this.parseJsonList(detail.tags) : []
+				const tagList = this.publishType == 'sell'
+					? this.parseJsonList(detail.tags).map(tag => this.normalizeFishTag(tag))
+					: []
 				const content = detail.content || ''
 				this.form.title = detail.title || ''
 				this.form.price = String(this.publishType == 'want' ? (detail.expectedPrice || '') : (detail.price || ''))
@@ -341,7 +379,7 @@
 				const profile = await getIeProfile().catch(() => null)
 				const verified = await ensureIeVerifiedBeforeAction({
 					profile: profile || {},
-					actionText: '发布校园二手信息',
+					actionText: this.isSocialArea ? '发布二手信息' : '发布校园二手信息',
 					authDialog: this.fishAuthDialogOptions(),
 					reload: getIeProfile,
 					requireProfileSetup: false
@@ -524,7 +562,7 @@
 					const profile = await getIeProfile().catch(() => null)
 					const verified = await ensureIeVerifiedBeforeAction({
 						profile: profile || {},
-						actionText: '发布校园二手信息',
+						actionText: this.isSocialArea ? '发布二手信息' : '发布校园二手信息',
 						authDialog: this.fishAuthDialogOptions(),
 						reload: getIeProfile,
 						requireProfileSetup: false
@@ -603,7 +641,7 @@
 			},
 			fishAuthDialogOptions() {
 				return {
-					badge: '校园二手',
+					badge: this.fishBadgeText,
 					title: '实名认证',
 					content: '根据法律法规要求，对应流程需要调用阿里云实名认证。半径里不会存储您的实名信息。',
 					steps: []