diff --git a/package1/group/groupBuyList.vue b/package1/group/groupBuyList.vue
index 9538b07..09f40f2 100644
--- a/package1/group/groupBuyList.vue
+++ b/package1/group/groupBuyList.vue
@@ -65,7 +65,7 @@
 		<view class="shop-list">
 			<view class="shop-member" v-for="(item,index) in shopList" :key="index" @tap="goDetail('shop',item)">
 				<view @tap.stop="buyingye" v-if="item.shopTakeaway.status != 0"
-					style="width: 100%;height:100%;position: absolute;top: 0;background: rgba(0, 0, 0, 0.4);z-index: 999;border-radius: 10px;">
+					style="width: 100%;height:100%;position: absolute;top: 0;background: rgba(0, 0, 0, 0.1);z-index: 999;border-radius: 10px;">
 				</view>
 				<view class="shop-top">
 					<view class="shop-img">
diff --git a/package1/order/orderDetail.vue b/package1/order/orderDetail.vue
index 9b12064..4d2d50f 100644
--- a/package1/order/orderDetail.vue
+++ b/package1/order/orderDetail.vue
@@ -204,9 +204,7 @@
 										{{item3.productName}}
 									</view>
 									<view class="goods-content-center">
-										<view class="goods-deal1">
-											{{item3.specs}}
-										</view>
+										{{item3.specs}}
 									</view>
 									<view class="goods-content-bottom">
 										<view style="width: 50%;">
@@ -267,11 +265,11 @@
 				</view>
 				
 				<view class="box1">
-					<view style="width: 100%;line-height: 70rpx;font-size: 28rpx;font-weight: 700;" v-if="orderDetail.shopName != null">
-						{{orderDetail.shopName}} 
+					<view style="width: 100%;line-height: 70rpx;font-size: 28rpx;font-weight: 700;display: flex;" v-if="orderDetail.shopName != null">
+						<text style="flex:1">{{orderDetail.shopName}}</text>
 						<img @tap="makeCall(orderDetail.shopPhone)"
 							src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/869a7af6a1c24bf3a0d523c4a18b55c6.png"
-							alt="" style="width: 60rpx;height: 60rpx;" />
+							alt="" style="width: 40rpx;height: 40rpx;margin-top: 7px;" />
 					</view>
 					
 					<view  v-for="(item1,index1) in orderDetail.goodsList" :key="index1"   v-if="orderDetail.goodsList != null && orderDetail.goodsList.length > 0" style="display: flex;padding: 20rpx;background: #eee;border-radius: 20rpx;">
@@ -283,9 +281,7 @@
 								{{item1.productName}}
 							</view>
 							<view class="goods-content-center">
-								<view class="goods-deal1">
-									{{item1.specs}}
-								</view>
+								{{item1.specs}}
 							</view>
 							<view class="goods-content-bottom">
 								<view style="width: 50%;">
@@ -387,11 +383,11 @@
 							<view style="flex: 1;color: #777;font-weight: 700;">
 								配送员
 							</view>
-							<view style="color: #000;font-weight: 700;" v-if="orderDetail.deliveryInfo && orderDetail.deliveryInfo.workerId != null && orderDetail.deliveryInfo.workerId != ''">
+							<view style="color: #000;font-weight: 700;display: flex;" v-if="orderDetail.deliveryInfo && orderDetail.deliveryInfo.workerId != null && orderDetail.deliveryInfo.workerId != ''">
 								{{orderDetail.deliveryInfo.workerName != null ? orderDetail.deliveryInfo.workerName : ''}}
 								<img @tap="makeCall(orderDetail.deliveryInfo.workerPhone)"
 									src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/869a7af6a1c24bf3a0d523c4a18b55c6.png"
-									alt="" style="width: 60rpx;height: 60rpx;" />
+									alt="" style="width: 40rpx;height: 40rpx;margin: 20rpx 0 0 20rpx;" />
 							</view>
 							<view style="color: #000;font-weight: 700;" v-else>
 								未指定等待接单中
@@ -1122,9 +1118,6 @@
 		    margin: 16rpx 0;
 		    color: #777;
 	}
