Merge branch 'master' of http://121.196.213.68:3000/caoliancun/PointsMall_Admin into chenlianjie

Reviewed-on: #10

src/api/finance/marketing.js

@@ -117,10 +117,10 @@ export default {
       data: page
     })
   },
-  getProductByPage(page) {
+  getProductPage(page) {
     // 商品销售列表
     return request({
-      url: `/${service_name}/mallProductInfo/getByPage`,
+      url: `/${service_name}/mallProductInfo/getPage`,
       method: 'post',
       data: page
     })

src/views/statistics/productStatisticsList.vue

@@ -257,7 +257,7 @@ export default {
 
     this.Time = [new Date(sevenDaysAgo), new Date(DaysAgo)]
     this.createTime2 = [new Date(sevenDaysAgo), new Date(DaysAgo)]
-    
+
     console.log('createTime', this.createTime)
 
     this.page.params.startTime = sevenDaysAgo
@@ -386,7 +386,7 @@ export default {
     },
     // 商品销售列表
     async getList() {
-      await marketingApi.getProductByPage(this.page).then(res => {
+      await marketingApi.getProductPage(this.page).then(res => {
         if ((res.code = 20000)) ({ list: this.tableList = [], totalCount: this.page.totalCount = 0 } = res.data)
       })
       console.log('tableList', this.tableList)