更改订单管理页面

src/views/system/order/index.vue

@@ -141,32 +141,28 @@
 
     <el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="订单流水号" align="center" prop="orderNo" />
       <el-table-column label="订单类型" align="center" prop="orderType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.store_order_type" :value="scope.row.orderType"/>
         </template>
       </el-table-column>
-      <el-table-column label="订单流水号" align="center" prop="serialNumber" />
       <el-table-column label="会员昵称" align="center" prop="consumerName" />
-      <el-table-column label="手机号" align="center" prop="consumerName" />
-      <el-table-column label="消费描述" align="center" prop="description" />
-      <el-table-column label="应付金额" align="center" prop="originalPrice" />
-      <el-table-column label="支付方式" align="center" prop="payWays">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.store_pay_ways" :value="scope.row.payWays"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="实付金额" align="center" prop="realPrice" />
-      <el-table-column label="优惠类型" align="center" prop="couponType">
+      <el-table-column label="手机号" align="center" prop="consumerPhone" />
+      <el-table-column label="门店ID" align="center" prop="storeId" />
+      <el-table-column label="房间ID" align="center" prop="roomId" />
+      <el-table-column label="套餐ID" align="center" prop="packId" />
+      <el-table-column label="套餐金额" align="center" prop="packPrice" />
+      <el-table-column label="优惠券id" align="center" prop="couponId" />
+      <el-table-column label="优惠券金额" align="center" prop="couponPrice" />
+      <el-table-column label="预约开始时间" align="center" prop="preStartDate" width="180">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.store_coupon_type" :value="scope.row.couponType"/>
+          <span>{{ parseTime(scope.row.preStartDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="优惠额度" align="center" prop="realPrice" />
-      <el-table-column label="优惠券名称" align="center" prop="couponName" />
-      <el-table-column label="订单状态" align="center" prop="status">
+      <el-table-column label="预约结束时间" align="center" prop="preEndDate" width="180">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.store_order_status" :value="scope.row.status"/>
+          <span>{{ parseTime(scope.row.preEndDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="开始时间" align="center" prop="startDate" width="180">
@@ -179,15 +175,19 @@
           <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="预约开始时间" align="center" prop="preStartDate" width="180">
+      <el-table-column label="订单总价" align="center" prop="totalPrice" />
+      <el-table-column label="实际支付金额" align="center" prop="payPrice" />
+      <el-table-column label="支付时间" align="center" prop="payTime" />
+      <el-table-column label="订单时长(H)" align="center" prop="timeLong" >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.preStartDate, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.timeLong, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="预约结束时间" align="center" prop="preEndDate" width="180">
+      <el-table-column label="支付类型" align="center" prop="payType" />
+      <el-table-column label="支付状态" align="center" prop="payStatus" />
+      <el-table-column label="订单状态" align="center" prop="status">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.preEndDate, '{y}-{m}-{d}') }}</span>
+          <dict-tag :options="dict.type.store_order_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">