1.钣喷

pages/user/myOrder/mallOrderDetail.vue

@@ -6,10 +6,10 @@
 				<image src="../../../static/img/icon_order_def.png" mode="" style="width: 44rpx;height: 44rpx;"></image>
 
 
-				<view class="SheetState" v-if="orderData.orderSheet.sheetState == 1">待付款</view>
-				<view class="SheetState" v-if="orderData.orderSheet.sheetState == 2">待服务</view>
-				<view class="SheetState" v-if="orderData.orderSheet.sheetState == 3">已完成</view>
-				<view class="SheetState" v-if="orderData.orderSheet.sheetState == 4">已取消</view>
+				<view class="SheetState" v-if="orderData.data.sheetState == 1">待付款</view>
+				<view class="SheetState" v-if="orderData.data.sheetState == 2">待服务</view>
+				<view class="SheetState" v-if="orderData.data.sheetState == 3">已完成</view>
+				<view class="SheetState" v-if="orderData.data.sheetState == 4">已取消</view>
 
 			</view>
 
@@ -44,19 +44,19 @@
 		<!-- 订单内容 -->
 		<view class="information">
 			<view class="detailedTitle">订单内容</view>
-			<view class="goodsName">{{orderData.OpenSheetQRCodeList.itemName}}轮毂去污护理（4支）</view>
+			<view class="goodsName">{{orderData.OpenSheetQRCodeList.itemName}}</view>
 			<view class="informationLine2">
-				<view class="informationNum">￥{{orderData.OpenSheetQRCodeList.totalPrice}}24</view>
+				<view class="informationNum">￥{{orderData.OpenSheetQRCodeList.totalPrice}}</view>
 				<view class="informationNum">
-					x2{{orderData.OpenSheetQRCodeList.noWriteoffQty+orderData.OpenSheetQRCodeList.writeoffQty}}</view>
+					x{{orderData.OpenSheetQRCodeList.noWriteoffQty+orderData.OpenSheetQRCodeList.writeoffQty}}</view>
 			</view>
 
 			<view>
 				<view class="goodsName">券码信息（{{orderData.OpenSheetQRCodeList.noWriteoffQty}}张可用）</view>
 				<view class="detailedLine" v-for="(v,index) in orderData.OpenSheetQRCodeList.OpenSheetQRCode">
-					<view class="detailedName"><span class="redPoint"></span> 938393 <span class="quanState"
+					<view class="detailedName"><span class="redPoint"></span><span class="quanState"
 							v-if="v.WriteoffState==3">待使用</span></view>
-					<view class="detailedName old"><span class="redPoint"></span> 938393 <span class="quanState"
+					<view class="detailedName old"><span class="redPoint"></span><span class="quanState"
 							v-if="v.WriteoffState==1">已使用</span></view>
 					<image src="../../../static/img/icon_erweima.png" mode="" style="width: 36rpx;height: 36rpx;"
 						v-if="v.WriteoffState==3"></image>
@@ -66,7 +66,7 @@
 		</view>
 
 		<!-- 套餐内容 -->
-		<view class="information">
+		<view class="information" v-if="SheetType==3">
 			<view class="detailedTitle">套餐内容</view>
 			<!-- 项目 -->
 			<view class="itemBox">
@@ -109,7 +109,7 @@
 		<!-- 实付款 -->
 		<view class="money">
 			<view class="informationNum">实付款：</view>
-			<view class="informationNum" style="color: #FF0000;">￥235{{orderData.data.realMoney}}</view>
+			<view class="informationNum" style="color: #FF0000;">￥{{orderData.data.realMoney}}</view>
 		</view>
 
 		<!-- 订单信息 -->
@@ -151,14 +151,14 @@
 			</view>
 			<view class="informationLine">
 				<view class="informationTxt">支付时间：</view>
-				<view class="informationNum">{{orderData.data.payTime}}</view>
+				<view class="informationNum">{{orderData.data.payTime?orderData.data.payTime:'-'}}</view>
 			</view>
 
 		</view>
 
 		<view style="height: 50rpx;background-color: #F4F5F7;"></view>
 
-		<view class="bottom" v-if="orderData.orderSheet.sheetState == 1">
+		<view class="bottom" v-if="orderData.data.sheetState == 1">
 
 			<view class="cancel" @click="cancelBespeak">取消订单</view>
 			<view class="defer" @click="pay">立即支付</view>
@@ -176,14 +176,16 @@
 			return {
 
 				id: '',
+				SheetType:'',//SheetType 1 商品2项目3套餐4救援5钣喷6集客
 				orderData: '',
-
+				
 
 			}
 		},
 		onLoad(opt) {
 
 			this.id = opt.id
+			this.SheetType = opt.SheetType
 
 			if (this.id) {
 				this.getData()
@@ -328,7 +330,7 @@
 	.box {
 		min-height: 100vh;
 		background: #F4F5F7;
-
+		padding-bottom: 135rpx;
 	}
 
 	.top {
@@ -567,6 +569,8 @@
 		width: 100vw;
 		position: fixed;
 		bottom: 0rpx;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
 	}
 
 	.cancel {