钣金喷漆

pages/order/details.vue

@@ -18,10 +18,16 @@
 					<!-- <span>￥{{product.costPrice}}</span> -->
 				</view>
 				<view class="span" v-if="product.state == '待支付'">
-					顾客于{{product.buyTime}}下单
+					订单已取消
 				</view>
 				<view class="span" v-if="product.state == '待使用'">
-					顾客于{{product.buyTime}}下单
+					等待客户到店核销
+				</view>
+				<view class="span" v-if="product.state == '已完成'">
+					客户已到店核销
+				</view>
+				<view class="span" v-if="product.state == '已失效'">
+					该订单已失效
 				</view>
 			</view>
 			<view class="refund" @click="cutPopup" v-if="product.refundType == 1">
@@ -97,31 +103,31 @@
 				</view>
 				<view class="data">
 					<span>订单号：</span>
-					{{product.orderId}}
+					{{product.orderId?product.orderId:'--'}}
 				</view>
 				<view class="data">
 					<span>支付流水号：</span>
-					{{product.tradeId}}
+					{{product.tradeId?product.tradeId:'--'}}
 				</view>
 				<view class="data">
 					<span>提交人：</span>
-					{{product.linkName}}
+					{{product.linkName?product.linkName:'--'}}
 				</view>
 				<view class="data">
 					<span>联系电话：</span>
-					{{product.phone}}
+					{{product.phone?product.phone:'--'}}
 				</view>
 				<view class="data">
 					<span>下单时间：</span>
-					{{product.buyTime}}
+					{{product.buyTime?product.buyTime:'--'}}
 				</view>
 				<view class="data">
 					<span>付款时间：</span>
-					{{product.payTime}}
+					{{product.payTime?product.payTime:'--'}}
 				</view>
 				<view class="data">
 					<span>使用时间：</span>
-					{{product.useTime}}
+					{{product.useTime?product.useTime:'--'}}
 				</view>
 			</view>
 		</view>

pages/order/index.vue

@@ -77,8 +77,6 @@
 				<!-- 钣金喷漆订单 -->
 				<view class="spec" v-if="item.categoryId == 1945013773786701826">
 					<view class="" v-if="item.orderLinkCategorySpecItems && item.orderLinkCategorySpecItems.length>0">
-
-
 						<view class="order_product"
 							v-for="(specitem, specIndex) in item.orderLinkCategorySpecItems.slice(0, item.isShow ? item.orderLinkCategorySpecItems.length : 2)"
 							:key="specIndex">
@@ -115,7 +113,7 @@
 				</view>
 				<view class="time">
 					<view class="time_left">
-						顾客于{{item.buyTime}}
+						{{item.orderStateTimeName}}：{{item.orderStateTime}}
 					</view>
 					<view class="time_right" @click.stop="goRecord(item)" v-if="item.auditType =='0'">
 						去处理