Merge branch 'master' of http://git.qiniu1314.com/cmy/jztAdmin

src/pages/order/three/index.vue

@@ -1,22 +1,22 @@
 <template>
 	<!-- 订单-售后订单 -->
 	<div>
-		<!-- <Card :bordered="false" dis-hover class="ivu-mt" :padding="0">
+		<Card :bordered="false" dis-hover class="ivu-mt" :padding="0">
 			<div class="new_card_pd">
 				<Form ref="pagination" inline :model="pagination" :label-width="labelWidth"
 					:label-position="labelPosition" @submit.native.prevent>
-					<FormItem label="支付状态：">
+					<!-- <FormItem label="支付状态：">
 						<Select v-model="pagination.paid" class="input-add">
 							<Option v-for="(item, index) in num" :value="item.value" :key="index">{{ item.name }}
 							</Option>
 						</Select>
-					</FormItem>
-					<FormItem label="员工ID：" label-for="title">
+					</FormItem> -->
+					<!-- <FormItem label="员工ID：" label-for="title">
 						<div class='flex-search'>
 							<Input v-model="pagination.work_member_id" icon="ios-search" @on-click='openmid'
 								placeholder="请输入员工ID" class="input-add mr14" />
 						</div>
-					</FormItem>
+					</FormItem> -->
 					<FormItem label="用户ID：" label-for="title">
 						<div class='flex-search'>
 							<Input v-model="pagination.uid" icon="ios-search" @on-click='openuid' placeholder="请输入用户ID"
@@ -24,13 +24,13 @@
 						</div>
 					</FormItem>
 
-					<FormItem label="订单搜索：" label-for="title">
-						<Input v-model="pagination.order_id" placeholder="请输入订单号" class="input-add mr14" />
+					<FormItem label="手机号搜索：" label-for="title">
+						<Input v-model="pagination.user_phone" placeholder="请输入手机号" class="input-add mr14" />
 						<Button type="primary" @click="orderSearch()">查询</Button>
 					</FormItem>
 				</Form>
 			</div>
-		</Card> -->
+		</Card>
 		<Card :bordered="false" dis-hover class="ivu-mt">
 			<!-- 售后订单表格 -->
 			<Table :columns="thead" :data="tbody" ref="table" :loading="loading" highlight-row no-userFrom-text="暂无数据"
@@ -48,7 +48,7 @@
 				</template>
 				<template slot-scope="{ row }" slot="goods_name">
 					<div class="tabBox_serve" >
-						{{row.goods_name}} ( {{row.pay_price}} )
+						{{row.goods_name}}
 					</div>
 				</template>
 				<template slot-scope="{ row, index }" slot="pay_price">