liujiaxin 1 viikko sitten
vanhempi
commit
239f45b1be
100 muutettua tiedostoa jossa 1725 lisäystä ja 1385 poistoa
  1. 4 4
      assets/css/common.less
  2. 1 1
      assets/css/common.scss
  3. 1 1
      components/Menu.vue
  4. 1 1
      components/chengpeng-audio/free-audio.vue
  5. 1 1
      components/evan-switch/evan-switch.vue
  6. 1 1
      components/im/tui-chat/message-input/index.css
  7. 6 5
      components/likeProduct.vue
  8. 20 14
      pages.json
  9. 10 10
      pages/auth/login.vue
  10. 2 2
      pages/healthy/detail.vue
  11. 1 1
      pages/healthy/idea.vue
  12. 4 4
      pages/healthy/index.vue
  13. 1 1
      pages/home/doctorCase.vue
  14. 383 307
      pages/home/index.vue
  15. 2 2
      pages/home/new/articleDetails.vue
  16. 4 4
      pages/home/new/articleList.vue
  17. 3 3
      pages/home/new/chineseMedicineDetails.vue
  18. 4 4
      pages/home/new/chineseMedicineList.vue
  19. 1 1
      pages/home/new/diseaseDetails.vue
  20. 4 4
      pages/home/new/diseaseList.vue
  21. 3 3
      pages/home/new/famousPrescribeDetails.vue
  22. 4 4
      pages/home/new/famousPrescribeList.vue
  23. 3 3
      pages/home/new/medicatedFoodDetails.vue
  24. 4 4
      pages/home/new/medicatedFoodList.vue
  25. 2 2
      pages/home/new/questionsDetails.vue
  26. 4 4
      pages/home/new/questionsList.vue
  27. 1 1
      pages/home/new/testDetails.vue
  28. 2 2
      pages/home/new/testList.vue
  29. 3 3
      pages/home/new/testResult.vue
  30. 1 1
      pages/home/new/testResultImg.vue
  31. 3 3
      pages/home/new/vesselDetails.vue
  32. 4 4
      pages/home/new/vesselList.vue
  33. 1 1
      pages/home/productList.vue
  34. 12 12
      pages/home/shopping.vue
  35. 258 186
      pages/learn/index.vue
  36. 300 260
      pages/live/index.vue
  37. 2 2
      pages/shopping/cart.vue
  38. 3 3
      pages/shopping/confirmOrder.vue
  39. 492 278
      pages/shopping/index.vue
  40. 1 1
      pages/shopping/payOrder.vue
  41. 3 3
      pages/shopping/paymentOrder.vue
  42. 7 7
      pages/shopping/prescribe.vue
  43. 6 6
      pages/shopping/productDetails.vue
  44. 9 78
      pages/user/index.vue
  45. 1 1
      pages_company/alipayImg.vue
  46. 1 1
      pages_company/auth/login.vue
  47. 1 1
      pages_company/card.vue
  48. 3 3
      pages_company/coupon.vue
  49. 1 1
      pages_company/index.vue
  50. 2 2
      pages_company/order/cart.vue
  51. 2 2
      pages_company/order/confirmCompanyOrder.vue
  52. 4 4
      pages_company/order/confirmOrder.vue
  53. 3 3
      pages_company/order/coupon.vue
  54. 6 6
      pages_company/order/productDetails.vue
  55. 1 1
      pages_company/order/productList.vue
  56. 3 3
      pages_company/order/productShowDetails.vue
  57. 3 3
      pages_company/storeOrder.vue
  58. 4 4
      pages_company/storeOrderDetail.vue
  59. 6 6
      pages_company/storeProductPackage.vue
  60. 9 9
      pages_company/storeProductPackageDetails.vue
  61. 1 1
      pages_company/wechatcode.vue
  62. 5 5
      pages_doctor/doctorDetail.vue
  63. 2 2
      pages_doctor/doctorIm.vue
  64. 3 3
      pages_doctor/doctorList.vue
  65. 1 1
      pages_doctor/index.vue
  66. 1 1
      pages_doctor/paymentOrder.vue
  67. 2 2
      pages_doctor/submitOrder.vue
  68. 2 2
      pages_index/index/articleDetails.vue
  69. 4 4
      pages_index/index/articleList.vue
  70. 3 3
      pages_index/index/chineseMedicineDetails.vue
  71. 4 4
      pages_index/index/chineseMedicineList.vue
  72. 1 1
      pages_index/index/diseaseDetails.vue
  73. 4 4
      pages_index/index/diseaseList.vue
  74. 2 2
      pages_index/index/doctorArticleDetails.vue
  75. 4 4
      pages_index/index/doctorArticleList.vue
  76. 3 3
      pages_index/index/famousPrescribeDetails.vue
  77. 4 4
      pages_index/index/famousPrescribeList.vue
  78. 3 3
      pages_index/index/medicatedFoodDetails.vue
  79. 4 4
      pages_index/index/medicatedFoodList.vue
  80. 2 2
      pages_index/index/questionsDetails.vue
  81. 4 4
      pages_index/index/questionsList.vue
  82. 1 1
      pages_index/index/testDetails.vue
  83. 2 2
      pages_index/index/testList.vue
  84. 3 3
      pages_index/index/testResult.vue
  85. 1 1
      pages_index/index/testResultImg.vue
  86. 3 3
      pages_index/index/vesselDetails.vue
  87. 4 4
      pages_index/index/vesselList.vue
  88. 3 3
      pages_shopping/shopping/confirmCreateOrder.vue
  89. 2 2
      pages_shopping/shopping/confirmPackageOrder.vue
  90. 3 3
      pages_user/user/addAddress.vue
  91. 1 1
      pages_user/user/addDoc.vue
  92. 1 1
      pages_user/user/addDocRecord.vue
  93. 1 1
      pages_user/user/addPatient.vue
  94. 2 2
      pages_user/user/address.vue
  95. 1 1
      pages_user/user/doc.vue
  96. 1 1
      pages_user/user/docRecord.vue
  97. 2 2
      pages_user/user/doctorOrder.vue
  98. 1 1
      pages_user/user/otherPaymentOrder.vue
  99. 1 1
      pages_user/user/otherPaymentOrderRemain.vue
  100. 1 1
      pages_user/user/patient.vue

+ 4 - 4
assets/css/common.less

