Merge branch 'dev' into order

src/pages/write_off/search_result/search_result.vue

@@ -38,6 +38,9 @@
                     <view>
                         <view>核销时间：{{ e.verify_time || '-'}}</view>
                     </view>
+                    <view>
+                        <view>离场时间：{{ e.verify_leave_time || '-'}}</view>
+                    </view>
                 </view>
             </view>
         </view>

src/subpackage/device/components/order/reservation_people_detail/reservation_people_detail.vue

@@ -52,8 +52,10 @@
 							<view class="s-btn" v-if="e.is_recovery" @click="recoverBtn(e)">恢复</view>
 						</view>
 						<block v-if="e.status==2">
-							<view class="rs-view"><view>核销方式：{{zh_verify_type(e.verify_type)}}</view></view>
+							<view class="rs-view"><view>核销方式：{{e.verify_desc || '-'}}</view></view>
 							<view class="rs-view"><view>核销时间：{{e.verify_time || '-'}}</view></view>
+							<view class="rs-view"><view>离场方式：{{e.verify_leave_desc || '-'}}</view></view>
+							<view class="rs-view"><view>离场时间：{{e.verify_leave_time || '-'}}</view></view>
 						</block>
 					</view>
 				</view>

src/subpackage/device/components/order/reservation_site_detail/reservation_site_detail.vue

@@ -27,12 +27,20 @@
 			<block v-if="orderInfo.pay_status==2">
 				<view class="rb-line">
 					<view class="rl-view">核销方式：</view>
-					<text class="rl-text">{{zh_verify_type(orderInfo.verify_type)}}</text>
+					<text class="rl-text">{{orderInfo.verify_desc || '-'}}</text>
 				</view>
 				<view class="rb-line">
 					<view class="rl-view">核销时间：</view>
 					<text class="rl-text">{{orderInfo.verify_time || '-'}}</text>
 				</view>
+				<view class="rb-line">
+					<view class="rl-view">离场方式：</view>
+					<text class="rl-text">{{orderInfo.verify_leave_desc || '-'}}</text>
+				</view>
+				<view class="rb-line">
+					<view class="rl-view">离场时间：</view>
+					<text class="rl-text">{{orderInfo.verify_leave_time || '-'}}</text>
+				</view>
 			</block>
 		</view>
 		<view class="rs-box">