分为销售订单和二手市场订单

src/main/vue/src/router.js

@@ -171,6 +171,14 @@ const router = new Router({
                         title: '订单'
                     }
                 },
+                {
+                    path: '/orderUsedList',
+                    name: 'OrderUsedList',
+                    component: () => import(/* webpackChunkName: "orderList" */ '@/views/OrderUsedList.vue'),
+                    meta: {
+                        title: '订单'
+                    }
+                },
                 {
                     path: '/assetEdit',
                     name: 'AssetEdit',
@@ -352,83 +360,85 @@ const router = new Router({
                 {
                     path: '/commissionRecordEdit',
                     name: 'CommissionRecordEdit',
-                    component: () => import(/* webpackChunkName: "commissionRecordEdit" */ '@/views/CommissionRecordEdit.vue'),
+                    component: () =>
+                        import(/* webpackChunkName: "commissionRecordEdit" */ '@/views/CommissionRecordEdit.vue'),
                     meta: {
-                       title: '分销记录编辑',
-                    },
+                        title: '分销记录编辑'
+                    }
                 },
                 {
                     path: '/commissionRecordList',
                     name: 'CommissionRecordList',
-                    component: () => import(/* webpackChunkName: "commissionRecordList" */ '@/views/CommissionRecordList.vue'),
+                    component: () =>
+                        import(/* webpackChunkName: "commissionRecordList" */ '@/views/CommissionRecordList.vue'),
                     meta: {
-                       title: '分销记录',
-                    },
-               },
+                        title: '分销记录'
+                    }
+                },
                 {
                     path: '/recommendEdit',
                     name: 'RecommendEdit',
                     component: () => import(/* webpackChunkName: "recommendEdit" */ '@/views/RecommendEdit.vue'),
                     meta: {
-                       title: '首页推荐编辑',
-                    },
+                        title: '首页推荐编辑'
+                    }
                 },
                 {
                     path: '/recommendList',
                     name: 'RecommendList',
                     component: () => import(/* webpackChunkName: "recommendList" */ '@/views/RecommendList.vue'),
                     meta: {
-                       title: '首页推荐',
-                    },
-               },
+                        title: '首页推荐'
+                    }
+                },
                 {
                     path: '/activityEdit',
                     name: 'ActivityEdit',
                     component: () => import(/* webpackChunkName: "activityEdit" */ '@/views/ActivityEdit.vue'),
                     meta: {
-                       title: '活动编辑',
-                    },
+                        title: '活动编辑'
+                    }
                 },
                 {
                     path: '/activityList',
                     name: 'ActivityList',
                     component: () => import(/* webpackChunkName: "activityList" */ '@/views/ActivityList.vue'),
                     meta: {
-                       title: '活动',
-                    },
-               },
+                        title: '活动'
+                    }
+                },
                 {
                     path: '/inviteEdit',
                     name: 'InviteEdit',
                     component: () => import(/* webpackChunkName: "inviteEdit" */ '@/views/InviteEdit.vue'),
                     meta: {
-                       title: '邀请码管理编辑',
-                    },
+                        title: '邀请码管理编辑'
+                    }
                 },
                 {
                     path: '/inviteList',
                     name: 'InviteList',
                     component: () => import(/* webpackChunkName: "inviteList" */ '@/views/InviteList.vue'),
                     meta: {
-                       title: '邀请码管理',
-                    },
-               },
+                        title: '邀请码管理'
+                    }
+                },
                 {
                     path: '/appVersionEdit',
                     name: 'AppVersionEdit',
                     component: () => import(/* webpackChunkName: "appVersionEdit" */ '@/views/AppVersionEdit.vue'),
                     meta: {
-                       title: 'APP版本管理编辑',
-                    },
+                        title: 'APP版本管理编辑'
+                    }
                 },
                 {
                     path: '/appVersionList',
                     name: 'AppVersionList',
                     component: () => import(/* webpackChunkName: "appVersionList" */ '@/views/AppVersionList.vue'),
                     meta: {
-                       title: 'APP版本管理',
-                    },
-               }
+                        title: 'APP版本管理'
+                    }
+                }
                 /**INSERT_LOCATION**/
             ]
         },

src/main/vue/src/views/OrderList.vue