@@ -183,8 +183,8 @@ radio .wx-radio-input{
 }
 /* 选中后的 背景样式  */
 radio .wx-radio-input.wx-radio-input-checked{
-	background: linear-gradient(135deg, #5B37FD  0%, #5B37FD  100%);
-	border: 1px solid #5B37FD ;
+	background: linear-gradient(135deg, #F5723A  0%, #F5723A  100%);
+	border: 1px solid #F5723A ;
 }
 /* 选中后的 对勾样式 (白色对勾) */
 radio .wx-radio-input.wx-radio-input-checked::before{
@@ -197,8 +197,8 @@ checkbox .wx-checkbox-input{
 	border-radius: 50%;
 }
 checkbox .wx-checkbox-input.wx-checkbox-input-checked {
-	background: linear-gradient(135deg, #5B37FD 0%, #5B37FD  100%);
-	border: 1px solid #5B37FD ;
+	background: linear-gradient(135deg, #F5723A 0%, #F5723A  100%);
+	border: 1px solid #F5723A ;
 	border-radius: 50%;
 }
 checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {

+ 1 - 1
assets/css/common.scss

@@ -159,5 +159,5 @@ $steps: 100 200 300 400 500 600 700 800 bold;
 	background-color: #fff;
 }
 .base-color{
-	color: #5B37FD;
+	color: #F5723A;
 }

+ 1 - 1
components/Menu.vue

@@ -139,7 +139,7 @@ export default {
 		.dot-active {
 			width: 40rpx;
 			height: 3rpx;
-			background: #5B37FD ;
+			background: #F5723A ;
 			margin-right: 10rpx;
 		}
 	}

+ 1 - 1
components/chengpeng-audio/free-audio.vue

@@ -15,7 +15,7 @@
 				:step='0.1'
 				backgroundColor="#E9F0F0"
 				:block-size='14'
-				block-color='#5B37FD '>
+				block-color='#F5723A '>
 			</slider>
 		</view>
 		<view class='ml-3'>{{getTime(Math.round(currentTime))}}</view>

+ 1 - 1
components/evan-switch/evan-switch.vue

@@ -112,7 +112,7 @@
 		transition: background-color 0.3s;
 		width: 100upx;
 		height: 36upx;
-		background: #5B37FD ;
+		background: #F5723A ;
 		border-radius: 18upx;
 		/* #ifndef APP-NVUE */
 		box-sizing: content-box;

+ 1 - 1
components/im/tui-chat/message-input/index.css

@@ -29,7 +29,7 @@
 	height: 48rpx;
 	margin-left: 16rpx;
 	border-radius: 24rpx;
-	background-color: #5B37FD ;
+	background-color: #F5723A ;
 }
 
 .TUI-commom-function-item:first-child {

+ 6 - 5
components/likeProduct.vue

@@ -1,8 +1,9 @@
 <template>
    <view>
 		<view class="like-title" v-show="list &&list.length > 0">
-			<image src="https://zlwh.obs.cn-southwest-2.myhuaweicloud.com/orangeShop/like.png" mode=""></image>
-			<text class="text">猜你喜欢</text>
+			<image src="/static/img_title.png" mode=""></image>
+			<text class="text">猜你想要</text>
+			<image src="/static/img_title.png" mode=""></image>
 		</view>
 		<view class="like-list">
 			<view class="item" v-for="(item,index) in list" :key="index" @click="showProduct(item)">
@@ -129,9 +130,9 @@
 		justify-content: center;
 		padding: 30upx 0;
 		image{
-			width: 37upx;
-			height: 37upx;
-			margin-right: 20upx;
+			width: 40upx;
+			height: 40upx;
+			margin:0 4upx;
 		}
 		.text{
 			font-size: 36upx;

+ 20 - 14
pages.json

@@ -320,7 +320,12 @@
 		{
 			"path": "pages/learn/index",
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom",
+				"app-plus": {
+					"titleNView": false
+				}
 			}
 		}
 		// ,{
@@ -1307,7 +1312,7 @@
 	},
 	"tabBar": {
 		"color": "#666666",
-		"selectedColor": "#5B37FD",
+		"selectedColor": "#F5723A",
 		// "custom": true, 
 		"borderStyle": "white",
 		"backgroundColor": "#ffffff",
@@ -1333,24 +1338,25 @@
 			// 	"selectedIconPath": "/static/orangetabbar/shop_pre.png",
 			// 	"text": "健康产品"
 			// },
-			{
-				"pagePath": "pages/shopping/index",
-				"iconPath": "/static/orangetabbar/shop.png",
-				"selectedIconPath": "/static/orangetabbar/shop_pre.png",
-				"text": "健康产品"
+				{
+				"pagePath": "pages/learn/index",
+				"iconPath": "/static/orangetabbar/new.png",
+				"selectedIconPath": "/static/orangetabbar/new_pre.png",
+				"text": "百科"
 			},
 			{
 				"pagePath": "pages/live/index",
 				"iconPath": "/static/orangetabbar/live.png",
 				"selectedIconPath": "/static/orangetabbar/live_pre.png",
-				"text": "直播"
+				"text": "课程"
 			},
-			// {
-			// 	"pagePath": "pages/learn/index",
-			// 	"iconPath": "/static/orangetabbar/new.png",
-			// 	"selectedIconPath": "/static/orangetabbar/new_pre.png",
-			// 	"text": "学习"
-			// },
+			{
+				"pagePath": "pages/shopping/index",
+				"iconPath": "/static/orangetabbar/shop.png",
+				"selectedIconPath": "/static/orangetabbar/shop_pre.png",
+				"text": "商城"
+			},
+		
 			// {
 			// 	"pagePath": "pages/message/index",
 			// 	"iconPath": "/static/orangetabbar/new.png",

+ 10 - 10
pages/auth/login.vue

@@ -250,8 +250,8 @@ export default {
 			position: absolute;
 			width: 630rpx;
 			height: 80rpx;
-			background: linear-gradient(to right, #5B37FD  0%, #2aa7B9 100%);
-			background: -moz-linear-gradient(to right, #5B37FD  0%, #2aa7B9 100%);
+			background: linear-gradient(to right, #F5723A  0%, #2aa7B9 100%);
+			background: -moz-linear-gradient(to right, #F5723A  0%, #2aa7B9 100%);
 			// box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22);
 			border-radius: 40rpx;
 			font-size: 30rpx;
@@ -341,8 +341,8 @@ export default {
     .author-btn {
       width: 630rpx;
       height: 80rpx;
-      background: linear-gradient(to right, #5B37FD  0%, #5B37FD  100%);
-      background: -moz-linear-gradient(to right, #5B37FD 0%, #5B37FD  100%);
+      background: linear-gradient(to right, #F5723A  0%, #F5723A  100%);
+      background: -moz-linear-gradient(to right, #F5723A 0%, #F5723A  100%);
       // box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22);
       border-radius: 40rpx;
       font-size: 30rpx;
@@ -356,12 +356,12 @@ export default {
       height: 80rpx;
       margin-top: 30rpx;
       border-radius: 40rpx;
-      border: 2rpx solid #5B37FD ;
+      border: 2rpx solid #F5723A ;
       background: none;
       font-size: 30rpx;
       font-family: PingFang SC;
       font-weight: 500;
-      color: #5B37FD ;
+      color: #F5723A ;
     }
   }
 }
@@ -375,7 +375,7 @@ export default {
 	checkbox{
 	}
 	.btn{
-		color: #5B37FD ;
+		color: #F5723A ;
 	}
 }
 
@@ -424,7 +424,7 @@ export default {
 				width: 50%;
 				height: 80rpx;
 				border-radius: 5rpx;
-				background-color: #5B37FD ;
+				background-color: #F5723A ;
 				font-size: 30rpx;
 				font-family: PingFang SC;
 				font-weight: 500;
@@ -436,12 +436,12 @@ export default {
 				width: 50%;
 				height: 80rpx;
 				border-radius: 5rpx;
-				border: 2rpx solid #5B37FD ;
+				border: 2rpx solid #F5723A ;
 				background: none;
 				font-size: 30rpx;
 				font-family: PingFang SC;
 				font-weight: 500;
-				color: #5B37FD ;
+				color: #F5723A ;
 			}
 		}
 	}

+ 2 - 2
pages/healthy/detail.vue

@@ -228,7 +228,7 @@
 			font-family: PingFang SC;
 			font-weight: 500;
 			color: #FFFFFF;
-			background: #5B37FD ;
+			background: #F5723A ;
 			border-radius: 40upx;
 			display: flex;
 			align-items: center;
@@ -273,7 +273,7 @@
 				font-size: 22upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #5B37FD ;
+				color: #F5723A ;
 				line-height: 1;
 			}
 			 

+ 1 - 1
pages/healthy/idea.vue

@@ -230,7 +230,7 @@
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #5B37FD ;
+				background: #F5723A ;
 				border-radius: 44upx;
 			}
 		}

+ 4 - 4
pages/healthy/index.vue

@@ -246,15 +246,15 @@
 			font-size: 28upx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #5B37FD ;
+			color: #F5723A ;
 			background: #F5FFFE;
-			border: 1px solid #5B37FD ;
+			border: 1px solid #F5723A ;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #5B37FD ;
-				border: 1px solid #5B37FD ;
+				background: #F5723A ;
+				border: 1px solid #F5723A ;
 			}
 		}
 	}

+ 1 - 1
pages/home/doctorCase.vue

@@ -58,7 +58,7 @@
 							<free-audio 
 								startPic='https://zlwh.obs.cn-southwest-2.myhuaweicloud.com/orangeShop/play.png' 
 								endPic='https://zlwh.obs.cn-southwest-2.myhuaweicloud.com/orangeShop/pause.png'
-								activeColor="#5B37FD "
+								activeColor="#F5723A "
 								:audioId="'audio'+index"
 								:url='item.replyAudioUrl'
 							></free-audio>

+ 383 - 307
pages/home/index.vue

@@ -1,16 +1,12 @@
 <template>
 	<view class="home-container">
-		<!-- 顶部背景装饰 -->
+		<!-- 顶部渐变背景装饰 -->
 		<view class="top-bg-decoration"></view>
 
 		<!-- 自定义导航栏 -->
 		<view class="nav-bar-fixed" :style="{ paddingTop: statusBarHeight + 'px' }">
 			<view class="nav-content">
 				<view class="product-name">产品名称</view>
-				<view class="search-input-box" @click="toSearch">
-					<image class="search-icon" src="/static/search_gray.png" mode="aspectFit"></image>
-					<text class="placeholder">搜索课程</text>
-				</view>
 			</view>
 		</view>
 
@@ -22,79 +18,117 @@
 					indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff">
 					<swiper-item v-for="(item, index) in advList" :key="index" @click="handleAdvClick(item)">
 						<view class="banner-card">
-							<image v-if="item.imageUrl" class="banner-image" :src="item.imageUrl" mode="aspectFill"></image>
+							<image class="banner-image" :src="item.imageUrl || '/static/home_top_bg.png'" mode="aspectFill"></image>
 						</view>
 					</swiper-item>
 				</swiper>
 			</view>
 
-			<!-- 导航网格 -->
-			<view class="nav-grid">
-				<view class="nav-item" v-for="(item, index) in navMenus" :key="index" @click="menuClick(item)">
-					<view class="nav-icon-wrap">
-						<image class="nav-icon" :src="item.icon" mode="aspectFit"></image>
-					</view>
-					<text class="nav-title">{{ item.title }}</text>
+			<!-- 三个大功能入口 -->
+			<view class="quick-access-grid">
+				<view class="access-item" @click="goPage('/pages/shopping/index')">
+					<image class="access-img" src="/static/home1.png" mode="widthFix"></image>
+				</view>
+				<view class="access-item" @click="goPage('/pages_course/teacherClassroom?type=1')">
+					<image class="access-img" src="/static/home2.png" mode="widthFix"></image>
+				</view>
+				<view class="access-item" @click="goPage('/pages/healthy/index')">
+					<image class="access-img" src="/static/home3.png" mode="widthFix"></image>
 				</view>
 			</view>
 
-			<!-- 热门好课 -->
+			<!-- 热门文章 (可横向滑动) -->
 			<view class="section-container">
 				<view class="section-header">
-					<text class="section-title">热门好课</text>
-					<view class="more-link" @click="goClassList(1)">
+					<view class="left">
+						<image class="header-icon" src="/static/home_article.png" mode="aspectFit"></image>
+						<text class="section-title">热门文章</text>
+					</view>
+					<view class="more-link" @click="goArticleList">
 						<text>更多</text>
 						<image class="arrow-icon" src="/static/right_arrow_right.png" mode="aspectFit"></image>
 					</view>
 				</view>
-
-				<!-- 特色大课 -->
-				<view class="featured-course-card" v-if="featuredCourse" @click="goClass(featuredCourse.courseId, 1)">
-					<view class="cover-wrap">
-						<image class="course-cover" :src="featuredCourse.imgUrl || '/static/bg_video.png'" mode="aspectFill"></image>
-						<view class="tag-yangsheng">养生</view>
-						<view class="lesson-badge">
-							<view class="left">
-							<image class="left-icon" src="/static/course_number_bg.png" mode="aspectFit"></image>
-							<image class="play-icon-small" src="/static/course_number.png" mode="aspectFit"></image>
-							<text>第1讲</text>
+				
+				<scroll-view class="article-scroll-x" scroll-x enable-flex>
+					<view class="article-list-row">
+						<view class="article-card" v-for="(item, index) in hotArticles" :key="index" @click="goArticleDetail(item.id)">
+							<image class="article-img" :src="item.imgUrl || '/static/course_img.png'" mode="aspectFill"></image>
+							<view class="article-info">
+								<view class="article-title ellipsis-2">{{ item.title }}</view>
+								<view class="article-meta">
+									<text>{{ item.views }}阅读</text>
+									<text>{{ item.likes }}点赞</text>
+								</view>
 							</view>
-							<text>共{{ featuredCourse.lessonCount }}节课</text>
-							<image class="arrow-right-small" src="/static/right_arrow_white.png" mode="aspectFit"></image>
 						</view>
 					</view>
-					<view class="course-info">
-						<view class="course-title">{{ featuredCourse.courseName }}</view>
-						<view class="course-footer">
-							<view class="author-info">
-								<image class="author-avatar" :src="featuredCourse.authorAvatar || '/static/avatar.png'" mode="aspectFill"></image>
-								<text class="author-name">{{ featuredCourse.authorName }}</text>
+				</scroll-view>
+			</view>
+
+			<!-- 精品课程 -->
+			<view class="section-container">
+				<view class="section-header">
+					<view class="left">
+						<image class="header-icon" src="/static/home_lessen.png" mode="aspectFit"></image>
+						<text class="section-title">精品课程</text>
+					</view>
+					<view class="more-link" @click="goCourseList">
+						<text>更多</text>
+						<image class="arrow-icon" src="/static/right_arrow_right.png" mode="aspectFit"></image>
+					</view>
+				</view>
+				
+				<view class="course-vertical-list">
+					<view class="course-card-horizontal" v-for="(item, index) in featuredCourses" :key="index" @click="goCourseDetail(item.id)">
+						<view class="course-cover-wrap">
+							<image class="course-cover" :src="item.imgUrl || '/static/course_img.png'" mode="aspectFill"></image>
+						</view>
+						<view class="course-content">
+							<view class="course-title ellipsis-1">{{ item.title }}</view>
+							<view class="course-tags">
+								<text class="tag-orange">养生</text>
+								<text class="meta-text">{{ item.playCount }}次播放</text>
+								<text class="meta-text">|</text>
+
+								<text class="meta-text">{{ item.likes }}人喜欢</text>
+							</view>
+							<view class="course-footer">
+								<view class="author-box">
+									<image class="author-avatar" :src="item.authorAvatar || '/static/avatar.png'" mode="aspectFill"></image>
+									<text class="author-name">{{ item.authorName }}</text>
+								</view>
+								<view class="study-btn-orange">立即学习</view>
 							</view>
-							<view class="playback-count">{{ featuredCourse.playCount }}次播放</view>
 						</view>
 					</view>
 				</view>
+			</view>
 
-				<!-- 课程列表 -->
-				<view class="course-list">
-					<view class="course-item" v-for="(item, index) in otherCourses" :key="index" @click="goClass(item.courseId, 1)">
-						<image class="item-thumb" :src="item.imgUrl || '/static/course_img.png'" mode="aspectFill"></image>
-						<view class="item-content">
-							<view class="item-title ellipsis-2">{{ item.courseName }}</view>
-							<view class="item-footer">
-								<text class="item-playback">{{ item.playCount }}次播放</text>
-								<view class="study-btn">去学习</view>
+			<!-- 商品列表 (瀑布流/两列) -->
+			<view class="product-grid">
+				<view class="product-item" v-for="(item, index) in productList" :key="index" @click="goProductDetail(item.id)">
+					<image class="product-img" :src="item.imgUrl || '/static/course_img.png'" mode="aspectFill"></image>
+					<view class="product-info">
+						<view class="product-title ellipsis-2">{{ item.title }}</view>
+						<view class="price-row">
+							<view class="price-box">
+								<text class="price-label">会员价</text>
+								<text class="price-symbol">¥</text>
+								<text class="price-value">{{ item.memberPrice }}</text>
 							</view>
+							<view class="add-btn"><image src="/static/good_more.png" mode="aspectFit"></image></view>
 						</view>
+						<view class="original-price">¥{{ item.price }}</view>
 					</view>
 				</view>
 			</view>
 			
-			<!-- 底部间距 -->
+			<!-- 底部占位 -->
 			<view class="bottom-safe-area"></view>
 		</scroll-view>
 
-		<!-- 原有的弹窗组件保留 -->
+		<!-- 弹窗保留 -->
 		<view class="popup-box" v-if="activityShow">
 			<view class="info-mask" @tap="closeActivity()"></view>
 			<view class="info-form">
@@ -121,36 +155,32 @@
 			return {
 				statusBarHeight: uni.getSystemInfoSync().statusBarHeight,
 				advList: [
-					{ imageUrl: '', advUrl: '', showType: 1 },
 					{ imageUrl: '', advUrl: '', showType: 1 }
 				],
-				navMenus: [
-					{ title: '药品商城', icon: '/static/menu1.png',  linkUrl: '/pages/shopping/index', linkType: 1 },
-					{ title: '热门好课', icon: '/static/menu2.png',linkUrl: '/pages_course/teacherClassroom?type=1', linkType: 1 },
-					{ title: '我的课程', icon: '/static/menu3.png',  linkUrl: '/pages_course/teacherClassroom?type=2', linkType: 1 },
-					{ title: '专业客服', icon: '/static/menu4.png',  linkUrl: '/pages/message/index', linkType: 1 }
+				hotArticles: [
+					{ id: 1, title: '每日养生睡眠最佳方式', views: '123', likes: '45', imgUrl: '/static/famous_doctor_img.png' },
+					{ id: 2, title: '每日养生睡眠最佳方式', views: '123', likes: '45', imgUrl: '/static/famous_doctor_img.png' },
+					{ id: 3, title: '植物油和动物油到底谁更...', views: '123', likes: '45', imgUrl: '/static/famous_doctor_img.png' },
+					{ id: 4, title: '植物油和动物油到底谁更...', views: '123', likes: '45', imgUrl: '/static/famous_doctor_img.png' }
+				],
+				featuredCourses: [
+					{ id: 1, title: '中医基础理论与养生智慧', playCount: '2468', likes: '900', authorName: '李医生', authorAvatar: '/static/avatar.png', imgUrl: '/static/famous_doctor_img.png' },
+					{ id: 2, title: '上班族 30 分钟每日养生计划', playCount: '2468', likes: '900', authorName: '李医生', authorAvatar: '/static/avatar.png', imgUrl: '/static/famous_doctor_img.png' },
+					{ id: 3, title: '马年四季养生课:跟着节气养...', playCount: '2468', likes: '900', authorName: '李医生', authorAvatar: '/static/avatar.png', imgUrl: '/static/famous_doctor_img.png' },
+					{ id: 4, title: '中医基础理论与养生智慧', playCount: '2468', likes: '900', authorName: '李医生', authorAvatar: '/static/avatar.png', imgUrl: '/static/famous_doctor_img.png' }
 				],
-				featuredCourse: {
-					courseId: 4,
-					courseName: '你和合理膳食还有多少距离?',
-					imgUrl: '/static/bg_video.png',
-					lessonCount: 30,
-					authorName: '健康大讲堂',
-					authorAvatar: '/static/avatar.png',
-					playCount: '8.1万'
-				},
-				otherCourses: [
-					{ courseId: 5, courseName: '脑梗塞是帕金森病的发病因素吗?', imgUrl: '/static/famous_doctor_img.png', playCount: '25862' },
-					{ courseId: 6, courseName: '合理的运动与健康', imgUrl: '/static/famous_doctor_img2.png', playCount: '25862' },
-					{ courseId: 7, courseName: '合理的运动与健康', imgUrl: '/static/course_img.png', playCount: '25862' },
-					{ courseId: 8, courseName: '合理的运动与健康', imgUrl: '/static/famous_doctor_img.png', playCount: '25862' }
+				productList: [
+					{ id: 1, title: '益生菌配方羊乳粉 成人中老年羊奶粉学生羊...', memberPrice: '105.36', price: '128.00', imgUrl: '/static/course_img.png' },
+					{ id: 2, title: '复合益生菌果蔬片 轻松入睡 肠通无阻', memberPrice: '105.36', price: '128.00', imgUrl: '/static/course_img.png' },
+					{ id: 3, title: '低GI控糖多元谷物专为控糖人士配比', memberPrice: '105.36', price: '128.00', imgUrl: '/static/course_img.png' },
+					{ id: 4, title: '天赐蓉精选阿拉善有机荒漠肉苁蓉', memberPrice: '105.36', price: '128.00', imgUrl: '/static/course_img.png' }
 				],
 				activityShow: false,
 				activity: null,
 				tuiModalControl: false,
 				btnGroup: [
 					{ text: '取消', color: '#FFFFFF', bgColor: '#999999', width: '150rpx', height: '80rpx', shape: 'fillet', eventName: 'cancle' },
-					{ text: '确定', color: '#FFFFFF', bgColor: '#5B37FD', width: '150rpx', height: '80rpx', shape: 'fillet', eventName: 'sure' }
+					{ text: '确定', color: '#FFFFFF', bgColor: '#F5723A', width: '150rpx', height: '80rpx', shape: 'fillet', eventName: 'sure' }
 				]
 			}
 		},
@@ -178,23 +208,23 @@
 					uni.navigateTo({ url: item.advUrl });
 				}
 			},
-			menuClick(item) {
-				if (item.linkType == 1) {
-					uni.navigateTo({ url: item.linkUrl });
-				}
+			goPage(url) {
+				uni.navigateTo({ url });
 			},
-			goClass(id, type) {
-				uni.navigateTo({
-					url: '/pages_course/learn?courseId=' + id + '&type=' + type
-				});
+			goArticleList() {
+				uni.navigateTo({ url: '/pages_index/index/articleList' });
 			},
-			goClassList(type) {
-				uni.navigateTo({
-					url: '/pages_course/teacherClassroom?type=' + type
-				});
+			goArticleDetail(id) {
+				uni.navigateTo({ url: '/pages_index/index/articleDetails?id=' + id });
 			},
-			toSearch() {
-				uni.navigateTo({ url: './productSearch' });
+			goCourseList() {
+				uni.navigateTo({ url: '/pages_course/teacherClassroom?type=1' });
+			},
+			goCourseDetail(id) {
+				uni.navigateTo({ url: '/pages_course/learn?courseId=' + id });
+			},
+			goProductDetail(id) {
+				uni.navigateTo({ url: '/pages/shopping/productDetails?id=' + id });
 			},
 			closeActivity() { this.activityShow = false; },
 			showActivity() {
@@ -221,7 +251,7 @@
 <style lang="scss">
 	.home-container {
 		min-height: 100vh;
-		background-color: #FFFFFF;
+		background-color: #F8F8F8;
 		position: relative;
 	}
 
@@ -230,8 +260,8 @@
 		top: 0;
 		left: 0;
 		width: 100%;
-		height: 450rpx;
-		background: linear-gradient(180deg, #F0F2FF 0%, rgba(255, 255, 255, 0) 100%);
+		height: 400rpx;
+		background: linear-gradient(180deg, #FFE4D6 0%, rgba(255, 255, 255, 0) 100%);
 		z-index: 0;
 	}
 
@@ -249,305 +279,351 @@
 			display: flex;
 			align-items: center;
 			padding: 0 30rpx;
-
+			
 			.product-name {
-				font-size: 42rpx;
+				font-size: 36rpx;
 				font-weight: bold;
-				color: #1A1A1A;
-				margin-right: 24rpx;
-				flex-shrink: 0;
-			}
-
-			.search-input-box {
-				width: 302rpx;
-				height: 68rpx;
-				background: #FFFFFF;
-				border-radius: 34rpx;
-				display: flex;
-				align-items: center;
-				padding: 0 28rpx;
-				margin-right: 24rpx;
-				box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
-
-				.search-icon {
-					width: 30rpx;
-					height: 30rpx;
-					margin-right: 14rpx;
-				}
-
-				.placeholder {
-					font-size: 28rpx;
-					color: #BBBBBB;
-				}
+				color: #333333;
 			}
-
-		
 		}
 	}
 
 	.main-content-scroll {
 		height: 100vh;
-		position: relative;
-		z-index: 1;
+		box-sizing: border-box;
 	}
 
 	/* Banner */
 	.banner-section {
 		padding: 20rpx 30rpx;
-
+		
 		.banner-swiper {
-			height: 233rpx;
-			border-radius: 28rpx;
+			height: 300rpx;
+			border-radius: 24rpx;
 			overflow: hidden;
-		}
-
-		.banner-card {
-			width: 100%;
-			height: 100%;
-			background: linear-gradient(135deg, #FF4D4D 0%, #FF8533 100%);
-			position: relative;
-		}
-
-		.banner-image {
-			position: absolute;
-			width: 100%;
-			height: 100%;
-			z-index: 1;
+			transform: translateY(0);
+			
+			.banner-card {
+				width: 100%;
+				height: 100%;
+				
+				.banner-image {
+					width: 100%;
+					height: 100%;
+					border-radius: 24rpx;
+				}
+			}
 		}
 	}
 
-	/* 导航网格 */
-	.nav-grid {
+	/* 功能入口 */
+	.quick-access-grid {
 		display: flex;
 		justify-content: space-between;
-		padding: 40rpx 50rpx;
-
-		.nav-item {
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-
-			.nav-icon-wrap {
-				width: 104rpx;
-				height: 104rpx;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				margin-bottom: 20rpx;
-				.nav-icon {
-					width:100%;
-					height: 100%;
-				}
-			}
-
-			.nav-title {
-				font-size: 28rpx;
-				color: #333333;
-				font-weight: 500;
+		padding: 10rpx 30rpx 30rpx;
+		
+		.access-item {
+			width: 216rpx;
+			
+			.access-img {
+				width: 100%;
+				border-radius: 20rpx;
 			}
 		}
 	}
 
-	/* 章节容器 */
+	/* 公共块样式 */
 	.section-container {
-		padding: 20rpx 30rpx;
-
+		background: linear-gradient( 180deg, #FBEBE1 0%, #FFFFFF 30%, #FFFFFF 100%);
+		margin: 0 30rpx 24rpx;
+		border-radius: 24rpx;
+		padding: 24rpx 20rpx;
+		
 		.section-header {
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
-			margin-bottom: 30rpx;
-
-			.section-title {
-				font-size: 38rpx;
-				font-weight: bold;
-				color: #1A1A1A;
+			margin-bottom:48rpx;
+			
+			.left {
+				display: flex;
+				align-items: center;
+				
+				.header-icon {
+					width: 36rpx;
+					height: 36rpx;
+					margin-right: 12rpx;
+				}
+				
+				.section-title {
+					font-size: 32rpx;
+					font-weight: bold;
+					color: #333333;
+				}
 			}
-
+			
 			.more-link {
 				display: flex;
 				align-items: center;
-				font-size: 28rpx;
-				color: #BBBBBB;
-
+				font-size: 26rpx;
+				color: #999999;
+				
 				.arrow-icon {
-					width: 28rpx;
-					height: 28rpx;
+					width: 48rpx;
+					height: 48rpx;
 					margin-left: 4rpx;
 				}
 			}
 		}
 	}
 
-	/* 特色大课卡片 */
-	.featured-course-card {
-		background: #FFFFFF;
-		border-radius: 28rpx;
-		overflow: hidden;
-		box-shadow: 0 6rpx 30rpx rgba(0, 0, 0, 0.06);
-		margin-bottom: 40rpx;
-
-		.cover-wrap {
-			position: relative;
-			width: 100%;
-			height: 420rpx;
-
-			.course-cover {
-				width: 100%;
-				height: 100%;
-			}
-
-			.tag-yangsheng {
-				position: absolute;
-				top: 0;
-				left: 0;
-				padding: 10rpx 28rpx;
-				background: #5B37FD;
-				color: #FFFFFF;
-				font-size: 26rpx;
-				border-bottom-right-radius: 24rpx;
+	/* 热门文章横向滑动 */
+	.article-scroll-x {
+		width: 100%;
+		white-space: nowrap;
+		
+		.article-list-row {
+			display: flex;
+			flex-wrap: wrap;
+			height: 360rpx; /* 两行的高度 */
+			flex-direction: column;
+		}
+		
+		.article-card {
+			display: inline-flex;
+			width: 500rpx;
+			margin-right: 30rpx;
+			margin-bottom: 20rpx;
+			
+			.article-img {
+				width: 120rpx;
+				height: 120rpx;
+				border-radius: 12rpx;
+				margin-right: 20rpx;
+				flex-shrink: 0;
 			}
-
-			.lesson-badge {
-				padding-right: 16rpx;
-				position: absolute;
-				bottom: 24rpx;
-				right: 24rpx;
-			background: rgba(0,0,0,0.5);
-				backdrop-filter: blur(6px);
-				border-radius: 24rpx;
+			
+			.article-info {
+				flex: 1;
 				display: flex;
-				height: 48rpx;
-				align-items: center;
-				color: #FFFFFF;
-				font-size: 26rpx;
-				.left{
-					display: flex;
-					align-items: center;
-					padding-left: 16rpx;
-					width: 144rpx;
-					height: 48rpx;
-					position: relative;
-					.left-icon{
-					position: absolute;
-					left: 0;
-					top: 0;
-					width: 144rpx;
-					height: 48rpx;
-					z-index: -1;
-				}
-				.play-icon-small {
-					width: 30rpx;
-					height: 30rpx;
-					margin-right: 4rpx;
-				}
+				flex-direction: column;
+				justify-content: space-between;
+				white-space: normal;
+				
+				.article-title {
+					font-size: 28rpx;
+					color: #333333;
+					line-height: 1.4;
 				}
 				
-				.arrow-right-small {
-					width: 20rpx;
-					height: 20rpx;
+				.article-meta {
+					font-size: 24rpx;
+					color: #BBBBBB;
+					
+					text {
+						margin-right: 20rpx;
+					}
 				}
 			}
 		}
+	}
 
-		.course-info {
-			padding: 30rpx;
-				background: #68686A;
-				color: #fff;
-			.course-title {
-				font-size: 36rpx;
-				font-weight: bold;
-				margin-bottom: 28rpx;
+	/* 精品课程列表 */
+	.course-vertical-list {
+		.course-card-horizontal {
+			display: flex;
+			margin-bottom: 30rpx;
+			
+			&:last-child {
+				margin-bottom: 0;
 			}
-
-			.course-footer {
+			
+			.course-cover-wrap {
+				position: relative;
+				width: 220rpx;
+				height: 160rpx;
+				margin-right: 24rpx;
+				flex-shrink: 0;
+				
+				.course-cover {
+					width: 100%;
+					height: 100%;
+					border-radius: 16rpx 0 0 16rpx;
+				}
+				
+				// .tag-yangsheng {
+				// 	position: absolute;
+				// 	top: 0;
+				// 	left: 0;
+				// 	background: rgba(0,0,0,0.4);
+				// 	color: #FFFFFF;
+				// 	font-size: 20rpx;
+				// 	padding: 4rpx 12rpx;
+				// 	border-top-left-radius: 16rpx;
+				// 	border-bottom-right-radius: 16rpx;
+				// }
+			}
+			
+			.course-content {
+				flex: 1;
 				display: flex;
+				flex-direction: column;
 				justify-content: space-between;
-				align-items: center;
-
-				.author-info {
+				
+				.course-title {
+					font-size: 30rpx;
+					font-weight: 500;
+					color: #333333;
+				}
+				
+				.course-tags {
 					display: flex;
 					align-items: center;
-
-					.author-avatar {
-						width: 52rpx;
-						height: 52rpx;
-						border-radius: 50%;
+					margin-top: 10rpx;
+					
+					.tag-orange {
+						background: #FFF1E8;
+						color: #F8792B;
+						font-size: 22rpx;
+						padding: 2rpx 10rpx;
+						border-radius: 8rpx;
 						margin-right: 16rpx;
 					}
-
-					.author-name {
-						font-size: 28rpx;
+					
+					.meta-text {
+						font-size: 24rpx;
+						color: #999999;
+						margin-right: 16rpx;
 					}
 				}
-
-				.playback-count {
-					font-size: 28rpx;
+				
+				.course-footer {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					margin-top: 10rpx;
+					
+					.author-box {
+						display: flex;
+						align-items: center;
+						
+						.author-avatar {
+							width: 40rpx;
+							height: 40rpx;
+							border-radius: 50%;
+							margin-right: 12rpx;
+						}
+						
+						.author-name {
+							font-size: 24rpx;
+							color: #666666;
+						}
+					}
+					
+					.study-btn-orange {
+						background: linear-gradient( 180deg, #FFA33B 0%, #F5723A 100%);
+						color: #FFFFFF;
+						font-size: 24rpx;
+						padding: 8rpx 24rpx;
+						border-radius: 86rpx;
+					}
 				}
 			}
 		}
 	}
 
-	/* 课程列表 */
-	.course-list {
-		.course-item {
-			display: flex;
-			padding: 30rpx 0;
-			&:last-child {
-				border-bottom: none;
-			}
-
-			.item-thumb {
-				width: 260rpx;
-				height: 160rpx;
-				border-radius: 20rpx;
-				margin-right: 30rpx;
+	/* 商品列表网格 */
+	.product-grid {
+		display: flex;
+		flex-wrap: wrap;
+		padding: 0 30rpx;
+		justify-content: space-between;
+		
+		.product-item {
+			width: 334rpx;
+			background-color: #FFFFFF;
+			border-radius: 20rpx;
+			margin-bottom: 24rpx;
+			overflow: hidden;
+			
+			.product-img {
+				width: 100%;
+				height: 334rpx;
 			}
-
-			.item-content {
-				flex: 1;
-				display: flex;
-				flex-direction: column;
-				justify-content: space-between;
-
-				.item-title {
-					font-size: 32rpx;
-					color: #1A1A1A;
-					font-weight: bold;
-					line-height: 1.4;
+			
+			.product-info {
+				padding: 20rpx;
+				
+				.product-title {
+					font-size: 28rpx;
+					color: #333333;
+					font-weight: 500;
+					height: 80rpx;
+					line-height: 40rpx;
 				}
-
-				.item-footer {
+				
+				.price-row {
 					display: flex;
 					justify-content: space-between;
-					align-items: center;
-
-					.item-playback {
-						font-size: 26rpx;
-						color: #CCCCCC;
+					align-items: flex-end;
+					margin-top: 16rpx;
+					
+					.price-box {
+						color: #FF5D32;
+						display: flex;
+						align-items: baseline;
+						
+						.price-label {
+							font-size: 20rpx;
+							margin-right: 4rpx;
+						}
+						
+						.price-symbol {
+							font-size: 24rpx;
+							font-weight: bold;
+						}
+						
+						.price-value {
+							font-size: 32rpx;
+							font-weight: bold;
+						}
 					}
-
-					.study-btn {
-						padding: 12rpx 40rpx;
-						background: #5B37FD;
-						color: #FFFFFF;
-						font-size: 28rpx;
-						border-radius: 36rpx;
-						font-weight: 500;
+					
+					.add-btn {
+						width: 40rpx;
+						height: 40rpx;
+					image{
+						width: 100%;
+						height: 100%;
 					}
+					}
+				}
+				
+				.original-price {
+					font-size: 24rpx;
+					color: #BBBBBB;
+					text-decoration: line-through;
+					margin-top: 4rpx;
 				}
 			}
 		}
 	}
 
+	.bottom-safe-area {
+		height: 40rpx;
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+
+	.ellipsis-1 {
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
 	.ellipsis-2 {
 		display: -webkit-box;
 		-webkit-box-orient: vertical;
 		-webkit-line-clamp: 2;
 		overflow: hidden;
 	}
-
-	.bottom-safe-area {
-		height: 160rpx;
-	}
 </style>

+ 2 - 2
pages/home/new/articleDetails.vue

@@ -173,7 +173,7 @@
 			font-family: PingFang SC;
 			font-weight: 500;
 			color: #FFFFFF;
-			background: #5B37FD ;
+			background: #F5723A ;
 			border-radius: 40upx;
 			display: flex;
 			align-items: center;
@@ -218,7 +218,7 @@
 				font-size: 22upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #5B37FD ;
+				color: #F5723A ;
 				line-height: 1;
 			}
 			 

+ 4 - 4
pages/home/new/articleList.vue

@@ -211,15 +211,15 @@
 			font-size: 28upx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #5B37FD ;
+			color: #F5723A ;
 			background: #ffffff;
-			border: 1px solid #5B37FD ;
+			border: 1px solid #F5723A ;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #5B37FD ;
-				border: 1px solid #5B37FD ;
+				background: #F5723A ;
+				border: 1px solid #F5723A ;
 			}
 		}
 	}

+ 3 - 3
pages/home/new/chineseMedicineDetails.vue

@@ -123,7 +123,7 @@
 					border-radius: 5rpx;
 					width: 8rpx;
 					height:30rpx;
-					background-color: #5B37FD ;
+					background-color: #F5723A ;
 				}
 				.title{
 					margin-left: 15rpx;
@@ -155,7 +155,7 @@
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
-				// border: 1rpx solid #5B37FD ;
+				// border: 1rpx solid #F5723A ;
 				border-radius: 30rpx;
 				line-height: 60rpx;
 				.tab1{
@@ -207,7 +207,7 @@
 					font-family: PingFang SC;
 				}
 				.active{
-					background-color: #5B37FD ;
+					background-color: #F5723A ;
 					color: #fff;
 				}
 				 

+ 4 - 4
pages/home/new/chineseMedicineList.vue

@@ -12,7 +12,7 @@
 				 <u-tabs
 				  :scrollable="false"
 				  :list="tabs"  
-				  lineColor="#5B37FD "
+				  lineColor="#F5723A "
 				 @change="tabChange">
 				 </u-tabs>
 			</view>
@@ -242,14 +242,14 @@
 						border-radius: 5rpx;
 						width: 8rpx;
 						height:30rpx;
-						background-color: #5B37FD ;
+						background-color: #F5723A ;
 					}
 					
 				}
 				.active{
 					background-color: #fff;
 					font-weight: bold;
-					color: #5B37FD ;
+					color: #F5723A ;
 				}
 			}
 			
@@ -268,7 +268,7 @@
 				font-size: 40upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #5B37FD ;
+				color: #F5723A ;
 				line-height: 80upx;
 			}
 			.items{

+ 1 - 1
pages/home/new/diseaseDetails.vue

@@ -102,7 +102,7 @@
 			.line{
 				width: 6rpx;
 				height:30rpx;
-				background-color: #5B37FD ;
+				background-color: #F5723A ;
 				 
 			}
 			.title{

+ 4 - 4
pages/home/new/diseaseList.vue

@@ -205,15 +205,15 @@
 			font-size: 28upx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #5B37FD ;
+			color: #F5723A ;
 			background: #ffffff;
-			border: 1px solid #5B37FD ;
+			border: 1px solid #F5723A ;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #5B37FD ;
-				border: 1px solid #5B37FD ;
+				background: #F5723A ;
+				border: 1px solid #F5723A ;
 			}
 		}
 	}

+ 3 - 3
pages/home/new/famousPrescribeDetails.vue

@@ -123,7 +123,7 @@
 					border-radius: 5rpx;
 					width: 8rpx;
 					height:30rpx;
-					background-color: #5B37FD ;
+					background-color: #F5723A ;
 				}
 				.title{
 					margin-left: 15rpx;
@@ -155,7 +155,7 @@
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
-				// border: 1rpx solid #5B37FD ;
+				// border: 1rpx solid #F5723A ;
 				border-radius: 30rpx;
 				line-height: 60rpx;
 				.tab1{
@@ -207,7 +207,7 @@
 					font-family: PingFang SC;
 				}
 				.active{
-					background-color: #5B37FD ;
+					background-color: #F5723A ;
 					color: #fff;
 				}
 				 

+ 4 - 4
pages/home/new/famousPrescribeList.vue

@@ -12,7 +12,7 @@
 				 <u-tabs
 				  :scrollable="false"
 				  :list="tabs"  
-				  lineColor="#5B37FD "
+				  lineColor="#F5723A "
 				 @change="tabChange">
 				 </u-tabs>
 			</view>
@@ -269,14 +269,14 @@
 						border-radius: 5rpx;
 						width: 8rpx;
 						height:30rpx;
-						background-color: #5B37FD ;
+						background-color: #F5723A ;
 					}
 					
 				}
 				.active{
 					background-color: #fff;
 					font-weight: bold;
-					color: #5B37FD ;
+					color: #F5723A ;
 				}
 			}
 			
@@ -295,7 +295,7 @@
 				font-size: 40upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #5B37FD ;
+				color: #F5723A ;
 				line-height: 80upx;
 			}
 			.items{

+ 3 - 3
pages/home/new/medicatedFoodDetails.vue

@@ -98,7 +98,7 @@
 					border-radius: 5rpx;
 					width: 8rpx;
 					height:30rpx;
-					background-color: #5B37FD ;
+					background-color: #F5723A ;
 				}
 				.title{
 					margin-left: 15rpx;
@@ -130,7 +130,7 @@
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
-				// border: 1rpx solid #5B37FD ;
+				// border: 1rpx solid #F5723A ;
 				border-radius: 30rpx;
 				line-height: 60rpx;
 				.tab1{
@@ -182,7 +182,7 @@
 					font-family: PingFang SC;
 				}
 				.active{
-					background-color: #5B37FD ;
+					background-color: #F5723A ;
 					color: #fff;
 				}
 				 

+ 4 - 4
pages/home/new/medicatedFoodList.vue

@@ -225,15 +225,15 @@
 			font-size: 28upx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #5B37FD ;
+			color: #F5723A ;
 			background: #ffffff;
-			border: 1px solid #5B37FD ;
+			border: 1px solid #F5723A ;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #5B37FD ;
-				border: 1px solid #5B37FD ;
+				background: #F5723A ;
+				border: 1px solid #F5723A ;
 			}
 		}
 	}

+ 2 - 2
pages/home/new/questionsDetails.vue

@@ -169,7 +169,7 @@
 			font-family: PingFang SC;
 			font-weight: 500;
 			color: #FFFFFF;
-			background: #5B37FD ;
+			background: #F5723A ;
 			border-radius: 40upx;
 			display: flex;
 			align-items: center;
@@ -214,7 +214,7 @@
 				font-size: 22upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #5B37FD ;
+				color: #F5723A ;
 				line-height: 1;
 			}
 			 

+ 4 - 4
pages/home/new/questionsList.vue

@@ -209,15 +209,15 @@
 			font-size: 28upx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #5B37FD ;
+			color: #F5723A ;
 			background: #ffffff;
-			border: 1px solid #5B37FD   ;
+			border: 1px solid #F5723A   ;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #5B37FD    ;
-				border: 1px solid #5B37FD ;
+				background: #F5723A    ;
+				border: 1px solid #F5723A ;
 			}
 		}
 	}

+ 1 - 1
pages/home/new/testDetails.vue

@@ -215,7 +215,7 @@
 			 		font-family: PingFang SC;
 			 		font-weight: bold;
 			 		color: #FFFFFF;
-			 		background: #5B37FD ;
+			 		background: #F5723A ;
 			 		border-radius: 50upx;
 			 	}
 			 }

+ 2 - 2
pages/home/new/testList.vue

@@ -183,7 +183,7 @@
 					.people-num{
 						font-size: 24upx;
 						font-family: PingFang SC;
-						color: #5B37FD ;
+						color: #F5723A ;
 						.num{
 							font-weight: bold;
 							color: #814E1B;
@@ -194,7 +194,7 @@
 						font-size: 24upx;
 						font-family: PingFang SC;
 						font-weight: 500;
-						color: #5B37FD ;
+						color: #F5723A ;
 					}
 				}
 			}

+ 3 - 3
pages/home/new/testResult.vue

@@ -172,8 +172,8 @@
 			.bg{
 				width: 100%;
 				height:100%;
-				// background-color: #5B37FD ;
-				// background: linear-gradient(#5B37FD, #5B37FD );
+				// background-color: #F5723A ;
+				// background: linear-gradient(#F5723A, #F5723A );
 				position: fixed;
 				image{
 					width: 100%;
@@ -289,7 +289,7 @@
 								.title-line{
 									width: 8rpx;
 									height: 28rpx;
-									background: #5B37FD ;
+									background: #F5723A ;
 									border-radius: 2px 2px 2px 2px;
 									opacity: 1;
 								}

+ 1 - 1
pages/home/new/testResultImg.vue

@@ -189,7 +189,7 @@ page {
  		font-family: PingFang SC;
  		font-weight: 400;
  		color: #ffffff;
- 		background:#5B37FD  !important;
+ 		background:#F5723A  !important;
  		border-radius: 44upx;
  	}
  }

+ 3 - 3
pages/home/new/vesselDetails.vue

@@ -100,7 +100,7 @@
 					border-radius: 5rpx;
 					width: 8rpx;
 					height:30rpx;
-					background-color: #5B37FD ;
+					background-color: #F5723A ;
 				}
 				.title{
 					margin-left: 15rpx;
@@ -132,7 +132,7 @@
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
-				// border: 1rpx solid #5B37FD ;
+				// border: 1rpx solid #F5723A ;
 				border-radius: 30rpx;
 				line-height: 60rpx;
 				.tab1{
@@ -184,7 +184,7 @@
 					font-family: PingFang SC;
 				}
 				.active{
-					background-color: #5B37FD ;
+					background-color: #F5723A ;
 					color: #fff;
 				}
 				 

+ 4 - 4
pages/home/new/vesselList.vue

@@ -12,7 +12,7 @@
 				 <u-tabs
 				  :scrollable="false"
 				  :list="tabs"  
-				  lineColor="#5B37FD "
+				  lineColor="#F5723A "
 				 @change="tabChange">
 				 </u-tabs>
 			</view>
@@ -242,14 +242,14 @@
 						border-radius: 5rpx;
 						width: 8rpx;
 						height:30rpx;
-						background-color: #5B37FD ;
+						background-color: #F5723A ;
 					}
 					
 				}
 				.active{
 					background-color: #fff;
 					font-weight: bold;
-					color: #5B37FD ;
+					color: #F5723A ;
 					padding-left: 0;
 					width: 100%;
 				}
@@ -270,7 +270,7 @@
 				font-size: 40upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #5B37FD ;
+				color: #F5723A ;
 				line-height: 80upx;
 			}
 			.items{

+ 1 - 1
pages/home/productList.vue

@@ -307,7 +307,7 @@
 			align-items: center;
 			justify-content: center;
 			&.active .label{
-				color: #5B37FD ;
+				color: #F5723A ;
 			}
 			.label{
 				font-size: 26upx;

+ 12 - 12
pages/home/shopping.vue

@@ -305,7 +305,7 @@
 				}, {
 					text: '确定',
 					color: '#FFFFFF',
-					bgColor: '#5B37FD ',
+					bgColor: '#F5723A ',
 					width: '150rpx',
 					height: '80rpx',
 					shape: 'fillet',
@@ -988,10 +988,10 @@
 		left: 0;
 		z-index: 1000;
 		transition: all 0.5s;
-		background-color: #5B37FD ;
+		background-color: #F5723A ;
 
 		&.show-back {
-			// background: linear-gradient(135deg, #5B37FD 0%, #5B37FD  100%);
+			// background: linear-gradient(135deg, #F5723A 0%, #F5723A  100%);
 		}
 
 		.status_bar {
@@ -1114,7 +1114,7 @@
 					padding: 5upx 20rpx;
 					font-size: 24upx;
 					color: #FFFFFF;
-					background-color: #5B37FD ;
+					background-color: #F5723A ;
 					border-radius: 50rpx;
 				}
 			}
@@ -1257,7 +1257,7 @@
 							}
 
 							.active {
-								color: #5B37FD ;
+								color: #F5723A ;
 							}
 						}
 
@@ -1428,7 +1428,7 @@
 									font-family: PingFang SC;
 									font-weight: 500;
 									color: #FFFFFF;
-									background: #5B37FD ;
+									background: #F5723A ;
 									border-radius: 10upx 4upx 10upx 4upx;
 									margin-right: 12upx;
 								}
@@ -1527,14 +1527,14 @@
 									.label {
 										font-size: 26upx;
 										font-weight: 500;
-										color: #5B37FD ;
+										color: #F5723A ;
 										margin-right: 5upx;
 									}
 
 									.num {
 										font-size: 28upx;
 										font-weight: bold;
-										color: #5B37FD ;
+										color: #F5723A ;
 									}
 								}
 							}
@@ -1554,7 +1554,7 @@
 						font-size: 26rpx;
 						font-family: PingFang SC;
 						font-weight: bold;
-						color: #5B37FD ;
+						color: #F5723A ;
 
 						image {
 							margin-left: 8rpx;
@@ -2512,7 +2512,7 @@
 
 									.price {
 										padding: 5rpx 10rpx;
-										background-color: #5B37FD ;
+										background-color: #F5723A ;
 										border-radius: 30rpx;
 										font-size: 20upx;
 										font-family: PingFang SC;
@@ -2582,7 +2582,7 @@
 				font-size: 28upx;
 				font-family: PingFang SC;
 				font-weight: 500;
-				color: #5B37FD ;
+				color: #F5723A ;
 			}
 		}
 
@@ -2596,7 +2596,7 @@
 			font-weight: 500;
 			color: #FFFFFF;
 			border: 1px solid #D2E6FF;
-			background: linear-gradient(135deg, #5B37FD 0%, #5B37FD  100%);
+			background: linear-gradient(135deg, #F5723A 0%, #F5723A  100%);
 			border-radius: 24upx;
 			margin-left: 30upx;
 		}

+ 258 - 186
pages/learn/index.vue

@@ -1,232 +1,304 @@
 <template>
-	<view class="page-container">
-		<!-- <view class="status_bar" :style="{ height: statusBarHeight }"></view> -->
-		
-		<!-- 学习统计卡片 -->
-		<view class="stats-card">
-			<view class="stats-item">
-				<view class="num-box">
-					<text class="num">30</text>
-					<text class="unit">分钟</text>
-				</view>
-				<view class="label">今日学习</view>
-			</view>
-			<view class="divider"></view>
-			<view class="stats-item">
-				<view class="num-box">
-					<text class="num">250</text>
-					<text class="unit">金币</text>
+	<view class="learn-container">
+		<image class="learn-bg" src="/static/home_top_bg.png" mode="aspectFill"></image>
+		<!-- 顶部导航栏 -->
+		<view class="custom-navbar" :style="{ paddingTop: statusBarHeight + 'px' }">
+			<view class="navbar-content">
+				<text class="page-title">热门文章</text>
+				<view class="search-box">
+					<image class="search-icon" src="/static/icon_search_org.png" mode="aspectFit"></image>
+					<input class="search-input" type="text" placeholder="搜索文章" placeholder-class="search-placeholder" />
+					<button class="search-btn">搜索</button>
 				</view>
-				<view class="label">累计奖励</view>
 			</view>
 		</view>
 
-		<!-- 课程列表 -->
-		<view class="course-list">
-			<view class="course-item" v-for="(item, index) in studyList" :key="index" @click="goCourse(item)">
-				<view class="course-left">
-					<image class="cover" :src="item.image" mode="aspectFill"></image>
-					<view class="play-tag">{{ item.playCount }}次播放</view>
+		<!-- 分类标签栏 - 悬浮在导航栏下方 -->
+		<view class="category-tabs-wrap" :style="{ top: (statusBarHeight + 44) + 'px' }">
+			<scroll-view scroll-x class="category-tabs">
+				<view class="tab-item" :class="{ active: activeCategory === index }" v-for="(category, index) in categories" :key="index" @click="selectCategory(index)">
+					<text>{{ category }}</text>
 				</view>
-				<view class="course-right">
-					<view class="title">{{ item.title }}</view>
-					<view class="subtitle">共{{ item.total }}节 | 已学{{ item.learned }}节</view>
-					<view class="progress-box">
-						<view class="progress-bar">
-							<view class="progress-inner" :style="{ width: item.percent + '%' }"></view>
-						<text class="percent-text">{{ item.percent }}%</text>
+			</scroll-view>
+		</view>
 
+		<!-- 页面内容区域 - 可滚动 -->
+		<scroll-view scroll-y class="page-content-scroll" :style="{ paddingTop: (statusBarHeight + 80) + 'px' }">
+			<!-- 文章列表 -->
+			<view class="article-list">
+				<view class="article-card" v-for="(article, index) in articles" :key="index">
+					<view class="article-header">
+						<text class="article-main-title">{{ article.mainTitle }}</text>
+						<text class="article-sub-title">{{ article.subTitle }}</text>
+					</view>
+					<view class="article-content">
+						<image class="article-cover" :src="article.cover" mode="aspectFill"></image>
+						<view class="article-info">
+							<text class="article-description">{{ article.description }}</text>
+							<view class="article-meta">
+								<text class="category-tag">{{ article.category }}</text>
+								<text class="category-line">|</text>
+								<text class="play-count">{{ article.playCount }}次播放</text>
+							</view>
 						</view>
 					</view>
 				</view>
 			</view>
-		</view>
-
+		</scroll-view>
 	</view>
 </template>
 
 <script>
-export default {
-	data() {
-		return {
-			statusBarHeight: uni.getStorageSync('menuInfo') ? uni.getStorageSync('menuInfo').statusBarHeight : 20,
-			studyList: [
-				{
-					id: 1,
-					image: "/static/famous_doctor_img.png",
-					title: "中医降脂养肝课",
-					playCount: "8.1万",
-					total: 20,
-					learned: 10,
-					percent: 50
-				},
-				{
-					id: 2,
-					image: "/static/famous_doctor_img2.png",
-					title: "五脏养生操",
-					playCount: "8.1万",
-					total: 35,
-					learned: 10,
-					percent: 40
-				}
-			]
-		};
-	},
-	methods: {
-		goCourse(item) {
-			uni.navigateTo({
-				url: `/pages_course/learn?courseId=${item.id}&type=1`
-			});
+	export default {
+		data() {
+			return {
+				statusBarHeight: uni.getSystemInfoSync().statusBarHeight,
+				categories: ['推荐', '科普', '养生', '中医', '自然', '饮食', '运动'],
+				activeCategory: 0,
+				articles: [{
+					mainTitle: '熬夜党必看:养肝护肾,修复身体的夜间自愈课',
+					subTitle: '',
+					cover: '/static/course_img.png',
+					description: '睡眠是藏在夜里的养生良方。子时入睡,胆经得养;丑时安睡,肝经舒通。一夜好眠,能补气...',
+					category: '科普',
+					playCount: '2468'
+				}, {
+					mainTitle: '科学饮食,稳糖稳脂不复发',
+					subTitle: '',
+					cover: '/static/course_img.png',
+					description: '睡眠是藏在夜里的养生良方。子时入睡,胆经得养;丑时安睡,肝经舒通。一夜好眠,能补气...',
+					category: '科普',
+					playCount: '2468'
+				}, {
+					mainTitle: '护腰护颈,远离颈椎腰椎病',
+					subTitle: '',
+					cover: '/static/course_img.png',
+					description: '睡眠是藏在夜里的养生良方。子时入睡,胆经得养;丑时安睡,肝经舒通。一夜好眠,能补气...',
+					category: '科普',
+					playCount: '2468'
+				}, {
+					mainTitle: '好睡眠,是成年人最高级的养生',
+					subTitle: '',
+					cover: '/static/course_img.png',
+					description: '睡眠是藏在夜里的养生良方。子时入睡,胆经得养;丑时安睡,肝经舒通。一夜好眠,能补气...',
+					category: '科普',
+					playCount: '2468'
+				},{
+					mainTitle: '护腰护颈,远离颈椎腰椎病',
+					subTitle: '',
+					cover: '/static/course_img.png',
+					description: '睡眠是藏在夜里的养生良方。子时入睡,胆经得养;丑时安睡,肝经舒通。一夜好眠,能补气...',
+					category: '科普',
+					playCount: '2468'
+				}, {
+					mainTitle: '好睡眠,是成年人最高级的养生',
+					subTitle: '',
+					cover: '/static/course_img.png',
+					description: '睡眠是藏在夜里的养生良方。子时入睡,胆经得养;丑时安睡,肝经舒通。一夜好眠,能补气...',
+					category: '科普',
+					playCount: '2468'
+				}]
+			};
+		},
+		methods: {
+			selectCategory(index) {
+				this.activeCategory = index;
+			}
 		}
 	}
-};
 </script>
 
 <style lang="scss" scoped>
-.page-container {
-	width: 100%;
-	min-height: 100vh;
-	background-color: #F8F9FB;
-	padding: 0 30rpx 140rpx;
-}
-
-.status_bar {
-	width: 100%;
-}
-
-.stats-card {
-	margin-top: 30rpx;
-	background: #FFFFFF;
-	border-radius: 24rpx;
-	height: 180rpx;
-	display: flex;
-	align-items: center;
-	justify-content: space-around;
-	padding: 0 40rpx;
-
-	.stats-item {
-		flex: 1;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-
-		.num-box {
+	.learn-container {
+		min-height: 100vh;
+		background-color: #F8F8F8;
+		position: relative;
+		.learn-bg{
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 380rpx;
+		}
+	}
+
+	.custom-navbar {
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 100%;
+		z-index: 100;
+		.navbar-content {
+			height: 44px;
 			display: flex;
-			align-items: baseline;
-			margin-bottom: 12rpx;
+			align-items: center;
+			padding: 0 30rpx;
 
-			.num {
-				font-size: 48rpx;
+			.page-title {
+				font-size: 36rpx;
 				font-weight: bold;
-				color: #1A1A1A;
+				color: #333333;
 			}
 
-			.unit {
-				font-size: 24rpx;
-				color: #999;
-				margin-left: 8rpx;
-			}
-		}
+			.search-box {
+				display: flex;
+				align-items: center;
+				background-color: #fff;
+				padding: 8rpx 8rpx 8rpx 24rpx;
+			width: 324rpx;
+				margin-left: 30rpx;
+				border-radius: 36rpx;
+border: 2rpx solid #F5723A;
 
-		.label {
-			font-size: 26rpx;
-			color: #666;
-		}
-	}
+				.search-icon {
+					width: 32rpx;
+					height: 32rpx;
+					margin-right: 10rpx;
+				}
 
-	.divider {
-		width: 1rpx;
-		height: 80rpx;
-		background-color: #F0F0F0;
-	}
-}
-
-.course-list {
-	margin-top: 30rpx;
-
-	.course-item {
-		background: #FFFFFF;
-		border-radius: 24rpx;
-		padding: 24rpx;
-		display: flex;
-		margin-bottom: 30rpx;
-
-		.course-left {
-			position: relative;
-			width: 240rpx;
-			height: 160rpx;
-			border-radius: 16rpx;
-			overflow: hidden;
-			margin-right: 24rpx;
-
-			.cover {
-				width: 100%;
-				height: 100%;
-			}
+				.search-input {
+					flex: 1;
+					font-size: 28rpx;
+					color: #333333;
+					height: 100%;
+				}
 
-			.play-tag {
-				position: absolute;
-				bottom: 0;
-				left: 0;
-				width: 100%;
-				height: 48rpx;
-				background: linear-gradient(to top, rgba(0,0,0,0.6), transparent);
-				font-size: 20rpx;
-				color: #FFFFFF;
-				padding: 12rpx;
-				display: flex;
-				align-items: center;
+				.search-placeholder {
+					color: #999999;
+				}
+
+				.search-btn {
+		
+background: linear-gradient( 180deg, #FFA33B 0%, #F5723A 100%);
+border-radius: 58rpx 58rpx 58rpx 58rpx;
+					color: #FFFFFF;
+					font-size: 28rpx;
+					padding: 16rpx 24rpx;
+					margin-left: 20rpx;
+					line-height: 1;
+					height: auto;
+				}
 			}
 		}
+	}
 
-		.course-right {
-			flex: 1;
-			display: flex;
-			flex-direction: column;
-			justify-content: space-between;
+	.category-tabs-wrap {
+		position: fixed;
+		left: 0;
+		width: 100%;
+		z-index: 99;
+		padding: 20rpx 0;
+		
+		.category-tabs {
+			white-space: nowrap;
+			padding: 0 30rpx;
+			
+			.tab-item {
+				display: inline-block;
+				margin-right: 68rpx;
+				font-size: 30rpx;
+				color: #666666;
+				position: relative;
+				padding-bottom: 10rpx;
 
-			.title {
-				font-size: 32rpx;
-				font-weight: bold;
-				color: #1A1A1A;
-				margin-bottom: 8rpx;
+				&.active {
+					color: #333333;
+					font-weight: bold;
+
+					&::after {
+						content: '';
+						position: absolute;
+						bottom: 0;
+						left: 50%;
+						transform: translateX(-50%);
+						width: 40rpx;
+						height: 6rpx;
+						background-color: #FF8D4D;
+						border-radius: 3rpx;
+					}
+				}
 			}
+		}
+	}
 
-			.subtitle {
-				font-size: 24rpx;
-				color: #999;
+	.page-content-scroll {
+		height: 100vh;
+		box-sizing: border-box;
+		
+		.article-list {
+			padding: 20rpx 24rpx;
+			
+			.article-card {
+				background-color: #FFFFFF;
+				border-radius: 20rpx;
 				margin-bottom: 20rpx;
-			}
+				padding: 24rpx;
 
-			.progress-box {
-				display: flex;
-				align-items: center;
+				.article-header {
+					margin-bottom: 20rpx;
 
-				.progress-bar {
-					flex: 1;
-					height: 12rpx;
-					background: #F5F6F8;
-					border-radius: 6rpx;
-					margin-right: 20rpx;
-					display: flex;
-					align-items: center;
-					overflow: hidden;
+					.article-main-title {
+						font-size: 32rpx;
+						font-weight: bold;
+						color: #333333;
+						line-height: 1.4;
+					}
 
-					.progress-inner {
-						height: 100%;
-						background: #FEB413;
-						border-radius: 6rpx;
+					.article-sub-title {
+						font-size: 28rpx;
+						color: #666666;
+						margin-top: 8rpx;
 					}
 				}
 
-				.percent-text {
-					font-size:14rpx;
-					color: #FFFFFF;
-					flex: 1;
-					text-align: center;
+				.article-content {
+					display: flex;
+					align-items: flex-start;
+
+					.article-cover {
+						width: 200rpx;
+						height: 140rpx;
+						border-radius: 12rpx;
+						margin-right: 24rpx;
+						flex-shrink: 0;
+					}
+
+					.article-info {
+						flex: 1;
+						display: flex;
+						flex-direction: column;
+						justify-content: space-between;
+						height: 140rpx;
+
+						.article-description {
+							font-size: 28rpx;
+							color: #666666;
+							line-height: 1.5;
+							display: -webkit-box;
+							-webkit-box-orient: vertical;
+							-webkit-line-clamp: 2;
+							overflow: hidden;
+						}
+
+						.article-meta {
+							display: flex;
+							align-items: center;
+							margin-top: 10rpx;
+								color: #999999;
+font-size: 24rpx;
+							.category-tag {
+								padding: 4rpx 12rpx;
+								border-radius: 8rpx;
+							}
+							.category-line {
+								margin:0 16rpx;
+							}
+							.play-count {
+							}
+						}
+					}
 				}
 			}
 		}
 	}
-}
 </style>

+ 300 - 260
pages/live/index.vue

@@ -1,326 +1,366 @@
 <template>
 	<view class="live-container">
-		<!-- 状态栏占位 -->
-		<view class="status_bar" :style="{ height: statusBarHeight + 'px' }"></view>
+		<image class="live-bg" src="/static/home_top_bg.png" mode="aspectFill"></image>
 		
 		<!-- 顶部导航栏 -->
-		<view class="nav-bar">
-			<text class="nav-title">讲堂</text>
-			<view class="search-box" @click="toSearch">
-				<image class="search-icon" src="/static/search_gray.png" mode="aspectFit"></image>
-				<text class="placeholder">搜索课程</text>
+		<view class="custom-navbar" :style="{ paddingTop: statusBarHeight + 'px' }">
+			<view class="navbar-content">
+				<text class="page-title">精选课程</text>
+				<view class="search-box">
+					<image class="search-icon" src="/static/icon_search_org.png" mode="aspectFit"></image>
+					<input class="search-input" type="text" placeholder="搜索课程" placeholder-class="search-placeholder" />
+					<button class="search-btn">搜索</button>
+				</view>
 			</view>
-			<!-- 右侧留出微信胶囊位 -->
-			<view class="capsule-placeholder"></view>
 		</view>
 
-		<!-- 分类切换栏 -->
-		<view class="category-wrapper">
-			<scroll-view class="category-scroll" scroll-x :show-scrollbar="false">
-				<view class="category-list">
-					<view 
-						v-for="(item, index) in categories" 
-						:key="index" 
-						class="category-item"
-						:class="{ active: currentCateIndex === index }"
-						@click="changeCate(index)"
-					>
-						<text class="cate-name">{{ item }}</text>
-						<view class="active-line" v-if="currentCateIndex === index"></view>
-					</view>
+		<!-- 分类标签栏 - 悬浮在导航栏下方 -->
+		<view class="category-tabs-wrap" :style="{ top: (statusBarHeight + 44) + 'px' }">
+			<scroll-view scroll-x class="category-tabs">
+				<view class="tab-item" :class="{ active: activeCategory === index }" v-for="(category, index) in categories" :key="index" @click="selectCategory(index)">
+					<text>{{ category }}</text>
 				</view>
 			</scroll-view>
-			<view class="expand-btn">
-				<image class="arrow-icon" src="/static/icon_arrow_down.png" mode="aspectFit"></image>
-			</view>
 		</view>
 
-		<!-- 课程列表 -->
-		<scroll-view class="course-scroll" scroll-y @scrolltolower="loadMore">
+		<!-- 页面内容区域 - 可滚动 -->
+		<scroll-view scroll-y class="page-content-scroll" :style="{ paddingTop: (statusBarHeight +88) + 'px' }">
+			<!-- 课程列表 -->
 			<view class="course-list">
-				<view 
-					class="course-item" 
-					v-for="(item, index) in courseList" 
-					:key="index"
-					@click="goDetail(item)"
-				>
-					<image class="course-thumb" :src="item.image || '/static/course_img.png'" mode="aspectFill"></image>
+				<view class="course-card-horizontal" v-for="(item, index) in courses" :key="index" @click="goCourseDetail(item.id)">
+					<view class="course-cover-wrap">
+						<image class="course-cover" :src="item.imgUrl || '/static/course_img.png'" mode="aspectFill"></image>
+						<view class="tag-yangsheng" v-if="item.tag">{{ item.tag }}</view>
+					</view>
 					<view class="course-content">
-						<view class="course-title-wrap">
-							<text class="course-title ellipsis-2">{{ item.title }}</text>
+						<view class="course-title ellipsis-1">{{ item.title }}</view>
+						<view class="course-tags">
+							<text class="tag-orange" v-if="item.tag">{{ item.tag }}</text>
+							<text class="meta-text">{{ item.playCount }}次播放</text>
+							<text class="meta-text">|</text>
+							<text class="meta-text">{{ item.likes }}人喜欢</text>
 						</view>
 						<view class="course-footer">
-							<text class="play-count">{{ item.playCount }}次播放</text>
-							<view class="study-btn">去学习</view>
+							<view class="author-box">
+								<image class="author-avatar" :src="item.authorAvatar || '/static/avatar.png'" mode="aspectFill"></image>
+								<text class="author-name">{{ item.authorName }}</text>
+							</view>
+							<view class="study-btn-orange">立即学习</view>
 						</view>
 					</view>
 				</view>
 			</view>
-			<!-- 底部占位,防止被系统tabbar遮挡 -->
-			<view class="bottom-placeholder"></view>
+			
+			<!-- 底部安全区占位 -->
+			<view class="bottom-safe-area"></view>
 		</scroll-view>
 	</view>
 </template>
 
 <script>
-export default {
-	data() {
-		return {
-			statusBarHeight: uni.getSystemInfoSync().statusBarHeight,
-			currentCateIndex: 0,
-			categories: ['热门好课', '养生', '健康饮食', '乐器', '慢性病', '心理健康', '运动健身', '家庭教育'],
-			courseList: [
-				{
+	export default {
+		data() {
+			return {
+				statusBarHeight: uni.getSystemInfoSync().statusBarHeight,
+				categories: ['全部', '养生', '饮食', '运动', '心理', '国学', '乐器'],
+				activeCategory: 0,
+				courses: [{
 					id: 1,
-					title: "脑梗塞是帕金森病的发病因素吗?",
-					image: "/static/famous_doctor_img.png",
-					playCount: "25862"
-				},
-				{
+					title: '中医基础理论与养生智慧',
+					tag: '养生',
+					playCount: '2468',
+					likes: '900',
+					authorName: '李医生',
+					authorAvatar: '/static/avatar.png',
+					imgUrl: '/static/famous_doctor_img.png'
+				}, {
 					id: 2,
-					title: "合理的运动与健康",
-					image: "/static/famous_doctor_img2.png",
-					playCount: "25862"
-				},
-				{
+					title: '上班族 30 分钟每日养生计划',
+					tag: '养生',
+					playCount: '2468',
+					likes: '900',
+					authorName: '李医生',
+					authorAvatar: '/static/avatar.png',
+					imgUrl: '/static/famous_doctor_img2.png'
+				}, {
 					id: 3,
-					title: "合理的运动与健康",
-					image: "/static/course_img.png",
-					playCount: "25862"
-				},
-				{
+					title: '马年四季养生课:跟着节气养生',
+					tag: '养生',
+					playCount: '2468',
+					likes: '900',
+					authorName: '李医生',
+					authorAvatar: '/static/avatar.png',
+					imgUrl: '/static/course_img.png'
+				}, {
 					id: 4,
-					title: "合理的运动与健康",
-					image: "/static/famous_doctor_img.png",
-					playCount: "25862"
-				},
-				{
+					title: '科学膳食与慢性病管理',
+					tag: '健康',
+					playCount: '2468',
+					likes: '900',
+					authorName: '张教授',
+					authorAvatar: '/static/avatar.png',
+					imgUrl: '/static/famous_doctor_img.png'
+				}, {
 					id: 5,
-					title: "合理的运动与健康",
-					image: "/static/famous_doctor_img2.png",
-					playCount: "25862"
-				},
-				{
-					id: 6,
-					title: "合理的运动与健康",
-					image: "/static/course_img.png",
-					playCount: "25862"
-				}
-			]
-		};
-	},
-	methods: {
-		changeCate(index) {
-			this.currentCateIndex = index;
-			// 这里通常会重新请求对应分类的课程数据
+					title: '乐器入门:古筝基础教程',
+					tag: '艺术',
+					playCount: '2468',
+					likes: '900',
+					authorName: '王老师',
+					authorAvatar: '/static/avatar.png',
+					imgUrl: '/static/famous_doctor_img2.png'
+				}]
+			};
 		},
-		toSearch() {
-			uni.navigateTo({
-				url: '/pages/home/productSearch'
-			});
-		},
-		goDetail(item) {
-			uni.navigateTo({
-				url: `/pages_course/learn?courseId=${item.id}&type=1`
-			});
-		},
-		loadMore() {
-			console.log('加载更多...');
+		methods: {
+			selectCategory(index) {
+				this.activeCategory = index;
+			},
+			goCourseDetail(id) {
+				uni.navigateTo({
+					url: '/pages_course/learn?courseId=' + id
+				});
+			}
 		}
 	}
-};
 </script>
 
 <style lang="scss" scoped>
-.live-container {
-	width: 100%;
-	height: 100vh;
-	display: flex;
-	flex-direction: column;
-	background-color: #ffffff;
-}
-
-.status_bar {
-	width: 100%;
-	background-color: #ffffff;
-}
-
-.nav-bar {
-	height: 44px;
-	display: flex;
-	align-items: center;
-	padding: 0 30rpx;
-	background-color: #ffffff;
-
-	.nav-title {
-		font-size: 44rpx;
-		font-weight: bold;
-		color: #1A1A1A;
-		margin-right: 30rpx;
-	}
-
-	.search-box {
-		flex: 1;
-		height: 72rpx;
-		background: #F5F6F8;
-		border-radius: 36rpx;
-		display: flex;
-		align-items: center;
-		padding: 0 24rpx;
-		margin-right: 20rpx;
-
-		.search-icon {
-			width: 32rpx;
-			height: 32rpx;
-			margin-right: 12rpx;
-		}
-
-		.placeholder {
-			font-size: 28rpx;
-			color: #999999;
+	.live-container {
+		min-height: 100vh;
+		background-color: #F8F8F8;
+		position: relative;
+		
+		.live-bg {
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 380rpx;
+			z-index: 0;
 		}
 	}
 
-	.capsule-placeholder {
-		width: 180rpx; // 模拟微信胶囊宽度
-	}
-}
-
-.category-wrapper {
-	display: flex;
-	align-items: center;
-	padding: 20rpx 0 10rpx;
-	background-color: #ffffff;
-
-	.category-scroll {
-		flex: 1;
-		white-space: nowrap;
-		padding-left: 30rpx;
-
-		.category-list {
-			display: inline-flex;
+	.custom-navbar {
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 100%;
+		z-index: 100;
+		
+		.navbar-content {
+			height: 44px;
+			display: flex;
 			align-items: center;
+			padding: 0 30rpx;
 
-			.category-item {
-				margin-right: 50rpx;
-				position: relative;
+			.page-title {
+				font-size: 36rpx;
+				font-weight: bold;
+				color: #333333;
+			}
+
+			.search-box {
 				display: flex;
-				flex-direction: column;
 				align-items: center;
-				padding-bottom: 15rpx;
+				background-color: #ffffff;
+				padding: 8rpx 8rpx 8rpx 24rpx;
+				width: 324rpx;
+				margin-left: 30rpx;
+				border-radius: 36rpx;
+				border: 2rpx solid #F5723A;
+
+				.search-icon {
+					width: 32rpx;
+					height: 32rpx;
+					margin-right: 10rpx;
+				}
 
-				.cate-name {
-					font-size: 32rpx;
-					color: #666666;
-					transition: all 0.3s;
+				.search-input {
+					flex: 1;
+					font-size: 26rpx;
+					color: #333333;
+					height: 100%;
 				}
 
-				.active-line {
-					position: absolute;
-					bottom: 0;
-					left: 50%;
-					transform: translateX(-50%);
-					width: 60rpx;
-					height: 6rpx;
-					background: #5B37FD;
-					border-radius: 3rpx;
+				.search-placeholder {
+					color: #999999;
 				}
 
-				&.active {
-					.cate-name {
-						color: #1A1A1A;
-						font-weight: bold;
+				.search-btn {
+					background: linear-gradient(180deg, #FFA33B 0%, #F5723A 100%);
+					border-radius: 58rpx;
+					color: #FFFFFF;
+					font-size: 24rpx;
+					padding: 12rpx 24rpx;
+					line-height: 1;
+					height: auto;
+					border: none;
+					margin: 0;
+					
+					&::after {
+						border: none;
 					}
 				}
 			}
 		}
 	}
 
-	.expand-btn {
-		width: 80rpx;
-		height: 60rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		background: linear-gradient(to right, rgba(255,255,255,0), #fff 20%);
-
-		.arrow-icon {
-			width: 32rpx;
-			height: 32rpx;
-			opacity: 0.4;
-		}
-	}
-}
-
-.course-scroll {
-	flex: 1;
-	overflow: hidden;
-}
-
-.course-list {
-	padding: 20rpx 30rpx;
-
-	.course-item {
-		display: flex;
-		padding: 24rpx 0;
-
-		&:last-child {
-			border-bottom: none;
-		}
-
-		.course-thumb {
-			width: 240rpx;
-			height: 150rpx;
-			border-radius: 12rpx;
-			margin-right: 24rpx;
-			flex-shrink: 0;
-		}
-
-		.course-content {
-			flex: 1;
-			display: flex;
-			flex-direction: column;
-			justify-content: space-between;
+	.category-tabs-wrap {
+		position: fixed;
+		left: 0;
+		width: 100%;
+		z-index: 99;
+		padding: 20rpx 0;
+		
+		.category-tabs {
+			white-space: nowrap;
+			padding: 0 30rpx;
+			
+			.tab-item {
+				display: inline-block;
+				margin-right: 68rpx;
+				font-size: 30rpx;
+				color: #666666;
+				position: relative;
+				padding-bottom: 10rpx;
 
-			.course-title-wrap {
-				.course-title {
-					font-size: 32rpx;
-					color: #1A1A1A;
-					font-weight: 500;
-					line-height: 1.4;
+				&.active {
+					color: #333333;
+					font-weight: bold;
+
+					&::after {
+						content: '';
+						position: absolute;
+						bottom: 0;
+						left: 50%;
+						transform: translateX(-50%);
+						width: 40rpx;
+						height: 6rpx;
+						background-color: #F5723A;
+						border-radius: 3rpx;
+					}
 				}
 			}
+		}
+	}
 
-			.course-footer {
+	.page-content-scroll {
+		height: 100vh;
+		box-sizing: border-box;
+		
+		.course-list {
+			padding: 20rpx 24rpx;
+			
+			.course-card-horizontal {
 				display: flex;
-				justify-content: space-between;
-				align-items: center;
-
-				.play-count {
-					font-size: 24rpx;
-					color: #CCCCCC;
+				background-color: #FFFFFF;
+				border-radius: 20rpx;
+				margin-bottom: 24rpx;
+				padding: 24rpx;
+				.course-cover-wrap {
+					position: relative;
+					width: 220rpx;
+					height: 160rpx;
+					margin-right: 24rpx;
+					flex-shrink: 0;
+					
+					.course-cover {
+						width: 100%;
+						height: 100%;
+						border-radius: 16rpx;
+					}
+					
+					.tag-yangsheng {
+						position: absolute;
+						top: 0;
+						left: 0;
+						background: rgba(0,0,0,0.4);
+						color: #FFFFFF;
+						font-size: 20rpx;
+						padding: 4rpx 12rpx;
+						border-top-left-radius: 16rpx;
+						border-bottom-right-radius: 16rpx;
+					}
 				}
-
-				.study-btn {
-					padding: 10rpx 36rpx;
-					background: #5B37FD;
-					color: #FFFFFF;
-					font-size: 26rpx;
-					border-radius: 32rpx;
+				
+				.course-content {
+					flex: 1;
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+					
+					.course-title {
+						font-size: 30rpx;
+						font-weight: bold;
+						color: #333333;
+					}
+					
+					.course-tags {
+						display: flex;
+						align-items: center;
+						margin-top: 8rpx;
+						
+						.tag-orange {
+							background: #FFF1E8;
+							color: #F8792B;
+							font-size: 22rpx;
+							padding: 2rpx 12rpx;
+							border-radius: 8rpx;
+							margin-right: 16rpx;
+						}
+						
+						.meta-text {
+							font-size: 24rpx;
+							color: #999999;
+							margin-right: 12rpx;
+						}
+					}
+					
+					.course-footer {
+						display: flex;
+						justify-content: space-between;
+						align-items: center;
+						margin-top: 10rpx;
+						
+						.author-box {
+							display: flex;
+							align-items: center;
+							
+							.author-avatar {
+								width: 40rpx;
+								height: 40rpx;
+								border-radius: 50%;
+								margin-right: 12rpx;
+							}
+							
+							.author-name {
+								font-size: 24rpx;
+								color: #666666;
+							}
+						}
+						
+						.study-btn-orange {
+							background: linear-gradient(180deg, #FFA33B 0%, #F5723A 100%);
+							color: #FFFFFF;
+							font-size: 24rpx;
+							padding: 10rpx 24rpx;
+							border-radius: 86rpx;
+						}
+					}
 				}
 			}
 		}
 	}
-}
 
-.bottom-placeholder {
-	height: 40rpx;
-}
+	.bottom-safe-area {
+		height: 40rpx;
+		padding-bottom: env(safe-area-inset-bottom);
+	}
 
-.ellipsis-2 {
-	display: -webkit-box;
-	-webkit-box-orient: vertical;
-	-webkit-line-clamp: 2;
-	overflow: hidden;
-}
+	.ellipsis-1 {
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
 </style>

+ 2 - 2
pages/shopping/cart.vue

@@ -301,7 +301,7 @@
 							font-family: PingFang SC;
 							font-weight: bold;
 							color: #FFFFFF;
-							background: linear-gradient(90deg, #5B37FD 0%, #5B37FD  100%);
+							background: linear-gradient(90deg, #F5723A 0%, #F5723A  100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							flex-shrink: 0;
@@ -452,7 +452,7 @@
 					font-family: PingFang SC;
 					font-weight: bold;
 					color: #FFFFFF;
-					background: #5B37FD ;
+					background: #F5723A ;
 					border-radius: 44upx;
 				}
 			}

+ 3 - 3
pages/shopping/confirmOrder.vue

@@ -66,7 +66,7 @@
 				</view>
 				<view class="right">
 					<text class="text">{{price.usedIntegral}}积分</text>
-					<evan-switch @change="integralChange" v-model="checked" activeColor="#5B37FD " inactiveColor="rgba(0, 0, 0, 0.1)"></evan-switch>
+					<evan-switch @change="integralChange" v-model="checked" activeColor="#F5723A " inactiveColor="rgba(0, 0, 0, 0.1)"></evan-switch>
 				</view>
 			</view>
 			<view class="points" @click="openCoupon()">
@@ -476,7 +476,7 @@
 							display: inline-block;
 							padding: 0 6upx;
 							height: 30upx;
-							background: linear-gradient(90deg, #5B37FD 0%, #5B37FD  100%);
+							background: linear-gradient(90deg, #F5723A 0%, #F5723A  100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							font-size: 22upx;
@@ -683,7 +683,7 @@
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #5B37FD ;
+				background: #F5723A ;
 				border-radius: 44upx;
 			}
 		}

+ 492 - 278
pages/shopping/index.vue

@@ -1,112 +1,152 @@
 <template>
-	<view class="content">
-		<image class="bg-image" src="/static/purple_home_top_bg.png" ></image>
-		<!-- 顶部导航栏 -->
-		<view class="header-box">
-			<view class="status_bar" :style="{height: statusBarHeight}"></view>
-			<view class="header-content">
-				<view class="title">商城</view>
-				<view class="search-bar" @click="toSearch">
-					<image class="search-icon" src="/static/search_gray.png" mode="aspectFit"></image>
-					<text class="placeholder">搜索商品</text>
-				</view>
-				<view class="cart-box">
-					<image class="cart-icon" src="/static/shop_shopping_car.png" mode="aspectFit"></image>
-					<view class="badge">8</view>
+	<view class="shopping-container">
+		<!-- 顶部渐变背景装饰 -->
+		<view class="top-bg-decoration"></view>
+
+		<!-- 自定义导航栏 -->
+		<view class="nav-bar-fixed" :style="{ paddingTop: statusBarHeight + 'px' }">
+			<view class="nav-content">
+				<view class="page-title">商城</view>
+				<view class="search-box">
+					<image class="search-icon" src="/static/icon_search_org.png" mode="aspectFit"></image>
+					<input class="search-input" type="text" placeholder="搜索商品" placeholder-class="search-placeholder" />
+					<button class="search-btn">搜索</button>
 				</view>
 			</view>
 		</view>
 
-		<scroll-view scroll-y="true" class="main-scroll" :refresher-enabled="isEnabled" :refresher-triggered="triggered"
-			@refresherrefresh="pullDownRefresh" @scrolltolower="reachBottom">
-			<view class="page-container">
-				<!-- 轮播图 -->
-				<view class="banner-box">
-					<swiper class="swiper" :indicator-dots="true" :circular="true" :autoplay="true" :interval="3000"
-						:duration="1000" indicator-color="rgba(255, 255, 255, 0.6)" indicator-active-color="#ffffff">
-						<swiper-item class="swiper-item" v-for="(item,index) in advs" :key="index"
-							@click="handleAdvClick(item)">
-							<image :src="item.imageUrl || '/static/famous_doctor_img.png'" mode="aspectFill"></image>
-						</swiper-item>
-						<swiper-item v-if="advs.length === 0" class="swiper-item">
-							<image src="/static/famous_doctor_img.png" mode="aspectFill"></image>
-						</swiper-item>
-					</swiper>
+		<!-- 内容区域 -->
+		<scroll-view class="main-content-scroll" scroll-y :style="{ paddingTop: (statusBarHeight + 44) + 'px' }">
+			<!-- 海报图 -->
+			<view class="banner-section"  @click="handleAdvClick(advs[0])">
+				<view class="banner-card">
+					<image class="banner-image" :src="advs[0].imageUrl || '/static/famous_doctor_img.png'" mode="widthFix"></image>
 				</view>
+			</view>
 
-				<!-- 分类导航 -->
-				<view class="category-grid">
-					<view class="category-item" v-for="(item, index) in categoryList" :key="index">
-						<image :src="item.icon" mode="aspectFit" class="cate-icon"></image>
-						<text class="cate-name">{{item.name}}</text>
-					</view>
-					<!-- 分类指示器 -->
-					<view class="indicator-box">
-						<view class="indicator-bar"></view>
+			<!-- 分类标签栏 - 滚动到此处时可考虑吸顶,但此处简单实现 -->
+			<view class="category-tabs-row">
+				<scroll-view scroll-x class="category-scroll" :show-scrollbar="false">
+					<view class="tab-item" :class="{ active: activeCategory === index }" v-for="(item, index) in categories" :key="index" @click="selectCategory(index)">
+						<text>{{ item.name }}</text>
 					</view>
+				</scroll-view>
+				<view class="more-icon" @click="openFilter">
+					<image src="/static/all_icon.png" mode="aspectFit"></image>
 				</view>
+			</view>
 
-				<!-- 商品列表 -->
-				<view class="product-section">
-					<view class="product-list">
-						<view class="product-item" v-for="(item, index) in subCates" :key="index" @click="showProductDetails(item)">
-							<image :src="item.image" mode="aspectFill" class="product-img"></image>
-							<view class="product-info">
-								<view class="product-title ellipsis-2">{{item.productName}}</view>
-								<view class="price-row">
-									<text class="price-symbol">¥</text>
-									<text class="price-integer">{{getInteger(item.price)}}</text>
-									<text class="price-decimal">.{{getDecimal(item.price)}}</text>
-									<text class="original-price">¥{{item.otPrice || item.price}}</text>
-								</view>
+			<!-- 商品列表 (瀑布流/两列) -->
+			<view class="product-grid">
+				<view class="product-item" v-for="(item, index) in subCates" :key="index" @click="showProductDetails(item)">
+					<image class="product-img" :src="item.image || '/static/course_img.png'" mode="aspectFill"></image>
+					<view class="product-info">
+						<view class="product-title ellipsis-2">{{ item.productName }}</view>
+						<view class="price-row">
+							<view class="price-box">
+								<text class="price-symbol">¥</text>
+								<text class="price-value">{{ item.price }}</text>
 							</view>
+							<text class="original-price">¥{{ item.otPrice || item.price }}</text>
 						</view>
 					</view>
-					<u-loadmore :status="status" />
-					
-					<view v-if="subCates.length === 0 && status !== 'loading'" class="empty-box">
-						<image src="/static/images/no_data.png" mode="aspectFit" class="empty-img"></image>
-						<text class="empty-text">暂无商品</text>
-					</view>
 				</view>
 			</view>
+			
+			<!-- 底部占位 -->
+			<view class="bottom-safe-area"></view>
 		</scroll-view>
+
+		<!-- 悬浮购物车按钮 -->
+		<view class="cart-fab" @click="toCart">
+			<image class="cart-icon" src="/static/shop_shopping_car.png" mode="aspectFit"></image>
+			<view class="badge" v-if="cartCount > 0">{{ cartCount }}</view>
+		</view>
+
+		<!-- 分类筛选弹窗 -->
+		<view class="filter-popup-mask" v-if="showFilter" @click="closeFilter" @touchmove.stop.prevent></view>
+		<view class="filter-popup-content" :class="{ show: showFilter }" @touchmove.stop.prevent>
+			<view class="filter-header">
+				<text class="filter-title">分类</text>
+			</view>
+			
+			<view class="filter-tabs">
+				<view class="filter-tab-item" :class="{ active: activeFilterTab === 0 }" @click="activeFilterTab = 0">全部分类</view>
+				<view class="filter-tab-item" :class="{ active: activeFilterTab === 1 }" @click="activeFilterTab = 1">一级分类</view>
+				<view class="filter-tab-item" :class="{ active: activeFilterTab === 2 }" @click="activeFilterTab = 2">专业药房</view>
+			</view>
+
+			<scroll-view scroll-y class="filter-scroll-view">
+				<view class="filter-section" v-for="(section, sIndex) in filterSections" :key="sIndex">
+					<view class="section-title">{{ section.title }}</view>
+					<view class="tag-grid">
+						<view class="tag-item" 
+							:class="{ active: section.selected === tag }" 
+							v-for="(tag, tIndex) in section.tags" 
+							:key="tIndex"
+							@click="selectFilterTag(sIndex, tag)"
+						>
+							{{ tag }}
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+
+			<view class="filter-footer">
+				<button class="reset-btn" @click="resetFilter">重置</button>
+				<button class="confirm-btn" @click="confirmFilter">确定</button>
+			</view>
+		</view>
 	</view>
 </template>
 
 <script>
 	import {
-		getProductCate,
 		getProducts
 	} from '@/api/product'
 	import {
 		getAdv
 	} from '@/api/adv'
+	
 	export default {
 		data() {
 			return {
-				statusBarHeight: (uni.getStorageSync('menuInfo') && uni.getStorageSync('menuInfo').statusBarHeight) || '20px',
+				statusBarHeight: uni.getSystemInfoSync().statusBarHeight,
 				advs: [],
+				categories: [
+					{ name: '推荐', id: 0 },
+					{ name: '感冒发烧', id: 1 },
+					{ name: '儿童用药', id: 2 },
+					{ name: '肠胃消化', id: 3 },
+					{ name: '家用护理', id: 4 }
+				],
+				activeCategory: 0,
 				subCates: [],
+				cartCount: 8,
+				showFilter: false,
+				activeFilterTab: 0,
+				filterSections: [
+					{
+						title: '家庭常备',
+						tags: ['感冒发烧', '儿童用药', '肠胃消化', '肠胃消化', '肠胃消化', '肠胃消化', '肠胃消化', '肠胃消化', '肠胃消化'],
+						selected: '感冒发烧'
+					},
+					{
+						title: '家居百货',
+						tags: ['清洁护理', '热卖单品', '纸品湿巾'],
+						selected: ''
+					},
+					{
+						title: '促销活动',
+						tags: ['清洁护理', '热卖单品'],
+						selected: ''
+					}
+				],
 				page: {
 					num: 1,
 					size: 10
 				},
-				isEnabled: true,
-				triggered: false,
-				status: 'loadmore',
-				categoryList: [
-					{ name: '家庭常备', icon: '/static/shop_meau1.png' },
-					{ name: '儿童用药', icon: '/static/shop_meau2.png' },
-					{ name: '女性用药', icon: '/static/shop_meau3.png' },
-					{ name: '感冒发烧', icon: '/static/shop_meau4.png' },
-					{ name: '专业药房', icon: '/static/shop_meau5.png' },
-					{ name: '营养膳食', icon: '/static/shop_meau6.png' },
-					{ name: '健康理疗', icon: '/static/shop_meau7.png' },
-					{ name: '日用百货', icon: '/static/shop_meau8.png' },
-					{ name: '保健养生', icon: '/static/shop_meau9.png' },
-					{ name: '品牌好礼', icon: '/static/shop_meau10.png' }
-				]
+				status: 'loadmore'
 			};
 		},
 		onShow() {
@@ -114,28 +154,9 @@
 			this.getproduct('refresh');
 		},
 		methods: {
-			getInteger(price) {
-				if (!price) return '0';
-				return Math.floor(price);
-			},
-			getDecimal(price) {
-				if (!price) return '00';
-				let decimal = (price % 1).toFixed(2).split('.')[1];
-				return decimal || '00';
-			},
-			pullDownRefresh() {
-				this.triggered = true;
-				this.page.num = 1;
-				this.getproduct('refresh');
-				setTimeout(() => {
-					this.triggered = false;
-				}, 1000);
-			},
-			reachBottom() {
-				if (this.status === 'loadmore') {
-					this.page.num++;
-					this.getproduct();
-				}
+			selectCategory(index) {
+				this.activeCategory = index;
+				// 根据分类ID获取商品列表的逻辑
 			},
 			getAdv() {
 				getAdv({ advType: 2 }).then(res => {
@@ -167,6 +188,11 @@
 					url: '../home/productSearch'
 				});
 			},
+			toCart() {
+				uni.navigateTo({
+					url: '/pages/shopping/cart'
+				});
+			},
 			showProductDetails(item) {
 				uni.navigateTo({
 					url: '/pages/shopping/productDetails?productId=' + item.productId
@@ -182,265 +208,453 @@
 					uni.setStorageSync('content', item.content);
 					uni.navigateTo({ url: "../home/content" });
 				}
+			},
+			openFilter() {
+				this.showFilter = true;
+			},
+			closeFilter() {
+				this.showFilter = false;
+			},
+			selectFilterTag(sectionIndex, tag) {
+				this.filterSections[sectionIndex].selected = tag;
+			},
+			resetFilter() {
+				this.filterSections.forEach(section => {
+					section.selected = '';
+				});
+				this.activeFilterTab = 0;
+			},
+			confirmFilter() {
+				this.closeFilter();
+				// 可以在这里根据选中的筛选条件重新请求数据
+				this.getproduct('refresh');
 			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	.content {
-		display: flex;
-		flex-direction: column;
-		height: 100vh;
-		background-color: #F8F9FB;
+	.shopping-container {
+		min-height: 100vh;
+		background-color: #F8F8F8;
 		position: relative;
-		z-index: 2;
-		.bg-image {
-			position: absolute;
-			top: 0;
-			left: 0;
-			width: 100%;
-			height: 680rpx;
-			z-index: -1;
-		}
-		
 	}
 
-	.header-box {
-		padding-bottom: 20rpx;
+	.top-bg-decoration {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 400rpx;
+		background: linear-gradient(180deg, #FFE4D6 0%, rgba(255, 255, 255, 0) 100%);
+		z-index: 0;
+	}
+
+	/* 导航栏 */
+	.nav-bar-fixed {
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 100%;
+		z-index: 100;
+		background-color: transparent;
 
-		.header-content {
+		.nav-content {
+			height: 44px;
 			display: flex;
 			align-items: center;
 			padding: 0 30rpx;
-			height: 88rpx;
-
-			.title {
-				font-size: 44rpx;
+			
+			.page-title {
+				font-size: 36rpx;
 				font-weight: bold;
-				color: #333;
-				margin-right: 20rpx;
+				color: #333333;
+				margin-right: 30rpx;
 			}
 
-			.search-bar {
-				width: 302rpx;
-				height: 72rpx;
-				background: #FFFFFF;
-				border-radius: 36rpx;
+			.search-box {
 				display: flex;
 				align-items: center;
-				padding: 0 30rpx;
-				margin: 0 20rpx;
-				box-sizing: border-box;
+				background-color: #ffffff;
+				padding: 8rpx 8rpx 8rpx 24rpx;
+				width: 324rpx;
+				border-radius: 36rpx;
+				border: 2rpx solid #F5723A;
+				width: 412rpx;
 
 				.search-icon {
 					width: 32rpx;
 					height: 32rpx;
-					margin-right: 16rpx;
+					margin-right: 10rpx;
 				}
 
-				.placeholder {
-					font-size: 28rpx;
-					color: #999;
+				.search-input {
+					flex: 1;
+					font-size: 26rpx;
+					color: #333333;
+					height: 100%;
 				}
-			}
-
-			.cart-box {
-				position: relative;
-				padding: 10rpx;
 
-				.cart-icon {
-					width: 48rpx;
-					height: 48rpx;
+				.search-placeholder {
+					color: #999999;
 				}
 
-				.badge {
-					position: absolute;
-					top: 0;
-					right: 0;
-					background: #FF4D4F;
-					color: #fff;
-					font-size: 20rpx;
-					min-width: 28rpx;
-					height: 28rpx;
-					border-radius: 14rpx;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					padding: 0 6rpx;
-					border: 2rpx solid #fff;
+				.search-btn {
+					background: linear-gradient(180deg, #FFA33B 0%, #F5723A 100%);
+					border-radius: 58rpx;
+					color: #FFFFFF;
+					font-size: 24rpx;
+					padding: 12rpx 24rpx;
+					line-height: 1;
+					height: auto;
+					border: none;
+					margin: 0;
+					
+					&::after {
+						border: none;
+					}
 				}
 			}
 		}
 	}
 
-	.main-scroll {
-		flex: 1;
-		overflow: hidden;
+	.main-content-scroll {
+		height: 100vh;
+		box-sizing: border-box;
 	}
 
-	.page-container {
-		padding: 0 30rpx 30rpx;
+	/* Banner */
+	.banner-section {
+		padding: 20rpx 30rpx;
+			.banner-card {
+				width: 702rpx;
+			        height: 280rpx;
+					overflow: hidden;
+					border-radius: 24rpx;
+				.banner-image {
+					width: 100%;
+					height: 100%;
+				}
+			}
 	}
 
-	.banner-box {
-		width: 100%;
-		height: 320rpx;
-		border-radius: 24rpx;
-		overflow: hidden;
-		margin-bottom: 40rpx;
-
-		.swiper {
-			width: 100%;
-			height: 100%;
-
+	/* 分类标签栏 */
+	.category-tabs-row {
+		display: flex;
+		align-items: center;
+		padding: 20rpx 0;
+		background-color: transparent;
+		position: relative;
+		.category-scroll {
+			flex: 1;
+			white-space: nowrap;
+			padding-left: 30rpx;
+			
+			.tab-item {
+				display: inline-block;
+				margin-right: 50rpx;
+				font-size: 30rpx;
+				color: #666666;
+				position: relative;
+				padding-bottom: 10rpx;
+
+				&.active {
+					color: #333333;
+					font-weight: bold;
+
+					&::after {
+						content: '';
+						position: absolute;
+						bottom: 0;
+						left: 50%;
+						transform: translateX(-50%);
+						width: 40rpx;
+						height: 6rpx;
+						background-color: #F5723A;
+						border-radius: 3rpx;
+					}
+				}
+			}
+		}
+		
+		.more-icon {
+			position: absolute;
+			top: 0rpx;
+			right: 0rpx;
+			padding:22rpx 18rpx 30rpx 50rpx;
+			// width: 104rpx;
+			// height: 88rpx;
+			background: linear-gradient( 90deg, rgba(255,255,255,0) 0%, #FFFFFF 36.79%, #FFFFFF 100%);
+			border-radius: 0rpx 0rpx 0rpx 0rpx;
 			image {
-				width: 100%;
-				height: 100%;
+				width: 36rpx;
+				height: 36rpx;
 			}
 		}
 	}
 
-	.category-grid {
+	/* 商品列表网格 */
+	.product-grid {
 		display: flex;
 		flex-wrap: wrap;
-		background: #FFFFFF;
-		border-radius: 24rpx;
-		padding: 30rpx 10rpx 20rpx;
-		margin-bottom: 30rpx;
+		padding: 0 24rpx;
+		justify-content: space-between;
+		
+		.product-item {
+			width: 342rpx;
+			background-color: #FFFFFF;
+			border-radius: 20rpx;
+			margin-bottom: 24rpx;
+			overflow: hidden;
+			box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
+			
+			.product-img {
+				width: 100%;
+				height: 342rpx;
+			}
+			
+			.product-info {
+				padding: 20rpx;
+				
+				.product-title {
+					font-size: 28rpx;
+					color: #333333;
+					font-weight: 500;
+					height: 80rpx;
+					line-height: 40rpx;
+				}
+				
+				.price-row {
+					display: flex;
+					align-items: baseline;
+					margin-top: 16rpx;
+					
+					.price-box {
+						color: #FF4D4F;
+						display: flex;
+						align-items: baseline;
+						margin-right: 12rpx;
+						
+						.price-symbol {
+							font-size: 24rpx;
+							font-weight: bold;
+						}
+						
+						.price-value {
+							font-size: 32rpx;
+							font-weight: bold;
+						}
+					}
+					
+					.original-price {
+						font-size: 24rpx;
+						color: #BBBBBB;
+						text-decoration: line-through;
+					}
+				}
+			}
+		}
+	}
 
-		.category-item {
-			width: 20%;
+	/* 悬浮购物车 */
+	.cart-fab {
+		position: fixed;
+		right: 30rpx;
+		bottom: 140rpx; // 留出系统tabbar的高度
+		width: 90rpx;
+		height: 90rpx;
+		background-color: #FFFFFF;
+		border-radius: 50%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.15);
+		z-index: 110;
+		
+		.cart-icon {
+			width: 50rpx;
+			height: 50rpx;
+		}
+		
+		.badge {
+			position: absolute;
+			top: 0;
+			right: 0;
+			background-color: #FF4D4F;
+			color: #FFFFFF;
+			font-size: 20rpx;
+			min-width: 30rpx;
+			height: 30rpx;
+			border-radius: 15rpx;
 			display: flex;
-			flex-direction: column;
 			align-items: center;
-			margin-bottom: 30rpx;
+			justify-content: center;
+			border: 2rpx solid #FFFFFF;
+		}
+	}
 
-			.cate-icon {
-				width: 88rpx;
-				height: 88rpx;
-				margin-bottom: 12rpx;
-			}
+	.bottom-safe-area {
+		height: 40rpx;
+		padding-bottom: env(safe-area-inset-bottom);
+	}
 
-			.cate-name {
-				font-size: 24rpx;
-				color: #333;
-			}
+	.ellipsis-2 {
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+		overflow: hidden;
+	}
+
+	/* 筛选弹窗样式 */
+	.filter-popup-mask {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background: rgba(0, 0, 0, 0.5);
+		z-index: 999;
+	}
+
+	.filter-popup-content {
+		position: fixed;
+		top: 0;
+		right: -100%;
+		width: 640rpx;
+		height: 100vh;
+		background: #FFFFFF;
+		z-index: 1000;
+		transition: right 0.3s;
+		display: flex;
+		flex-direction: column;
+		border-radius: 40rpx 0 0 40rpx;
+
+		&.show {
+			right: 0;
 		}
 
-		.indicator-box {
-			width: 100%;
+		.filter-header {
+			margin-top: 88rpx;
+			padding: 40rpx 30rpx 20rpx;
 			display: flex;
 			justify-content: center;
-			margin-top: -10rpx;
+			align-items: center;
 
-			.indicator-bar {
-				width: 50rpx;
-				height: 8rpx;
-				background: #F2F2F2;
-				border-radius: 4rpx;
-				position: relative;
-				
-				&::after {
-					content: "";
-					position: absolute;
-					left: 0;
-					top: 0;
-					width: 25rpx;
-					height: 100%;
-					background: #5B37FD;
-					border-radius: 4rpx;
-				}
+			.filter-title {
+				font-size: 36rpx;
+				font-weight: bold;
+				color: #333333;
 			}
 		}
-	}
 
-	.product-section {
-		.product-list {
+		.filter-tabs {
 			display: flex;
-			flex-wrap: wrap;
+			padding: 20rpx 30rpx;
 			justify-content: space-between;
 
-			.product-item {
-				width: 335rpx;
-				background: #FFFFFF;
-				border-radius: 20rpx;
-				overflow: hidden;
-				margin-bottom: 20rpx;
-
-				.product-img {
-					width: 100%;
-					height: 335rpx;
+			.filter-tab-item {
+				font-size: 30rpx;
+				color: #999999;
+				position: relative;
+				padding-bottom: 10rpx;
+
+				&.active {
+					color: #333333;
+					font-weight: bold;
+
+					&::after {
+						content: '';
+						position: absolute;
+						bottom: 0;
+						left: 50%;
+						transform: translateX(-50%);
+						width: 71rpx;
+height: 6rpx;
+background: #F8792B;
+border-radius: 3rpx 3rpx 3rpx 3rpx;
+					}
 				}
+			}
+		}
 
-				.product-info {
-					padding: 20rpx;
-
-					.product-title {
-						font-size: 28rpx;
-						color: #333;
-						line-height: 40rpx;
-						height: 80rpx;
-						margin-bottom: 16rpx;
-						font-weight: 500;
-					}
+		.filter-scroll-view {
+			flex: 1;
+			overflow: hidden;
+			padding: 0 30rpx;
 
-					.price-row {
-						display: flex;
-						align-items: baseline;
+			.filter-section {
+				margin-top: 40rpx;
 
-						.price-symbol {
-							font-size: 24rpx;
-							color: #FF4D4F;
-							font-weight: bold;
-						}
+				.section-title {
+					font-size: 30rpx;
+					font-weight: bold;
+					color: #333333;
+					margin-bottom: 24rpx;
+				}
 
-						.price-integer {
-							font-size: 36rpx;
-							color: #FF4D4F;
-							font-weight: bold;
-						}
+				.tag-grid {
+					display: flex;
+					flex-wrap: wrap;
 
-						.price-decimal {
-							font-size: 24rpx;
-							color: #FF4D4F;
-							font-weight: bold;
+					.tag-item {
+						width: 180rpx;
+						height: 72rpx;
+						background: #F5F6F8;
+						border-radius: 36rpx;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						font-size: 26rpx;
+						color: #333333;
+						margin-right: 20rpx;
+						margin-bottom: 20rpx;
+						border: 2rpx solid transparent;
+
+						&:nth-child(3n) {
+							margin-right: 0;
 						}
 
-						.original-price {
-							font-size: 24rpx;
-							color: #999;
-							text-decoration: line-through;
-							margin-left: 10rpx;
+						&.active {
+							background: #FFF1E8;
+							color: #F5723A;
+							border-color: #F5723A;
 						}
 					}
 				}
 			}
 		}
-	}
 
-	.ellipsis-2 {
-		display: -webkit-box;
-		-webkit-box-orient: vertical;
-		-webkit-line-clamp: 2;
-		overflow: hidden;
-	}
+		.filter-footer {
+			padding: 30rpx;
+			display: flex;
+			justify-content: space-between;
+			padding-bottom: calc(30rpx + env(safe-area-inset-bottom));
 
-	.empty-box {
-		padding: 100rpx 0;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
+			button {
+				width: 280rpx;
+				height: 88rpx;
+				border-radius: 44rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				font-size: 32rpx;
+				margin: 0;
 
-		.empty-img {
-			width: 200rpx;
-			height: 150rpx;
-			margin-bottom: 20rpx;
-		}
+				&::after {
+					border: none;
+				}
+			}
 
-		.empty-text {
-			font-size: 24rpx;
-			color: #999;
+			.reset-btn {
+				background: #FFFFFF;
+				color: #999999;
+				border: 2rpx solid #DDDDDD;
+			}
+
+			.confirm-btn {
+				background: #F8792B;
+				color: #FFFFFF;
+			}
 		}
 	}
 </style>

+ 1 - 1
pages/shopping/payOrder.vue

@@ -338,7 +338,7 @@
 				font-weight: bold;
 				color: #FFFFFF;
 				text-align: center;
-				background: #5B37FD ;
+				background: #F5723A ;
 				border-radius: 44upx;
 			}
 		}

+ 3 - 3
pages/shopping/paymentOrder.vue

@@ -565,7 +565,7 @@
 				font-weight: bold;
 				color: #FFFFFF;
 				text-align: center;
-				background: #5B37FD ;
+				background: #F5723A ;
 				border-radius: 44upx;
 				margin-bottom: 10rpx;
 			}
@@ -576,8 +576,8 @@
 				font-size: 30upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #5B37FD ;
-				border: 1rpx solid #5B37FD ;
+				color: #F5723A ;
+				border: 1rpx solid #F5723A ;
 				text-align: center;
 				background: #FFFFFF;
 				border-radius: 44upx;

+ 7 - 7
pages/shopping/prescribe.vue

@@ -439,7 +439,7 @@
 		justify-content: space-between;
 		.fixed-top-box{
 			width: 100%;
-			background: linear-gradient(135deg, #5B37FD 0%, #5B37FD  100%);
+			background: linear-gradient(135deg, #F5723A 0%, #F5723A  100%);
 			position: fixed;
 			top: 0;
 			left: 0;
@@ -479,7 +479,7 @@
 					color: #666666;
 					&.active{
 						font-weight: bold;
-						color: #5B37FD ;
+						color: #F5723A ;
 					}
 				}
 				.arrow{
@@ -574,7 +574,7 @@
 							}
 							&.active{
 								background: rgba(230, 250, 247, 0);
-								border: 2upx solid #5B37FD ;
+								border: 2upx solid #F5723A ;
 								position: relative;
 							}
 							.active-img{
@@ -647,15 +647,15 @@
 							font-size: 28upx;
 							font-family: PingFang SC;
 							font-weight: 500;
-							color: #5B37FD ;
+							color: #F5723A ;
 							background: #F5FFFE;
 							border: 1px solid #8AD5CE;
 							padding: 0 20upx;
 							border-radius: 32upx;
 							margin: 0 20upx 20upx 0;
 							&.active{
-								background: #5B37FD ;
-								border: 1px solid #5B37FD ;
+								background: #F5723A ;
+								border: 1px solid #F5723A ;
 								color: #FFFFFF;
 							}
 						}
@@ -821,7 +821,7 @@
 				font-weight: bold;
 				color: #FFFFFF;
 				text-align: center;
-				background: #5B37FD ;
+				background: #F5723A ;
 				border-radius: 44upx;
 			}
 		}

+ 6 - 6
pages/shopping/productDetails.vue

@@ -676,7 +676,7 @@
 			.share-box{
 				width: 120upx;
 				height: 46upx;
-				border: 1px solid #5B37FD ;
+				border: 1px solid #F5723A ;
 				border-radius: 23upx;
 				display: flex;
 				align-items: center;
@@ -686,7 +686,7 @@
 					font-size: 26upx;
 					font-family: PingFang SC;
 					font-weight: 500;
-					color: #5B37FD ;
+					color: #F5723A ;
 				}
 				image{
 					margin-left: 2rpx;
@@ -722,7 +722,7 @@
 				display: inline-block;
 				padding: 0 6upx;
 				height: 30upx;
-				background: linear-gradient(90deg, #5B37FD 0%, #5B37FD  100%);
+				background: linear-gradient(90deg, #F5723A 0%, #F5723A  100%);
 				border-radius: 4upx;
 				margin-right: 10upx;
 				font-size: 22upx;
@@ -927,7 +927,7 @@
 					background: #FF6633;
 				}
 				&.buy{
-					background: #5B37FD ;
+					background: #F5723A ;
 				}
 			}
 		}
@@ -1020,7 +1020,7 @@
 					&.active{
 						background: #F1FFFE;
 						border: 1px solid #8AD5CE;
-						color: #5B37FD ;
+						color: #F5723A ;
 					}
 				}
 			}
@@ -1077,7 +1077,7 @@
 			font-family: PingFang SC;
 			font-weight: bold;
 			color: #FFFFFF;
-			background: #5B37FD ;
+			background: #F5723A ;
 			border-radius: 44upx;
 			margin-top: 30upx;
 			// margin-bottom: 30upx;

+ 9 - 78
pages/user/index.vue

@@ -83,26 +83,15 @@
 					<view class="used-tools">
 						<view class="title">我的服务</view>
 						
-						<view class="my-modules">
-							<view class="module-item" @click="navgetTo('/pages/learn/index')">
-								<image class="bg" src="/static/bg_myclass.png" mode="aspectFill"></image>
-								<image class="icon" src="/static/icon_myclass.png" mode=""></image>
-								<view class="module-info">
-									<text class="m-title">我的课程</text>
-									<view class="m-desc">开始学习<image class="desc-icon" src="/static/icon_direction_right2.png" mode=""></image></view>
-								</view>
+						<view class="tools-list">
+							<view class="item no-marin-bottom" @click="navgetTo('/pages_user/user/storeProductRelation')">
+								<image src="/static/icon_myclass.png" mode=""></image>
+								<text class="text">我的课程</text>
 							</view>
-							<view class="module-item" @click="navgetTo('')">
-								<image class="bg" src="/static/bg_video.png" mode="aspectFill"></image>
-								<image class="icon" src="/static/icon_video.png" mode=""></image>
-								<view class="module-info">
-									<text class="m-title">我的收藏</text>
-									<view class="m-desc color">立即查看<image class="desc-icon" src="/static/icon_direction_right.png" mode=""></image></view>
-								</view>
+							<view class="item no-marin-bottom" @click="navgetTo('/pages_user/user/storeProductRelation')">
+								<image src="/static/icon_video.png" mode=""></image>
+								<text class="text">赞过的课程</text>
 							</view>
-						</view>
-						
-						<view class="tools-list">
 							<view class="item no-marin-bottom" @click="navgetTo('/pages_user/user/storeProductRelation')">
 								<image src="/static/footprint.png" mode=""></image>
 								<text class="text">我的足迹</text>
@@ -165,9 +154,9 @@
 				<view style="padding-bottom: 20rpx;" v-if="UserInfo">
 					<view @tap="loginOUt" class="log-out x-c" >退出登录</view>
 				</view>
-				<!-- <view class="like-product">
+				<view class="like-product">
 					<likeProduct  ref="product" />
-				</view> -->
+				</view>
 				
 				<!-- 退出登录按钮 -->
 				
@@ -506,64 +495,6 @@
 				color: #222222;
 				line-height: 1;
 			}
-			.my-modules {
-				display: flex;
-				justify-content: space-between;
-				margin-top: 40upx;
-				.module-item {
-					position: relative;
-					width: 310upx;
-					height: 140upx;
-					border-radius: 16upx;
-					overflow: hidden;
-					display: flex;
-					align-items: center;
-					justify-content: space-around;
-					z-index: 2;
-					.icon{
-						// position: absolute;
-						// top: 20upx;
-						// left: 20upx;
-						width: 64upx;
-						height: 64upx;
-					}
-					.bg {
-						position: absolute;
-						top: 0;
-						left: 0;
-						width: 100%;
-						height: 100%;
-						z-index: -1;
-					}
-					.module-info {
-						position: relative;
-						z-index: 1;
-						padding: 25upx 20upx;
-						display: flex;
-						flex-direction: column;
-						.m-title {
-							font-size: 30upx;
-							font-weight: bold;
-							color: #222222;
-						}
-						.m-desc {
-							display: flex;
-							align-items: center;
-							font-size: 22upx;
-							color: #6154DC;
-							margin-top: 10upx;
-							&.color{
-								color: #F5723A;
-							}
-							.desc-icon{
-								width: 24upx;
-								height: 24upx;
-								margin-left:4upx;
-							}
-						}
-					}
-				}
-			}
 			.tools-list{
 				margin-top: 50upx;
 				display: flex;

+ 1 - 1
pages_company/alipayImg.vue

@@ -97,7 +97,7 @@ page {
  		font-family: PingFang SC;
  		font-weight: 400;
  		color: #FFFFFF;
- 		background:#5B37FD  !important;
+ 		background:#F5723A  !important;
  		border-radius: 44upx;
  	}
  }

+ 1 - 1
pages_company/auth/login.vue

@@ -137,7 +137,7 @@ export default {
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #5B37FD ;
+				background: #F5723A ;
 				border-radius: 44upx;
 			}
 		}

+ 1 - 1
pages_company/card.vue

@@ -99,7 +99,7 @@ page {
  		font-family: PingFang SC;
  		font-weight: 400;
  		color: #FFFFFF;
- 		background:#5B37FD  !important;
+ 		background:#F5723A  !important;
  		border-radius: 44upx;
  	}
  }

+ 3 - 3
pages_company/coupon.vue

@@ -149,15 +149,15 @@ page {
 			font-size: 28upx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #5B37FD ;
+			color: #F5723A ;
 			background: #F5FFFE;
 			border: 1px solid #8AD5CE;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #5B37FD ;
-				border: 1px solid #5B37FD ;
+				background: #F5723A ;
+				border: 1px solid #F5723A ;
 			}
 		}
 	}

+ 1 - 1
pages_company/index.vue

@@ -243,7 +243,7 @@
 				font-weight: 500;
 				color: #FFFFFF;
 				border-radius: 8rpx;
-				background-color: #5B37FD ;
+				background-color: #F5723A ;
 			}
 		}
 		.used-tools{

+ 2 - 2
pages_company/order/cart.vue

@@ -296,7 +296,7 @@
 							font-family: PingFang SC;
 							font-weight: bold;
 							color: #FFFFFF;
-							background: linear-gradient(90deg, #5B37FD 0%, #5B37FD  100%);
+							background: linear-gradient(90deg, #F5723A 0%, #F5723A  100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							flex-shrink: 0;
@@ -444,7 +444,7 @@
 					font-family: PingFang SC;
 					font-weight: bold;
 					color: #FFFFFF;
-					background: #5B37FD ;
+					background: #F5723A ;
 					border-radius: 44upx;
 				}
 			}

+ 2 - 2
pages_company/order/confirmCompanyOrder.vue

@@ -224,7 +224,7 @@
 							display: inline-block;
 							padding: 0 6upx;
 							height: 30upx;
-							background: linear-gradient(90deg, #5B37FD 0%, #5B37FD  100%);
+							background: linear-gradient(90deg, #F5723A 0%, #F5723A  100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							font-size: 22upx;
@@ -430,7 +430,7 @@
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #5B37FD ;
+				background: #F5723A ;
 				border-radius: 44upx;
 				position: relative;
 				.share{

+ 4 - 4
pages_company/order/confirmOrder.vue

@@ -209,7 +209,7 @@
 							display: inline-block;
 							padding: 0 6upx;
 							height: 30upx;
-							background: linear-gradient(90deg, #5B37FD 0%, #5B37FD  100%);
+							background: linear-gradient(90deg, #F5723A 0%, #F5723A  100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							font-size: 22upx;
@@ -415,7 +415,7 @@
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #5B37FD ;
+				background: #F5723A ;
 				border-radius: 44upx;
 			}
 		}
@@ -536,7 +536,7 @@
 				font-size: 28upx;
 				font-family: PingFang SC;
 				font-weight: 500;
-				color: #5B37FD ;
+				color: #F5723A ;
 			}
 		}
 		.btn{
@@ -549,7 +549,7 @@
 			font-weight: 500;
 			color: #FFFFFF;
 			border: 1px solid #D2E6FF;
-			background: linear-gradient(135deg, #5B37FD 0%, #5B37FD  100%);
+			background: linear-gradient(135deg, #F5723A 0%, #F5723A  100%);
 			border-radius: 24upx;
 			margin-left: 30upx;
 		}

+ 3 - 3
pages_company/order/coupon.vue

@@ -123,15 +123,15 @@ page {
 			font-size: 28upx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #5B37FD ;
+			color: #F5723A ;
 			background: #F5FFFE;
 			border: 1px solid #8AD5CE;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #5B37FD ;
-				border: 1px solid #5B37FD ;
+				background: #F5723A ;
+				border: 1px solid #F5723A ;
 			}
 		}
 	}

+ 6 - 6
pages_company/order/productDetails.vue

@@ -510,7 +510,7 @@
 			.share-box{
 				width: 120upx;
 				height: 46upx;
-				border: 1px solid #5B37FD ;
+				border: 1px solid #F5723A ;
 				border-radius: 23upx;
 				display: flex;
 				align-items: center;
@@ -520,7 +520,7 @@
 					font-size: 26upx;
 					font-family: PingFang SC;
 					font-weight: 500;
-					color: #5B37FD ;
+					color: #F5723A ;
 				}
 				image{
 					margin-left: 2rpx;
@@ -556,7 +556,7 @@
 				display: inline-block;
 				padding: 0 6upx;
 				height: 30upx;
-				background: linear-gradient(90deg, #5B37FD  0%, #2BC7A4 100%);
+				background: linear-gradient(90deg, #F5723A  0%, #2BC7A4 100%);
 				border-radius: 4upx;
 				margin-right: 10upx;
 				font-size: 22upx;
@@ -761,7 +761,7 @@
 					background: #FF6633;
 				}
 				&.buy{
-					background: #5B37FD ;
+					background: #F5723A ;
 				}
 			}
 		}
@@ -854,7 +854,7 @@
 					&.active{
 						background: #F1FFFE;
 						border: 1px solid #8AD5CE;
-						color: #5B37FD ;
+						color: #F5723A ;
 					}
 				}
 			}
@@ -911,7 +911,7 @@
 			font-family: PingFang SC;
 			font-weight: bold;
 			color: #FFFFFF;
-			background: #5B37FD ;
+			background: #F5723A ;
 			border-radius: 44upx;
 			margin-top: 30upx;
 			// margin-bottom: 30upx;

+ 1 - 1
pages_company/order/productList.vue

@@ -310,7 +310,7 @@
 			align-items: center;
 			justify-content: center;
 			&.active .label{
-				color: #5B37FD ;
+				color: #F5723A ;
 			}
 			.label{
 				font-size: 26upx;

+ 3 - 3
pages_company/order/productShowDetails.vue

@@ -264,7 +264,7 @@
 			.share-box{
 				width: 120upx;
 				height: 46upx;
-				border: 1px solid #5B37FD ;
+				border: 1px solid #F5723A ;
 				border-radius: 23upx;
 				display: flex;
 				align-items: center;
@@ -274,7 +274,7 @@
 					font-size: 26upx;
 					font-family: PingFang SC;
 					font-weight: 500;
-					color: #5B37FD ;
+					color: #F5723A ;
 				}
 				image{
 					margin-left: 2rpx;
@@ -310,7 +310,7 @@
 				display: inline-block;
 				padding: 0 6upx;
 				height: 30upx;
-				background: linear-gradient(90deg, #5B37FD 0%, #5B37FD  100%);
+				background: linear-gradient(90deg, #F5723A 0%, #F5723A  100%);
 				border-radius: 4upx;
 				margin-right: 10upx;
 				font-size: 22upx;

+ 3 - 3
pages_company/storeOrder.vue

@@ -267,7 +267,7 @@
 						font-weight: 500;
 						line-height: 1;
 						&.success{
-							color: #5B37FD ;
+							color: #F5723A ;
 						}
 						&.black{
 							color: #111111;
@@ -310,7 +310,7 @@
 								display: inline-block;
 								padding: 0 6upx;
 								height: 30upx;
-								background: linear-gradient(90deg, #5B37FD 0%, #5B37FD  100%);
+								background: linear-gradient(90deg, #F5723A 0%, #F5723A  100%);
 								border-radius: 4upx;
 								margin-right: 10upx;
 								font-size: 22upx;
@@ -420,7 +420,7 @@
 								color: #666666;
 							}
 							&.pay{
-								background: #5B37FD ;
+								background: #F5723A ;
 								color: #FFFFFF;
 								position: relative;
 								.share{

+ 4 - 4
pages_company/storeOrderDetail.vue

@@ -378,7 +378,7 @@
 <style lang="scss">
 	.fixed-top-box{
 		width: 100%;
-		background: linear-gradient(135deg, #5B37FD 0%, #5B37FD  100%);
+		background: linear-gradient(135deg, #F5723A 0%, #F5723A  100%);
 		position: fixed;
 		top: 0;
 		left: 0;
@@ -546,7 +546,7 @@
 							display: inline-block;
 							padding: 0 6upx;
 							height: 30upx;
-							background: linear-gradient(90deg, #5B37FD 0%, #5B37FD  100%);
+							background: linear-gradient(90deg, #F5723A 0%, #F5723A  100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							font-size: 22upx;
@@ -737,7 +737,7 @@
 			border-radius: 32upx;
 			margin-left: 15upx;
 			&.share-btn{
-				background: #5B37FD ;
+				background: #F5723A ;
 				color: #FFFFFF;
 				position: relative;
 				.share{
@@ -838,7 +838,7 @@
 					font-family: PingFang SC;
 					font-weight: bold;
 					color: #FFFFFF;
-					background: #5B37FD ;
+					background: #F5723A ;
 					border-radius: 44upx;
 				}
 			}

+ 6 - 6
pages_company/storeProductPackage.vue

@@ -238,15 +238,15 @@
 				font-size: 28upx;
 				font-family: PingFang SC;
 				font-weight: 500;
-				color: #5B37FD ;
+				color: #F5723A ;
 				background: #F5FFFE;
 				border: 1px solid #8AD5CE;
 				border-radius: 32upx;
 				margin: 0 20upx 20upx 0;
 				&.active{
 					color: #FFFFFF;
-					background: #5B37FD ;
-					border: 1px solid #5B37FD ;
+					background: #F5723A ;
+					border: 1px solid #F5723A ;
 				}
 			}
 		}
@@ -302,7 +302,7 @@
 						font-weight: 500;
 						line-height: 1;
 						&.success{
-							color: #5B37FD ;
+							color: #F5723A ;
 						}
 						&.black{
 							color: #111111;
@@ -346,7 +346,7 @@
 								display: inline-block;
 								padding: 0 6upx;
 								height: 30upx;
-								background: linear-gradient(90deg, #5B37FD 0%, #5B37FD  100%);
+								background: linear-gradient(90deg, #F5723A 0%, #F5723A  100%);
 								border-radius: 4upx;
 								margin-right: 10upx;
 								font-size: 22upx;
@@ -471,7 +471,7 @@
 								color: #666666;
 							}
 							&.pay{
-								background: #5B37FD ;
+								background: #F5723A ;
 								color: #FFFFFF;
 								position: relative;
 								.share{

+ 9 - 9
pages_company/storeProductPackageDetails.vue

@@ -349,7 +349,7 @@
 			.share-box{
 				width: 120upx;
 				height: 46upx;
-				border: 1px solid #5B37FD ;
+				border: 1px solid #F5723A ;
 				border-radius: 23upx;
 				display: flex;
 				align-items: center;
@@ -359,7 +359,7 @@
 					font-size: 26upx;
 					font-family: PingFang SC;
 					font-weight: 500;
-					color: #5B37FD ;
+					color: #F5723A ;
 				}
 				image{
 					margin-left: 2rpx;
@@ -395,7 +395,7 @@
 				display: inline-block;
 				padding: 0 6upx;
 				height: 30upx;
-				background: linear-gradient(90deg, #5B37FD 0%, #5B37FD  100%);
+				background: linear-gradient(90deg, #F5723A 0%, #F5723A  100%);
 				border-radius: 4upx;
 				margin-right: 10upx;
 				font-size: 22upx;
@@ -600,7 +600,7 @@
 					background: #FF6633;
 				}
 				&.buy{
-					background: #5B37FD ;
+					background: #F5723A ;
 				}
 			}
 		}
@@ -693,7 +693,7 @@
 					&.active{
 						background: #F1FFFE;
 						border: 1px solid #8AD5CE;
-						color: #5B37FD ;
+						color: #F5723A ;
 					}
 				}
 			}
@@ -750,7 +750,7 @@
 			font-family: PingFang SC;
 			font-weight: bold;
 			color: #FFFFFF;
-			background: #5B37FD ;
+			background: #F5723A ;
 			border-radius: 44upx;
 			margin-top: 30upx;
 			// margin-bottom: 30upx;
@@ -803,7 +803,7 @@
 							display: inline-block;
 							padding: 0 6upx;
 							height: 30upx;
-							background: linear-gradient(90deg, #5B37FD 0%, #5B37FD  100%);
+							background: linear-gradient(90deg, #F5723A 0%, #F5723A  100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							font-size: 22upx;
@@ -891,7 +891,7 @@
 				font-size: 28upx;
 				font-family: PingFang SC;
 				font-weight: 500;
-				color: #5B37FD ;
+				color: #F5723A ;
 			}
 		}
 		.btn{
@@ -904,7 +904,7 @@
 			font-weight: 500;
 			color: #FFFFFF;
 			border: 1px solid #D2E6FF;
-			background: linear-gradient(135deg, #5B37FD 0%, #5B37FD  100%);
+			background: linear-gradient(135deg, #F5723A 0%, #F5723A  100%);
 			border-radius: 24upx;
 			margin-left: 30upx;
 		}

+ 1 - 1
pages_company/wechatcode.vue

@@ -112,7 +112,7 @@
 	}
 
 	.generate {
-		background-color: #5B37FD ;
+		background-color: #F5723A ;
 		width: 70%;
 		margin: 0 auto;
 		border-radius: 40rpx;

+ 5 - 5
pages_doctor/doctorDetail.vue

@@ -342,7 +342,7 @@
 							font-family: PingFang SC;
 							font-weight: 500;
 							color: #FFFFFF;
-							background: #5B37FD ;
+							background: #F5723A ;
 							border-radius: 10upx 4upx 10upx 4upx;
 							margin-right: 12upx;
 						}
@@ -444,7 +444,7 @@
 					font-size: 28upx;
 					font-family: PingFang SC;
 					font-weight: 500;
-					color: #5B37FD ;
+					color: #F5723A ;
 				}
 				image{
 					width: 14upx;
@@ -485,7 +485,7 @@
 			}
 			&.active{
 				position: relative;
-				border: 2upx solid #5B37FD ;
+				border: 2upx solid #F5723A ;
 				.active-img{
 					display: block;
 				}
@@ -507,7 +507,7 @@
 				.price{
 					display: flex;
 					align-items: flex-end;
-					color: #5B37FD ;
+					color: #F5723A ;
 					.num{
 						font-size: 30upx;
 						font-weight: bold;
@@ -575,7 +575,7 @@
 			font-family: PingFang SC;
 			font-weight: bold;
 			color: #FFFFFF;
-			background: #5B37FD ;
+			background: #F5723A ;
 			border-radius: 44upx;
 			text-align: center;
 		}

+ 2 - 2
pages_doctor/doctorIm.vue

@@ -385,7 +385,7 @@
 								text-align: right;
 							}
 							.words{
-								background: #5B37FD ;
+								background: #F5723A ;
 								color: #FFFFFF;
 								border-radius: 20upx 0 20upx 20upx;
 							}
@@ -453,7 +453,7 @@
 					height: 64upx;
 					line-height: 64upx;
 					border-radius: 32upx;
-					background: #5B37FD ;
+					background: #F5723A ;
 					font-size: 28upx;
 					font-family: PingFang SC;
 					font-weight: 500;

+ 3 - 3
pages_doctor/doctorList.vue

@@ -333,7 +333,7 @@
 						font-family: PingFang SC;
 						font-weight: 500;
 						color: #FFFFFF;
-						background: #5B37FD ;
+						background: #F5723A ;
 						border-radius: 10upx 4upx 10upx 4upx;
 						margin-right: 12upx;
 					}
@@ -418,13 +418,13 @@
 						.label{
 							font-size: 26upx;
 							font-weight: 500;
-							color: #5B37FD ;
+							color: #F5723A ;
 							margin-right: 5upx;
 						}
 						.num{
 							font-size: 28upx;
 							font-weight: bold;
-							color: #5B37FD ;
+							color: #F5723A ;
 						}
 					}
 				}

+ 1 - 1
pages_doctor/index.vue

@@ -86,7 +86,7 @@
 									<free-audio 
 										startPic='https://zlwh.obs.cn-southwest-2.myhuaweicloud.com/orangeShop/play.png' 
 										endPic='https://zlwh.obs.cn-southwest-2.myhuaweicloud.com/orangeShop/pause.png'
-										activeColor="#5B37FD "
+										activeColor="#F5723A "
 										:audioId="'audio'+index"
 										:url='item.replyAudioUrl'
 									></free-audio>

+ 1 - 1
pages_doctor/paymentOrder.vue

@@ -308,7 +308,7 @@
 				font-weight: bold;
 				color: #FFFFFF;
 				text-align: center;
-				background: #5B37FD ;
+				background: #F5723A ;
 				border-radius: 44upx;
 			}
 		}

+ 2 - 2
pages_doctor/submitOrder.vue

@@ -299,7 +299,7 @@
 						}
 						&.active{
 							background: rgba(230, 250, 247, 0);
-							border: 2upx solid #5B37FD ;
+							border: 2upx solid #F5723A ;
 							position: relative;
 						}
 						.active-img{
@@ -444,7 +444,7 @@
 				font-weight: bold;
 				color: #FFFFFF;
 				text-align: center;
-				background: #5B37FD ;
+				background: #F5723A ;
 				border-radius: 44upx;
 			}
 		}

+ 2 - 2
pages_index/index/articleDetails.vue

@@ -173,7 +173,7 @@
 			font-family: PingFang SC;
 			font-weight: 500;
 			color: #FFFFFF;
-			background: #5B37FD ;
+			background: #F5723A ;
 			border-radius: 40upx;
 			display: flex;
 			align-items: center;
@@ -218,7 +218,7 @@
 				font-size: 22upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #5B37FD ;
+				color: #F5723A ;
 				line-height: 1;
 			}
 			 

+ 4 - 4
pages_index/index/articleList.vue

@@ -211,15 +211,15 @@
 			font-size: 28upx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #5B37FD ;
+			color: #F5723A ;
 			background: #ffffff;
-			border: 1px solid #5B37FD ;
+			border: 1px solid #F5723A ;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #5B37FD ;
-				border: 1px solid #5B37FD ;
+				background: #F5723A ;
+				border: 1px solid #F5723A ;
 			}
 		}
 	}

+ 3 - 3
pages_index/index/chineseMedicineDetails.vue

@@ -123,7 +123,7 @@
 					border-radius: 5rpx;
 					width: 8rpx;
 					height:30rpx;
-					background-color: #5B37FD ;
+					background-color: #F5723A ;
 				}
 				.title{
 					margin-left: 15rpx;
@@ -155,7 +155,7 @@
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
-				// border: 1rpx solid #5B37FD ;
+				// border: 1rpx solid #F5723A ;
 				border-radius: 30rpx;
 				line-height: 60rpx;
 				.tab1{
@@ -207,7 +207,7 @@
 					font-family: PingFang SC;
 				}
 				.active{
-					background-color: #5B37FD ;
+					background-color: #F5723A ;
 					color: #fff;
 				}
 				 

+ 4 - 4
pages_index/index/chineseMedicineList.vue

@@ -12,7 +12,7 @@
 				 <u-tabs
 				  :scrollable="false"
 				  :list="tabs"  
-				  lineColor="#5B37FD "
+				  lineColor="#F5723A "
 				 @change="tabChange">
 				 </u-tabs>
 			</view>
@@ -242,14 +242,14 @@
 						border-radius: 5rpx;
 						width: 8rpx;
 						height:30rpx;
-						background-color: #5B37FD ;
+						background-color: #F5723A ;
 					}
 					
 				}
 				.active{
 					background-color: #fff;
 					font-weight: bold;
-					color: #5B37FD ;
+					color: #F5723A ;
 				}
 			}
 			
@@ -268,7 +268,7 @@
 				font-size: 40upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #5B37FD ;
+				color: #F5723A ;
 				line-height: 80upx;
 			}
 			.items{

+ 1 - 1
pages_index/index/diseaseDetails.vue

@@ -102,7 +102,7 @@
 			.line{
 				width: 6rpx;
 				height:30rpx;
-				background-color: #5B37FD ;
+				background-color: #F5723A ;
 				 
 			}
 			.title{

+ 4 - 4
pages_index/index/diseaseList.vue

@@ -205,15 +205,15 @@
 			font-size: 28upx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #5B37FD ;
+			color: #F5723A ;
 			background: #ffffff;
-			border: 1px solid #5B37FD ;
+			border: 1px solid #F5723A ;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #5B37FD ;
-				border: 1px solid #5B37FD ;
+				background: #F5723A ;
+				border: 1px solid #F5723A ;
 			}
 		}
 	}

+ 2 - 2
pages_index/index/doctorArticleDetails.vue

@@ -226,14 +226,14 @@
 				height: 100upx;
 				border-radius: 50%;
 				z-index: 9;
-				border: 2rpx solid #5B37FD ;
+				border: 2rpx solid #F5723A ;
 			}
 			.text{
 				margin-top: 15upx;
 				font-size: 30upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #5B37FD ;
+				color: #F5723A ;
 			}
 			 
 		}

+ 4 - 4
pages_index/index/doctorArticleList.vue

@@ -214,15 +214,15 @@
 			font-size: 28upx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #5B37FD ;
+			color: #F5723A ;
 			background: #ffffff;
-			border: 1px solid #5B37FD ;
+			border: 1px solid #F5723A ;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #5B37FD ;
-				border: 1px solid #5B37FD ;
+				background: #F5723A ;
+				border: 1px solid #F5723A ;
 			}
 		}
 	}

+ 3 - 3
pages_index/index/famousPrescribeDetails.vue

@@ -123,7 +123,7 @@
 					border-radius: 5rpx;
 					width: 8rpx;
 					height:30rpx;
-					background-color: #5B37FD ;
+					background-color: #F5723A ;
 				}
 				.title{
 					margin-left: 15rpx;
@@ -155,7 +155,7 @@
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
-				// border: 1rpx solid #5B37FD ;
+				// border: 1rpx solid #F5723A ;
 				border-radius: 30rpx;
 				line-height: 60rpx;
 				.tab1{
@@ -207,7 +207,7 @@
 					font-family: PingFang SC;
 				}
 				.active{
-					background-color: #5B37FD ;
+					background-color: #F5723A ;
 					color: #fff;
 				}
 				 

+ 4 - 4
pages_index/index/famousPrescribeList.vue

@@ -12,7 +12,7 @@
 				 <u-tabs
 				  :scrollable="false"
 				  :list="tabs"  
-				  lineColor="#5B37FD "
+				  lineColor="#F5723A "
 				 @change="tabChange">
 				 </u-tabs>
 			</view>
@@ -269,14 +269,14 @@
 						border-radius: 5rpx;
 						width: 8rpx;
 						height:30rpx;
-						background-color: #5B37FD ;
+						background-color: #F5723A ;
 					}
 					
 				}
 				.active{
 					background-color: #fff;
 					font-weight: bold;
-					color: #5B37FD ;
+					color: #F5723A ;
 				}
 			}
 			
@@ -295,7 +295,7 @@
 				font-size: 40upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #5B37FD ;
+				color: #F5723A ;
 				line-height: 80upx;
 			}
 			.items{

+ 3 - 3
pages_index/index/medicatedFoodDetails.vue

@@ -98,7 +98,7 @@
 					border-radius: 5rpx;
 					width: 8rpx;
 					height:30rpx;
-					background-color: #5B37FD ;
+					background-color: #F5723A ;
 				}
 				.title{
 					margin-left: 15rpx;
@@ -130,7 +130,7 @@
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
-				// border: 1rpx solid #5B37FD ;
+				// border: 1rpx solid #F5723A ;
 				border-radius: 30rpx;
 				line-height: 60rpx;
 				.tab1{
@@ -182,7 +182,7 @@
 					font-family: PingFang SC;
 				}
 				.active{
-					background-color: #5B37FD ;
+					background-color: #F5723A ;
 					color: #fff;
 				}
 				 

+ 4 - 4
pages_index/index/medicatedFoodList.vue

@@ -225,15 +225,15 @@
 			font-size: 28upx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #5B37FD ;
+			color: #F5723A ;
 			background: #ffffff;
-			border: 1px solid #5B37FD ;
+			border: 1px solid #F5723A ;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #5B37FD ;
-				border: 1px solid #5B37FD ;
+				background: #F5723A ;
+				border: 1px solid #F5723A ;
 			}
 		}
 	}

+ 2 - 2
pages_index/index/questionsDetails.vue

@@ -169,7 +169,7 @@
 			font-family: PingFang SC;
 			font-weight: 500;
 			color: #FFFFFF;
-			background: #5B37FD ;
+			background: #F5723A ;
 			border-radius: 40upx;
 			display: flex;
 			align-items: center;
@@ -214,7 +214,7 @@
 				font-size: 22upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #5B37FD ;
+				color: #F5723A ;
 				line-height: 1;
 			}
 			 

+ 4 - 4
pages_index/index/questionsList.vue

@@ -209,15 +209,15 @@
 			font-size: 28upx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #5B37FD ;
+			color: #F5723A ;
 			background: #ffffff;
-			border: 1px solid #5B37FD   ;
+			border: 1px solid #F5723A   ;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #5B37FD    ;
-				border: 1px solid #5B37FD ;
+				background: #F5723A    ;
+				border: 1px solid #F5723A ;
 			}
 		}
 	}

+ 1 - 1
pages_index/index/testDetails.vue

@@ -215,7 +215,7 @@
 			 		font-family: PingFang SC;
 			 		font-weight: bold;
 			 		color: #FFFFFF;
-			 		background: #5B37FD ;
+			 		background: #F5723A ;
 			 		border-radius: 50upx;
 			 	}
 			 }

+ 2 - 2
pages_index/index/testList.vue

@@ -185,7 +185,7 @@
 					.people-num{
 						font-size: 24upx;
 						font-family: PingFang SC;
-						color: #5B37FD ;
+						color: #F5723A ;
 						.num{
 							font-weight: bold;
 							color: #814E1B;
@@ -196,7 +196,7 @@
 						font-size: 24upx;
 						font-family: PingFang SC;
 						font-weight: 500;
-						color: #5B37FD ;
+						color: #F5723A ;
 					}
 				}
 			}

+ 3 - 3
pages_index/index/testResult.vue

@@ -186,8 +186,8 @@
 			.bg{
 				width: 100%;
 				height:100%;
-				// background-color: #5B37FD ;
-				// background: linear-gradient(#5B37FD, #5B37FD );
+				// background-color: #F5723A ;
+				// background: linear-gradient(#F5723A, #F5723A );
 				position: fixed;
 				image{
 					width: 100%;
@@ -303,7 +303,7 @@
 								.title-line{
 									width: 8rpx;
 									height: 28rpx;
-									background: #5B37FD ;
+									background: #F5723A ;
 									border-radius: 2px 2px 2px 2px;
 									opacity: 1;
 								}

+ 1 - 1
pages_index/index/testResultImg.vue

@@ -189,7 +189,7 @@ page {
  		font-family: PingFang SC;
  		font-weight: 400;
  		color: #ffffff;
- 		background:#5B37FD  !important;
+ 		background:#F5723A  !important;
  		border-radius: 44upx;
  	}
  }

+ 3 - 3
pages_index/index/vesselDetails.vue

@@ -100,7 +100,7 @@
 					border-radius: 5rpx;
 					width: 8rpx;
 					height:30rpx;
-					background-color: #5B37FD ;
+					background-color: #F5723A ;
 				}
 				.title{
 					margin-left: 15rpx;
@@ -132,7 +132,7 @@
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
-				// border: 1rpx solid #5B37FD ;
+				// border: 1rpx solid #F5723A ;
 				border-radius: 30rpx;
 				line-height: 60rpx;
 				.tab1{
@@ -184,7 +184,7 @@
 					font-family: PingFang SC;
 				}
 				.active{
-					background-color: #5B37FD ;
+					background-color: #F5723A ;
 					color: #fff;
 				}
 				 

+ 4 - 4
pages_index/index/vesselList.vue

@@ -12,7 +12,7 @@
 				 <u-tabs
 				  :scrollable="false"
 				  :list="tabs"  
-				  lineColor="#5B37FD "
+				  lineColor="#F5723A "
 				 @change="tabChange">
 				 </u-tabs>
 			</view>
@@ -242,14 +242,14 @@
 						border-radius: 5rpx;
 						width: 8rpx;
 						height:30rpx;
-						background-color: #5B37FD ;
+						background-color: #F5723A ;
 					}
 					
 				}
 				.active{
 					background-color: #fff;
 					font-weight: bold;
-					color: #5B37FD ;
+					color: #F5723A ;
 					padding-left: 0;
 					width: 100%;
 				}
@@ -270,7 +270,7 @@
 				font-size: 40upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #5B37FD ;
+				color: #F5723A ;
 				line-height: 80upx;
 			}
 			.items{

+ 3 - 3
pages_shopping/shopping/confirmCreateOrder.vue

@@ -66,7 +66,7 @@
 				</view>
 				<view class="right">
 					<text class="text">{{price.usedIntegral}}积分</text>
-					<evan-switch @change="integralChange" v-model="checked" activeColor="#5B37FD " inactiveColor="rgba(0, 0, 0, 0.1)"></evan-switch>
+					<evan-switch @change="integralChange" v-model="checked" activeColor="#F5723A " inactiveColor="rgba(0, 0, 0, 0.1)"></evan-switch>
 				</view>
 			</view>
 			<view class="points" @click="openCoupon()">
@@ -475,7 +475,7 @@
 							display: inline-block;
 							padding: 0 6upx;
 							height: 30upx;
-							background: linear-gradient(90deg, #5B37FD 0%, #5B37FD  100%);
+							background: linear-gradient(90deg, #F5723A 0%, #F5723A  100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							font-size: 22upx;
@@ -682,7 +682,7 @@
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #5B37FD ;
+				background: #F5723A ;
 				border-radius: 44upx;
 			}
 		}

+ 2 - 2
pages_shopping/shopping/confirmPackageOrder.vue

@@ -417,7 +417,7 @@
 							display: inline-block;
 							padding: 0 6upx;
 							height: 30upx;
-							background: linear-gradient(90deg, #5B37FD 0%, #5B37FD  100%);
+							background: linear-gradient(90deg, #F5723A 0%, #F5723A  100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							font-size: 22upx;
@@ -624,7 +624,7 @@
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #5B37FD ;
+				background: #F5723A ;
 				border-radius: 44upx;
 			}
 		}

+ 3 - 3
pages_user/user/addAddress.vue

@@ -36,7 +36,7 @@
 			<!-- 设为默认地址 -->
 			<view class="setting-box">
 				<text class="label">设为默认地址</text>
-				<evan-switch v-model="isDefault" activeColor="#5B37FD " inactiveColor="rgba(0, 0, 0, 0.1)"></evan-switch>
+				<evan-switch v-model="isDefault" activeColor="#F5723A " inactiveColor="rgba(0, 0, 0, 0.1)"></evan-switch>
 			</view>
 		</view>
 		<view class="btn-box">
@@ -298,7 +298,7 @@
 						text-align: center;
 						border-radius: 32upx;
 						&.parse{
-							background: #5B37FD ;
+							background: #F5723A ;
 							color: #FFFFFF;
 						}
 					}
@@ -397,7 +397,7 @@
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #5B37FD ;
+				background: #F5723A ;
 				border-radius: 44upx;
 			}
 		}

+ 1 - 1
pages_user/user/addDoc.vue

@@ -273,7 +273,7 @@
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #5B37FD ;
+				background: #F5723A ;
 				border-radius: 44upx;
 			}
 		}

+ 1 - 1
pages_user/user/addDocRecord.vue

@@ -277,7 +277,7 @@
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #5B37FD ;
+				background: #F5723A ;
 				border-radius: 44upx;
 			}
 		}

+ 1 - 1
pages_user/user/addPatient.vue

@@ -306,7 +306,7 @@
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #5B37FD ;
+				background: #F5723A ;
 				border-radius: 44upx;
 			}
 		}

+ 2 - 2
pages_user/user/address.vue

@@ -204,7 +204,7 @@
 							font-family: PingFang SC;
 							font-weight: 500;
 							color: #FFFFFF;
-							background: #5B37FD ;
+							background: #F5723A ;
 							border-radius: 4upx;
 							float: left;
 							margin-right: 10upx;
@@ -261,7 +261,7 @@
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #5B37FD ;
+				background: #F5723A ;
 				border-radius: 44upx;
 			}
 		}

+ 1 - 1
pages_user/user/doc.vue

@@ -228,7 +228,7 @@
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #5B37FD ;
+				background: #F5723A ;
 				border-radius: 44upx;
 			}
 		}

+ 1 - 1
pages_user/user/docRecord.vue

@@ -448,7 +448,7 @@
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #5B37FD ;
+				background: #F5723A ;
 				border-radius: 44upx;
 			}
 		}

+ 2 - 2
pages_user/user/doctorOrder.vue

@@ -292,7 +292,7 @@
 							font-weight: 500;
 							line-height: 1;
 							&.success{
-								color: #5B37FD ;
+								color: #F5723A ;
 							}
 							&.black{
 								color: #111111;
@@ -409,7 +409,7 @@
 								color: #666666;
 							}
 							&.pay{
-								background: #5B37FD ;
+								background: #F5723A ;
 								color: #FFFFFF;
 							}
 						}

+ 1 - 1
pages_user/user/otherPaymentOrder.vue

@@ -337,7 +337,7 @@
 				font-weight: bold;
 				color: #FFFFFF;
 				text-align: center;
-				background: #5B37FD ;
+				background: #F5723A ;
 				border-radius: 44upx;
 				margin-bottom: 10rpx;
 			}

+ 1 - 1
pages_user/user/otherPaymentOrderRemain.vue

@@ -341,7 +341,7 @@
 				font-weight: bold;
 				color: #FFFFFF;
 				text-align: center;
-				background: #5B37FD ;
+				background: #F5723A ;
 				border-radius: 44upx;
 				margin-bottom: 10rpx;
 			}

+ 1 - 1
pages_user/user/patient.vue

@@ -226,7 +226,7 @@
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #5B37FD ;
+				background: #F5723A ;
 				border-radius: 44upx;
 			}
 		}

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä