diff --git a/api/config.ts b/api/config.ts index 5b3a64c..98494ac 100644 --- a/api/config.ts +++ b/api/config.ts @@ -7,8 +7,8 @@ export const ENV = process.env.NODE_ENV || 'development'; */ const BASE_URL_MAP = { development: { - // MAIN: 'http://192.168.110.100:9300/pb/', // 张川川 - MAIN: 'https://global.nuttyreading.com/', // 线上 + MAIN: 'http://192.168.110.100:9300/pb/', // 张川川 + // MAIN: 'https://global.nuttyreading.com/', // 线上 // PAYMENT: 'https://dev-pay.example.com', // 暂时用不到 // CDN: 'https://cdn-dev.example.com', // 暂时用不到 }, diff --git a/locale/en.json b/locale/en.json index 4de83c9..8370f54 100644 --- a/locale/en.json +++ b/locale/en.json @@ -227,6 +227,9 @@ "instruction2": "After data migration is complete, the chinese account data will be cleared, and all purchased Tianyi Coins, points, courses, E-book, VIP, certificate, and User Contribution will be transferred to the current account", "instruction3": "The migration process may take a few minutes, please be patient.", "instruction4": "If you encounter any issues, please contact customer service for assistance.", + "alreadyMigrated": "You have already migrated:", + "notMigration": "This migration:", + "migratedCompleted": "You have completed all migrations:", "closeWindow": "Close the payment pop-up window" }, "book": { diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json index 54d1fc9..5494e8e 100644 --- a/locale/zh-Hans.json +++ b/locale/zh-Hans.json @@ -228,6 +228,9 @@ "instruction2": "数据迁移完成后,旧账号数据将被清空,已购买的天医币、积分、课程、电子书、VIP、证书、湖分将转移到当前账号。", "instruction3": "迁移过程可能需要几分钟时间,请耐心等待。", "instruction4": "如遇到问题,请联系客服获取帮助。", + "alreadyMigrated": "您已迁移过:", + "notMigration": "本次迁移:", + "migratedCompleted": "您已迁移过所有可迁移数据:", "closeWindow": "关闭支付弹窗" }, "book": { diff --git a/pages/user/index.vue b/pages/user/index.vue index 3cd324b..5b80905 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -255,7 +255,7 @@ $theme-color: #54a966; .user-page { - min-height: 100vh; + min-height: calc(100vh - 50px); background-color: #f7faf9; } diff --git a/pages/user/migrate/index.vue b/pages/user/migrate/index.vue index 387c28d..b3b1503 100644 --- a/pages/user/migrate/index.vue +++ b/pages/user/migrate/index.vue @@ -3,10 +3,20 @@ - {{ $t('user.migrateWarning') }} + + {{ $t('user.alreadyMigrated') }}{{ migrateInfo.alreadyMigration }} + {{ $t('user.notMigration') }}{{ migrateInfo.notMigration }} + + + + + + + + {{ $t('user.migrateWarning') }} - +