diff --git a/dist.rar b/dist.rar index e588f70..5288ede 100644 Binary files a/dist.rar and b/dist.rar differ diff --git a/src/api/super/platform.js b/src/api/super/platform.js index 7f4cce7..a397d52 100644 --- a/src/api/super/platform.js +++ b/src/api/super/platform.js @@ -10,12 +10,20 @@ export function superPlatformList(query) { } // 更新接口信息 export function createPlatformUpdate(data) { - return request({ - url: '/super/platform/update', - method: 'post', - data: data - }) - } + return request({ + url: '/super/platform/update', + method: 'post', + data: data + }) +} +//新增接口信息 +export function createPlatformAdd(data) { + return request({ + url: '/super/platform/add', + method: 'post', + data: data + }) +} // 游戏列表 export function superGameList(query) { return request({ diff --git a/src/views/login.vue b/src/views/login.vue index f6cc5ae..a3628a7 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -102,7 +102,7 @@ - +
@@ -245,12 +245,27 @@ function handleLogin() { sessionStorage.setItem('TepdCode', 500); loading.value = false; }else{ - if (res.data.bindStatus == true){ - goodDialogVisible.value = true; - }else if (res.data.bindStatus == false){ - goodDialogShow.value = true; - imgCods.value = res.data.bindQrCode; - authenticatorForm.value.randomSecretKey = res.data.randomSecretKey; + if(res.data.googleCodeSwitch == 0){ + const query = route.query; + if (res.data.token){ + setToken(res.data.token); + sessionStorage.removeItem('TepdCode'); + const otherQueryParams = Object.keys(query).reduce((acc, cur) => { + if (cur !== "redirect") { + acc[cur] = query[cur]; + } + return acc; + }, {}); + router.push({ path: redirect.value || "/", query: otherQueryParams }); + } + }else{ + if (res.data.bindStatus == true){ + goodDialogVisible.value = true; + }else if (res.data.bindStatus == false){ + goodDialogShow.value = true; + imgCods.value = res.data.bindQrCode; + authenticatorForm.value.randomSecretKey = res.data.randomSecretKey; + } } } }).catch(() => { @@ -320,7 +335,7 @@ const goolesubmit = async() => { return acc; }, {}); router.push({ path: redirect.value || "/", query: otherQueryParams }); - } + } } }) diff --git a/src/views/merchant/businessInformation/components/AddMerchantsDialog.vue b/src/views/merchant/businessInformation/components/AddMerchantsDialog.vue index da9f030..872ef16 100644 --- a/src/views/merchant/businessInformation/components/AddMerchantsDialog.vue +++ b/src/views/merchant/businessInformation/components/AddMerchantsDialog.vue @@ -51,24 +51,40 @@ --> - - -   - {{ t(' (万法定货币=1万通用额度)') }} - + + + + +   + {{ t(' (万法定货币=1万通用额度)') }} + + + + + + + + {{ t('单币种') }} - {{ t('多币种') }} +
{{ t('平台比例') }}
@@ -367,6 +383,7 @@ const formRef = ref(null);//获取表单验证 scoreRatio: formAll.scoreRatio, tenantType: formAll.tenantType, curType: formAll.curType, + googleCodeSwitch: formAll.googleCodeSwitch, // proportion: formAll.proportion||numbers.value, tenantPlatforms: formAll.tenantSystemPlatforms, googleCode:formAll.googleCode, diff --git a/src/views/merchant/businessInformation/components/AdjustmentDialog.vue b/src/views/merchant/businessInformation/components/AdjustmentDialog.vue index 32b724e..43908c9 100644 --- a/src/views/merchant/businessInformation/components/AdjustmentDialog.vue +++ b/src/views/merchant/businessInformation/components/AdjustmentDialog.vue @@ -38,10 +38,12 @@ @@ -70,14 +72,36 @@
- + + + + {{formAdjustment.tenantKey}} + + +
+
+ {{ t('余额') }} +
+
{{getcurrencySign(formAdjustment.currencyCode)}} {{ formAdjustment.balance||'00' }}
+
- +
+ + + + +
+
+ {{ t('如需扣余额,则输入负数,例如:-10.50') }} +
+ + +
@@ -146,6 +143,36 @@ {{ row.quotaTypeName? row.quotaTypeName : '--' }} + + + + + + @@ -185,6 +223,7 @@ import IconTips from '@/components/IconTips' import { parseTime } from '@/utils/ruoyi'; // 时间格式化 import { nextTick } from "vue"; +import { get } from "@vueuse/core"; const router = useRouter(); const { proxy } = getCurrentInstance(); const { ff_tenant_type, ff_tenant_status } = proxy.useDict("ff_tenant_type", "ff_tenant_status"); @@ -294,7 +333,17 @@ const getsuperCommonPlatformTypeSelect = async () => { open.value = false; reset(); } - + const getQuota = (row, type) => { + if (!row || !row.quotaTypeName || !row.balanceStr) return 0; + + const names = row.quotaTypeName.split(','); // 拆成数组 + const balances = row.balanceStr.split(','); // 拆成数组 + + const index = names.indexOf(type); // 找到对应下标 + if (index === -1) return 0; // 没找到返回 0 + + return balances[index] || 0; // 对应值不存在也返回 0 +} /** 表单重置 */ function reset() { form.value = { @@ -402,5 +451,37 @@ const getsuperCommonPlatformTypeSelect = async () => { width: calc(100% - 120px); margin-left: 120px; } + .al-list { + padding: 5px 0; + margin: 0; + width: 100%; + list-style: none; + li { + list-style: none; + width: 100%; + text-align: center; + padding: 10px 0; + border-bottom: #eeeeee solid 1px; + + &:first-child { + span { + font-weight: bold; + } + } + + span { + display: inline-block; + width: 25%; + } + + &:last-child { + border: none + } + } +} + +// .al-list li span { +// width: 50% !important; +// } \ No newline at end of file diff --git a/src/views/platform/gameManagement/index.vue b/src/views/platform/gameManagement/index.vue new file mode 100644 index 0000000..7e5fb12 --- /dev/null +++ b/src/views/platform/gameManagement/index.vue @@ -0,0 +1,805 @@ + + + + + + \ No newline at end of file diff --git a/src/views/platform/platformInformation/index.vue b/src/views/platform/platformInformation/index.vue index 4d32371..be1efd6 100644 --- a/src/views/platform/platformInformation/index.vue +++ b/src/views/platform/platformInformation/index.vue @@ -2,14 +2,24 @@
- + @@ -25,8 +35,10 @@ @@ -87,16 +99,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + {{ t('普通') }} + + {{ t('多币种') }} + + + +
+ + + +
+
+ +
+ + + +
+
+ + +
+ + + +
+
+ +
+ + + + +
+
+ +
+ + + + +
+
+ +
+ + + +
+
+
+
+
@@ -152,7 +257,7 @@