diff --git a/.env.local b/.env.local
index 4bfc4d4f..bf41f464 100644
--- a/.env.local
+++ b/.env.local
@@ -4,9 +4,9 @@ NODE_ENV=development
VITE_DEV=true
# 请求路径
-VITE_BASE_URL='https://yffzpapi.zianxin.com'
+# VITE_BASE_URL='https://yffzpapi.zianxin.com'
-#VITE_BASE_URL='http://localhost:48088'
+VITE_BASE_URL='http://localhost:48088'
# 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持 S3 服务
VITE_UPLOAD_TYPE=server
diff --git a/src/api/mall/trade/order/index.ts b/src/api/mall/trade/order/index.ts
index 9ab2756c..c1f213d8 100644
--- a/src/api/mall/trade/order/index.ts
+++ b/src/api/mall/trade/order/index.ts
@@ -121,6 +121,11 @@ export interface TradeOrderSummaryRespVO {
afterSalePrice?: string
}
+// 查询交易订单列表
+export const exportOrderExcel = async (params: any) => {
+ return await request.download({ url: `/trade/order/export-excel`, params })
+}
+
// 查询交易订单列表
export const getOrderPage = async (params: any) => {
return await request.get({ url: `/trade/order/page`, params })
@@ -156,6 +161,7 @@ export const deliveryOrder = async (data: DeliveryVO) => {
export const deliveryOrder100 = async (data: { id: number }) => {
return await request.put({ url: `/trade/order/delivery-kuaidi100?id=${data.id}`, data })
}
+
// 订单备注
export const updateOrderRemark = async (data: any) => {
return await request.put({ url: `/trade/order/update-remark`, data })
diff --git a/src/views/mall/trade/config/index.vue b/src/views/mall/trade/config/index.vue
index c24744f9..9626cf13 100644
--- a/src/views/mall/trade/config/index.vue
+++ b/src/views/mall/trade/config/index.vue
@@ -3,13 +3,7 @@
-
+
@@ -17,35 +11,17 @@
-
-
+
+
-
-
+
+
@@ -56,13 +32,8 @@
商城是否启用全场包邮
-
+
商城商品满多少金额即可包邮，单位：元
@@ -70,6 +41,13 @@
+
+
+
+ 天
+
+
@@ -79,11 +57,8 @@
-
+
{{ dict.label }}
@@ -96,11 +71,8 @@
-
+
{{ dict.label }}
@@ -118,60 +90,35 @@
-
+
订单交易成功后给推广人返佣的百分比
-
+
订单交易成功后给推广人的推荐人返佣的百分比
-
+
防止用户退款，佣金被提现了，所以需要设置佣金冻结时间，单位：天
-
+
用户提现最低金额限制，单位：元
-
+
提现手续费百分比，范围 0-100，0 为无提现手续费。例：设置 10，即收取 10% 手续费，提现
10 元，到账 9 元，1 元手续费
@@ -179,11 +126,8 @@
-
+
{{ dict.label }}
@@ -217,6 +161,7 @@ const formData = ref({
deliveryExpressFreeEnabled: false,
deliveryExpressFreePrice: 0,
deliveryPickUpEnabled: false,
+ deliveryAutoReceiveDay: 14,
brokerageEnabled: false,
brokerageEnabledCondition: undefined,
brokerageBindMode: undefined,
@@ -230,6 +175,7 @@ const formData = ref({
})
const formRules = reactive({
deliveryExpressFreePrice: [{ required: true, message: '满额包邮不能为空', trigger: 'blur' }],
+ deliveryAutoReceiveDay: [{ required: true, message: '自动收货时间不能为空', trigger: 'blur' }],
brokerageEnabledCondition: [{ required: true, message: '分佣模式不能为空', trigger: 'blur' }],
brokerageBindMode: [{ required: true, message: '分销关系绑定模式不能为空', trigger: 'blur' }],
brokerageFirstPercent: [{ required: true, message: '一级返佣比例不能为空', trigger: 'blur' }],
diff --git a/src/views/mall/trade/order/index.vue b/src/views/mall/trade/order/index.vue
index 683a2d90..ac8bcfcd 100644
--- a/src/views/mall/trade/order/index.vue
+++ b/src/views/mall/trade/order/index.vue
@@ -75,7 +75,12 @@
重置
+
+
+ 导出
+
+
@@ -167,12 +172,16 @@ import * as PickUpStoreApi from '@/api/mall/trade/delivery/pickUpStore'
import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
import * as DeliveryExpressApi from '@/api/mall/trade/delivery/express'
import { DeliveryTypeEnum, TradeOrderStatusEnum } from '@/utils/constants'
+import download from '@/utils/download'
import { OrderTableColumn } from './components'
defineOptions({ name: 'TradeOrder' })
+const message = useMessage() // 消息弹窗
+
const { currentRoute, push } = useRouter() // 路由跳转
const loading = ref(true) // 列表的加载中
+const exportLoading = ref(false)
const total = ref(2) // 列表的总页数
const list = ref([]) // 列表的数据
const queryFormRef = ref() // 搜索的表单
@@ -215,6 +224,22 @@ const inputChangeSelect = (val: string) => {
})
}
+/** 导出按钮操作 */
+const handleExport = async () => {
+ try {
+ // 导出的二次确认
+ await message.exportConfirm()
+ // 发起导出
+ exportLoading.value = true
+ const data = await TradeOrderApi.exportOrderExcel(queryParams.value)
+ console.log("data:", data);
+ download.excel(data, '订单列表.xls')
+ } catch {
+ } finally {
+ exportLoading.value = false
+ }
+}
+
/** 查询列表 */
const getList = async () => {
loading.value = true