Merge branch 'dev-meta-dz' of xiongzhu/raex_back into master

src/main/vue/src/views/DomainOrderList.vue

@@ -15,8 +15,8 @@
                 @keyup.enter.native="getData">
                 <el-button @click="getData" slot="append" icon="el-icon-search"></el-button>
             </el-input>
-            <el-select v-model="orderStatus" placeholder="筛选状态" clearable @change="getData" class="filter-item">
-                <el-option v-for="item in orderStatusOptions" :key="item.value" :value="item.value"
+            <el-select v-model="status" placeholder="筛选状态" clearable @change="getData" class="filter-item">
+                <el-option v-for="item in statusOptions" :key="item.value" :value="item.value"
                     :label="item.label"></el-option>
             </el-select>
             <el-input placeholder="搜索域名名称" v-model="picName" clearable class="filter-item" @keyup.enter.native="getData">
@@ -71,7 +71,7 @@
                 </el-button-group>
             </div> -->
             <el-pagination background @size-change="onSizeChange" @current-change="onCurrentChange" :current-page="page"
-                :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
+                :page-sizes="[10, 20, 30, 40]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
                 :total="totalElements">
             </el-pagination>
         </div>
@@ -127,7 +127,7 @@ export default {
 					value: 'DESTROY'
 				}
 			],
-            orderStatus: null,
+            status: null,
 			picName: '',
 			userId: ''
 		};
@@ -244,8 +244,8 @@ export default {
 			if (this.search) {
 				data.search = this.search;
 			}
-			if (this.orderStatus) {
-				data.query.orderStatus = this.orderStatus;
+			if (this.status) {
+				data.query.status = this.status;
 			}
 			if (this.picName) {
 				data.query.picName = this.picName;