Merge branch 'master' into test-zxc

# Conflicts:
#	pages.json
#	pages/forget/forget.vue
#	pages/register/register.vue

pages.json

@@ -1,27 +1,27 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
-			"path" : "pages/login/login",
-			"style" : {
+			"path": "pages/index/index",
+			"style": {
 				"navigationStyle":"custom",
 				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false,
+				"enablePullDownRefresh": true,
 				"app-plus": {
 					"titleNView": false
 				}
 			}
-		},{
-			"path": "pages/index/index",
-			"style": {
+		},
+		{
+			"path" : "pages/login/login",
+			"style" : {
 				"navigationStyle":"custom",
 				"navigationBarTitleText": "",
-				"enablePullDownRefresh": true,
+				"enablePullDownRefresh": false,
 				"app-plus": {
 					"titleNView": false
 				}
 			}
 		},
-
 		{
 			"path" : "pages/chat/chat",
 			"style" :

pages/chat/chat.vue

@@ -42,6 +42,8 @@
 	import { ref } from 'vue'
 	import { onLoad } from '@dcloudio/uni-app'
 	
+	const uToast = ref()
+	
 	const searchInputStyle = {
 		backgroundColor: '#E5E5E5'
 	}
@@ -80,7 +82,7 @@
 			type: 'shengri',
 			time: '8/16',
 			count: 1
-		},
+		}
 	])
 	function onChatClick(chat) {
 		uni.navigateTo({

pages/chatDetail/chatDetail.vue

@@ -1,6 +1,20 @@
 <template>
 	<view class="container">
-		消息详情
+		<view class="list-box">
+			<view class="list-item-box" v-for="item in list" :key="item.id">
+				<view class="header-box">
+					<view class="icon-box">
+						<cover-image class="icon" :src="`/static/chat-icon/${item.type}.png`"></cover-image>
+					</view>
+					<view class="title-box">
+						{{item.title}}
+					</view>
+				</view>
+				<view class="main-box">
+					{{item.content}}
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -11,6 +25,23 @@
 	const chatId = ref()
 	const chatTitle = ref('')
 	
+	const list = ref([
+		{
+			id: '1',
+			title: '课程提醒',
+			content: '尊敬的用户，您预约2023年8月16日《广州市存量房网……》直播课堂已经开始，请及时观看！',
+			type: 'jiaoyu',
+			time: '8/16',
+		},
+		{
+			id: '2',
+			title: '课程提醒',
+			content: '尊敬的用户，您预约2023年8月16日《xxxx》直播课堂已经开始，请及时观看！',
+			type: 'jiaoyu',
+			time: '8/16',
+		},
+	])
+	
 	onLoad((load) => {
 		chatId.value = load.id
 		chatTitle.value = load.title
@@ -26,5 +57,38 @@
 		width: 100vw;
 		background-color: $uni-bg-color;
 		padding: 0 20rpx;
+		
+		.list-box {
+			padding: 0 20rpx;
+			.list-item-box {
+				padding: 20rpx;
+				background-color: $uni-text-color-inverse;
+				margin-bottom: 30rpx;
+				border-radius: $uni-card-border-radius;
+				.header-box {
+					display: flex;
+					align-items: center;
+					margin-bottom: 10rpx;
+					.icon-box {
+						width: 50rpx;
+						.icon {
+							width: 35rpx;
+							height: 35rpx;
+						}
+					}
+					.title-box {
+						font-size: $uni-title-font-size-2;
+						font-weight: bolder;
+					}
+				}
+				.main-box {
+					padding: 10rpx;
+					padding-bottom: 0;
+					font-size: $uni-font-size-1;
+					font-weight: bold;
+					line-height: 40rpx;
+				}
+			}
+		}
 	}
 </style>

uni.scss

@@ -48,6 +48,8 @@ $uni-font-size-1: 24rpx;
 $uni-font-size-2: 20rpx;
 $uni-font-size-3: 18rpx;
 
+/* 卡片圆角 */
+$uni-card-border-radius: 20rpx;
 
 @mixin backgroundImg($url) {
   background-image: url($url);