Merge branch 'master' of https://gitlab.ezijing.com/webapp/x-training-new

src/components/caseSelect/Index.vue

 <template>
   <el-dialog custom-class="case-dialog" title="" :visible="value" :close-on-click-modal="false" :close-on-press-escape="false" top="20px" :show-close="showClose" @close="handleClose">
+    <div slot="title">
+      <el-button v-if="type" @click="type = ''" round icon="el-icon-back">返回</el-button>
+    </div>
     <product v-if="!type" @select="handleProdSelect"></product>
     <case v-else  @select="handleCaseSelect"></case>
   </el-dialog>
@@ -59,4 +62,7 @@ export default {
   max-width:1160px;
   margin-bottom:20px;
 }
+::v-deep .el-dialog__body{
+  padding:0 20px 20px;
+}
 </style>

src/modules/works-show/views/List.vue

@@ -46,7 +46,7 @@
           </el-table-column>
         </el-table>
         <div class="pagination">
-          <el-pagination :current-page.sync="tool.page" layout="prev, pager, next" :total="tool.total" @current-change="fetchUserRecords"></el-pagination>
+          <el-pagination :current-page.sync="tool.page" layout="prev, pager, next" :total="tool.total" @current-change="fetchToolRecords"></el-pagination>
         </div>
       </el-tab-pane>
     </el-tabs>