1

components/tab-bar/delivery.vue

@@ -127,14 +127,16 @@
 									<view class="">
 										{{item.shopName}}
 									</view>
+									<view class="shop-address-row">
 										<view @tap="productDetail(item)" v-if="item.deliveryType == 1"
-										style="width: 32rpx;height: 30rpx;font-weight: 700;font-size: 20rpx;color: #fff;text-align: center;background: #00BFFF;border-radius: 10rpx;margin: 20rpx 0 0 10rpx;line-height: 30rpx;">
+											class="detail-tag">
 											祥
 										</view>
-									<view style="color: #777;">
+										<view class="shop-address">
 											{{item.shopAddress}}
 										</view>
 									</view>
+								</view>
 								<view class="right">
 									<img @tap="makeCall(item.shopPhone)"
 										src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/869a7af6a1c24bf3a0d523c4a18b55c6.png"
@@ -179,8 +181,10 @@
 							</view>
 						</view>
 					</view>
-					<view v-if="item.isReturn != null && item.isReturn == 1" style="width: 100%;height: 100rpx;margin-top: 32rpx;">
+					<view v-if="item.isReturn != null && item.isReturn == 1" class="refund-status">
-						用户申请 退款中
+						<view class="refund-status-text">
+							用户申请退款中
+						</view>
 					</view>
 					<view v-else style="width: 100%;height: 100rpx;margin-top: 32rpx;">
 						<img v-if="item.status == 1 && item.arriveTime == null" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/d649c22310874f19a74cf8dfbb1c7240.png"
@@ -851,6 +855,56 @@
 		padding-top: 20rpx;
 	}
 	
+	.shop-address-row {
+		display: flex;
+		align-items: center;
+		width: 100%;
+		min-width: 0;
+		margin-top: 8rpx;
+	}
+	
+	.detail-tag {
+		width: 32rpx;
+		height: 30rpx;
+		line-height: 30rpx;
+		flex-shrink: 0;
+		font-weight: 700;
+		font-size: 20rpx;
+		color: #fff;
+		text-align: center;
+		background: #00BFFF;
+		border-radius: 10rpx;
+		margin-right: 10rpx;
+	}
+	
+	.shop-address {
+		flex: 1;
+		min-width: 0;
+		color: #777;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+	
+	.refund-status {
+		width: 100%;
+		height: 100rpx;
+		margin-top: 32rpx;
+		display: flex;
+		align-items: center;
+	}
+	
+	.refund-status-text {
+		height: 56rpx;
+		line-height: 56rpx;
+		padding: 0 24rpx;
+		background: rgba(255, 117, 88, 0.12);
+		color: #ff4d35;
+		border: 1px solid rgba(255, 117, 88, 0.35);
+		border-radius: 16rpx;
+		font-weight: 700;
+	}
+
 	.guize-list {
 		width: 600rpx;
 		padding: 20rpx;