diff --git a/dist.rar b/dist.rar
deleted file mode 100644
index bec6356..0000000
Binary files a/dist.rar and /dev/null differ
diff --git a/src/components/TableSearchDate/index.vue b/src/components/TableSearchDate/index.vue
index c7848c1..029c6e4 100644
--- a/src/components/TableSearchDate/index.vue
+++ b/src/components/TableSearchDate/index.vue
@@ -135,7 +135,6 @@ const timeTypeChange = (val) => {
getTimeFnTop(dayjs().subtract(1, 'day').startOf('day')),
getTimeFnTop(dayjs().subtract(1, 'day').endOf('day'))
];
- console.log(dateRange.value);
}else{
dateRange.value = getTimeFn(dayjs().startOf('day'));
}
diff --git a/src/views/commissionList/agentCommissionReport/index.vue b/src/views/commissionList/agentCommissionReport/index.vue
index 426932e..0ccf8b1 100644
--- a/src/views/commissionList/agentCommissionReport/index.vue
+++ b/src/views/commissionList/agentCommissionReport/index.vue
@@ -25,7 +25,7 @@
+ :end-placeholder="t('结束时间')" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
@@ -155,6 +155,7 @@ import Crontab from '@/components/Crontab'
import CustomSelect from '@/components/CustomSelect'
import { parseTime } from '@/utils/ruoyi'; // 时间格式化
import { id } from "element-plus/es/locales.mjs";
+import dayjs from 'dayjs';
const router = useRouter();
const { proxy } = getCurrentInstance();
const { ff_tenant_type, ff_tenant_status,ff_tenant_agent_approval_status,ff_tenant_agent_commission_type } = proxy.useDict("ff_tenant_type", "ff_tenant_status","ff_tenant_agent_approval_status","ff_tenant_agent_commission_type");
@@ -179,7 +180,10 @@ const withdrawn = ref(0);
const total = ref(0);
const invite = ref(0);
const take = ref(0);
-const dateRange = ref([]);
+const dateRange = ref([
+ dayjs().startOf('day').format('YYYY-MM-DD HH:mm:ss'),
+ dayjs().endOf('day').format('YYYY-MM-DD HH:mm:ss')
+]);
const data = reactive({
form: {},
queryParams: {
@@ -213,7 +217,6 @@ function getList() {
loading.value = false;
});
}
-
/** 取消按钮 */
function cancel() {
open.value = false;
diff --git a/src/views/components/DashboardCard.vue b/src/views/components/DashboardCard.vue
index e7581dc..ea455e1 100644
--- a/src/views/components/DashboardCard.vue
+++ b/src/views/components/DashboardCard.vue
@@ -47,8 +47,8 @@
default: () => ({})
},
currencyType: {
- type: Array,
- default:()=>[]
+ type: String,
+ default: ''
}
})
// 卡片数据
diff --git a/src/views/components/DashboardCardNo.vue b/src/views/components/DashboardCardNo.vue
index c15d4b5..69e225f 100644
--- a/src/views/components/DashboardCardNo.vue
+++ b/src/views/components/DashboardCardNo.vue
@@ -48,8 +48,8 @@
default: () => ({})
},
currencyType: {
- type: Array,
- default:()=>[]
+ type: String,
+ default: ''
}
})
// 卡片数据
diff --git a/src/views/components/OperationCard.vue b/src/views/components/OperationCard.vue
index aa9c182..46730c3 100644
--- a/src/views/components/OperationCard.vue
+++ b/src/views/components/OperationCard.vue
@@ -179,8 +179,8 @@ import { el } from 'element-plus/es/locales.mjs';
const props = defineProps({
currencyType: {
- type: Array,
- default: () => ['VND']
+ type: String,
+ default: ''
}
})
const operateTimeType = ref('day'); // 操作时间类型
@@ -237,7 +237,7 @@ import { el } from 'element-plus/es/locales.mjs';
let obj = {
operationType:tabPosition.value,
timeZone:timeZones,
- currencyCode:props.currencyType.join(","),
+ currencyCode:props.currencyType,
startTime:finalTimestamp(dateRange.value[0]),
endTime:finalTimestamp(dateRange.value[1]),
}
diff --git a/src/views/index.vue b/src/views/index.vue
index 0948abc..d6ed458 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -2,8 +2,9 @@
-
+
+
-
+
@@ -54,15 +55,25 @@ import TodayRankingCard from "./components/TodayRankingCard";
// import RecentlyCard from "./components/RecentlyCard";
import OperationCard from "./components/OperationCard";
import CurrencySelect from '@/components/CurrencySelect'; // 币种选择
+import CustomSelect from '@/components/CustomSelect';
+import { getLocalStorage } from "@/utils/auth";
import CheckboxSelect from '@/components/CheckboxSelect';
import auth from '@/plugins/auth'
import {getHomeIndex,getHomerealTimeFocusTenant} from "@/api/home";
import { nextTick } from "vue";
-const currencyCodes = ref(['VND']);
+const currencyCodes = ref('VND');
const platformCodes = ref([]);
const tenantKeys = ref([]);
const cardData = ref({});
const loadings = ref(true);
+const currencyOptions = ref([]);
+let resData = getLocalStorage('currencySelect');
+currencyOptions.value = resData.map(item => {
+ return {
+ label: `${item.currencyName}(${item.currencyCode})`,
+ value: item.currencyCode
+ }
+ });
const getHomeIndexs = async () => {
// 获取当前时间
@@ -74,7 +85,7 @@ const startOfDay = new Date(now.getFullYear(), now.getMonth(), now.getDate()).ge
// 当天结束时间(23:59:59.999)
const endOfDay = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 23, 59, 59, 999).getTime();
let obj = {
- currencyCode:currencyCodes.value.join(","),
+ currencyCode:currencyCodes.value,
platformCodes:platformCodes.value.join(","),
tenantKeys:tenantKeys.value.join(","),
startTime:startOfDay,
@@ -99,7 +110,7 @@ const startOfDay = new Date(now.getFullYear(), now.getMonth(), now.getDate()).ge
// 当天结束时间(23:59:59.999)
const endOfDay = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 23, 59, 59, 999).getTime();
let obj = {
- currencyCode:currencyCodes.value.join(","),
+ currencyCode:currencyCodes.value,
platformCodes:platformCodes.value.join(","),
startTime:startOfDay,
endTime:endOfDay,
diff --git a/src/views/merchant/businessInformation/components/RenewDialog.vue b/src/views/merchant/businessInformation/components/RenewDialog.vue
index 157ea10..ff408d1 100644
--- a/src/views/merchant/businessInformation/components/RenewDialog.vue
+++ b/src/views/merchant/businessInformation/components/RenewDialog.vue
@@ -221,11 +221,20 @@ function getSuperCommonCurrencySelect() {
function findByConditions(arr, conditions = {}) {
// 如果 conditions 为空对象,就直接返回全部
if (conditions.currencyCode == '') {
- let arr11 = [];
- arr.map(item => {
- arr11.push(...item.list);
- })
- return arr11||[];
+ // ✅ 用 ref 包装成响应式
+ const arr11 = ref([]);
+ // 异步小步处理,避免一次性塞太多
+ const mergeData = async () => {
+ for (let i = 0; i < arr.length; i++) {
+ arr11.value.push(...arr[i].list);
+ if (i % 1 == 0) {
+ // 每处理20组,给浏览器一点空闲时间
+ await new Promise(resolve => setTimeout(resolve, 100));
+ }
+ }
+ };
+ mergeData();
+ return arr11.value || [];
}
const found = arr.find(item => item.currencyCode == conditions.currencyCode);
return found ? found.list : [];
@@ -235,6 +244,7 @@ const loading2 = ref(false);
const changeCurrency = (val) => {
loading2.value = true;
+ console.log(tenantSystemPlatforms.value.length);
formAll.tenantSystemPlatforms = findByConditions(tenantSystemPlatforms.value, { currencyCode: val });
totalPlatform.value = formAll.tenantSystemPlatforms.length;
nextTick(() => {
diff --git a/src/views/platform/platformInformation/index.vue b/src/views/platform/platformInformation/index.vue
index 5cb3b9d..282b6b5 100644
--- a/src/views/platform/platformInformation/index.vue
+++ b/src/views/platform/platformInformation/index.vue
@@ -29,7 +29,8 @@
-
@@ -128,17 +129,26 @@
-
+
+
+ {{ t('平台代码') }} *
+
-
+
-
+
+
+ {{ t('平台展示代码') }} *
+
-
+
+
+ {{ t('平台名称') }} *
+
@@ -150,14 +160,20 @@
{{ t('多币种') }}
-
+
+
+ {{ t('平台信息') }} *
+
-
+
+
+ {{ t('地址信息') }} *
+
@@ -165,14 +181,20 @@
-
+
+
+ {{ t('语言信息') }} *
+
-
+
+
+ {{ t('币种信息') }} *
+
@@ -180,7 +202,10 @@
-
+
+
+ {{ t('扩展信息') }} *
+
@@ -188,7 +213,10 @@
-
+
+
+ {{ t('密钥信息') }} *
+