From 92df12db8e408fe60b959bc1bf4a5e9cfd92045d Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Wed, 29 May 2024 15:54:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json             |  7 ++++
 pages/course/index.vue | 82 ++++++++++++++++++++++++++++++++++++++++++
 pages/news/news.vue    | 10 +-----
 pages/peanut/home.vue  | 16 ++++-----
 4 files changed, 98 insertions(+), 17 deletions(-)
 create mode 100644 pages/course/index.vue

diff --git a/pages.json b/pages.json
index 8a0a00a..64d47dc 100644
--- a/pages.json
+++ b/pages.json
@@ -233,6 +233,13 @@
 				"navigationBarTitleText" : "news",
 				"enablePullDownRefresh": false
 			}
+		},
+		{
+			"path" : "pages/course/index",
+			"style" : 
+			{
+				"navigationBarTitleText" : "课程列表"
+			}
 		}		
 	],
 	"globalStyle": {
diff --git a/pages/course/index.vue b/pages/course/index.vue
new file mode 100644
index 0000000..cec33f5
--- /dev/null
+++ b/pages/course/index.vue
@@ -0,0 +1,82 @@
+<template>
+	<view>
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<z-nav-bar title="消息详情"></z-nav-bar>
+		<view class="box">
+			<view class="title">
+				{{news.title}}
+			</view>
+			<view class="content" v-html="news.content"></view>
+		</view>
+
+		<music-play :playData="playData"></music-play>
+	</view>
+</template>
+
+<script>
+	import musicPlay from '@/components/music.vue'
+	import $http from '@/config/requestConfig.js';
+	var clear;
+	import {
+		mapState
+	} from 'vuex';	
+	export default {
+		data() {
+			return {
+				playData: {},
+				newsId: null,
+				news: {
+					content: '',
+					title: ''
+				}
+			};
+		},
+		//第一次加载
+		onLoad(e) {
+			// 隐藏原生的tabbar
+			uni.hideTabBar();
+			this.newsId = e.newsid
+			console.log(e, '------')
+		},
+		computed: {
+			...mapState(['userInfo'])
+		},
+		//页面显示
+		onShow() {
+			// 隐藏原生的tabbar
+			uni.hideTabBar();
+			this.getData();
+
+		},
+		components: {
+			musicPlay
+		},
+		//方法
+		methods: {
+			getData() {
+				this.$http
+					.post('common/message/getMessageById?id=' + this.newsId)
+					.then(res => {
+						if (res.code == 0) {
+							this.news.content = res.result.content
+							this.news.title = res.result.title
+						}
+					}).catch(e => {
+						console.log(e, '获取新闻详情报错')
+					});
+			}
+		},
+	};
+</script>
+<style lang="scss" scoped>
+	@import '@/style/mixin.scss';
+
+	.box {
+		background-color: #fff;
+		@include pleft_right(10px);
+		min-height: calc(100vh - 70rpx);
+	}
+	.title{font-size: 32rpx; font-weight: bold; display: block; text-align: center;}
+	.content { font-size: 26rpx; line-height: 48rpx; margin-top: 10rpx;}
+</style>
\ No newline at end of file
diff --git a/pages/news/news.vue b/pages/news/news.vue
index 98dbc73..cec33f5 100644
--- a/pages/news/news.vue
+++ b/pages/news/news.vue
@@ -20,15 +20,7 @@
 	var clear;
 	import {
 		mapState
-	} from 'vuex';
-	// 密码验证的正则
-	//1、密码为八位及以上并且字母数字特殊字符三项都包括
-	var strongRegex = new RegExp("^(?=.{8,})(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*\\W).*$", "g");
-	//2、密码为八位及以上并且字母、数字、特殊字符三项中有两项，强度是中等
-	var mediumRegex = new RegExp(
-		"^(?=.{8,})(((?=.*[A-Z])(?=.*[a-z]))|((?=.*[A-Z])(?=.*[0-9]))|((?=.*[a-z])(?=.*[0-9]))|((?=.*[a-z])(?=.*\\W))|((?=.*[0-9])(?=.*\\W))|((?=.*[A-Z])(?=.*\\W))).*$",
-		"g");
-	var enoughRegex = new RegExp("(?=.{8,}).*", "g");
+	} from 'vuex';	
 	export default {
 		data() {
 			return {
diff --git a/pages/peanut/home.vue b/pages/peanut/home.vue
index 3ec31b4..fea2085 100644
--- a/pages/peanut/home.vue
+++ b/pages/peanut/home.vue
@@ -101,7 +101,7 @@
 				<view class="borderbb">
 					<view class=" main">
 						<view class="flexbox">
-							<view class="item" v-for="(item, index) in tjProList" :key="index">
+							<view class="item" v-for="(item, index) in tjProList" :key="index" @click="onPageJump('/pages/bookShop/commodityDetail',item.productId)">
 								<view class="imgcontainer">
 									<image :src="item.productImages" mode="aspectFit"></image>
 								</view>
@@ -139,7 +139,7 @@
 						</view>
 						<scroll-view class="scroll-view_H" scroll-x="true">
 							<!-- <view class=""> -->
-							<view class="item" v-for="(item, index) in seckillList" :key="index">
+							<view class="item" v-for="(item, index) in seckillList" :key="index"  @click="onPageJump('/pages/bookShop/commodityDetail',item.productId)">
 								<view class="imgcontainer">
 									<image :src="item.productImages" mode="aspectFit"></image>
 								</view>
@@ -332,11 +332,11 @@
 				id ? ftag = id : ftag = 0
 
 				$http.request({
-					url: "medical/home/getMedicalLabels",
+					url: "curseTagList",
 					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-					data: {
-						'id': ftag
-					},
+					// data: {
+					// 	'id': ftag
+					// },
 					header: { //默认 无 说明：请求头
 						'Content-Type': 'application/json'
 					},
@@ -519,9 +519,9 @@
 			},
 
 			// 跳转
-			onPageJump(url) {
+			onPageJump(url,thatId) {
 				uni.navigateTo({
-					url: url
+					url: `${url}?id=${thatId}`
 				});
 			},