diff --git a/pageC/cart/ConfirmOrder.vue b/pageC/cart/ConfirmOrder.vue
index 3dae2a0..f361dd4 100644
--- a/pageC/cart/ConfirmOrder.vue
+++ b/pageC/cart/ConfirmOrder.vue
@@ -48,6 +48,10 @@
 						</view>
 					</view>
 				</view>
+				<view class="pick-up" v-if="is_selfraising == 1">
+					<view class="title">自提地址</view>
+					<view class="content">{{ orderInfo.store_list[index].store_address }}</view>
+				</view>
 			</view>
 		</view>
 		<view class="common-active">
@@ -387,6 +391,12 @@ export default {
 		},
 		async setDelivery(index) {
 			// console.log(index);
+			if(index == 1) {
+				if(!this.isTakeawayer) this.$u.toast('此地区不支持骑手配送');
+				return false;
+				this.delivery = this.deliveryList[index];
+				this.getFreight();
+			} 
 			if(index == 2) {
 				this.is_selfraising = 1;
 				for (const key in this.freight) {
@@ -400,12 +410,6 @@ export default {
 			} else {
 				this.is_selfraising = 0;
 			}
-			if(index == 1) {
-				if(!this.isTakeawayer) this.$u.toast('此地区不支持骑手配送');
-				return false;
-				this.delivery = this.deliveryList[index];
-				this.getFreight();
-			} 
 			if(index == 0) {
 				this.delivery = this.deliveryList[index];
 				this.getFreight();
@@ -434,6 +438,7 @@ export default {
 	min-height: calc(100vh - var(--window-top));
 	background-color: #ECECEC;
 	padding-top: 1rpx;
+	padding-bottom: 200rpx;
 	.info-address {
 		padding: 30rpx;
 		display: flex;
@@ -591,10 +596,24 @@ export default {
 					}
 				}
 			}
+			.pick-up {
+				padding: 30rpx;
+				background: rgba(255,255,255,1);
+				.title {
+					font-size: 28rpx;
+					color:  #666666;
+					margin-bottom: 30rpx;
+				}
+				.content {
+					font-size: 30rpx;
+					color:  #343434;
+					line-height: 40rpx;
+				}
+			}
 		}
 	}
 	.common-active {
-		padding-bottom: 200rpx;
+		padding-bottom: 30rpx;
 		> view {
 			height: 98rpx;
 			background: rgba(255,255,255,1);
diff --git a/pageE/order/Details.vue b/pageE/order/Details.vue
index 4896201..3681d78 100644
--- a/pageE/order/Details.vue
+++ b/pageE/order/Details.vue
@@ -39,10 +39,6 @@
 					</view>
 				</view>
 				<view class="goods-others">
-					<view>
-						<view class="title">配送方式</view>
-						<view class="price" v-if="orderInfo.is_selfraising == 1">自提</view>
-					</view>
 					<view>
 						<view class="title">运费(快递/骑手)</view>
 						<view class="price">￥{{ orderInfo.shipping_fee }}</view>
@@ -63,12 +59,17 @@
 						<view class="title">支付方式</view>
 						<view class="price">{{ orderInfo.payment_name }}</view>
 					</view>
+					<view v-if="orderInfo.is_selfraising == 1">
+						<view class="title">配送方式</view>
+						<view class="price">自提</view>
+					</view>
 				</view>
 			</view>
 			<view class="info-order">
 				<view>订单编号：{{ orderInfo.order_sn }}</view>
 				<view>支付单号：{{ orderInfo.pay_sn }}</view>
 				<view>创建时间：{{ orderInfo.add_time | date}}</view>
+				<view v-if="orderInfo.is_selfraising == 1" class="address">自提地址：{{ orderInfo.extend_store.store_address }}</view>
 			</view>
 		</view>
 		 <!-- '4', '8' -->
@@ -464,6 +465,9 @@ export default {
 			> view:not(:last-child) {
 				margin-bottom: 30rpx;
 			}
+			.address {
+				line-height: 40rpx;
+			}
 		}
 	}
 	.btn {