yb 10 месяцев назад
Родитель
Сommit
7fbfe3234c

+ 4 - 1
src/api/mall/order/storeOrder/index.ts

@@ -51,10 +51,13 @@ export interface StoreOrderVO {
   verifyCode: string
   storeId: number
   shippingType: boolean
-  isChannel: byte
+  isChannel: boolean
   isSystemDel: boolean
 }
 
+export interface StoreOrderPageReqVO {
+
+}
 // 查询订单列表
 export const getStoreOrderPage = async (params: StoreOrderPageReqVO) => {
   return await request.get({ url: `/order/store-order/page`, params })

+ 5 - 6
src/views/mall/order/storeOrder/index.vue

@@ -8,7 +8,7 @@
       <el-tab-pane :label="t('mall.reservationOrders')" name="due" />
     </el-tabs>
     <el-form-item :label="`${t('mall.orderStatus')}:`">
-      <el-radio-group v-model="orderStatus" size="large" fill="#DC143C" @change="queryOrderStatus" v-if="queryParams.orderType != 'due'">
+      <el-radio-group v-model="orderStatus" fill="#DC143C" @change="queryOrderStatus" v-if="queryParams.orderType != 'due'">
         <el-radio-button label="">{{ t('mall.all') }}</el-radio-button>
         <el-radio-button :label="0">{{ t('mall.unpaid') }}</el-radio-button>
         <el-radio-button :label="1">{{ t('mall.pendingOrder') }}</el-radio-button>
@@ -18,15 +18,15 @@
         <el-radio-button label="5">{{ t('mall.refundOrders') }}</el-radio-button>
         <el-radio-button label="6">{{ t('mall.deleted') }}</el-radio-button>
       </el-radio-group>
-      <el-radio-group v-model="orderStatus" size="large" fill="#DC143C" @change="queryOrderStatus" v-else>
+      <el-radio-group v-model="orderStatus" fill="#DC143C" @change="queryOrderStatus" v-else>
         <el-radio-button label="">{{ t('mall.all') }}</el-radio-button>
         <el-radio-button label="1">{{ t('mall.reserving') }}</el-radio-button>
         <el-radio-button label="2">{{ t('mall.cancelled') }}</el-radio-button>
         <el-radio-button label="3">{{ t('mall.completed') }}</el-radio-button>
       </el-radio-group>
     </el-form-item>
-    <el-form-item :label="`${t('mall.paymentMethod')}:`">
-      <el-radio-group v-model="payStatus" size="large" fill="#FF1493" @change="queryPayStatus">
+    <el-form-item class="mb-0px" :label="`${t('mall.paymentMethod')}:`">
+      <el-radio-group v-model="payStatus" fill="#FF1493" @change="queryPayStatus">
         <el-radio-button label="">{{ t('mall.all') }}</el-radio-button>
         <el-radio-button label="weixin">{{ t('mall.wechatPayment') }}</el-radio-button>
         <el-radio-button label="alipay">{{ t('mall.alipayPayment') }}</el-radio-button>
@@ -293,14 +293,13 @@ const queryParams = reactive({
   orderId: '',
   realName: '',
   userPhone: '',
-  createTime: [],
+  createTime: undefined,
   orderStatus: '',
   payStatus: '',
   orderType: ''
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
-const VITE_BASE_URL = import.meta.env.VITE_BASE_URL
 const activeName = ref('')
 const orderStatus = ref('')
 const payStatus = ref('')