新增：优惠券

src/views/shop/shopOrder/components/search.vue

@@ -1,6 +1,18 @@
 <!-- 搜索表单 -->
 <template>
   <a-space :size="10" style="flex-wrap: wrap">
+    <a-button
+      danger
+      type="primary"
+      class="ele-btn-icon"
+      :disabled="selection?.length === 0"
+      @click="removeBatch"
+    >
+      <template #icon>
+        <DeleteOutlined/>
+      </template>
+      <span>批量删除</span>
+    </a-button>
     <a-select
       v-model:value="where.type"
       style="width: 150px"
@@ -9,7 +21,8 @@
     >
       <a-select-option value="">全部</a-select-option>
       <a-select-option :value="1">普通订单</a-select-option>
-      <a-select-option :value="0">未付款</a-select-option>
+      <a-select-option :value="2">秒杀订单</a-select-option>
+      <a-select-option :value="3">拼团订单</a-select-option>
     </a-select>
     <a-select
       v-model:value="where.payStatus"
@@ -43,16 +56,7 @@
       placeholder="付款方式"
       @change="search"
     />
-    <a-select
-      v-model:value="where.isInvoice"
-      style="width: 150px"
-      placeholder="开票状态"
-      @change="search"
-    >
-      <a-select-option :value="1">已开票</a-select-option>
-      <a-select-option :value="0">未开票</a-select-option>
-      <a-select-option :value="2">不能开票</a-select-option>
-    </a-select>
+
     <a-range-picker
       v-model:value="dateRange"
       @change="search"
@@ -67,18 +71,6 @@
     />
     <a-button @click="reset">重置</a-button>
     <a-button @click="handleExport">导出</a-button>
-    <a-button
-      danger
-      type="primary"
-      class="ele-btn-icon"
-      :disabled="selection?.length === 0"
-      @click="removeBatch"
-    >
-      <template #icon>
-        <DeleteOutlined/>
-      </template>
-      <span>批量删除</span>
-    </a-button>
   </a-space>
 </template>
 
@@ -86,7 +78,6 @@
   import { ref, watch } from 'vue';
   import { utils, writeFile } from 'xlsx';
   import { message } from 'ant-design-vue';
-  import {DeleteOutlined} from '@ant-design/icons-vue';
   import useSearch from "@/utils/use-search";
   import {ShopOrder, ShopOrderParam} from "@/api/shop/shopOrder/model";
   import {listShopOrder} from "@/api/shop/shopOrder";
@@ -119,7 +110,6 @@
     payStatus: undefined,
     orderStatus: undefined,
     payType: undefined,
-    isInvoice: undefined,
   });
 
   const reload = () => {

src/views/shop/shopOrder/index.vue

@@ -104,11 +104,11 @@
           </template>
           <template v-if="column.key === 'action'">
             <a-space>
-              <a @click="openEdit(record)">修改</a>
+              <a @click.stop="openEdit(record)">修改</a>
               <a-divider type="vertical"/>
               <a-popconfirm
                 title="确定要删除此记录吗？"
-                @confirm="remove(record)"
+                @confirm.stop="remove(record)"
               >
                 <a class="ele-text-danger">删除</a>
               </a-popconfirm>
@@ -247,15 +247,15 @@ const columns = ref<ColumnItem[]>([
     sorter: true,
     ellipsis: true,
     customRender: ({text}) => toDateString(text)
-  },
-  {
-    title: '操作',
-    key: 'action',
-    width: 180,
-    fixed: 'right',
-    align: 'center',
-    hideInSetting: true
   }
+  // {
+  //   title: '操作',
+  //   key: 'action',
+  //   width: 180,
+  //   fixed: 'right',
+  //   align: 'center',
+  //   hideInSetting: true
+  // }
 ]);
 
 /* 搜索 */