1

package1/group/groupBuySingle.vue

@@ -822,8 +822,7 @@
 		methods: {
 			// 页面touchmove事件：吸顶后阻止页面整体滑动（让goods-list接管滚动）
 			onPageTouchMove(e) {
-				// 吸顶状态下不需要额外处理，scroll-view会自己处理
+				
-				console.log(e)
 			},
 			// goods-list滚动事件：检测分类切换 + 滚回顶部取消吸顶
 			onGoodsListScroll(e) {
@@ -905,7 +904,7 @@
 							if (this.productItem[i].sellBeginTime != '' && this.productItem[i].sellEndTime != '') {
 								let isEndTime = this.isWithinBusinessHours(this.productItem[i].sellBeginTime, this
 									.productItem[i].sellEndTime)
-								console.log(isEndTime)
+								
 								this.productItem[i].status = isEndTime ? 0 : 1
 							}
 							if (that.productItem[i].isMoreBuy == 1) {
@@ -1034,9 +1033,7 @@
 									});
 								}
 							}
-						} catch (e) {
+						} catch (e) {}
-							console.log(e);
-						}
 					}
 					this.isPintuan = true;
 
@@ -1169,9 +1166,7 @@
 									});
 								}
 							}
-						} catch (e) {
+						} catch (e) {}
-							console.log(e);
-						}
 					}
 
 					if (index == 'pintuan') {
@@ -1454,7 +1449,6 @@
 
 				const startMinutes = parseTime(begin);
 				const endMinutes = parseTime(end);
-				console.log(currentMinutes + ',' + startMinutes + ',' + endMinutes)
 
 				// 判断是否在区间内（包含端点）
 				return currentMinutes >= startMinutes && currentMinutes <= endMinutes;
@@ -1501,9 +1495,9 @@
 			},
 			goDetail(type) {
 				if (type == 'goodsDetail') {
-					uni.navigateTo({
+					// uni.navigateTo({
-						url: '/package1/goods/goodsDetail'
+					// 	url: '/package1/goods/goodsDetail'
-					})
+					// })
 				} else if (type == 'shopDetail') {
 					uni.navigateTo({
 						url: '/package1/group/groupBuyDetail?item=' + JSON.stringify(this.shopItem)

package1/order/returnOrder.vue

@@ -890,8 +890,7 @@
 		background: #fff;
 		max-height: 1200rpx;
 		width: 100%;
-		border-top-left-radius: 20rpx;
+		border-radius: 20rpx;
-		border-top-right-radius: 20rpx;
 		padding: 20rpx;
 		overflow: scroll;
 	}

package1/runErrand/runErrand.vue

@@ -207,13 +207,11 @@
 					<view class="content-title">
 						订单备注
 					</view>
-					<view style="height: 200rpx;background: rgba(247, 248, 248, 0.6);border-radius: 40rpx;padding: 20rpx;width: 70%;margin-top: 20rpx;">
+					<view style="height: 200rpx;background: rgba(247, 248, 248, 0.6);border-radius: 40rpx;padding: 20rpx;margin-top: 20rpx;flex: 1;">
 						<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;font-weight: 700; align-items:center;padding: 0 4%;border-top: 1px solid #eee;margin-top: 10px;" @tap="openCouponPopup">
-
-			<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>
@@ -241,7 +239,7 @@
 					<view style="flex: 1;">合计</view>
 					<view>￥{{totalAmountCalc.toFixed(2)}}</view>
 				</view>
-			
+			</view>
 			<view style="width: 100%;height: 520rpx;"></view>
 		</view>