1

package1/buyFood/buyFood.vue

@@ -1336,7 +1336,7 @@
 		width: 100%;
 		min-height: 146rpx;
 		display: flex;
-		padding-bottom: env(safe-area-inset-bottom);
+		padding-bottom: 20rpx;
 		background: rgba(255, 255, 255, 0.92);
 		z-index: 99;
 		box-shadow: 0 -10rpx 34rpx rgba(0, 35, 28, 0.12);

package1/group/groupBuySingle.vue

@@ -2257,7 +2257,7 @@
 	.team2 {
 		width: 190rpx;
 		height: 270rpx;
-		background: rgba(247, 248, 248, 0.6);
+		background: rgba(247, 248, 248, 1);
 		border-radius: 10px;
 		float: left;
 		text-align: center;

package1/order/orderDetail.vue

@@ -49,7 +49,7 @@
 					<view class="kaituan1-title1">
 						差{{orderDetail.groupInfo.targetMembers - orderDetail.groupInfo.currentMembers}}人即可成团
 						<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/21b403bd13414ce79ad73cf1c8e3de98.png"
-							alt="" style="width: 120rpx;height: 22rpx;position: absolute;bottom: 0;right: 30rpx;" />
+							alt="" style="width: 240rpx;height: 22rpx;position: absolute;bottom: 0;right: 30rpx;" />
 					</view>
 					<view class="kaituan1-title11">
 						快呼唤小伙伴参加吧！
@@ -77,13 +77,10 @@
 						</button>
 					</view>
 					<view class="kaituan41 kaituan41-cancel" v-if="orderStatus(orderDetail)" @tap="returnPopupProp(orderDetail)">
-						取消订单 <uni-icons type="weixin" size="15"></uni-icons>
+						取消订单
 					</view>
 					<view class="kaituan41 kaituan41-buy" v-if="orderStatusBuy(orderDetail)" @tap="returnPopupPropBuy(orderDetail)">
-						取消拼团转直接购买 <uni-icons type="weixin" size="15"></uni-icons>
+						取消拼团转直接购买
-					</view>
-					<view class="kaituan41 kaituan41-refresh" @tap="refreah(orderDetail)">
-						刷新 <uni-icons type="weixin" size="15"></uni-icons>
 					</view>
 				</view>
 				<view class="kaituan51">
@@ -875,6 +872,9 @@
 				imageUrl: 'https://jewel-shop.oss-cn-beijing.aliyuncs.com/62c9aa038b2541ad9c400a76ddae7ef8.png'
 			}
 		},
+		onPullDownRefresh() { 
+		    this.getOrderDetail(this.orderId)
+		},
 		onUnload() {
 			uni.$off('updateDeliveryWorker');
 		},
@@ -1201,6 +1201,7 @@
 				this.pintuan = false;
 				let that = this
 				that.tui.request("/mall/order/detail/" + id, "GET", {}, false, true).then((res) => {
+					uni.stopPullDownRefresh()
 					if (res.code == 200) {
 						that.orderDetail = res.result;
 						if (that.orderDetail.mallRefundRecord != null && that.orderDetail.mallRefundRecord.length >
@@ -1414,7 +1415,7 @@
 
 	.content {
 		position: absolute;
-		top: 150rpx;
+		top: 190rpx;
 		width: 100%;
 		padding-bottom: 60rpx;
 	}
@@ -1716,7 +1717,7 @@
 	.title1 {
 		background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/69c894452e924bedbb5a24bf978f47c7.png') no-repeat;
 		width: 100%;
-		height: 360rpx;
+		height: 600rpx;
 		background-size: 100% auto;
 	}
 
@@ -1733,15 +1734,13 @@
 		width: 64rpx;
 		height: 64rpx;
 		border-radius: 50%;
-		background: rgba(255, 255, 255, 0.64);
-		box-shadow: 0 10rpx 24rpx rgba(0, 35, 28, 0.08);
 		text-align: center;
 		line-height: 64rpx;
 	}
 
 	.box11 {
 		width: 95%;
-		margin: 0 auto 22rpx;
+		margin: -150rpx auto 22rpx;
 		background: rgba(255, 255, 255, 0.96);
 		border-radius: 32rpx;
 		padding: 24rpx;