订单

src/main/vue/src/views/CardCaseList.vue

@@ -33,12 +33,10 @@
             <el-table-column prop="id" label="ID" width="100"> </el-table-column>
             <el-table-column prop="store.storeName" label="店铺名称"> </el-table-column>
             <el-table-column prop="collection.name" label="卡牌主题"> </el-table-column>
-            <el-table-column prop="collection.series.name" label="卡盒列表"> </el-table-column>
-            <el-table-column prop="code" label="卡箱编号"> </el-table-column>
-            <el-table-column prop="boxesCount" label="卡盒编号"> </el-table-column>
+            <el-table-column prop="customName" label="福袋名称"> </el-table-column>
             <el-table-column prop="boxPrice" label="每盒单价"> </el-table-column>
             <el-table-column prop="caseStatus" label="卡箱状态" :formatter="caseStatusFormatter"> </el-table-column>
-            <el-table-column prop="startTime" label="开始时间"> </el-table-column>
+            <el-table-column prop="startTime" label="创建时间"> </el-table-column>
             <el-table-column label="操作" align="center" fixed="right" min-width="150">
                 <template slot-scope="{ row }">
                     <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>

src/main/vue/src/views/OrderRefundApplyList.vue

@@ -39,7 +39,9 @@
             <el-table-column prop="auditTime" label="审核时间"> </el-table-column>
             <el-table-column prop="refundTime" label="退款时间"> </el-table-column>
             <el-table-column prop="refundId" label="退款单号"> </el-table-column>
-            <!-- <el-table-column prop="orderInfo" label="订单"> </el-table-column> -->
+            <el-table-column prop="orderInfo.user.nickname" label="昵称"> </el-table-column>
+            <el-table-column prop="orderInfo.store.storeName" label="店铺"> </el-table-column>
+            <el-table-column prop="orderInfo.cardCase.customName" label="卡箱"> </el-table-column>
             <el-table-column prop="information" label="信息"> </el-table-column>
             <el-table-column label="操作" align="center" fixed="right" min-width="150">
                 <template slot-scope="{ row }">

src/main/vue/src/views/WithdrawApplyList.vue

@@ -26,7 +26,7 @@
             <el-table-column prop="id" label="ID" width="100"> </el-table-column>
             <el-table-column prop="money" label="金额"> </el-table-column>
             <el-table-column prop="status" label="状态" :formatter="statusFormatter"> </el-table-column>
-            <el-table-column prop="createdAt" label="通过时间"> </el-table-column>
+            <el-table-column prop="createdAt" label="提交时间"> </el-table-column>
             <el-table-column prop="storeName" label="店铺名称"> </el-table-column>
             <el-table-column prop="username" label="用户名称"> </el-table-column>
             <el-table-column label="操作" align="center" fixed="right" min-width="150">