@@ -161,7 +161,8 @@ export default {
             let data = {
                 // sort: 'createdAt,desc',
                 query: {
-                    del: false
+                    del: false,
+                    source: 'OFFICIAL'
                 }
             };
             if (this.search) {

src/main/vue/src/views/OrderUsedList.vue

@@ -0,0 +1,258 @@
+<template>
+    <div class="list-view">
+        <page-title>
+            <!-- <el-button
+                @click="addRow"
+                type="primary"
+                icon="el-icon-plus"
+                :disabled="fetchingData || downloading"
+                class="filter-item"
+            >
+                新增
+            </el-button> -->
+            <el-button
+                @click="download"
+                icon="el-icon-upload2"
+                :loading="downloading"
+                :disabled="fetchingData"
+                class="filter-item"
+            >
+                导出
+            </el-button>
+        </page-title>
+        <div class="filters-container">
+            <el-select v-model="status" placeholder="筛选状态" clearable @change="getData" class="filter-item">
+                <el-option
+                    v-for="item in statusOptions"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+                ></el-option>
+            </el-select>
+            <created-at-picker v-model="createdAt" @input="getData" name="下单" class="filter-item"></created-at-picker>
+            <el-input
+                placeholder="搜索..."
+                v-model="search"
+                clearable
+                class="filter-item search"
+                @keyup.enter.native="getData"
+            >
+                <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
+            </el-input>
+        </div>
+        <el-table
+            :data="tableData"
+            row-key="id"
+            ref="table"
+            header-row-class-name="table-header-row"
+            header-cell-class-name="table-header-cell"
+            row-class-name="table-row"
+            cell-class-name="table-cell"
+            :height="tableHeight"
+            v-loading="fetchingData"
+        >
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+            <el-table-column prop="id" label="ID" width="155"> </el-table-column>
+            <el-table-column prop="userId" label="用户ID"> </el-table-column>
+            <el-table-column prop="nickname" label="用户昵称" show-overflow-tooltip> </el-table-column>
+            <el-table-column prop="collectionId" label="藏品ID"> </el-table-column>
+            <el-table-column prop="name" label="名称" min-width="120" show-overflow-tooltip> </el-table-column>
+            <el-table-column prop="pic" label="图片" width="80">
+                <template slot-scope="{ row }">
+                    <el-image
+                        style="width: 30px; height: 30px"
+                        :src="row.pic[0].thumb || row.pic[0].url"
+                        fit="cover"
+                        :preview-src-list="row.pic.map(i => i.thumb || i.url)"
+                    ></el-image>
+                </template>
+            </el-table-column>
+            <el-table-column prop="price" label="价格"> </el-table-column>
+            <el-table-column prop="gasPrice" label="gas费"> </el-table-column>
+            <el-table-column prop="totalPrice" label="总价"> </el-table-column>
+            <el-table-column prop="status" label="状态" :formatter="statusFormatter"> </el-table-column>
+            <el-table-column prop="payMethod" label="支付方式" :formatter="payMethodFormatter"> </el-table-column>
+            <el-table-column prop="transactionId" label="交易ID" show-overflow-tooltip> </el-table-column>
+            <el-table-column prop="createdAt" label="下单时间" width="140"> </el-table-column>
+            <el-table-column prop="payTime" label="支付时间" width="140"> </el-table-column>
+            <el-table-column prop="txHash" label="链上hash" show-overflow-tooltip> </el-table-column>
+            <el-table-column prop="gasUsed" label="消耗gas"></el-table-column>
+            <el-table-column prop="invitor" label="推广用户"></el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" width="150">
+                <template slot-scope="{ row }">
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>查看</el-button>
+                    <!-- <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button> -->
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div> -->
+            <el-pagination
+                background
+                @size-change="onSizeChange"
+                @current-change="onCurrentChange"
+                :current-page="page"
+                :page-sizes="[10, 20, 30, 40, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="totalElements"
+            >
+            </el-pagination>
+        </div>
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+import CreatedAtPicker from '../components/CreatedAtPicker.vue';
+
+export default {
+    components: { CreatedAtPicker },
+    name: 'OrderUsedList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/order/backAll',
+            downloading: false,
+            statusOptions: [
+                { label: '未支付', value: 'NOT_PAID' },
+                { label: '已支付，处理中', value: 'PROCESSING' },
+                { label: '已完成', value: 'FINISH' },
+                { label: '已取消', value: 'CANCELLED' }
+            ],
+            payMethodOptions: [
+                { label: '微信', value: 'WEIXIN' },
+                { label: '支付宝', value: 'ALIPAY' }
+            ],
+            status: null,
+            createdAt: []
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        statusFormatter(row, column, cellValue, index) {
+            let selectedOption = this.statusOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
+        payMethodFormatter(row, column, cellValue, index) {
+            let selectedOption = this.payMethodOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
+        getParams() {
+            let data = {
+                // sort: 'createdAt,desc',
+                query: {
+                    del: false,
+                    source: 'TRANSFER'
+                }
+            };
+            if (this.search) {
+                data.search = this.search;
+            }
+            if (this.createdAt) {
+                data.query.createdAt = this.createdAt;
+            }
+            if (this.status) {
+                data.query.status = this.status;
+            }
+            return data;
+        },
+        beforeGetData() {
+            // return { search: this.search, query: { del: false, status: this.status } };
+            return this.getParams();
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/orderEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/orderEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            let params = this.getParams();
+            params.size = 10000;
+            this.$axios
+                .post('/order/excel', params, {
+                    responseType: 'blob'
+                })
+                .then(res => {
+                    console.log(res);
+                    this.downloading = false;
+                    const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                    const link = document.createElement('a');
+                    link.href = downloadUrl;
+                    link.setAttribute('download', '订单.xlsx');
+                    document.body.appendChild(link);
+                    link.click();
+                    link.remove();
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.downloading = false;
+                    this.$message.error(e.error);
+                });
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/order/del/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped>
+</style>