商家备注

ext.json

@@ -1,6 +1,6 @@
 {
 	"extEnable": true,
-	"extAppid": "wx9f7e94fe11dc0c23",
+	"extAppid": "wxa3127ed5c3542a28",
 	"ext": {
 		"store_id": 10048
 	}

pages/order/detail.vue

@@ -185,7 +185,7 @@
 				</view>
 			</view> -->
 			<view class="orderTitle" v-if="order.delivery_status == DeliveryStatusEnum.DELIVERED.value">
-				<view class="total" v-if="order.delivery[0].delivery_method != DeliveryMethodEnum.UNWANTED.value">
+				<view class="total">
 					物流公司：
 				</view>
 				<view class="price">
@@ -208,14 +208,23 @@
 					{{order.pay_time}}
 				</view>
 			</view>
-			<!-- <view class="orderTitle" v-if="order.receipt_time">
+			<view class="remarkTitle" v-if="order.merchant.length>0">
 				<view class="total">
-					期待配送时间：
+					商家备注：
 				</view>
-				<view class="price">
+				<view style="overflow: hidden;">
-					{{order.receipt_time}}
+					<view class="merchant" v-for="(item, idx) in order.merchant">
+						<view class="merchantImg">
+							<image @click="previewImage(idxs,item.image_url)" :src="img.preview_url"
+								v-for="(img, idxs) in item.image_url" mode=""></image>
+						</view>
+
+						<view class="remark">
+							{{item.remark}}
+						</view>
+					</view>
 				</view>
-			</view> -->
+			</view>
 			<view class="line">
 			</view>
 			<view class="amount">
@@ -464,6 +473,16 @@
 			}
 		},
 		methods: {
+			previewImage(index, list) {
+				let newList = []
+				list.forEach(item => {
+					newList.push(item.preview_url)
+				});
+				uni.previewImage({
+					current: index, // 当前显示图片索引
+					urls: newList, // 需要预览的图片http链接列表
+				});
+			},
 			onCopyLink(str) {
 				uni.setClipboardData({
 					data: str, //	这里是个坑接受字符串类型 value转化为字符串
@@ -700,7 +719,8 @@
 			// 点击去退款
 			onRefund(orderId, order, item) {
 				uni.navigateTo({
-					url: '/pages/order/refund/index?orderId=' + orderId + '&order=' + encodeURIComponent(JSON.stringify(order)) +
+					url: '/pages/order/refund/index?orderId=' + orderId + '&order=' + encodeURIComponent(JSON
+							.stringify(order)) +
 						"&deliveryStatus=" + item.delivery_status + '&receiptStatus=' + item.receipt_status
 				})
 			},
@@ -1579,4 +1599,50 @@
 			font-size: 36rpx;
 		}
 	}
+
+	.remarkTitle {
+		overflow: hidden;
+		margin-bottom: 20rpx;
+
+		.total {
+			float: left;
+			font-size: 24rpx;
+			color: #7E7E7E;
+		}
+
+		.merchantImg {
+			width: 100%;
+			display: flex;
+			flex-wrap: wrap;
+			flex-direction: row;
+			min-height: 100rpx;
+		}
+
+		.merchantImg image {
+			width: 100rpx;
+			height: 100rpx;
+			margin: 0 20rpx 20rpx 0;
+
+		}
+
+		.merchant {
+			margin-top: 5rpx;
+			overflow: hidden;
+			border-top: 1rpx solid #F4F4F4;
+			padding: 20rpx 0;
+
+			.remark {
+				font-size: 24rpx;
+				font-weight: 500;
+				color: #1E1E1E;
+				line-height: 34rpx;
+			}
+		}
+
+		.merchant:nth-child(1) {
+			padding-top: 0;
+			border-top: none;
+		}
+
+	}
 </style>