1

components/tab-bar/homeGroupPending.vue

@@ -24,7 +24,7 @@
 				<view class="earn-guide-light"></view>
 				<view class="earn-guide-icon">拼</view>
 				<text class="earn-guide-main">附近待成团</text>
-				<text class="earn-guide-tag">马上拼成更省钱</text>
+				<text class="earn-guide-tag">{{query.regionId == '2097949297042657280' ? '消费满2000免费使用快衣店进销存' : '马上拼成更省钱'}}</text>
 			</view>
 
 			<view class="tab-card" :class="{'tab-card--four': displayTabs.length > 2}">

components/tab-bar/postList.vue

@@ -4,7 +4,7 @@
 			<view class="brand-row">
 				<view class="brand">
 					<text class="brand-main">{{brandMainText}}</text>
-					<text class="brand-sub">鱼塘</text>
+					<text class="brand-sub">闲置</text>
 					<view class="brand-fish">≋</view>
 				</view>
 				<view class="brand-slogan">{{brandSloganText}}</view>

components/tab-bar/tab-bar.vue

@@ -55,7 +55,7 @@
 					isCheck: false,
 					shaking:false
 				}, {
-					tabName: '鱼塘',
+					tabName: '闲置',
 					pageIndex: 3,
 					tabIcon: '/static/images/tabbar/xianyu1.png',
 					tabIconSelect: '/static/images/tabbar/xianyu.png',

package1/order/orderList.vue

@@ -50,7 +50,7 @@
 				</view>
 				<view class="tabs1" @tap="checkTab1('ershou')"
 					:style="{'color':tab1Checked == 'ershou'?'#000':'#777','font-size':tab1Checked== 'ershou'?'36rpx':'30rpx'}">
-					鱼塘
+					闲置
 					<img v-if="tab1Checked == 'ershou'"
 						src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4bb5fc7725cb4a7a84d1d3a15f05b39c.png" alt=""
 						style="width: 80rpx;height: 14rpx;position: absolute;bottom: 8rpx;left: 32rpx;" />
@@ -128,9 +128,9 @@
 				</view>
 				<view style="width: 100%;line-height: 70rpx;font-size: 28rpx;font-weight: 700;display: flex;">
 					<view style="height: 40rpx;line-height: 40rpx;background: linear-gradient(90deg, rgba(255, 77, 0, 1), rgba(255, 184, 84, 1));padding: 0 16rpx;border-radius: 40rpx;color: #fff;margin: 14rpx 20rpx 0 0;">
-						{{item.otherOrder == 1 ? '快递/跑腿' : item.otherOrder == 2 ? '团购' : item.otherOrder == 3 ? '鱼塘' :"饭团"}}
+						{{item.otherOrder == 1 ? '快递/跑腿' : item.otherOrder == 2 ? '团购' : item.otherOrder == 3 ? '闲置' :"饭团"}}
 					</view>
-					{{item.otherOrder == 1 ? '快递/跑腿' :  item.otherOrder == 3 ? '鱼塘订单' : item.shopName}}
+					{{item.otherOrder == 1 ? '快递/跑腿' :  item.otherOrder == 3 ? '闲置订单' : item.shopName}}
 				</view>
 				<view v-if="item.otherOrder == 1"  class="errand-goods-card" @tap.stop="orderDetail(item.id)" style="display: flex;padding: 20rpx;background: rgba(247, 248, 248, 0.6);border-radius: 20rpx;">
 					<view class="goods-img">

pages/index/index.vue

@@ -110,7 +110,7 @@
 							<view class="menu-name">团团星球</view>
 							<view class="menu-desc">周边娱乐</view>
 						</view>
-						<view class="menu-list world-run" @tap="goDetail('1')">
+						<view v-if="showErrandPlanet" class="menu-list world-run" @tap="goDetail('1')">
 							<view class="world-light"></view>
 							<view class="world-dot world-dot-a"></view>
 							<img v-if="homeMenuIconImages.run" :src="homeMenuIconImages.run"
@@ -699,6 +699,7 @@
 				areaName: '',
 				areaKind: 1,
 				expressErrandEnabled: 1,
+				errandPlanetVisible: null,
 				gaoxiaoList:[{
 					title:'拼团搭子哪里找',
 					content:'隔壁宿舍全是宝！'
@@ -842,6 +843,9 @@
 			socialDeliveryEnabled() {
 				return !this.isSocialArea || Number(this.expressErrandEnabled) !== 0
 			},
+			showErrandPlanet() {
+				return this.errandPlanetVisible === null || this.errandPlanetVisible === '' || Number(this.errandPlanetVisible) !== 0
+			},
 			displayGaoxiaoList() {
 				return this.isSocialArea ? this.socialGaoxiaoList : this.gaoxiaoList
 			},
@@ -1061,7 +1065,7 @@
 				const tabTitleMap = {
 					1: '兼职配送，顺路赚点零花钱',
 					2: '新鲜事和搭子都在这里',
-					3: '二手好物，来鱼塘逛逛',
+					3: '二手好物，来闲置逛逛',
 					4: '半径里个人中心'
 				}
 				return {
@@ -2134,6 +2138,7 @@
 				const kind = area ? Number(area.areaKind) : 1
 				this.areaKind = kind === 2 ? 2 : 1
 				this.expressErrandEnabled = this.resolveExpressErrandEnabled(area)
+				this.errandPlanetVisible = this.resolveErrandPlanetVisible(area)
 				this.leaveClosedSocialDeliveryTab()
 			},
 			resolveExpressErrandEnabled(area) {
@@ -2143,6 +2148,12 @@
 				}
 				return Number(area.expressErrandEnabled) === 0 ? 0 : 1
 			},
+			resolveErrandPlanetVisible(area) {
+				if (!area || area.errandPlanetVisible === undefined || area.errandPlanetVisible === null || area.errandPlanetVisible === '') {
+					return null
+				}
+				return Number(area.errandPlanetVisible) === 0 ? 0 : 1
+			},
 			leaveClosedSocialDeliveryTab() {
 				if (this.isSocialArea && !this.socialDeliveryEnabled && this.currentIndex === 1) {
 					this.currentIndex = 0
@@ -3213,7 +3224,7 @@
 
 	.menu-box {
 		width: 95%;
-		height: 186rpx;
+		height: 172rpx;
 		display: flex;
 		align-items: flex-end;
 		margin: 30rpx auto 0;