From 3996e159f779a279081e6febd275b3b96d318aef Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Thu, 7 Mar 2024 16:51:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E8=87=AA=E6=8F=90=E7=82=B9?=
 =?UTF-8?q?=E5=8C=BA=E5=88=86=E5=BA=97=E9=95=BF=E4=B8=8E=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/news3/shopOrderDetails.vue | 100 +++++++++++++++++++++++++++++--
 pages/order/detail.vue           |  19 +++---
 pages/order/index.vue            |   3 +-
 pages/sureOrder/index.vue        |   6 +-
 4 files changed, 111 insertions(+), 17 deletions(-)

diff --git a/pages/news3/shopOrderDetails.vue b/pages/news3/shopOrderDetails.vue
index c4351e8..1d0fb72 100644
--- a/pages/news3/shopOrderDetails.vue
+++ b/pages/news3/shopOrderDetails.vue
@@ -34,7 +34,7 @@
 			</view>
 
 			<!-- 收货地址 -->
-			<view class="shipping-address" v-if="orderInfo.address">
+			<view class="shipping-address" v-if="orderInfo.address&&orderInfo.delivery_type == 10">
 				<view class="name-phone">
 					<text>{{orderInfo.address.name}}</text>
 					<text style="margin-left: 50rpx;">{{orderInfo.address.phone}}</text>
@@ -43,6 +43,22 @@
 					<text>{{orderInfo.address.region.province}}{{orderInfo.address.region.city}}{{orderInfo.address.region.region}}{{orderInfo.address.detail}}</text>
 				</view>
 			</view>
+			<view class="consignee" v-if="orderInfo &&orderInfo.delivery_type == 20">
+				<view class="conLeft">
+					<view class="thr">
+						<view class="peo">提货人</view>
+						<view class="name">{{ orderInfo.ziti_address.linkman }}</view>
+					</view>
+					<view class="thr">
+						<view class="peo">手机号</view>
+						<view class="name">{{ orderInfo.ziti_address.phone }}</view>
+					</view>
+					<view class="thr">
+						<view class="peo">到店时间</view>
+						<view class="name">{{ orderInfo.to_store_time }}</view>
+					</view>
+				</view>
+			</view>
 			<!-- 订单商品 -->
 			<view class="order-goods">
 				<view class="goods-list">
@@ -256,7 +272,7 @@
 			return {
 				status: 1,
 				orderInfo: '',
-				order_id:'',
+				order_id: '',
 				audit_status: 20,
 				audit_notes: '',
 				deleteShow: false,
@@ -277,7 +293,7 @@
 				const app = this
 				OrderApi.detail(this.order_id)
 					.then(result => {
-						this.orderInfo=result.data.order
+						this.orderInfo = result.data.order
 					})
 			},
 			// 联系商家
@@ -676,7 +692,7 @@
 		border-radius: 4px;
 
 		.goods-list {
-			padding: 30upx 40upx 0 40upx;
+			padding: 15upx 40upx 0 40upx;
 
 			.list {
 				display: flex;
@@ -1136,4 +1152,80 @@
 			}
 		}
 	}
