Merge pull request 'chenlianjie' (#16) from chenlianjie into master

Reviewed-on: #16

src/views/order/orderList.vue

@@ -65,7 +65,7 @@
         </el-table-column>
         <el-table-column label="订单金额" min-width="60" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.integral }}</span>
+            <span>¥ {{ scope.row.marketPrice }}</span>
           </template>
         </el-table-column>
         <el-table-column label="支付积分" min-width="80" align="center">
@@ -283,7 +283,7 @@ export default {
       const searchParam = { ...this.page }
       searchParam.pageSize = endIndex
       searchParam.currentPage = this.output.startPage
-      orderInfoApi.exportExcel(searchParam).then(res => {
+      orderInfoApi.getByPage(searchParam).then(res => {
         const link = document.createElement('a')
         // 创建Blob对象，设置文件类型
         const blob = new Blob([res], { type: 'application/vnd.ns-excel' }) // MIME类型

src/views/order/orderRefundList.vue

@@ -247,7 +247,7 @@ export default {
       const searchParam = { ...this.page }
       searchParam.pageSize = endIndex
       searchParam.currentPage = this.output.startPage
-      orderInfoApi.exportExcel(searchParam).then(res => {
+      orderInfoApi.getRefundOrder(searchParam).then(res => {
         const link = document.createElement('a')
         // 创建Blob对象，设置文件类型
         const blob = new Blob([res], { type: 'application/vnd.ns-excel' }) // MIME类型
@@ -259,7 +259,8 @@ export default {
         this.$message.success('导出成功')
         URL.revokeObjectURL(link.href) // 释放内存
       })
-
+      // const res = await orderInfoApi.getByPage(searchParam)
+      // tmpData = res.data.list
       import('@/vendor/Export2Excel').then(excel => {
         const data = this.formatJson(this.valColumn, tmpData)
         excel.export_json_to_excel({

src/views/product/productList/index.vue

@@ -71,14 +71,14 @@
         empty-text="暂无数据"
       >
         <el-table-column type="selection" width="60" :reserve-selection="true"> </el-table-column>
-        <el-table-column label="编号">
+        <el-table-column label="编号" min-width="120">
           <template slot-scope="scope">
             <span>{{ scope.row.id }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="商品类型">
+        <el-table-column label="商品类型" min-width="70">
           <template slot-scope="scope">
-            <span>{{ scope.row.productType ? '平台' : '店铺' }}</span>
+            <span>{{ scope.row.productType == '1' ? '平台' : '店铺' }}</span>
           </template>
         </el-table-column>
         <!-- <el-table-column label="商品图" min-width="90">
@@ -88,7 +88,7 @@
             </div>
           </template>
         </el-table-column> -->
-        <el-table-column label="商品名称" min-width="200"  align="center">
+        <el-table-column label="商品名称" min-width="180" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.productName }}</span>
           </template>
@@ -99,7 +99,7 @@
             <span>货号：{{ scope.row.productNum }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="标签" min-width="100">
+        <el-table-column label="标签" min-width="120">
           <template slot-scope="scope">
             <div>
               上架：

src/views/statistics/searchStatisticsList.vue

@@ -215,7 +215,7 @@ export default {
       const searchParam = { ...this.page }
       searchParam.pageSize = endIndex
       searchParam.currentPage = this.output.startPage
-      inspectionApi.exportExcel(searchParam).then(res => {
+      marketingApi.getByPageNew(searchParam).then(res => {
         const link = document.createElement('a')
         // 创建Blob对象，设置文件类型
         const blob = new Blob([res], { type: 'application/vnd.ns-excel' }) // MIME类型