1

components/tab-bar/myCenter.vue

@@ -216,7 +216,8 @@
 			</view>
 		</uni-popup>
 		<!-- 弹出区域选择 -->
-		<uni-popup ref="areaPopup" background-color="transparent">
+		<uni-popup ref="areaPopup" class="home-popup-layer area-popup-layer" background-color="transparent"
+			borderRadius="42rpx">
 			<view class="campus-area-popup">
 				<view class="area-popup-glow area-popup-glow-a"></view>
 				<view class="area-popup-glow area-popup-glow-b"></view>
@@ -2219,6 +2220,16 @@
 		box-sizing: border-box;
 	}
 
+	.home-popup-layer {
+		z-index: 1200 !important;
+	}
+
+	.area-popup-layer .uni-popup__wrapper {
+		overflow: hidden;
+		border-radius: 42rpx !important;
+		background: transparent !important;
+	}
+
 	.campus-area-popup {
 		position: relative;
 		box-sizing: border-box;
@@ -2229,6 +2240,7 @@
 		padding: 38rpx 30rpx 30rpx;
 		border: 1rpx solid rgba(255, 255, 255, .78);
 		border-radius: 42rpx;
+		-webkit-mask-image: -webkit-radial-gradient(#fff, #000);
 		background:
 			radial-gradient(circle at 16% 8%, rgba(227, 255, 150, .34), rgba(227, 255, 150, 0) 220rpx),
 			radial-gradient(circle at 92% 18%, rgba(166, 255, 234, .44), rgba(166, 255, 234, 0) 260rpx),

package1/address/addAddress.vue

@@ -428,7 +428,7 @@
 						if (matched && String(res.result.id) === String(currentRegionId)) {
 							resolve();
 						} else {
-							this.tui.toast('该地址不在当前区域配送范围内');
+							this.tui.toast('该地址不在当前区域配送范围内', 1500);
 							reject();
 						}
 					}).catch(() => {

package1/buyFood/buyFood.vue

@@ -971,7 +971,8 @@
 				if (this.startingPriceCheckAmount + 0.0001 >= this.startingPriceAmount) return true;
 				uni.showToast({
 					title: `不满${this.formatAmountText(this.startingPriceAmount)}元起送条件`,
-					icon: 'none'
+					icon: 'none',
+					duration: 1500
 				});
 				setTimeout(() => {
 					this.backToGroupBuySingle();
@@ -1274,7 +1275,7 @@
 					if (matched && String(res.result.id) === String(regionId)) {
 						return true;
 					}
-					this.tui.toast('收货地址不在当前区域配送范围内');
+					this.tui.toast('收货地址不在当前区域配送范围内', 1500);
 					return false;
 				}).catch(() => {
 					this.tui.toast('地址范围校验失败，请稍后重试');
@@ -1636,7 +1637,7 @@
 				if (deliveryType === 1 && !isJoiningFaceToFace) {
 					payload.addressId = this.formData.address ? this.formData.address.id : null;
 					payload.getAreaId = this.shopItem.shopArea || null;
-					payload.putAreaId = this.isSocialArea ? null : (this.formData.address ? this.formData.address.areaId : null);
+					payload.putAreaId = this.formData.address ? (this.isSocialArea ? this.formData.address.id : this.formData.address.areaId) : null;
 					if (this.shopItem.supportTransferDelivery == 1) {
 						payload.transferDelivery = 1;
 						payload.transferAddressId = this.shopItem.transferAddressId;

pages/index/index.vue

@@ -467,7 +467,8 @@
 			</view>
 		</view> -->
 		<!-- 弹出区域选择 -->
-		<uni-popup ref="areaPopup" class="home-popup-layer" :is-mask-click="areaPopupCanClose" background-color="transparent" @change="onAreaPopupChange">
+		<uni-popup ref="areaPopup" class="home-popup-layer area-popup-layer" :is-mask-click="areaPopupCanClose"
+			background-color="transparent" borderRadius="42rpx" @change="onAreaPopupChange">
 			<view class="campus-area-popup" @touchmove.stop>
 				<view class="area-popup-glow area-popup-glow-a"></view>
 				<view class="area-popup-glow area-popup-glow-b"></view>
@@ -2575,6 +2576,12 @@
 		z-index: 1200 !important;
 	}
 
+	.area-popup-layer .uni-popup__wrapper {
+		overflow: hidden;
+		border-radius: 42rpx !important;
+		background: transparent !important;
+	}
+
 	.home-ad-popup-layer {
 		z-index: 1300 !important;
 	}
@@ -4463,6 +4470,7 @@
 		padding: 38rpx 30rpx 30rpx;
 		border: 1rpx solid rgba(255, 255, 255, 0.78);
 		border-radius: 42rpx;
+		-webkit-mask-image: -webkit-radial-gradient(#fff, #000);
 		background:
 			radial-gradient(circle at 16% 8%, rgba(227, 255, 150, 0.34), rgba(227, 255, 150, 0) 220rpx),
 			radial-gradient(circle at 92% 18%, rgba(166, 255, 234, 0.44), rgba(166, 255, 234, 0) 260rpx),