Merge branch 'feature/act-code' into dev

src/views/salesleads/components/dataDetail.vue

@@ -48,7 +48,9 @@
         </template>
       </el-table-column>
     </el-table>
-    <dm-pagination v-if="tableData && tableData.length > 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="pageParam.pageNo" :page-sizes="[20, 40, 60, 80]" :page-size="pageParam.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="totalCount"> </dm-pagination>
+    <div class="block common-wrap__page text-right m-t-24" v-if="tableData && tableData.length > 0">
+      <dm-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="pageParam.pageNo" :page-sizes="[20, 40, 60, 80]" :page-size="pageParam.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="totalCount"> </dm-pagination>
+    </div>
   </div>
 </template>
 
@@ -231,8 +233,9 @@ export default {
 
       await this.api(paras).then(res => {
         if (res.data.code == 0) {
-          this.tableData = res.data.result.result || [];
-          this.totalCount = res.data.result.totalCount;
+          this.tableData = res.data.result.data || [];
+          this.totalCount = res.data.result.page.totalCount;
+          // this.totalCount = 1;
         } else {
           return this.$message(res.data.message);
         }