修复：复读报错

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: 'http://192.168.110.100:9300/pb/', // 张川川
-		// MAIN: 'https://global.nuttyreading.com/', // 线上
+		 MAIN: 'https://global.nuttyreading.com/', // 线上
 		// PAYMENT: 'https://dev-pay.example.com', // 暂时用不到
 		// CDN: 'https://cdn-dev.example.com', // 暂时用不到
   },

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<IApiResponse>({
+	const res = await skeletonClient.request<IApiResponse>({
 		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<IApiResponse>({
+	const res = await skeletonClient.request<IApiResponse>({
 		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<IApiResponse>({
+		url: 'common/courseRelearn/relearnShopProductList',
+		method: 'POST',
+		data: { catalogueId }
+	})
+	return res
 }

components/order/Confirm.vue

@@ -7,7 +7,7 @@
     </view>
 
     <!-- 订单备注区域 -->
-    <view class="remark-section common-section" @click="showRemarkPopup = true">
+    <view class="remark-section common-section" @click="showRemarkPopup = true" v-if="props.orderType !== 'relearn'">
       <view class="remark-row">
         <text class="remark-label">{{ $t('order.remark') }}</text>
         <view class="remark-value">
@@ -409,7 +409,7 @@ const handleSubmit = async () => {
  * 创建订单
  */
 const createOrder = async (): Promise<string | null> => {
-  const orderParams = {
+	const orderParams = {
     userId: props.userInfo.id,
     paymentMethod: 4, // 天医币
     orderMoney: totalAmount.value,
@@ -419,7 +419,8 @@ const createOrder = async (): Promise<string | null> => {
     // 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,

manifest.json

@@ -2,8 +2,8 @@
     "name" : "吴门国际",
     "appid" : "__UNI__1250B39",
     "description" : "吴门国际",
-    "versionName" : "1.1.11",
+    "versionName" : "1.1.12",
-    "versionCode" : 1111,
+    "versionCode" : 1112,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

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 ]

pages/user/myCourses/index.vue

@@ -11,7 +11,7 @@
 					<wd-tab :title="`${item.name}`" :name="item.id">
 						<view v-if="item.id === 0">
 							<wd-search v-model="title" placeholder-right placeholder="请输入课程名称" cancel-txt="搜索" @search="search"
-								@cancel="search" @clear="search" light style="margin-top: 10rpx;"/>
+								@cancel="search" @clear="search" light style="margin-top: 10rpx;" />
 							<view class="courses-row">
 								<view class="courses-category">{{ !tagData ? '已显示全部课程' : `已选择分类：${tagName}`}}
 									<wd-button size="small" type="warning" style="margin-left: 20rpx;" v-if="tagData"
@@ -89,13 +89,15 @@
 	import { courseApi } from '@/api/modules/course'
 	import { useUserStore } from '@/stores/user'
 	import GoodsSelector from '@/components/order/GoodsSelector.vue'
+	import { onShow } from '@dcloudio/uni-app'
 	import {
 		getUserCourseBuyList,
 		getUserCourseStudyingList,
 		getCourseExpireList,
 		addUserCourseStudyingList,
 		delUserCourseStudyingList,
-		getCourseMedicalTreeList
+		getCourseMedicalTreeList,
+		getRelearnShopProductList
 	} from '@/api/modules/user'
 
 	const { t } = useI18n()
@@ -195,7 +197,7 @@
 	 * 续费课程
 	 */
 	const renewal = async (id : any) => {
-		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;