修改后台管理系统

src/views/system/monthlyCardLog/index.vue

@@ -121,7 +121,12 @@
       <el-table-column align="center" label="月卡金额" prop="confAmount"/>
       <el-table-column align="center" label="使用时长" prop="useDuration"/>
       <el-table-column align="center" label="剩余时长" prop="residueDuration"/>
-      <el-table-column align="center" label="删除标记：1-删除，0-正常" prop="isDelete"/>
+      <el-table-column align="center" label="操作时间" prop="operationTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.operationTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <!--      <el-table-column align="center" label="删除标记：1-删除，0-正常" prop="isDelete"/>-->
       <el-table-column align="center" label="备注" prop="remark"/>
       <el-table-column align="center" class-name="small-padding fixed-width" label="操作">
         <template slot-scope="scope">

src/views/system/order/index.vue

@@ -243,6 +243,11 @@
       <el-table-column v-if="columns[11].visible" label="优惠券名称" align="center" prop="couponName" width="100"/>
       <el-table-column v-if="columns[12].visible" align="center" label="优惠券原价" prop="couponPrice" width="100"/>
       <el-table-column v-if="columns[13].visible" align="center" label="优惠券促销价" prop="couponPayPrice" width="100"/>
+      <el-table-column v-if="columns[30].visible" align="center" label="次卡名称" prop="secondaryCardName" width="100"/>
+      <el-table-column v-if="columns[31].visible" align="center" label="次卡金额" prop="secondaryCardAmount"
+                       width="100"/>
+      <el-table-column v-if="columns[32].visible" align="center" label="月卡名称" prop="monthlyCardName" width="100"/>
+      <el-table-column v-if="columns[33].visible" align="center" label="月卡金额" prop="monthlyCardAmount" width="100"/>
       <el-table-column v-if="columns[25].visible" align="center" label="使用时长" prop="duration"/>
       <el-table-column v-if="columns[26].visible" align="center" label="使用余额" prop="balance"/>
       <el-table-column v-if="columns[28].visible" align="center" label="充值余额" prop="rechargeAmount"/>
@@ -721,6 +726,11 @@ export default {
         {key: 27, label: `优惠比例`, visible: false},
         {key: 28, label: `充值余额`, visible: false},
         {key: 29, label: `赠送余额`, visible: false},
+        {key: 30, label: `次卡名称`, visible: false},
+        {key: 31, label: `次卡金额`, visible: false},
+        {key: 32, label: `月卡名称`, visible: false},
+        {key: 33, label: `月卡金额`, visible: false},
+
       ],
       changeOpen: false,
       changeForm: {

src/views/system/secondaryCardLog/index.vue

@@ -137,6 +137,11 @@
       <el-table-column align="center" label="次卡金额" prop="confAmount"/>
       <el-table-column align="center" label="使用次数" prop="usageCount"/>
       <el-table-column align="center" label="剩余次数" prop="residueCount"/>
+      <el-table-column align="center" label="操作时间" prop="operationTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.operationTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
       <!--      <el-table-column label="删除标记：1-删除，0-正常" align="center" prop="isDelete" />-->
       <el-table-column align="center" label="备注" prop="remark"/>
       <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->