完成换场地功能

src/views/booking/order/components/orderInfo.vue

@@ -141,29 +141,7 @@
           :data-source="form.orderInfoList"
           :columns="columns"
           :pagination="false"
-        >
-          <template #bodyCell="{ column, record }">
-            <template v-if="column.key === 'goodsName'">
-              <div class="order-info">
-                <a-image
-                  v-if="record.imageUrl"
-                  :src="record.imageUrl"
-                  :preview="false"
-                  :width="50"
-                />
-                <div class="info">
-                  <div>{{ record.goodsName }}</div>
-                  <div class="ele-text-placeholder" v-if="record.gear === 10">
-                    食堂档口
-                  </div>
-                  <div class="ele-text-placeholder" v-if="record.gear === 20">
-                    物品档口
-                  </div>
-                </div>
-              </div>
-            </template>
-          </template>
-        </a-table>
+        />
       </a-spin>
     </a-card>
   </ele-modal>

src/views/booking/order/components/search.vue

@@ -14,7 +14,7 @@
       @search="search"
       @pressEnter="search"
     />
-    <a-button @click="getCode">生成支付二维码</a-button>
+<!--    <a-button @click="getCode">生成支付二维码</a-button>-->
     <a-button @click="reset">重置</a-button>
   </a-space>
   <ele-modal

src/views/booking/order/index.vue

@@ -144,19 +144,30 @@
               {{ record.orderInfoList }}
             </template>
             <template v-if="column.key === 'orderStatus'">
-              <span v-if="record.orderStatus == 0"
-                ><ClockCircleOutlined class="tag-icon" />未使用</span
+              <span v-if="record.orderStatus == 0" class="ele-text-primary"
+                >未使用</span
               >
-              <span v-if="record.orderStatus == 1"
-                ><CheckOutlined class="tag-icon" />已付款</span
+              <span v-if="record.orderStatus == 2" class="ele-text-placeholder"
+                >已取消</span
               >
-              <span v-if="record.orderStatus == 3"
-                ><CloseOutlined class="tag-icon" />已取消</span
+              <span v-if="record.orderStatus == 1" class="ele-text-success"
+                >已付款</span
+              >
+              <span v-if="record.orderStatus == 3" class="ele-text-placeholder"
+                >已取消</span
+              >
+              <span v-if="record.orderStatus == 4" class="ele-text-warning"
+                >退款申请中</span
+              >
+              <span v-if="record.orderStatus == 5" class="ele-text-danger"
+                >退款被拒绝</span
+              >
+              <span v-if="record.orderStatus == 6" class="ele-text-heading"
+                >退款成功</span
+              >
+              <span v-if="record.orderStatus == 7" class="ele-text-warning"
+                >客户端申请退款</span
               >
-              <span v-if="record.orderStatus == 4">退款申请中</span>
-              <span v-if="record.orderStatus == 5">退款被拒绝</span>
-              <span v-if="record.orderStatus == 6">退款成功</span>
-              <span v-if="record.orderStatus == 7">客户端申请退款</span>
             </template>
             <template v-if="column.key === 'isInvoice'">
               <a-tag v-if="record.isInvoice == 0">未开</a-tag>
@@ -170,8 +181,8 @@
             <template v-if="column.key === 'action'">
               <a-space>
                 <a @click="openEdit(record)">详情</a>
-                <a-divider type="vertical" />
-                <a @click="openEdit(record)">编辑</a>
+                <!--                <a-divider type="vertical" />-->
+                <!--                <a @click="openEdit(record)">编辑</a>-->
               </a-space>
             </template>
           </template>
@@ -236,6 +247,7 @@
     if (filters) {
       where.status = filters.status;
     }
+    where.type = 1;
     return pageOrder({
       ...where,
       ...orders,
@@ -298,6 +310,13 @@
       key: 'payStatus',
       align: 'center'
     },
+    {
+      title: '付款时间',
+      dataIndex: 'payTime',
+      key: 'payTime',
+      align: 'center',
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd HH:mm:ss')
+    },
     {
       title: '订单状态',
       dataIndex: 'orderStatus',
@@ -317,11 +336,12 @@
       align: 'center'
     },
     {
-      title: '付款时间',
-      dataIndex: 'payTime',
-      key: 'payTime',
+      title: '类型',
+      dataIndex: 'type',
+      key: 'type',
       align: 'center',
-      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd HH:mm:ss')
+      customRender: ({ text }) =>
+        ['商城订单', '客户预定', '俱乐部训练场', '活动订场'][text]
     },
     // {
     //   title: '申请退款时间',
@@ -427,15 +447,14 @@
 </script>
 
 <script lang="ts">
+  import * as MenuIcons from '@/layout/menu-icons';
   export default {
-    name: 'Order'
+    name: 'Order',
+    components: MenuIcons
   };
 </script>
-
 <style lang="less" scoped>
   .tag-icon {
     padding-right: 6px;
-    background-image: linear-gradient(#9fcdec, rgb(0, 118, 199));
-    color: rgba(21, 154, 203, 0.5);
   }
 </style>