联调

src/pages/reader/develop.vue

@@ -25,43 +25,49 @@
             <span>{{changeDate(scope.row.day)}}</span>
           </template>
         </el-table-column>
+        <el-table-column label="渠道" fixed align="left" header-align="center" min-width="140px">
+          <template slot-scope="scope">
+            <span>{{changeDate(scope.row.day)}}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="用户数量" header-align="center">
-          <el-table-column label="当日新增" prop="uv" align="right" header-align="center"
+          <el-table-column label="当日新增" prop="dailyAdd" align="right" header-align="center"
+            min-width="100px"></el-table-column>
+          <el-table-column label="当日注销" prop="dailyLogout" align="right" header-align="center"
             min-width="100px"></el-table-column>
-          <el-table-column label="当日注销" prop="uv" align="right" header-align="center"
+          <el-table-column label="净增量" prop="dailyNetCount" align="right" header-align="center"
             min-width="100px"></el-table-column>
-          <el-table-column label="净增量" prop="uv" align="right" header-align="center"
+          <el-table-column label="存量" prop="dailyStock" align="right" header-align="center"
             min-width="100px"></el-table-column>
-          <el-table-column label="存量" prop="uv" align="right" header-align="center" min-width="100px"></el-table-column>
         </el-table-column>
         <el-table-column label="新增订单数量" header-align="center">
-          <el-table-column label="月包" prop="uv" align="right" header-align="center" min-width="100px"></el-table-column>
-          <el-table-column label="年包" prop="uv" align="right" header-align="center" min-width="100px"></el-table-column>
-          <el-table-column label="终身" prop="uv" align="right" header-align="center" min-width="100px"></el-table-column>
-          <el-table-column label="小计" prop="uv" align="right" header-align="center" min-width="100px"></el-table-column>
+          <el-table-column label="月包" prop="dailyAddMonthCount" align="right" header-align="center" min-width="100px"></el-table-column>
+          <el-table-column label="年包" prop="dailyAddYearCount" align="right" header-align="center" min-width="100px"></el-table-column>
+          <el-table-column label="终身" prop="dailyAddLifelongCount" align="right" header-align="center" min-width="100px"></el-table-column>
+          <el-table-column label="小计" prop="dailyAddCount" align="right" header-align="center" min-width="100px"></el-table-column>
         </el-table-column>
         <el-table-column label="新增销售金额" header-align="center">
-          <el-table-column label="月包" prop="uv" align="right" header-align="center" min-width="100px"></el-table-column>
-          <el-table-column label="年包" prop="uv" align="right" header-align="center" min-width="100px"></el-table-column>
-          <el-table-column label="终身" prop="uv" align="right" header-align="center" min-width="100px"></el-table-column>
-          <el-table-column label="小计" prop="uv" align="right" header-align="center" min-width="100px"></el-table-column>
+          <el-table-column label="月包" prop="dailyAddMonthAmount" align="right" header-align="center" min-width="100px"></el-table-column>
+          <el-table-column label="年包" prop="dailyAddYearAmount" align="right" header-align="center" min-width="100px"></el-table-column>
+          <el-table-column label="终身" prop="dailyAddLifelongAmount" align="right" header-align="center" min-width="100px"></el-table-column>
+          <el-table-column label="小计" prop="dailyAddAmount" align="right" header-align="center" min-width="100px"></el-table-column>
         </el-table-column>
         <el-table-column label="退订订单数量" header-align="center">
-          <el-table-column label="月包" prop="uv" align="right" header-align="center" min-width="100px"></el-table-column>
-          <el-table-column label="年包" prop="uv" align="right" header-align="center" min-width="100px"></el-table-column>
-          <el-table-column label="终身" prop="uv" align="right" header-align="center" min-width="100px"></el-table-column>
-          <el-table-column label="小计" prop="uv" align="right" header-align="center" min-width="100px"></el-table-column>
+          <el-table-column label="月包" prop="dailyRefundMonthCount" align="right" header-align="center" min-width="100px"></el-table-column>
+          <el-table-column label="年包" prop="dailyRefundYearCount" align="right" header-align="center" min-width="100px"></el-table-column>
+          <el-table-column label="终身" prop="dailyRefundLifelongCount" align="right" header-align="center" min-width="100px"></el-table-column>
+          <el-table-column label="小计" prop="dailyRefundCount" align="right" header-align="center" min-width="100px"></el-table-column>
         </el-table-column>
         <el-table-column label="退订销售金额" header-align="center">
-          <el-table-column label="月包" prop="uv" align="right" header-align="center" min-width="100px"></el-table-column>
-          <el-table-column label="年包" prop="uv" align="right" header-align="center" min-width="100px"></el-table-column>
-          <el-table-column label="终身" prop="uv" align="right" header-align="center" min-width="100px"></el-table-column>
-          <el-table-column label="小计" prop="uv" align="right" header-align="center" min-width="100px"></el-table-column>
+          <el-table-column label="月包" prop="dailyRefundMonthAmount" align="right" header-align="center" min-width="100px"></el-table-column>
+          <el-table-column label="年包" prop="dailyRefundYearAmount" align="right" header-align="center" min-width="100px"></el-table-column>
+          <el-table-column label="终身" prop="dailyRefundLifelongAmount" align="right" header-align="center" min-width="100px"></el-table-column>
+          <el-table-column label="小计" prop="dailyRefundAmount" align="right" header-align="center" min-width="100px"></el-table-column>
         </el-table-column>
       </el-table>
       <el-pagination style="text-align: center;" @current-change="handleCurrentChange"
         :current-page.sync="pagination.pageNo" :page-size="pagination.pageSize" layout="total, prev, pager, next"
-        :total="1000">
+        :total="pagination.totalSize">
       </el-pagination>
     </el-card>
   </div>
@@ -81,9 +87,9 @@ export default {
       },
       pagination: {
         pageSize: 30,
-        pageNo: 1
+        pageNo: 1,
+        totalSize: 0
       },
-      currentPage1: 1,
       options: []
     };
   },
@@ -107,7 +113,16 @@ export default {
         : "";
       this.$refs['skillParams'].validate(async valid => {
         if (valid) {
-          await getChannelData(Object.assign({ ...this.skillParams }, { channel: this.skillParams.channel[this.skillParams.channel.length - 1] }, this.pagination))
+          let res = await getChannelData(Object.assign({
+            oneLevelCode: this.skillParams.channel[0],
+            twoLevelCode: this.skillParams.channel[1] ? this.skillParams.channel[1] : '',
+            threeLevelCode: this.skillParams.channel[2] ? this.skillParams.channel[2] : '',
+            startDay: this.skillParams.startDay, endDay: this.skillParams.endDay
+          }, this.pagination))
+          console.log(res.data);
+          this.tableData = res.data.list
+          this.pagination.totalSize = res.data.totalSize
+          this.pagination.pageNo = res.data.pageNo
         } else {
           return false;
         }