From d18c32753f13931a1b4fc2418e6861c31993b257 Mon Sep 17 00:00:00 2001 From: fuchao <2577131060@qq.com> Date: Mon, 5 Jan 2026 13:53:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=A4=8D=E8=AF=BB?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/config.ts | 4 ++-- api/modules/user.ts | 18 ++++++++++++++++-- components/order/Confirm.vue | 7 ++++--- manifest.json | 4 ++-- pages/order/goodsConfirm.vue | 2 +- pages/user/myCourses/index.vue | 22 ++++++++++++++++------ 6 files changed, 41 insertions(+), 16 deletions(-) diff --git a/api/config.ts b/api/config.ts index 9231c86..66c7334 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/api/modules/user.ts b/api/modules/user.ts index b93bd1c..47668ca 100644 --- a/api/modules/user.ts +++ b/api/modules/user.ts @@ -433,7 +433,7 @@ export async function getCourseExpireList(page : number, limit : number, userId * @return */ export async function addUserCourseStudyingList(userId : string, courseId : string) { - const res = await mainClient.request({ + const res = await skeletonClient.request({ url: 'medical/course/addUserCourseStudying', method: 'POST', data: { userId, courseId } @@ -447,7 +447,7 @@ export async function addUserCourseStudyingList(userId : string, courseId : stri * @return */ export async function delUserCourseStudyingList(courseId : string) { - const res = await mainClient.request({ + const res = await skeletonClient.request({ url: 'medical/course/delUserCourseStudying', method: 'POST', data: { courseId } @@ -465,4 +465,18 @@ export async function getCourseMedicalTreeList() { method: 'POST' }) return res +} + +/** + * 续费课程 + * @param catalogueId 商品id + * @return + */ +export async function getRelearnShopProductList(catalogueId : string) { + const res = await skeletonClient.request({ + url: 'common/courseRelearn/relearnShopProductList', + method: 'POST', + data: { catalogueId } + }) + return res } \ No newline at end of file diff --git a/components/order/Confirm.vue b/components/order/Confirm.vue index 51d0f21..3d61298 100644 --- a/components/order/Confirm.vue +++ b/components/order/Confirm.vue @@ -7,7 +7,7 @@ - + {{ $t('order.remark') }} @@ -409,7 +409,7 @@ const handleSubmit = async () => { * 创建订单 */ const createOrder = async (): Promise => { - const orderParams = { + const orderParams = { userId: props.userInfo.id, paymentMethod: 4, // 天医币 orderMoney: totalAmount.value, @@ -419,7 +419,8 @@ const createOrder = async (): Promise => { // couponName: selectedCoupon.value?.couponEntity.couponName, vipDiscountAmount: vipDiscounted.value, districtMoney: promotionDiscounted.value, - remark: remark.value, + // 复读的时候备注传入格式id,名称 + remark: props.orderType === 'relearn' ? `${props.goodsList[0].productId},${props.goodsList[0].productName}` : remark.value, orderType: props.orderType, productList: props.orderType === 'order' ? goodsListParams.value : null, vipBuyConfigId: props.orderType === 'vip' ? props.goodsList[0].productId : null, diff --git a/manifest.json b/manifest.json index 053c757..cd2b78f 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "吴门国际", "appid" : "__UNI__1250B39", "description" : "吴门国际", - "versionName" : "1.1.11", - "versionCode" : 1111, + "versionName" : "1.1.12", + "versionCode" : 1112, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages/order/goodsConfirm.vue b/pages/order/goodsConfirm.vue index 8a3bab2..ebdfd82 100644 --- a/pages/order/goodsConfirm.vue +++ b/pages/order/goodsConfirm.vue @@ -99,7 +99,7 @@ onLoad(async (options: any) => { uni.$on('selectedGoods', async (data: IOrderGoods) => { // 获取用户信息 await getUserInfo() - + isRelearn.value = true // 处理商品数据 console.log('监听到传入的商品数据:', data) goodsList.value = [ data ] diff --git a/pages/user/myCourses/index.vue b/pages/user/myCourses/index.vue index a600819..06017c5 100644 --- a/pages/user/myCourses/index.vue +++ b/pages/user/myCourses/index.vue @@ -11,7 +11,7 @@ + @cancel="search" @clear="search" light style="margin-top: 10rpx;" /> {{ !tagData ? '已显示全部课程' : `已选择分类：${tagName}`}} { - const res = await courseApi.getProductListForCourse(id) + const res = await getRelearnShopProductList(id) if (res.code === 0 && res.productList.length > 0) { goodsList.value = res.productList showGoodsSelector.value = true @@ -215,7 +217,12 @@ const handleGoodsConfirm = () => { showGoodsSelector.value = false uni.navigateTo({ - url: `/pages/order/goodsConfirm?goods=${selectedGoods.value.productId}` + url: `/pages/order/goodsConfirm?isRelearn=1`, + success: () => { + setTimeout(() => { + uni.$emit('selectedGoods', selectedGoods.value) + }, 100) + } }) } @@ -239,7 +246,6 @@ try { const data = await getCourseMedicalTreeList() labelTree.value = data.labels - console.log(data, '分类标签数'); } catch (error) { console.error('分类标签数', error) } @@ -284,7 +290,10 @@ url: `${url}?id=${id}` }) } - + onShow(() => { + bookList.value = [] + getDataList() + }) onMounted(() => { getTreeList() }) @@ -305,6 +314,7 @@ display: flex; align-items: center; font-size: 26rpx; + text { color: #2979ff; margin-left: 4rpx;