顶部遮挡

manifest.json

@@ -2,8 +2,8 @@
     "name" : "掌柜生活商户版",
     "appid" : "__UNI__E0EA6E1",
     "description" : "",
-    "versionName" : "1.1.5.0",
-    "versionCode" : 1150,
+    "versionName" : "1.1.5.1",
+    "versionCode" : 1151,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */

pages/groupMeal/orders/order-details.vue

@@ -1,14 +1,15 @@
 <template>
 	<view class="page-container">
-		<u-navbar title="订单详情" bgColor="transparent" :autoBack="true" :placeholder="true"
-			:border-bottom="true"></u-navbar>
+		<view class="top">
+
+		</view>
+		<u-navbar title="订单详情" bgColor="transparent" :autoBack="true" :placeholder="true" :border-bottom="true"></u-navbar>
 		<view class="content">
 			<view class="status">
 				<view class="status_title">
 					{{ product.orderStatusName }} <text v-if="product.differenceMinutes > 0">, 剩余</text>
 					<u-count-down :show-days="false" font-size="36rpx" :timestamp="product.differenceMinutes * 60"
-						v-if="product.differenceMinutes > 0 && product.fundStatus == '待支付'" @end="getDetail"
-					></u-count-down>
+						v-if="product.differenceMinutes > 0 && product.fundStatus == '待支付'" @end="getDetail"></u-count-down>
 					<!-- <text>¥{{product.costPrice}}</text> -->
 				</view>
 				<!-- 退款中 -->
@@ -36,7 +37,8 @@
 				<view class="title">商品信息</view>
 				<view class="center">
 					<view class="img">
-						<image :src="product.productImage || `${$config.apiUrl}/${product.productImage.split(',')[0]}`" mode=""></image>
+						<image :src="product.productImage || `${$config.apiUrl}/${product.productImage.split(',')[0]}`" mode="">
+						</image>
 					</view>
 					<view class="box">
 						<view class="name">{{ product.packageName }}</view>
@@ -53,8 +55,7 @@
 					<template v-slot:="{ items }">
 						<view class="repair-list">
 							<view class="repair-item" v-for="(eitem, i) in items" :key="i">
-								<u-image :src="product.productImage" width="112rpx" height="112rpx"
-									border-radius="6rpx"></u-image>
+								<u-image :src="product.productImage" width="112rpx" height="112rpx" border-radius="6rpx"></u-image>
 								<view class="repair-details">
 									<text class="repair-name one-line-text">{{ product.productName }}</text>
 									<text class="repair-type">{{ eitem.partName }} {{ eitem.positionName }}</text>
@@ -77,7 +78,7 @@
 					</span>
 				</view>
 			</view>
-			
+
 			<view class="product">
 				<view class="title negotiate" v-if="!product.auditType">
 					<text>协商历史</text>
@@ -114,10 +115,7 @@
 			</view>
 		</view>
 
-		<u-popup mode="bottom" :border-radius="20"
-			:safe-area-inset-bottom="true"
-			v-model="isShow" @close="onPopupClose"
-		>
+		<u-popup mode="bottom" :border-radius="20" :safe-area-inset-bottom="true" v-model="isShow" @close="onPopupClose">
 			<view class="popup-container">
 				<view class="popup-header">
 					<text>退款去向详情</text>
@@ -154,375 +152,382 @@
 </template>
 
 <script>
