临时

src/components/order/detail.vue

@@ -20,7 +20,8 @@
 				<text>客户信息：</text>
 				<text>{{ order.contactName }}</text>
 			</view>
-			<image style="width: 84rpx;height: 56rpx;" :src="phoneIcon" @click="phoneToCustomer(order.contactPhone)">
+			<image v-if="showOperate" style="width: 84rpx;height: 56rpx;" :src="phoneIcon"
+				@click="phoneToCustomer(order.contactPhone)">
 			</image>
 		</view>
 		<view class="order-cell">
@@ -32,7 +33,7 @@
 				<u-icon name="map" size="28"></u-icon>
 				<text class="address-txt">{{ formatAddress }}</text>
 			</view>
-			<image style="width: 84rpx;height: 56rpx;" :src="navigationIcon"
+			<image v-if="showOperate" style="width: 84rpx;height: 56rpx;" :src="navigationIcon"
 				@click="openLocation(order.contactAddress)"></image>
 		</view>
 		<view v-if="readMore" @click="handleClick(false)" class="read-more-toggle">
@@ -70,16 +71,22 @@
 				default () {
 					return {}
 				}
-			},
+			},
 			// true 显示「查看更多」按钮， false 显示「点击收起」按钮
 			readMore: {
 				type: Boolean,
 				default: true
-			},
-			// 可以点击电话和地址
-			operate: {
-				type: Boolean,
-				default: true
+			},
+			// 可以点击电话和地址
+			operate: {
+				type: Boolean,
+				default: true
+			},
+
+			// 显示点击电话和地址
+			showOperate: {
+				type: Boolean,
+				default: true
 			}
 		},
 		data() {
@@ -255,26 +262,29 @@
 			margin-bottom: 20rpx;
 		}
 
-	}
-	.order-cell {
-		font-size: 26rpx;
-		font-weight: 400;
-		color: #333333;
-		line-height: 48rpx;
-		margin-bottom: 10rpx;
-	
-	}
-	
-	.between-cell {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-	}
-	.display-cell {
-		display: flex;
-	}
-	.cell-title {
-		text-align: left;
-		flex-shrink: 0;
+	}
+
+	.order-cell {
+		font-size: 26rpx;
+		font-weight: 400;
+		color: #333333;
+		line-height: 48rpx;
+		margin-bottom: 10rpx;
+
+	}
+
+	.between-cell {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.display-cell {
+		display: flex;
+	}
+
+	.cell-title {
+		text-align: left;
+		flex-shrink: 0;
 	}
 </style>

src/pages/order/complete.vue

@@ -3,6 +3,7 @@
         <complete-check :show="completeCheckStatus" :list-data="completeCheckResult" :pass="pass" @close="closeCheckResult" @handle="handerProgrom" @change="confirm"></complete-check>
         <view class="u-wrap">
             <u-navbar :background="{background: '#2272FF'}" back-icon-color="#fff" :title-size="32" title-color="#fff" :border-bottom="false" title="完工信息" title-bold></u-navbar>
+			<Detail :order="order" :readMore.sync="readMore" :showOperate="false"></Detail>
             <u-tabs v-show="showTab" class="order-tabs" ref="tabs" :current="tabIndex" name="panelName" :list="list"  @change="tabsChange" :is-scroll="false" bg-color="#2272FF" inactive-color="#a6c6ff" active-color="#fff" height="80" font-size="32"></u-tabs>
             <view :class="['u-menu-wrap', {'one': !showTab}]">
                 <scroll-view scroll-y scroll-with-animation class="u-tab-view menu-scroll-view" :scroll-top="scrollTop" v-if="list[tabIndex].items.length > 1 && showTab">
@@ -129,6 +130,7 @@
     import XhLabel from "../../components/createCom/XhLabel";
     import takePhoto from '@/components/take/index.vue'
     import baseFile from '@/components/upload/index';
+	import Detail from "@/components/order/detail.vue"
 	// import XhRadio from '@/components/createCom/XhRadio.vue'
     export default {
         data() {
@@ -174,7 +176,9 @@
                 takeStatus: false,
 				currentItemDate:{},
                 photoItem: {},
-				showTab: true
+				showTab: true,
+				order: {},
+				readMore: true
             }
         },
         components: {
@@ -191,6 +195,7 @@
 			XhServiceMeasure,
 			XhServiceMore,
 			XhLabel,
+			Detail,
             'take-photo': takePhoto
         },
         mixins: [baseFile],
@@ -200,13 +205,17 @@
         onLoad(option) {
 			getApp().trackPage('订单完工信息页')
             if (option) {
-                this.orderId = option.orderId
-				this.categoryId = option.categoryId
-				this.orderServiceType = decodeURIComponent(option.orderServiceType)
-				this.inGuaranteePeriod = option.inGuaranteePeriod
-				this.partnerCompanyId = option.partnerCompanyId
-				this.auditResultsId = option.auditResultsId
-				this.showTab =option.partnerCompanyName == '挚达充电桩'
+				let string = decodeURIComponent(option.item)
+				const item = JSON.parse(decodeURIComponent(string))
+				this.order = item
+				
+                this.orderId = item.orderId
+				this.categoryId = item.categoryId
+				this.orderServiceType = decodeURIComponent(item.orderServiceType)
+				this.inGuaranteePeriod = item.inGuaranteePeriod
+				this.partnerCompanyId = item.partnerCompanyId
+				this.auditResultsId = item.auditResultsId
+				this.showTab =item.partnerCompanyName == '挚达充电桩'
             } else {
                 this.orderId = 11880091
 				this.categoryId = 1100000214

src/pages/order/detail.vue

@@ -475,7 +475,7 @@
 					this.allowFeedback = true
 					this.showCenterBtn = true
 					this.scenePhoto = true
-					this.readMore = false
+					this.readMore = true
 					this.isAllowDianhuaAndDaohang = true
 				} else {
 					this.isAllowDianhuaAndDaohang = true
@@ -617,14 +617,18 @@
 			},
 			filish(){
 				// 去完工
+				let item = encodeURIComponent(JSON.stringify(this.order))
 				uni.navigateTo({
-					url: 'pages/order/complete?orderId='+this.order.orderId
-						+ "&categoryId=" + this.order.categoryId
-						+ "&orderServiceType=" + this.order.orderServiceType
-						+ "&inGuaranteePeriod=" + this.order.inGuaranteePeriod
-						+ "&partnerCompanyId=" + this.order.partnerCompanyId
-						+ '&partnerCompanyName=' + this.order.partnerCompanyName
+					url: 'pages/order/complete?item='+item
 				})
+				// uni.navigateTo({
+				// 	url: 'pages/order/complete?orderId='+this.order.orderId
+				// 		+ "&categoryId=" + this.order.categoryId
+				// 		+ "&orderServiceType=" + this.order.orderServiceType
+				// 		+ "&inGuaranteePeriod=" + this.order.inGuaranteePeriod
+				// 		+ "&partnerCompanyId=" + this.order.partnerCompanyId
+				// 		+ '&partnerCompanyName=' + this.order.partnerCompanyName
+				// })
 			},
 			rejectOrder() { // 拒单
 				// 检查是否可以拒单