更新项目

2025-03-20 16:14:57 +08:00
parent 37829438bc
commit fbce03f09f
6 changed files with 86 additions and 82 deletions
--- a/App.vue
+++ b/App.vue
@@ -18,10 +18,6 @@ export default {
 	  };
 	},
 	onLaunch: function() {
-		// #ifdef APP-PLUS
-		// 注册事件
-		plus.globalEvent.addEventListener("plusMessage", this.plusMessageHandler);
-		// #endif
 		// 禁止横屏
 		// #ifdef APP-PLUS
 		plus.screen.lockOrientation("portrait-primary");
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
    "name" : "心灵空间",
    "appid" : "__UNI__BBBDFD2",
    "description" : "心灵空间",
-    "versionName" : "1.0.03",
-    "versionCode" : 1003,
+    "versionName" : "1.0.04",
+    "versionCode" : 1004,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {
--- a/pages/curriculum/list/index.vue
+++ b/pages/curriculum/list/index.vue
@@ -28,7 +28,7 @@
 			<view class="list_block" v-if="!statusXLCP" :style="labelsList.length>0&&childrenList.length==0?`marginTop: ${45 + statusBarHeight}px;`:''">
 				<view class="list_item" v-if="list.length>0" v-for="(item,index) in list" :key="index" @click.stop="goToDetail(item)">
 					<view class="list_item_image">
-						<image v-if="item.squareImage" :src="item.squareImage" mode="aspectFit"></image>
+						<image v-if="item.image" :src="item.image" mode="aspectFit"></image>
 						<text class="image_null" v-else>暂无封面图</text>
 					</view>
 					<view class="list_item_right">
@@ -44,7 +44,7 @@
 									{{formatContent(v.title)}}<text v-if="i !== item.courseCatalogueEntityList.length - 1">/</text>
 								</text>
 								<text v-if="item.courseCatalogueEntityList[0].halfFee==0" style="padding-left: 20rpx;">免费</text>
-								<text v-else style="margin-left: 20rpx;">¥{{item.courseCatalogueEntityList[0].halfFee}}/{{item.courseCatalogueEntityList[0].fee}}</text>
+								<text v-else style="margin-left: 20rpx;">各{{item.courseCatalogueEntityList[0].halfFee}}/{{item.courseCatalogueEntityList[0].fee}}</text>
 							</view>
 							<text class="list_item_study">了解课程</text>
 						</view>
@@ -128,7 +128,7 @@ export default {
 		this.title = options.title;
 		this.id = options.id;
 		//如果是心理评测
-		if(this.id==87){
+		if(this.id==75){
 			this.statusXLCP = true;
 			this.getFormList();
 		}
@@ -205,7 +205,7 @@ export default {
 					this.labelsList = res.labels;
 					
 					//如果是心理测评
-					if(this.id == 87){
+					if(this.id == 75){
 						this.XL_id = this.labelsList[0].id;
 					}
 					//判断是否有子级
@@ -238,7 +238,7 @@ export default {
 			this.statusNull = null;
 			this.activeTab = index;
 			//如果是心理测评
-			if(this.id == 87){
+			if(this.id == 75){
 				this.XL_id = item.id;
 			}
 			if(item.isLast == 1) {
@@ -450,8 +450,8 @@ export default {
 	border-radius: 10rpx;
 }
 .list_item_image,.image_null{
-	width: 240rpx;
-	height: 240rpx;
+	width: 250rpx;
+	height: 220rpx;
 	background-color: rgba(125, 193, 240, 0.1);
 	display: flex;
 	justify-content: center;
--- a/pages/curriculum/list/scale.vue
+++ b/pages/curriculum/list/scale.vue
@@ -169,7 +169,7 @@ export default {
 <style scoped>
 .viewWrap{
 	height: 100vh;
-	background-color: #f4f7ff;
+	background-color: #eff5f8;
 }
 .scale_block{
 	padding: 20rpx;
--- a/pages/curriculum/order/index.vue
+++ b/pages/curriculum/order/index.vue
@@ -18,7 +18,7 @@
 					<image style="width: 100%" :src="curriculumData.image" mode="widthFix"></image>
 				</view>
 				
-				<view class="containerBg1" :style="`${curriculumData.content && curriculumData.content != ''? 'padding:10rpx 0;': ''}`">
+				<view class="containerBg1">
 					<view class="course_info_box">
 						<view class="course_info">
 							<view class="flexbox course_title" v-if="curriculumData.id">
@@ -30,13 +30,18 @@
 							<view class="containerBg" v-if="curriculumData.content && curriculumData.content != ''">
 								<view class="prof">
 									<view style="padding: 0 20rpx; position: relative;">
-										<view :class="`${isHideCourseInfo ? 'hidden2' : ''}`" v-html="curriculumData.content">
+										<view :class="`${isHideCourseInfo ? 'hidden2' : ''}`" v-html="parsedContent"></view>
+										<view v-for="(image, index) in images" :key="index" style=" width: 100%; margin-top: 10rpx;">
+										  <image 
+											style=" width: 100%;"
+											:src="image" mode="widthFix"
+											@tap="handleImageClick(image, index)"
+										  />
 										</view>
-										<br/>
 										<text @click="isHideCourseInfo = !isHideCourseInfo" style="
 											font-size: 24rpx;
 											position: absolute;
-											bottom: 0;
+											bottom: -40rpx;
 											right: 20rpx;
 											color: #838588;
 											">
@@ -250,6 +255,9 @@
 				userVip: null,  //是否是vip
 				courseVipModule: [],  //该课程需要什么类型的vip
 				textList: [],  //转化文字集合
+				//存储解析后的内容
+				parsedContent: '',
+				images: []
 			};
 		},
 		onLoad(options) {
@@ -278,6 +286,33 @@
 			});
 		},
 		methods: {
+			//删除文本里的图片
+			removeImagesFromHTML() {
+				const cleanText = this.curriculumData.content.replace(/<img[^>]*>/g, '');
+				this.parsedContent = cleanText; // 更新去除图片后的文本
+				this.extractImagesFromHTML();
+			},
+			//把文本里的图片另存起来
+			extractImagesFromHTML() {
+				const imgUrls = [];
+				// 使用正则表达式从 HTML 中提取所有图片的 src 属性
+				const regex = /<img[^>]+src="([^"]+)"[^>]*>/g;
+				let match;
+				while ((match = regex.exec(this.curriculumData.content)) !== null) {
+					imgUrls.push(match[1]);
+				}
+				this.images = imgUrls; // 更新 images 数组
+			},
+				
+			// 处理图片点击事件
+			handleImageClick(image, index) {
+				uni.previewImage({
+					current: image,  // 当前点击的图片
+					urls: this.images,  // 所有图片的 URL 列表
+					currentIndex: index  // 当前图片的索引
+				});
+			},
+			
 			//点击顶部按钮
 			handleClickGetVip() {
 				uni.navigateTo({
@@ -522,6 +557,8 @@
 							courseList: [...list],
 						};
 					}
+					//获取的数据解析
+					this.removeImagesFromHTML();

 					setTimeout(() => {
 						that.$refs.commonAnchorLink.getDistanceArr();
@@ -1087,10 +1124,6 @@
 	}
 	.course_info_box {
 		
-		.course_info {
-			overflow: hidden;
-			padding-bottom: 10rpx;
-		}
 	}

 	.catalogue_title {
@@ -1140,8 +1173,6 @@

 	.containerBg2 {
 		width: 100%;
-		// padding-top: 40rpx;
-		// margin-top: 100rpx;

 		.shiting {
 			line-height: 100rpx;
@@ -1278,10 +1309,13 @@
 		width: 100%;
 	}

+	.containerBg{
+		padding-bottom: 30rpx;
+	}
 	.containerBg1 {
+		padding: 20rpx 0;
 		background: #fff;
 		border-top: 1px solid #fff;
-		margin-top: -4rpx;
 	}

 	.courseTitle {
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -12,7 +12,7 @@
 			<view class="appJump" v-if="$platform=='android'">
 				<view class="app_item wumen" @click="appjumpfun('wumen')">
 					<view class="img">
-						<image src="@/static/logo_wumen.png" mode="widthFix"></image>
+						<image src="@/static/logo_wumen.png"></image>
 					</view>
 					<view class="text">
 						<text>吴门医述</text>
@@ -20,7 +20,7 @@
 				</view>
 				<view class="app_item zmzm" @click="appjumpfun('zmzm')">
 					<view class="img">
-						<image src="@/static/logo_zmzm.png" mode="widthFix"></image>
+						<image src="@/static/logo_zmzm.png"></image>
 					</view>
 					<view class="text">
 						<text>众妙之门</text>
@@ -28,7 +28,7 @@
 				</view>
 				<view class="app_item fzds" @click="appjumpfun('nuttyreading')">
 					<view class="img">
-						<image src="@/static/logo_fzds.png" mode="widthFix"></image>
+						<image src="@/static/logo_fzds.png"></image>
 					</view>
 					<view class="text">
 						<text>疯子读书</text>
@@ -36,25 +36,16 @@
 				</view>
 			</view>
 			<view class="cate_box">
-				<view class="cate_list">
-					<view class="cate_item_box"
-					:class="cateIndex==index?'cate_item_box_active':''"
-					:style="`width: ${(100/cateList.length)}%`"
-					v-for="(item, index) in cateList" :key="index"
-					@click="handleClickCate(item,index)"
-					>
-						<view class="cate_item_border">
-							<image :src="item.icon"></image>
+				<scroll-view scroll-x="true">
+					<view class="cate_list" v-if="cateList.length>0">
+						<view class="cate_item_box" v-for="(item, index) in cateList" @click="handleClickCate(item)">
+							<view class="cate_item_border">
+								<image :src="item.icon"></image>
+							</view>
+							<view class="cate_item_name">{{ item.title }}</view>
 						</view>
-						<view class="cate_item_name">{{ item.title }}</view>
 					</view>
-				</view>
-				<view class="sub_list">
-					<view class="sub_item_box" v-for="(item,index) in subList" :key="index"
-					@click="handleClickSub(item)">
-						<view class="sub_item_name">{{ item.title }}</view>
-					</view>
-				</view>
+				</scroll-view>
 			</view>
 			<view class="notice_box" v-if="noticeList.length>0">
 				<view class="flash_sale_top">
@@ -122,6 +113,7 @@
 </template>

 <script>
+import $http from "@/config/requestConfig.js";
 export default {
 	data() {
 		return {
@@ -217,9 +209,6 @@ export default {
 			})
 			.catch(e=>{
 			    uni.setStorageSync("guidePages", 2);
-			    uni.redirectTo({
-					url: "/pages/user/login",
-			    });
 			});
 		},
 		//获取二级列表数据
@@ -345,14 +334,8 @@ export default {
 				url: url,
 			});
 		},
-		//分类点击切换
-		handleClickCate(item,index){
-			this.cateIndex = index;
-			this.getSubList(item.id);
-			uni.setStorageSync('cateIndex', this.cateIndex);
-		},
-		//二级点击-课程列表
-		handleClickSub(item){
+		//课程列表
+		handleClickCate(item){
 			uni.navigateTo({
 				url: `/pages/curriculum/list/index?title=${item.title}&id=${item.id}`,
 			});
@@ -479,53 +462,44 @@ export default {
 	}
 	
 	.cate_box {
-		border: 1rpx solid #7dc1f0;
+		background: #7dc1f0;
+		box-shadow: 0rpx 0rpx 6rpx 0rpx #f9f6ea;
 		border-radius: 10rpx;
 		
 			.cate_list{
 				display: flex;
 				align-items: center;
-				border-bottom: 0.5px solid #fff;
+				justify-content: space-around;
 			
 			.cate_item_box {
-				padding: 25rpx 0;
-				display: flex;
-				align-items: center;
-				justify-content: center;
+				width: 20%;
+				padding: 40rpx 0 30rpx;
+				text-align: center;
 		
 				.cate_item_border {
-					width: 56rpx;
-					height: 56rpx;
-					background: #7dc1f0;
-					border-radius: 10rpx;
+					width: 60rpx;
+					height: 60rpx;
+					background-size: 100% 100%;
+					background-image: url("@/static/cate_bg.png");
+					border-radius: 4rpx;
 					display: flex;
 					align-items: center;
 					justify-content: center;
-					margin-right: 12rpx;
+					margin: 0 auto;
 					
 					image{
-						width: 40rpx;
-						height: 40rpx;
+						width: 46rpx;
+						height: 46rpx;
 					}
 				}
 		
 				.cate_item_name {
-					font-size: 28rpx;
+					margin-top: 15rpx;
+					font-size: 26rpx;
 					line-height: 34rpx;
 					text-align: center;
-					color: #294a97;
-					font-weight: bold;
-				}
-			}
-			.cate_item_box_active{
-				background: #7dc1f0;
-				
-				.cate_item_border{
-					background-size: 100% 100%;
-					background-image: url("@/static/cate_bg.png");
-				}
-				.cate_item_name{
 					color: #fff;
+					font-weight: bold;
 				}
 			}
 		}