Merge branch 'dev' of https://git.ouxuan.net/APP/ox_zhiNengZhuShou into dev

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

@@ -213,9 +213,10 @@ export default {
 		    }
 		},
 		zh_verify_status(){
-			// 核销状态  0/1/2/3/4 无效/待使用/已核销/已失效/已退款
+			// 核销状态  -1/0/1/2/3/4 已分享/无效/待使用/已核销/已失效/已退款
 			return status =>{
 			    const _obj = {
+					'-1': '已分享',
 			        '0': '无效',
 			        '1': '待使用',
 			        '2': '已使用',

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

@@ -67,7 +67,7 @@
 				<view class="oem-tit">结束计费</view>
 				<view class="oem-line">操作人：{{orderInfo.end_bill_operator_name || '-'}}</view>
 				<view class="oem-line">时长合计：<text class="ol-txt1">{{orderInfo.extension.duration || '-'}}</text></view>
-				<view class="oem-line">金额合计：<text class="ol-txt2">¥{{orderInfo.extension.refundable_amount || '-'}}</text></view>
+				<view class="oem-line">金额合计：<text class="ol-txt2">¥{{orderInfo.extension.amount || '-'}}</text></view>
 				<view class="oem-tips">*<text>请输入金额</text></view>
 				<view class="oem-ipt"><input type="digit" v-model="input_amount"/></view>
 				<view class="oem-btn" hover-class="hover-active" @click="confirmChange" >确认</view>