zm/taimed-international-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复：完善数据迁移；修改logo及课程首页接口文件覆盖问题；

Browse Source
This commit is contained in:
chenghuan
2025-12-18 15:57:50 +08:00
parent 9e04533bdc
commit 2b0e339bc9
13 changed files with 29 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/config.ts
View File

@@ -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', // 暂时用不到
},

22
api/modules/cousre_subject_classification.ts
View File

@@ -1,16 +1,10 @@
// api/modules/course.ts
import { createRequestClient } from '../request'
import { SERVICE_MAP } from '../config'
import { mainClient, skeletonClient } from '@/api/clients'
import type {
ICourseCategoryResponse,
IUserLateCourseListResponse,
IMarketCourseListResponse,
ICourseMedicalLabelsResponse
} from '@/types/course'
const client = createRequestClient({ baseURL: SERVICE_MAP.MAIN })
/**
* 课程分类及分类下课程相关API
*/
@@ -21,7 +15,7 @@ export const courseSubjectClassificationApi = {
* @returns 分类数据
*/
getCourseMedicalTree() {
return client.request<ICourseCategoryResponse>({
return mainClient.request<ICourseCategoryResponse>({
url: uni.getStorageSync('token') ? 'medical/home/getCourseMedicalTree' : '/visitor/getCourseMedicalTree',
method: 'POST',
data: {}
@@ -60,7 +54,7 @@ export const courseSubjectClassificationApi = {
* @returns 分类数据
*/
getCourseMedicalLabels(id: number) {
return client.request<ICourseCategoryResponse>({
return mainClient.request<ICourseCategoryResponse>({
url: 'medical/home/getMedicalLabels',
method: 'POST',
data: { id }
@@ -73,7 +67,7 @@ export const courseSubjectClassificationApi = {
* @returns 分类数据
*/
getCourseMedicalChildLabels(id: number) {
return client.request<ICourseCategoryResponse>({
return mainClient.request<ICourseCategoryResponse>({
url: 'medical/home/getChildCourseMedicalTree',
method: 'POST',
data: { id }
@@ -91,7 +85,7 @@ export const courseSubjectClassificationApi = {
page: number, // 页码
limit: number // 每页数量
}) {
return client.request<IMarketCourseListResponse>({
return mainClient.request<IMarketCourseListResponse>({
url: 'medical/home/getMedicalCourseList',
method: 'POST',
data
@@ -104,7 +98,7 @@ export const courseSubjectClassificationApi = {
* @returns 分类数据
*/
getCourseSoulChildLabels(id: number) {
return client.request<ICourseCategoryResponse>({
return mainClient.request<ICourseCategoryResponse>({
url: 'psyche/home/getChildCoursePsycheTree',
method: 'POST',
data: { id }
@@ -122,7 +116,7 @@ export const courseSubjectClassificationApi = {
page: number, // 页码
limit: number // 每页数量
}) {
return client.request<IMarketCourseListResponse>({
return mainClient.request<IMarketCourseListResponse>({
url: 'psyche/home/getPsycheCourseList',
method: 'POST',
data
@@ -140,7 +134,7 @@ export const courseSubjectClassificationApi = {
page: number, // 页码
limit: number // 每页数量
}) {
return client.request<IMarketCourseListResponse>({
return mainClient.request<IMarketCourseListResponse>({
url: 'sociology/course/getSociologyCourseList',
method: 'POST',
data

4
api/modules/user.ts
View File

@@ -324,7 +324,7 @@ export async function migrateUserData(data: { tel: string, code: string, type: s
* }
*/
export async function getUserMigrateInfo() {
const res = await mainClient.request<IApiResponse>({
const res = await skeletonClient.request<IApiResponse>({
url: 'common/user/getMigrationList',
method: 'POST',
})
@@ -336,7 +336,7 @@ export async function getUserMigrateInfo() {
* @return
*/
export async function getUserContributionData() {
const res = await mainClient.request<IApiResponse>({
const res = await skeletonClient.request<IApiResponse>({
url: 'common/userContribution/getUserContribution',
method: 'POST'
})

2
locale/zh-Hans.json
View File

@@ -224,7 +224,7 @@
"migrateCodePlaceholder": "国内版账号获取的迁移验证码",
"migrateWarning": "迁移后不可恢复，请谨慎操作！",
"migrateInstructions": "迁移说明",
"instruction1": "请在吴门医述、心灵空间、众妙之门、疯子读书任意APP中获取迁移验证码，获取方式【我的】-【数据迁移】-【获取迁移验证码】。",
"instruction1": "请在吴门医述APP中获取迁移验证码，获取方式【我的】-【数据迁移】-【获取迁移验证码】。",
"instruction2": "数据迁移完成后，旧账号数据将被清空，已购买的天医币、积分、课程、电子书、VIP、证书、湖分将转移到当前账号。",
"instruction3": "迁移过程可能需要几分钟时间，请耐心等待。",
"instruction4": "如遇到问题，请联系客服获取帮助。",

2
pages/book/index.vue
View File

@@ -12,7 +12,7 @@
/>
<view class="icon-hua">
<image
src="../../static/logo.png"
src="../../static/book/home_icon.png"
mode="aspectFit"
class="icon-hua-img"
/>

4
pages/course/index.vue
View File

@@ -686,7 +686,7 @@ $border-color: #eeeeee;
width: 60rpx;
height: 60rpx;
background-size: 100% 100%;
background-image: url("@/static/soul/cate_bg.png");
background-image: url("@/static/icon/cate_bg.png");
border-radius: 4rpx;
display: flex;
align-items: center;
@@ -747,7 +747,7 @@ $border-color: #eeeeee;
width: 65rpx;
height: 78rpx;
background-size: 100% 100%;
background-image: url("@/static/soul/cate_bg.png");
background-image: url("@/static/icon/cate_bg.png");
border-radius: 4rpx;
display: flex;
align-items: center;

6
pages/user/about/index.vue
View File

@@ -7,7 +7,7 @@
<!-- 应用信息 -->
<view class="app-info">
<image
src="/static/icon/home_icon_logo.jpg"
src="/static/logo.png"
mode="aspectFit"
class="app-logo"
/>
@@ -52,11 +52,9 @@
<script setup lang="ts">
import { ref, onMounted } from 'vue'
import { useI18n } from 'vue-i18n'
import { t } from '@/utils/i18n'
import { makePhoneCall } from '@/utils/index'
const { t } = useI18n()
// 导航栏高度
const statusBarHeight = ref(0)
const navbarHeight = ref('44px')

16
pages/user/index.vue
View File

@@ -142,13 +142,13 @@
url: '/pages/user/feedback/index',
type: 'pageJump'
},
// {
// id: 6,
// name: t('user.dataMigrate'),
// url: '/pages/user/migrate/index',
// desc: t('user.migrateSubtitle'),
// type: 'pageJump'
// }
{
id: 6,
name: t('user.dataMigrate'),
url: '/pages/user/migrate/index',
desc: t('user.migrateSubtitle'),
type: 'pageJump'
},
// {
// id: 7,
// name: t('user.certificate'),
@@ -191,7 +191,6 @@
*/
const getHufen = async () => {
hufenData.value = await getUserContributionData()
hufenData.value = await getUserContributionData()
}
/**
@@ -279,6 +278,7 @@
if (uni.getStorageSync('token')) {
tokenState.value = true
getData()
getHufen()
}
})

2
pages/user/migrate/index.vue
View File

@@ -96,7 +96,7 @@ const formData = ref({
const getMigrateInfo = async () => {
const res = await getUserMigrateInfo()
migrateInfo.value.alreadyMigration = res.alreadyMigration
// migrateInfo.value.notMigration = res.notMigration
migrateInfo.value.notMigration = res.notMigration
}
onMounted(() => {
getMigrateInfo()

4
pages/visitor/index.vue
View File

@@ -58,7 +58,7 @@
href: 'https://a.app.qq.com/o/simple.jsp?pkgname=com.cn.medicine',
title: "吴门医述",
summary: "我正在使用吴门医述提升自己，赶紧跟我一起来体验吧！",
imageUrl: "static/icon/home_icon_logo.png",
imageUrl: "static/logo.png",
success: function (res) {
console.log("success:" + JSON.stringify(res));
},
@@ -75,7 +75,7 @@
href: 'https://a.app.qq.com/o/simple.jsp?pkgname=com.cn.medicine',
title: "吴门医述",
summary: "我正在使用吴门医述提升自己，赶紧跟我一起来体验吧！",
imageUrl: "static/icon/home_icon_logo.png",
imageUrl: "static/logo.png",
success: function (res) {
console.log("success:" + JSON.stringify(res));
},

BIN
static/book/home_icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 261 KiB

0
static/soul/cate_bg.png → static/icon/cate_bg.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

83
style/tailwind.css
View File

@@ -8,8 +8,6 @@
--font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono",
"Courier New", monospace;
--color-red-500: oklch(63.7% 0.237 25.331);
--color-gray-300: oklch(87.2% 0.01 258.338);
--color-gray-500: oklch(55.1% 0.027 264.364);
--color-white: #fff;
--spacing: 0.25rem;
--text-xs: 0.75rem;
@@ -214,54 +212,12 @@
max-width: 96rem;
}
}
.mt-2 {
margin-top: calc(var(--spacing) * 2);
}
.mt-2\! {
margin-top: calc(var(--spacing) * 2) !important;
}
.mt-2\.5\! {
margin-top: calc(var(--spacing) * 2.5) !important;
}
.mt-3 {
margin-top: calc(var(--spacing) * 3);
}
.mt-3\! {
margin-top: calc(var(--spacing) * 3) !important;
}
.mt-5 {
margin-top: calc(var(--spacing) * 5);
}
.mt-5\! {
margin-top: calc(var(--spacing) * 5) !important;
}
.mt-20 {
margin-top: calc(var(--spacing) * 20);
}
.mt-20\! {
margin-top: calc(var(--spacing) * 20) !important;
}
.mt-\[20rpx\]\! {
margin-top: 20rpx !important;
}
.mr-\[20rpx\] {
margin-right: 20rpx;
}
.mr-\[20rpx\]\! {
margin-right: 20rpx !important;
}
.mb-1 {
margin-bottom: calc(var(--spacing) * 1);
}
.mb-1\! {
margin-bottom: calc(var(--spacing) * 1) !important;
}
.mb-1\.5\! {
margin-bottom: calc(var(--spacing) * 1.5) !important;
}
.mb-2 {
margin-bottom: calc(var(--spacing) * 2);
}
.mb-2\! {
margin-bottom: calc(var(--spacing) * 2) !important;
}
@@ -271,24 +227,12 @@
.mb-\[20rpx\]\! {
margin-bottom: 20rpx !important;
}
.ml-1 {
margin-left: calc(var(--spacing) * 1);
}
.ml-1\! {
margin-left: calc(var(--spacing) * 1) !important;
}
.ml-2 {
margin-left: calc(var(--spacing) * 2);
}
.ml-2\.5\! {
margin-left: calc(var(--spacing) * 2.5) !important;
}
.ml-\[20rpx\] {
margin-left: 20rpx;
}
.ml-\[20rpx\]\! {
margin-left: 20rpx !important;
}
.block {
display: block;
}
@@ -325,9 +269,6 @@
.flex-shrink {
flex-shrink: 1;
}
.border-collapse {
border-collapse: collapse;
}
.transform {
transform: var(--tw-rotate-x,) var(--tw-rotate-y,) var(--tw-rotate-z,) var(--tw-skew-x,) var(--tw-skew-y,);
}
@@ -344,27 +285,12 @@
border-style: var(--tw-border-style);
border-width: 1px;
}
.bg-gray-300 {
background-color: var(--color-gray-300);
}
.bg-gray-500 {
background-color: var(--color-gray-500);
}
.bg-white {
background-color: var(--color-white);
}
.p-0 {
padding: calc(var(--spacing) * 0);
}
.p-0\! {
padding: calc(var(--spacing) * 0) !important;
}
.p-2 {
padding: calc(var(--spacing) * 2);
}
.p-2\.5 {
padding: calc(var(--spacing) * 2.5);
}
.p-3 {
padding: calc(var(--spacing) * 3);
}
@@ -374,9 +300,6 @@
.p-\[20rpx\] {
padding: 20rpx;
}
.p-\[20rpx\]\! {
padding: 20rpx !important;
}
.p-\[30rpx\] {
padding: 30rpx;
}
@@ -389,9 +312,6 @@
.pt-\[10rpx\] {
padding-top: 10rpx;
}
.pb-0 {
padding-bottom: calc(var(--spacing) * 0);
}
.pb-0\! {
padding-bottom: calc(var(--spacing) * 0) !important;
}
@@ -442,9 +362,6 @@
--tw-ordinal: ordinal;
font-variant-numeric: var(--tw-ordinal,) var(--tw-slashed-zero,) var(--tw-numeric-figure,) var(--tw-numeric-spacing,) var(--tw-numeric-fraction,);
}
.underline {
text-decoration-line: underline;
}
.shadow-\[0_4rpx_12rpx_rgba\(0\,0\,0\,0\.05\)\] {
--tw-shadow: 0 4rpx 12rpx var(--tw-shadow-color, rgba(0,0,0,0.05));
box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);