Merge branch 'master' of http://git.jihengcc.cn/liubaiyan/qjd-user-uniapp

pagesMain/orderDetail.vue

@@ -86,7 +86,7 @@
 				<view class="order-info-row" v-if="orderData.orderStatus == 6">取消时间：{{orderData.cancelTime}}</view>
 			</view>
 		</view>
-		<view class="order-info-box" v-if="orderData.evaluateResVO.evaluateContent">
+		<view class="order-info-box" v-if="orderData.evaluateResVO && orderData.evaluateResVO.evaluateContent">
 			<view class="info-title-box">
 				<view class="info-title">评价信息</view>
 			</view>