diff --git a/src/views/busAdmin/userDevice/userDevice.vue b/src/views/busAdmin/userDevice/userDevice.vue
index 16bc784..3b38a9c 100644
--- a/src/views/busAdmin/userDevice/userDevice.vue
+++ b/src/views/busAdmin/userDevice/userDevice.vue
@@ -1,46 +1,25 @@
 <template>
-  <div class="table-container">
-    <el-row>
-      <el-form :model="listQuery" :inline="true" label-width="auto">
-        <el-form-item label="设备IMEI号:">
-          <el-input v-model="listQuery.keywords" clearable/>
-        </el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
-      </el-form>
-    </el-row>
-    <el-row class="table-title">
-      <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
-      <el-col :span="12" :offset="6" class="edit_btns">
-        <el-button v-if="hasPerm('/userDevice/add')" class="edit_btn" size="small" @click="add">新增</el-button>
-      </el-col>
-    </el-row>
-    <el-table v-loading="listLoading" ref="table" :data="list" class="table" border>
-      <el-table-column :index="indexMethod" align="center" type="index" />
-      <el-table-column v-for="column in tableColumns" :key="column.value" :label="column.text" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column v-if="hasPerm('/userDevice/update')||hasPerm('/userDevice/delete')" label="操作" align="center" width="200">
-        <template slot-scope="scope">
-          <el-button v-if="hasPerm('/userDevice/update')" class="table-button" type="text" @click="edit(scope.row)">编辑</el-button>
-          <el-button v-if="hasPerm('/userDevice/delete')" class="table-button" type="text" @click="del(scope.row)">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <div class="pagination-container">
-      <el-pagination
-        :current-page="listQuery.offset"
-        :page-sizes="[10,20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
+  <app-container>
+    <search-area @search="search">
+      <search-item>
+        <el-input v-model="listQuery.keywords" placeholder="设备IMEI号" clearable/>
+      </search-item>
+    </search-area>
+    <normal-table ref="table" :data="list" :columns="tableColumns" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage" @selection-change="handleSelectionChange">
+      <template slot="btns">
+        <el-button v-if="hasPerm('/userDevice/add')" size="small" @click="add">新增</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column v-if="hasPerm('/userDevice/update')||hasPerm('/userDevice/delete')" label="操作" align="center" width="200">
+          <template slot-scope="scope">
+            <el-button v-if="hasPerm('/userDevice/update')" class="table-button" type="text" @click="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/userDevice/delete')" class="table-button" type="text" @click="del(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
     <edit-user-device ref="editUserDevice" @watchChild="fetchData"/>
-  </div>
+  </app-container>
 </template>
 
 <script>
@@ -86,16 +65,22 @@
       ]
     }
   },
+  created() {
+    this.fetchData()
+  },
   activated() {
     this.fetchData()
   },
   methods: {
-    async fetchData() {
+    fetchData() {
       this.listLoading = true
-      const res = await getUserDeviceList(this.listQuery)
-      this.list = res.data.rows
-      this.total = parseInt(res.data.total)
-      this.listLoading = false
+      getUserDeviceList(this.listQuery).then(res => {
+        if (res.code === 200) {
+          this.list = res.data.rows
+          this.total = parseInt(res.data.total)
+          this.listLoading = false
+        }
+      })
     },
     search() {
       this.listQuery.offset = 1
@@ -126,17 +111,14 @@
         })
       })
     },
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
       this.fetchData()
     }
   }
@@ -144,34 +126,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
-  .table-container{
-    margin: 20px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
-  .table-button{
-    padding: 10px;
-    height: 23px;
-  }
 </style>