-import ListExpand from '@/components/list-scroll-view/list-expand.vue';
-export default {
-	components: {
-		ListExpand
-	},
-	data() {
-		return {
-			query: {},
-			product: {},
-			isShow: false,
-		}
-	},
-	onLoad(query) {
-		this.query = query;
-		if (query.hostOrderId) this.getDetail();
-	},
-	methods: {
-		getDetail() {
-			this.$http.post("/groupmeal/merchantPackageOrder/refundDetails", this.query).then(res => {
-				if (res.data.code == 200) {
-					this.product = res.data.result;
-				}
-			})
-		},
-		// 协商历史
-		goRecord() {
-			let str = this.$u.queryParams(this.query);
-			uni.navigateTo({
-				url: `/pages/groupMeal/orders/refund${str}`
-			});
+	import ListExpand from '@/components/list-scroll-view/list-expand.vue';
+	export default {
+		components: {
+			ListExpand
 		},
-		// 获取退款去向
-		getRefund() {
-			this.$http.get("/app/order/locaOrder/refundDestination?reOrderId=" + this.orderNo).then(res => {
-				if (res.data.code == 200) {
-					console.log(res)
-				}
-			})
-		},
-		// popup
-		onPopupOpen() {
-			this.isShow = true;
+		data() {
+			return {
+				query: {},
+				product: {},
+				isShow: false,
+			}
 		},
-		onPopupClose() {
-			this.isShow = false;
+		onLoad(query) {
+			this.query = query;
+			if (query.hostOrderId) this.getDetail();
 		},
+		methods: {
+			getDetail() {
+				this.$http.post("/groupmeal/merchantPackageOrder/refundDetails", this.query).then(res => {
+					if (res.data.code == 200) {
+						this.product = res.data.result;
+					}
+				})
+			},
+			// 协商历史
+			goRecord() {
+				let str = this.$u.queryParams(this.query);
+				uni.navigateTo({
+					url: `/pages/groupMeal/orders/refund${str}`
+				});
+			},
+			// 获取退款去向
+			getRefund() {
+				this.$http.get("/app/order/locaOrder/refundDestination?reOrderId=" + this.orderNo).then(res => {
+					if (res.data.code == 200) {
+						console.log(res)
+					}
+				})
+			},
+			// popup
+			onPopupOpen() {
+				this.isShow = true;
+			},
+			onPopupClose() {
+				this.isShow = false;
+			},
+		}
 	}
-}
 </script>
 
 <style lang="scss" scoped>
-.page-container {
-	height: 100vh;
-	background:
-		linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, #F7F8FC 10%),
-		linear-gradient(90deg, #E6FFFF 0%, #CEF7FF 40%, #A3CEFE 73%, #BCD6FF 100%);
-	display: flex;
-	flex-direction: column;
-
-	.content {
-		flex: 1;
-		padding: 24rpx;
-		overflow-y: auto;
-
-		.status {
-			font-size: 44rpx;
-			color: #333333;
-			padding: 0 20rpx;
-
-			.status_title {
-				font-size: 36rpx;
-				font-weight: 600;
-				display: flex;
-				align-items: end;
-				// justify-content: space-between;
-				margin-bottom: 15rpx;
-			}
+	.page-container {
+		height: 100vh;
+		background:
+			linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, #F7F8FC 10%),
+			linear-gradient(90deg, #E6FFFF 0%, #CEF7FF 40%, #A3CEFE 73%, #BCD6FF 100%);
+		display: flex;
+		flex-direction: column;
 
-			.span {
-				font-size: 28rpx;
-				color: #666666;
-			}
+		/*#ifdef APP-PLUS*/
+		.top {
+			width: 100%;
+			height: var(--status-bar-height);
 		}
 
-		.refund {
-			height: 76rpx;
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #333333;
-			margin: 24rpx 20rpx;
-			border-radius: 12rpx;
-			border: 1rpx solid #000000;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-		}
+		.content {
+			flex: 1;
+			padding: 24rpx;
+			overflow-y: auto;
 
-		.product {
-			width: 100%;
-			margin-top: 24rpx;
-			background: #FFFFFF;
-			box-shadow: 0 2rpx 8rpx 0 rgba(214, 225, 237, 0.1);
-			border-radius: 16rpx;
-			padding: 20rpx;
+			.status {
+				font-size: 44rpx;
+				color: #333333;
+				padding: 0 20rpx;
+
+				.status_title {
+					font-size: 36rpx;
+					font-weight: 600;
+					display: flex;
+					align-items: end;
+					// justify-content: space-between;
+					margin-bottom: 15rpx;
+				}
 
-			.title {
+				.span {
+					font-size: 28rpx;
+					color: #666666;
+				}
+			}
+
+			.refund {
+				height: 76rpx;
 				font-weight: 500;
 				font-size: 32rpx;
 				color: #333333;
-				margin-bottom: 16rpx;
-			}
-
-			.negotiate {
-				margin-bottom: 24rpx;
+				margin: 24rpx 20rpx;
+				border-radius: 12rpx;
+				border: 1rpx solid #000000;
 				display: flex;
 				align-items: center;
-				justify-content: space-between;
-
-				.btn {
-					width: 152rpx;
-					height: 50rpx;
-					font-weight: 500;
-					font-size: 26rpx;
-					color: #449AFF;
-					background: rgba(68, 154, 255, 0.05);
-					border-radius: 8rpx;
-					border: 1rpx solid #449AFF;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-				}
+				justify-content: center;
 			}
 
-			.center {
+			.product {
 				width: 100%;
-				display: flex;
+				margin-top: 24rpx;
+				background: #FFFFFF;
+				box-shadow: 0 2rpx 8rpx 0 rgba(214, 225, 237, 0.1);
+				border-radius: 16rpx;
+				padding: 20rpx;
 
-				.img {
-					width: 132rpx;
-					height: 132rpx;
-					margin-right: 16rpx;
-					border-radius: 12rpx;
-					overflow: hidden;
-
-					image {
-						width: 100%;
-						height: 100%;
-						background: #eee;
-					}
-				}
-
-				.box {
-					flex: 1;
-					display: flex;
-					flex-direction: column;
-					justify-content: space-between;
-				}
-
-				.name {
+				.title {
 					font-weight: 500;
-					font-size: 28rpx;
+					font-size: 32rpx;
 					color: #333333;
-					display: -webkit-box;
-					-webkit-line-clamp: 2;
-					-webkit-box-orient: vertical;
-					overflow: hidden;
+					margin-bottom: 16rpx;
 				}
 
-				.price {
+				.negotiate {
+					margin-bottom: 24rpx;
 					display: flex;
 					align-items: center;
 					justify-content: space-between;
 
-					.p {
-						font-weight: 400;
-						font-size: 22rpx;
-						color: #FD4912;
+					.btn {
+						width: 152rpx;
+						height: 50rpx;
+						font-weight: 500;
+						font-size: 26rpx;
+						color: #449AFF;
+						background: rgba(68, 154, 255, 0.05);
+						border-radius: 8rpx;
+						border: 1rpx solid #449AFF;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+					}
+				}
 
-						.v {
-							font-size: 32rpx;
+				.center {
+					width: 100%;
+					display: flex;
+
+					.img {
+						width: 132rpx;
+						height: 132rpx;
+						margin-right: 16rpx;
+						border-radius: 12rpx;
+						overflow: hidden;
+
+						image {
+							width: 100%;
+							height: 100%;
+							background: #eee;
 						}
 					}
 
-					.r {
-						font-weight: 400;
+					.box {
+						flex: 1;
+						display: flex;
+						flex-direction: column;
+						justify-content: space-between;
+					}
+
+					.name {
+						font-weight: 500;
 						font-size: 28rpx;
-						color: #666666;
+						color: #333333;
+						display: -webkit-box;
+						-webkit-line-clamp: 2;
+						-webkit-box-orient: vertical;
+						overflow: hidden;
+					}
+
+					.price {
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
 
 						.p {
-							color: #414141;
+							font-weight: 400;
+							font-size: 22rpx;
+							color: #FD4912;
+
+							.v {
+								font-size: 32rpx;
+							}
+						}
+
+						.r {
+							font-weight: 400;
+							font-size: 28rpx;
+							color: #666666;
+
+							.p {
+								color: #414141;
+							}
 						}
 					}
 				}
-			}
-
-			.data {
-				width: 100%;
-				font-weight: 400;
-				font-size: 28rpx;
-				color: #333333;
-				padding: 10rpx 0;
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
 
-				text {
+				.data {
+					width: 100%;
 					font-weight: 400;
-					font-size: 26rpx;
-					color: #8A91A8;
-					display: block;
-					margin-right: 16rpx;
+					font-size: 28rpx;
+					color: #333333;
+					padding: 10rpx 0;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+
+					text {
+						font-weight: 400;
+						font-size: 26rpx;
+						color: #8A91A8;
+						display: block;
+						margin-right: 16rpx;
+					}
 				}
 			}
 		}
-	}
 
-	.finnal-price {
-		display: flex;
-		align-items: center;
-		justify-content: end;
-		padding-top: 20rpx;
-		border-top: 1rpx solid #EEEEEE;
-	}
+		.finnal-price {
+			display: flex;
+			align-items: center;
+			justify-content: end;
+			padding-top: 20rpx;
+			border-top: 1rpx solid #EEEEEE;
+		}
 
-	.popup-container {
-		.popup-header {
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #333333;
-			padding: 20rpx 24rpx;
-			text-align: center;
-			position: relative;
-			border-bottom: 1rpx solid #EEEEEE;
-
-			image {
-				width: 40rpx;
-				height: 40rpx;
-				position: absolute;
-				right: 24rpx;
+		.popup-container {
+			.popup-header {
+				font-weight: 500;
+				font-size: 32rpx;
+				color: #333333;
+				padding: 20rpx 24rpx;
+				text-align: center;
+				position: relative;
+				border-bottom: 1rpx solid #EEEEEE;
+
+				image {
+					width: 40rpx;
+					height: 40rpx;
+					position: absolute;
+					right: 24rpx;
+				}
 			}
-		}
 
-		.popup-content {
-			margin: 24rpx;
-			padding: 20rpx;
-			border-radius: 12rpx;
-			background-color: #F7F8FC;
+			.popup-content {
+				margin: 24rpx;
+				padding: 20rpx;
+				border-radius: 12rpx;
+				background-color: #F7F8FC;
 
-			.one-box {
-				padding-bottom: 16rpx;
-				border-bottom: 1rpx solid #EEEEEE;
-				.amount {
-					font-weight: 500;
-					font-size: 30rpx;
-					color: #333333;
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
+				.one-box {
+					padding-bottom: 16rpx;
+					border-bottom: 1rpx solid #EEEEEE;
 
-					.val {
+					.amount {
 						font-weight: 500;
-						font-size: 32rpx;
-						color: #FD4912;
+						font-size: 30rpx;
+						color: #333333;
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+
+						.val {
+							font-weight: 500;
+							font-size: 32rpx;
+							color: #FD4912;
 
-						.unit {
-							font-weight: 400;
-							font-size: 22rpx;
-							margin-right: 4rpx;
+							.unit {
+								font-weight: 400;
+								font-size: 22rpx;
+								margin-right: 4rpx;
+							}
 						}
 					}
-				}
 
-				.text {
-					font-weight: 400;
-					font-size: 26rpx;
-					color: #666666;
-					margin-top: 12rpx;
+					.text {
+						font-weight: 400;
+						font-size: 26rpx;
+						color: #666666;
+						margin-top: 12rpx;
+					}
 				}
-			}
 
-			.two-box {
-				.refund {
-					font-weight: 400;
-					font-size: 28rpx;
-					color: #333333;
-					margin-top: 16rpx;
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
+				.two-box {
+					.refund {
+						font-weight: 400;
+						font-size: 28rpx;
+						color: #333333;
+						margin-top: 16rpx;
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
 
-					.val {
-						font-size: 32rpx;
+						.val {
+							font-size: 32rpx;
+						}
 					}
-				}
 
-				.desc {
-					font-weight: 400;
-					font-size: 26rpx;
-					color: #666666;
-					margin-top: 12rpx;
-				}
+					.desc {
+						font-weight: 400;
+						font-size: 26rpx;
+						color: #666666;
+						margin-top: 12rpx;
+					}
 
-				.time {
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #999999;
-					margin-top: 12rpx;
+					.time {
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #999999;
+						margin-top: 12rpx;
+					}
 				}
 			}
 		}
 	}
-}
 
-.repair-list {
-	padding: 20rpx 0;
+	.repair-list {
+		padding: 20rpx 0;
 
-	.repair-item {
-		display: flex;
-		align-items: center;
-		margin-bottom: 20rpx;
+		.repair-item {
+			display: flex;
+			align-items: center;
+			margin-bottom: 20rpx;
 
-		&:last-child {
-			margin-bottom: 0;
-		}
+			&:last-child {
+				margin-bottom: 0;
+			}
 
-		.repair-details {
-			flex: 1;
-			margin: 0 20rpx 0 40rpx;
+			.repair-details {
+				flex: 1;
+				margin: 0 20rpx 0 40rpx;
 
-			.repair-name,
-			.repair-type {
-				display: block;
-			}
+				.repair-name,
+				.repair-type {
+					display: block;
+				}
 
-			.repair-name {
-				font-weight: 400;
-				font-size: 26rpx;
-				color: #000000;
-			}
+				.repair-name {
+					font-weight: 400;
+					font-size: 26rpx;
+					color: #000000;
+				}
 
-			.repair-type {
-				font-weight: 400;
-				font-size: 22rpx;
-				color: #666666;
-				margin-top: 6rpx;
+				.repair-type {
+					font-weight: 400;
+					font-size: 22rpx;
+					color: #666666;
+					margin-top: 6rpx;
+				}
 			}
-		}
 
-		.repair-price {
-			text-align: right;
+			.repair-price {
+				text-align: right;
 
-			.final-price,
-			.original-price {
-				display: block;
-			}
+				.final-price,
+				.original-price {
+					display: block;
+				}
 
-			.final-price {
-				font-weight: 500;
-				font-size: 28rpx;
-				color: #fd2b54;
-			}
+				.final-price {
+					font-weight: 500;
+					font-size: 28rpx;
+					color: #fd2b54;
+				}
 
-			.original-price {
-				font-weight: 400;
-				font-size: 18rpx;
-				color: #999999;
-				text-decoration: line-through;
+				.original-price {
+					font-weight: 400;
+					font-size: 18rpx;
+					color: #999999;
+					text-decoration: line-through;
+				}
 			}
 		}
 	}
-}
 </style>