Merge branch 'feature/act-code' into dev

src/views/salesleads/actCodeManage/staffActCode/views/act-code-table.vue

@@ -136,10 +136,11 @@
         </template>
       </el-table-column>
       <el-table-column label="创建时间" prop="createTime" sortable="custom" min-width="110">
-        <template slot-scope="{ row }">
+        <template slot-scope="{ row }" v-if="row.createTime">
           <div>{{ row.createTime | timeStampToYmd }}</div>
           <div>{{ row.createTime | timeStampToHms }}</div>
         </template>
+        <template v-else>--</template>
       </el-table-column>
       <el-table-column label="操作" min-width="160" fixed="right">
         <template slot-scope="{ row }">

src/views/salesleads/components/dataDetail.vue

@@ -234,8 +234,8 @@ export default {
       console.log(this.api, 'api');
       await this.api(paras).then(res => {
         if (res.data.code == 0) {
-          this.tableData = res.data.result.data || [];
-          this.totalCount = res.data.result.page.totalCount;
+          this.tableData = res.data.result.result || [];
+          this.totalCount = res.data.result.totalCount || 0;
           // this.totalCount = 1;
         } else {
           return this.$message(res.data.message);