+
+	.consignee {
+		width: 100%;
+		// height: 200rpx;
+		background: #FFFFFF;
+		border-radius: 10rpx 10rpx 10rpx 10rpx;
+		opacity: 1;
+		margin: 12rpx 0 0 0rpx;
+		display: flex;
+		justify-content: space-between;
+		padding: 24rpx 36rpx 6rpx 32rpx;
+
+		.conLeft {
+			.thr {
+				overflow: hidden;
+				// display: flex;
+				width: 474rpx;
+				// height: 34rpx;
+				font-size: 24rpx;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 400;
+				color: #838383;
+				line-height: 34rpx;
+				margin-bottom: 20rpx;
+
+				// justify-content: flex-start;
+				.peo {
+					width: 150rpx;
+					float: left;
+				}
+
+				.name {
+					color: #333;
+					float: left;
+					word-wrap: break-word;
+					width: 300rpx;
+				}
+			}
+
+		}
+
+		.conRight {
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 600;
+			color: #F21A1C;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+
+			.code {
+				height: 34rpx;
+				font-size: 24rpx;
+				line-height: 34rpx;
+				margin-bottom: 8rpx;
+			}
+
+			.codeNum {
+				width: 80rpx;
+				height: 78rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.openCode {
+				height: 28rpx;
+				font-size: 20rpx;
+				font-weight: 400;
+				color: #848484;
+				line-height: 23rpx;
+				margin-top: 4rpx;
+			}
+		}
+	}
 </style>
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index 862b099..ec8d04f 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -41,13 +41,17 @@
 		<view class="consignee" v-if="order.delivery_type == DeliveryTypeEnum.EXTRACT.value">
 			<view class="conLeft">
 				<view class="thr">
-					<view class="peo">提货人</view>
-					<view class="name">{{ order.extract_shop.linkman }}</view>
+					<view class="peo">门店名称</view>
+					<view class="name">{{ order.extract_shop.shop_name }}</view>
 				</view>
 				<view class="thr">
-					<view class="peo">手机号</view>
+					<view class="peo">门店电话</view>
 					<view class="name">{{ order.extract_shop.phone }}</view>
 				</view>
+				<view class="thr">
+					<view class="peo">门店地址</view>
+					<view class="name">{{ order.extract_shop.full_address }}</view>
+				</view>
 				<view class="thr">
 					<view class="peo">营业时间</view>
 					<view class="name">{{ order.extract_shop.shop_hours }}</view>
@@ -56,12 +60,8 @@
 					<view class="peo">到店时间</view>
 					<view class="name">{{ order.to_store_time }}</view>
 				</view>
-				<!-- <view class="thr">
-					<view class="peo">预计到店时间</view>
-					<view class="name">2023-12-20 09:15</view>
-				</view> -->
 			</view>
-			<view class="conRight" @click="openCode">
+			<view class="conRight" @click="openCode" v-if="order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_type == DeliveryTypeEnum.EXTRACT.value">
 				<view class="code">
 					核销码
 				</view>
@@ -290,8 +290,7 @@
 					v-if="order.pay_status == PayStatusEnum.PENDING.value &&order.order_status == OrderStatusEnum.NORMAL.value">
 					立即支付
 				</view>
-				<view class="buyAgain" @click="onQrcodeImage(order.order_id)" v-if="order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_type == DeliveryTypeEnum.EXTRACT.value
-					&& order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value">
+				<view class="buyAgain" @click="onQrcodeImage(order.order_id)" v-if="order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_type == DeliveryTypeEnum.EXTRACT.value">
 					核销码
 				</view>
 				<view class="buyAgain" @click="handleTargetExpress(order.order_id)"
diff --git a/pages/order/index.vue b/pages/order/index.vue
index b98999f..8d73b87 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -73,8 +73,7 @@
 						v-if="item.order_status == OrderStatusEnum.COMPLETED.value || (item.pay_status == PayStatusEnum.PENDING.value&&item.order_status == OrderStatusEnum.NORMAL.value)">
 						更多</view>
 					<view class="b">
-						<view class="n" v-if="item.pay_status == PayStatusEnum.SUCCESS.value && item.delivery_type == DeliveryTypeEnum.EXTRACT.value
-                 && item.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value"
+						<view class="n" v-if="item.pay_status == PayStatusEnum.SUCCESS.value && item.delivery_type == DeliveryTypeEnum.EXTRACT.value"
 							@click="onExtractQRCode(item.order_id)">核销码
 						</view>
 						<view class="n"
diff --git a/pages/sureOrder/index.vue b/pages/sureOrder/index.vue
index a22b682..ac687fd 100644
--- a/pages/sureOrder/index.vue
+++ b/pages/sureOrder/index.vue
@@ -626,7 +626,6 @@
 	        this.$navTo('pages/order/index', {}, 'redirectTo')
 	      }, 1000)
 	    },
-	
 	    // 表单提交的数据
 	    getFormData() {
 	      const app = this
@@ -643,6 +642,11 @@
 	        expect_receive_time: app.buyType == 'sm'?app.timer : '',
 	        is_street_take: app.buyType == 'zq'?(app.is_street_take?1:0) : '',
 	        to_store_time: app.buyType == 'zq'?app.timer : '',
+			ziti_address:app.buyType=='zq'?({
+				shopId: app.selectedShopId || 0,
+				linkman: app.linkman,
+				phone: app.phone,
+			}):''
 	      }
 	      // 获取不同模式的参数
 	      const modeParam = getModeParam(options.mode, options)