fix bug

src/components/timing_order/timing_order.vue

@@ -26,7 +26,7 @@
 		        </view>
 		    </view>
 		</view>
-		<view class="ro-bot">
+		<view class="ro-bot" v-if="orderInfo.pay_status != 0">
 			<view class="rb-total">实付款 <text class="rt-txt"> ¥{{orderInfo.pay_amount || 0}}</text></view>
 		</view>
 	</view>

src/pages/order_search/order_search.vue

@@ -17,6 +17,7 @@
                     <reservation-order :order-info="e" v-if="orderType == 3"></reservation-order>
                     <membership-order :order-info="e" v-if="orderType == 4"></membership-order>
                     <integral-order :order-info="e" v-if="orderType == 5"></integral-order>
+					<timing-order :order-info="e" v-if="orderType == 1"></timing-order>
                 </view>
             </view>
         </view>
@@ -27,7 +28,7 @@
 import reservation_order from '../../components/reservation_order/reservation_order';
 import integral_order from '../../components/integral_order/integral_order';
 import membership_order from '../../components/membership_order/membership_order';
-
+import timing_order from '../../components/timing_order/timing_order.vue'
 import { API } from '../../js/api';
 import { servers } from '../../js/server';
 import util from '../../utils/util';
@@ -38,6 +39,7 @@ export default {
         'reservation-order': reservation_order,
         'membership-order': membership_order,
         'integral-order': integral_order,
+		'timing-order': timing_order,
     },
     computed: {
         ...mapState(['brandInfo']),
@@ -88,6 +90,7 @@ export default {
             if(type == 3)return API.reservationOrder;
             if(type == 4)return API.membershipOrder;
             if(type == 5)return API.integralOrder;
+			if(type == 1)return API.timeOrder;
         },
         getOrderList({
             key = "",

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

@@ -46,7 +46,7 @@
 				<view class="rc-item" v-for="(e,i) in orderInfo.sessions" :key="i">
 					<view class="ri-tit">验证码{{i+1}}：</view>
 					<view class="ri-section">
-						<view class="rs-view">{{e.verify_code || '-'}} ({{zh_verify_status(e.status)}})</view>
+						<view :class="['rs-view',e.status==1?'rs-active':'']">{{e.verify_code || '-'}} ({{zh_verify_status(e.status)}})</view>
 						<block v-if="e.status==2">
 							<view class="rs-view">核销方式：{{zh_verify_type(e.verify_type)}}</view>
 							<view class="rs-view">核销时间：{{e.verify_time || '-'}}</view>
@@ -64,7 +64,7 @@
 				<view>数量：<text>{{orderInfo.number || 0}}</text></view>
 			</view>
 			<view class="rb-line">
-				<view>类型：{{ zh_spec_names }}</view>
+				<view>类型：{{ zh_spec_names || '-'}}</view>
 			</view>
 			<view class="rb-section">
 				<view class="rs-line">
@@ -77,7 +77,7 @@
 				</view>
 				<view class="rs-line">
 					<view>折扣金额</view>
-					<view>-¥{{orderInfo.deduction_amount || 0}}</view>
+					<view>-¥{{orderInfo.discount_amount || 0}}</view>
 				</view>
 				<view class="rs-line">
 					<view>优惠券优惠</view>
@@ -136,13 +136,13 @@
 				<view class="osm-tit">筛选卡号</view>
 				<picker class="osm-picker" :range="depotList" @change="pickerChange">
 					<view class="osm-ipt">
-						<input type="text" placeholder="请选择仓库" v-model="depotInfo.ic_name"  />
+						<input type="text" placeholder="请选择仓库" v-model="depotInfo.ic_name" disabled="true"  />
 						<image src="/subpackage/device/static/images/arrow_b2.png"></image>
 					</view>
 				</picker>
 				
 				<view class="osm-ipt">
-					<input type="text" placeholder="请输入卡号" v-model="depotInfo.ic_no"  @change="inputChange"/>
+					<input type="number" placeholder="请输入卡号" v-model="depotInfo.ic_no"  @change="inputChange"/>
 				</view>
 				<view class="osm-btn-box">
 					<picker class="osm-check" :range="iccardList" @change="checkPickerChange">
@@ -240,7 +240,7 @@ export default {
 			let { orderInfo } = this
 			if(!orderInfo.person_number_spec_names)return '';
 			let spec = orderInfo.person_number_spec_names.join('+')
-			return spec;
+			return spec || '';
 		},
 		zh_order_type(){
 			//订单类型 0预约订单 1课程订单
@@ -345,6 +345,7 @@ export default {
 		// ic卡列表
 		getICCardList({key=''}){
 			let { brandInfo, curIdx, storehouseList } = this
+			this.iccardList.splice(0)
 			util.showLoad();
 			deviceServer.get({
 			    url: deviceApi.iccardList,
@@ -358,7 +359,10 @@ export default {
 			})
 			.then(res=>{
 			    util.hideLoad()
-				this.iccardList = res.list || []
+				let _list = res.list || []
+				for(var i in _list){
+					this.iccardList.push(_list[i].erp_iccard_no)
+				}
 			})
 		},
 		// 校验ic卡
@@ -424,6 +428,7 @@ export default {
 							.then(res=>{
 							    util.hideLoad()
 								util.showNone('操作成功！');
+								this.$emit('okChange');
 							})
 						}
 					}
@@ -570,6 +575,9 @@ export default {
 						font-size: 28rpx;
 						line-height: 46rpx;
 					}
+					.rs-active{
+						color: #009874;
+					}
 				}
 			}
 		}

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

@@ -61,7 +61,7 @@
 				</view>
 				<view class="rs-line">
 					<view>折扣金额</view>
-					<view>-¥{{orderInfo.deduction_amount || 0}}</view>
+					<view>-¥{{orderInfo.discount_amount || 0}}</view>
 				</view>
 				<view class="rs-line">
 					<view>优惠券优惠</view>

src/subpackage/device/pages/order_manage/order_manage.vue

@@ -49,7 +49,8 @@ const tabList = [
 			{
 				id: 4,
 				name: "储值卡订单",
-				path: '/pages/order_list/order_list',
+				// path: '/pages/order_list/order_list',
+				path: '',
 			},
 			{
 				id: 6,