diff --git a/.env.development b/.env.development index 75886ba..e3a3df8 100644 --- a/.env.development +++ b/.env.development @@ -10,18 +10,16 @@ ENV = 'development' # ADMIN 服务地址 # VITE_ADMIN_PROXY_PATH = http://123.157.250.162:8089/api/ # 测试线上 # VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 测试线上-过期 -# VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/ -VITE_ADMIN_PROXY_PATH = http://localhost:9999/ +# VITE_ADMIN_PROXY_PATH = http://localhost:9999/ # VITE_ADMIN_PROXY_PATH = http://192.168.101.196:9999 # 邓-本地 -# VITE_ADMIN_PROXY_PATH = http://59.202.170.152:81/api # 正式环境线上 +VITE_ADMIN_PROXY_PATH = http://59.202.170.152:81/api # 正式环境线上 # 图片访问基础地址 # VITE_IMAGE_BASE_PATH = http://123.157.250.162:8089/api/ # 测试线上 # VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api/ # 测试线上-过期 -# VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc -VITE_IMAGE_BASE_PATH = http://localhost:9999 +# VITE_IMAGE_BASE_PATH = http://localhost:9999 # VITE_IMAGE_BASE_PATH = http://192.168.101.196:9999 # 邓-本地 -# VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api/ # 正式环境线上 +VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api/ # 正式环境线上 # 代码生成服务地址 VITE_GEN_PROXY_PATH = http://192.168.110.156:5003 diff --git a/src/views/hard/hard-order/index.vue b/src/views/hard/hard-order/index.vue index 87eab54..7f8b9d0 100644 --- a/src/views/hard/hard-order/index.vue +++ b/src/views/hard/hard-order/index.vue @@ -274,6 +274,7 @@ import { useDict } from "/@/hooks/dict" import { displayPrice } from "/@/utils/formatMoney" import { ElLoading, TableColumnCtx } from "element-plus" import { VNode } from "vue" +import dayjs from "dayjs" const { push } = useRouter() @@ -309,8 +310,15 @@ const showSearch = ref(true) const selectObjs = ref([]) as any const multiple = ref(true) +const defaultCreateTimeList = [ + dayjs().subtract(3, "month").startOf("day").format("YYYY-MM-DD HH:mm:ss"), + dayjs().hour(23).minute(23).second(23).format("YYYY-MM-DD HH:mm:ss"), +] + const state: BasicTableProps = reactive({ - queryForm: {}, + queryForm: { + createTimeList: defaultCreateTimeList, + }, pageList: hardOrder.pageJoin, }) @@ -415,7 +423,7 @@ const getSummaries = (param: SummaryMethodProps) => { { column: "totalPrice", columnName: "商品总价", color: "#67C260" }, { column: "extraPrice", columnName: "额外支付", color: "#F56E9B" }, { column: "payPrice", columnName: "实际支付", color: "#355CF6" }, - ].forEach(({ column, columnName, color }: any, index: number) => { + ].forEach(({ column, columnName, color }: any) => { const values = data.map((item) => Number(item[column])) if (!values.every((value) => Number.isNaN(value))) { priceVNode.push( diff --git a/src/views/wallet/wallet-recharge-invoice/print-dialog.vue b/src/views/wallet/wallet-recharge-invoice/print-dialog.vue index c920fac..2666832 100644 --- a/src/views/wallet/wallet-recharge-invoice/print-dialog.vue +++ b/src/views/wallet/wallet-recharge-invoice/print-dialog.vue @@ -1,12 +1,14 @@