-	.goods-deal1 {
-		width: 60%;
-	}
 	.goods-content-bottom {
 		    display: flex;
 		    line-height: 56rpx;
@@ -1176,7 +1169,7 @@
 		    font-size: 20rpx;
 	}
 	.btn-box{
-		height: 120rpx;
+		height: auto;
 	}
 	.btn{
 		width: 90%;
diff --git a/package1/order/orderList.vue b/package1/order/orderList.vue
index d09115c..7995df4 100644
--- a/package1/order/orderList.vue
+++ b/package1/order/orderList.vue
@@ -86,9 +86,9 @@
 					已售后</view>
 			</view>
 		</view>
-		<view class="content">
+		<view class="content" :style="{top:tab1Checked =='quanbu'?'360rpx':'440rpx'}">
 			<view class="box1" v-for="(item,index) in orderList" :key="index">
-				<view class="ziqu-xuanfu" v-if="item.status == 0" style="background:red">
+				<view class="ziqu-xuanfu" v-if="item.status == 0" style="background:red;color:#fff;">
 					待支付
 				</view>
 				<view class="ziqu-xuanfu" v-if="item.status == 10"  style="background:rgba(166, 255, 234, 1)">
@@ -103,7 +103,7 @@
 				<view class="ziqu-xuanfu"  v-if="item.status == 3 && item.deliveryType == 2" style="background:rgba(166, 255, 234, 1)">
 					待消费
 				</view>
-				<view class="ziqu-xuanfu" v-if="item.status == 4" style="background:rgba(255, 193, 236, 1)">
+				<view class="ziqu-xuanfu" v-if="item.status == 4" style="background:rgba(255, 193, 236, 1);color:#fff;">
 					待送达
 				</view>
 				<view class="ziqu-xuanfu" v-if="item.status == 5">
@@ -118,7 +118,7 @@
 				<view class="ziqu-xuanfu" v-if="item.status == 8">
 					已退款
 				</view>
-				<view class="ziqu-xuanfu" v-if="item.status == 11">
+				<view class="ziqu-xuanfu" v-if="item.status == 11" style="background:rgba(227, 255, 150, 1);color:#777;">
 					售后中
 				</view>
 				<view class="ziqu-xuanfu" v-if="item.status == 12">
@@ -175,12 +175,12 @@
 					</view>
 				</view>
 				<view style="height: 100rpx;border-bottom: 1px solid #F5F5F5;display: flex;line-height: 100rpx;">
-					<view style="font-size: 24rpx;font-weight: 700;">
-						实付<text v-if="tab1Checked == 'fantuan'" style="font-size: 20rpx;color: #777;">（含包装/配送费）</text> <text
+					<view v-if="item.otherOrder == null" style="flex: 1;font-weight: 700;">
+						<text v-if="tab1Checked != 'fantuan'">下单时间:</text>{{item.createTime | formatTime}}
+					</view>
+					<view style="font-weight: 700;">
+						<text style="font-size:28rpx;">实付</text><text v-if="tab1Checked == 'fantuan'" style="font-size: 20rpx;color: #777;">（含包装/配送费）</text> <text
 							style="color: red;">￥{{item.totalAmount}}</text>
-							<text class="goods-content-bottom" style="float: right;" v-if="item.otherOrder == null">
-								下单时间：{{item.createTime | formatTime}}
-							</text>
 					</view>
 				</view>
 				<view class="bottom-btn">
@@ -652,7 +652,7 @@
 	}
 
 	.tab2 {
-		height: 70rpx;
+		height: auto;
 		width: 100%;
 		overflow-x: scroll;
 		overflow-y: hidden;
@@ -685,7 +685,7 @@
 		width: 120rpx;
 		text-align: center;
 		line-height: 56rpx;
-		color: #fff;
+		color: #777;
 	}
 
 	.box1 {
diff --git a/package1/runErrand/runErrand.vue b/package1/runErrand/runErrand.vue
index 41c73dc..5bd6968 100644
--- a/package1/runErrand/runErrand.vue
+++ b/package1/runErrand/runErrand.vue
@@ -33,7 +33,7 @@
 			</view>
 		</view>
 		<view class="content">
-			<view class="" style="background: #fff; border-radius: 20rpx; padding: 20rpx; margin-bottom: 20rpx; margin-top: 40rpx;box-shadow: 0 0 10rpx rgba(0,0,0,0.05);">
+			<view class="" style="background: #fff;padding: 20rpx;">
 				<!-- 取货地址 -->
 				<view v-if="isKuaidi" class="dizhi" style="border-bottom: 1px solid #eee; padding-bottom: 20rpx; margin-bottom: 20rpx;">
 					<view class="dizhi-tu">
@@ -101,7 +101,7 @@
 			</view>
 
 			<!-- 配送员模块 -->
-			<view style="background: #fff; border-radius: 20rpx; padding: 20rpx; margin-top: 20rpx; box-shadow: 0 0 10rpx rgba(0,0,0,0.05);">
+			<view style="width: 95%;margin: 10px auto;background: #fff; border-radius: 20rpx; padding: 20rpx; margin-top: 20rpx; box-shadow: 0 0 10rpx rgba(0,0,0,0.05);">
 				<view style="border-bottom: 1px solid #eee; padding-bottom: 20rpx;">
 					<view style="font-size: 28rpx;font-weight: 700;">配送员</view>
 					<view style="font-size: 24rpx;color: #777;margin-top: 10rpx;">指定配送员，如配送员拒绝接单或者下线，订单进入抢单大厅</view>
@@ -142,83 +142,75 @@
 						因您的收货楼层在3楼以上，将额外收取配送费 ¥{{highFloorFeeCalc}}
 					</view>
 				</view>
-			</view>
-
-			<view class="content-box" style="height: 120rpx;">
-				<view class="content-title">
-					取件数量<text style="color:red;">*</text>
-				</view>
-				<view style="display:flex;height: 80rpx;margin-top: 20rpx;line-height: 80rpx;border: 1px solid #777;background: #eee;border-radius: 20rpx;width: 40%;">
-					<view @tap="addFormData.num > 1 ? addFormData.num-- : 1" style="width: 30%;font-size: 44rpx;font-weight: 700;text-align: center;">-</view>
-					<input type="number" v-model="addFormData.num" disabled style="line-height: 80rpx;height: 80rpx;flex: 1;font-size: 36rpx;font-weight: 700;text-align: center;">
-					<view @tap="addFormData.num++" style="width: 30%;font-size: 44rpx;font-weight: 700;text-align: center;">+</view>
-				</view>
-			</view>
-			<view class="content-box">
-				<view class="content-title">
-					取件凭证<text v-if="isKuaidi" style="color:red;">*</text>
+				<view class="content-box" style="height: 120rpx;">
+					<view class="content-title">
+						取件数量<text style="color:red;">*</text>
+					</view>
+					<view style="display:flex;height: 80rpx;margin-top: 20rpx;line-height: 80rpx;border: 1px solid #777;background: #eee;border-radius: 20rpx;width: 40%;">
+						<view @tap="addFormData.num > 1 ? addFormData.num-- : 1" style="width: 30%;font-size: 44rpx;font-weight: 700;text-align: center;">-</view>
+						<input type="number" v-model="addFormData.num" disabled style="line-height: 80rpx;height: 80rpx;flex: 1;font-size: 36rpx;font-weight: 700;text-align: center;">
+						<view @tap="addFormData.num++" style="width: 30%;font-size: 44rpx;font-weight: 700;text-align: center;">+</view>
+					</view>
 				</view>
-				<view style="flex: 1;">
-					<view>
-						<view style="display: flex;">手机尾号</view>
-						<view class="check-input">
-							<input type="text" v-model="addFormData.phoneNumber" style="width: 100%;height: 100%;padding: 0 20rpx;border: 1px solid #eee;border-radius:10rpx;" placeholder="建议填写预留手机尾号4位">
-						</view>
+				<view class="content-box">
+					<view class="content-title">
+						取件凭证<text v-if="isKuaidi" style="color:red;">*</text>
 					</view>
-					<view v-if="isKuaidi">
-						<view style="display: flex;">取件码</view>
-						<view class="check-input" v-for="(item,index) in addFormData.codeList" :key="index" style="border: none;display: flex;">
-							<input type="text" v-model="item.code" style="width: 100%;height: 100%;padding: 0 20rpx;border: 1px solid #eee;border-radius:10rpx;" placeholder="建议填写取件码">
-							<view @tap="delCode(index)" v-if="addFormData.codeList.length>1" style="width: 90rpx;height: 70rpx;line-height: 70rpx;text-align: center;">
-								<uni-icons type="trash" size="18"></uni-icons>
+					<view style="flex: 1;padding-top: 26rpx;">
+						<view>
+							<view style="line-height:70rpx;">手机尾号</view>
+							<view class="check-input">
+								<input type="text" v-model="addFormData.phoneNumber" style="width: 100%;height: 100%;padding: 0 20rpx;border: 1px solid #eee;border-radius:10rpx;" placeholder="建议填写预留手机尾号4位">
 							</view>
 						</view>
-						<view class="check-add" @tap="addCode">+ 添加取件码</view>
-					</view>
-					<view>
-						<view style="display: flex;">截图凭证</view>
-						<view>
-							<view style="display: flex; flex-wrap: wrap;">
-								<view class="upload-img" @tap="pictureAdd" style="background: #eee;text-align: center;line-height: 160rpx;border-radius:10rpx;margin-top:10rpx;">
-									<uni-icons type="camera" size="28" color="#777"></uni-icons>
+						<view v-if="isKuaidi">
+							<view style="line-height:70rpx;">取件码</view>
+							<view class="check-input" v-for="(item,index) in addFormData.codeList" :key="index" style="border: none;display: flex;">
+								<input type="text" v-model="item.code" style="width: 100%;height: 100%;padding: 0 20rpx;border: 1px solid #eee;border-radius:10rpx;" placeholder="建议填写取件码">
+								<view @tap="delCode(index)" v-if="addFormData.codeList.length>1" style="width: 90rpx;height: 70rpx;line-height: 70rpx;text-align: center;">
+									<uni-icons type="trash" size="18"></uni-icons>
 								</view>
-								<view v-for="(item,index) in addFormData.picture" :key="index" style="width: 160rpx;height: 160rpx;margin-left: 20rpx;margin-top:10rpx;position:relative;">
-									<img :src="item" alt="" class="upload-img" style="border-radius:10rpx;">
-									<uni-icons type="clear" size="24" color="red" @tap="delPicture(index)" style="position: absolute;top: -10rpx;right: -10rpx;background:#fff;border-radius:50%;"></uni-icons>
+							</view>
+							<view class="check-add" @tap="addCode">+ 添加取件码</view>
+						</view>
+						<view style="margin-bottom: 10px;">
+							<view style="line-height:70rpx;">截图凭证</view>
+							<view>
+								<view style="display: flex; flex-wrap: wrap;">
+									<view class="upload-img" @tap="pictureAdd" style="background: #eee;text-align: center;line-height: 160rpx;border-radius:10rpx;margin-top:10rpx;">
+										<uni-icons type="camera" size="28" color="#777"></uni-icons>
+									</view>
+									<view v-for="(item,index) in addFormData.picture" :key="index" style="width: 160rpx;height: 160rpx;margin-left: 20rpx;margin-top:10rpx;position:relative;">
+										<img :src="item" alt="" class="upload-img" style="border-radius:10rpx;">
+										<uni-icons type="clear" size="24" color="red" @tap="delPicture(index)" style="position: absolute;top: -10rpx;right: -10rpx;background:#fff;border-radius:50%;"></uni-icons>
+									</view>
 								</view>
 							</view>
 						</view>
 					</view>
 				</view>
-			</view>
-			<view class="content-box">
-				<view class="content-title">
-					特殊情况
-				</view>
-				<view style="flex: 1;">
-					<view class="duoxuan" @tap="checkWeightOrVolume" :style="{'background':addFormData.isOverweightOrOvervolume?'rgba(166, 255, 234, 1)':'#eee'}">
-						超重/超大
+				<view class="content-box">
+					<view class="content-title">
+						特殊情况
+					</view>
+					<view style="flex: 1;">
+						<view class="duoxuan" @tap="checkWeightOrVolume" :style="{'background':addFormData.isOverweightOrOvervolume?'rgba(166, 255, 234, 1)':'#eee'}">
+							超重/超大
+						</view>
 					</view>
 				</view>
-			</view>
-			<view class="content-box" style="line-height: 200rpx;">
-				<view class="content-title">
-					订单备注
-				</view>
-				<view style="height: 200rpx;background: #eee;border-radius: 40rpx;padding: 20rpx;width: 70%;">
-					<textarea v-model="addFormData.remark" cols="30" rows="10" placeholder="请填写备注" style="height: 160rpx;width: 100%;"></textarea>
-				</view>
-			</view>
-			<view style="height: 80rpx;line-height: 80rpx;display: flex;margin-top: 20rpx;">
-				<view style="flex: 1;color: #777;font-weight: 700;font-size:32rpx;">
-					{{isKuaidi?'代取配送费':'跑腿费'}}
-				</view>
-				<view style="color: #000;font-weight:700;font-size:32rpx;">
-					￥{{deliveryFeeCalc.toFixed(2)}}
+				<view class="content-box" style="line-height: 200rpx;">
+					<view class="content-title">
+						订单备注
+					</view>
+					<view style="height: 200rpx;background: #eee;border-radius: 40rpx;padding: 20rpx;width: 70%;margin-top: 10px;">
+						<textarea v-model="addFormData.remark" cols="30" rows="10" placeholder="请填写备注" style="height: 160rpx;width: 100%;"></textarea>
+					</view>
 				</view>
 			</view>
-			<view style="display: flex;height: 80rpx;line-height: 80rpx;border-top: 1px solid #eee;font-size: 28rpx;font-weight: 700; align-items:center;" @tap="openCouponPopup">
-				<view style="flex: 1; color: #777; font-size:32rpx;">
+
+			<view style="display: flex;height: 80rpx;line-height: 80rpx;font-weight: 700; align-items:center;padding: 0 4%;" @tap="openCouponPopup">
+				<view style="flex: 1;">
 					优惠券
 				</view>
 				<view style="color: #ff5722;" v-if="selectedCoupon">
@@ -232,7 +224,16 @@
 				</view>
 				<uni-icons type="right" size="14" color="#999" style="margin-left:10rpx;"></uni-icons>
 			</view>
-			<view style="display: flex;height: 80rpx;line-height: 100rpx;border-top: 1px solid #eee;font-size: 32rpx;font-weight: 700;margin-bottom: 20rpx;">
+			<view style="height: 80rpx;line-height: 80rpx;display: flex;padding: 0 4%;">
+				<view style="flex: 1;font-weight: 700;">
+					{{isKuaidi?'代取配送费':'跑腿费'}}
+				</view>
+				<view style="color: #000;font-weight:700;">
+					￥{{deliveryFeeCalc.toFixed(2)}}
+				</view>
+			</view>
+			
+			<view style="display: flex;height: 80rpx;line-height: 100rpx;font-weight: 700;padding: 0 4%;">
 				<view style="flex: 1;">合计</view>
 				<view>￥{{totalAmountCalc.toFixed(2)}}</view>
 			</view>
@@ -951,12 +952,10 @@
 
 	.content {
 		position: absolute;
-		top: 280rpx;
+		top: 200rpx;
 		width: 100%;
 		overflow: scroll;
 		height: 100%;
-		padding: 0 4%;
-		box-sizing: border-box;
 	}
 
 	.tab1 {
@@ -983,7 +982,7 @@
 	.dizhi-tu {
 		width: 50rpx;
 		height: 50rpx;
-		margin: 26rpx 20rpx 0 0;
+		margin: 19rpx 20rpx 0 0;
 
 		img {
 			width: 100%;
@@ -993,15 +992,15 @@
 
 	.dizhi1 {
 		flex: 1;
-		height: 100rpx;
-		line-height: 100rpx;
+		height: 80rpx;
+		line-height: 80rpx;
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
 	}
 
 	.dizhi-ming {
-		font-size: 30rpx;
+		font-size: 24rpx;
 		font-weight: 700;
 		flex: 1;
 		white-space: nowrap;
@@ -1014,11 +1013,8 @@
 		display: flex;
 		line-height: 120rpx;
 		background: #fff;
-		border-radius: 20rpx;
 		padding: 0 20rpx;
-		margin-top: 20rpx;
-		box-shadow: 0 0 10rpx rgba(0,0,0,0.05);
-		box-sizing: border-box;
+		border-top: 1px solid #eee;
 	}
 
 	.content-title {
@@ -1118,6 +1114,8 @@
 		margin-top: 20rpx;
 		box-shadow: 0 0 10rpx rgba(0,0,0,0.05);
 		box-sizing: border-box;
+		width: 95%;
+		margin: 10px auto;
 	}
 
 	.time1 {