liujiaxin пре 1 недеља
родитељ
комит
cd86c0d1b4
100 измењених фајлова са 1073 додато и 1561 уклоњено
  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. 19 30
      components/tabbar/tabbar.vue
  8. 21 9
      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. 256 452
      pages/home/index.vue
  15. 12 12
      pages/home/indexOld.vue
  16. 2 2
      pages/home/new/articleDetails.vue
  17. 4 4
      pages/home/new/articleList.vue
  18. 3 3
      pages/home/new/chineseMedicineDetails.vue
  19. 4 4
      pages/home/new/chineseMedicineList.vue
  20. 1 1
      pages/home/new/diseaseDetails.vue
  21. 4 4
      pages/home/new/diseaseList.vue
  22. 3 3
      pages/home/new/famousPrescribeDetails.vue
  23. 4 4
      pages/home/new/famousPrescribeList.vue
  24. 3 3
      pages/home/new/medicatedFoodDetails.vue
  25. 4 4
      pages/home/new/medicatedFoodList.vue
  26. 2 2
      pages/home/new/questionsDetails.vue
  27. 4 4
      pages/home/new/questionsList.vue
  28. 1 1
      pages/home/new/testDetails.vue
  29. 2 2
      pages/home/new/testList.vue
  30. 3 3
      pages/home/new/testResult.vue
  31. 1 1
      pages/home/new/testResultImg.vue
  32. 3 3
      pages/home/new/vesselDetails.vue
  33. 4 4
      pages/home/new/vesselList.vue
  34. 1 1
      pages/home/productList.vue
  35. 232 0
      pages/learn/index.vue
  36. 132 229
      pages/live/index.vue
  37. 2 2
      pages/shopping/cart.vue
  38. 3 3
      pages/shopping/confirmOrder.vue
  39. 2 2
      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. 154 582
      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, #efa566  0%, #FC581C  100%);
-	border: 1px solid #FC581C ;
+	background: linear-gradient(135deg, #5B37FD  0%, #5B37FD  100%);
+	border: 1px solid #5B37FD ;
 }
 /* 选中后的 对勾样式 (白色对勾) */
 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, #efa566 0%, #FC581C  100%);
-	border: 1px solid #FC581C ;
+	background: linear-gradient(135deg, #5B37FD 0%, #5B37FD  100%);
+	border: 1px solid #5B37FD ;
 	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: #FC581C;
+	color: #5B37FD;
 }

+ 1 - 1
components/Menu.vue

@@ -139,7 +139,7 @@ export default {
 		.dot-active {
 			width: 40rpx;
 			height: 3rpx;
-			background: #FC581C ;
+			background: #5B37FD ;
 			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='#FC581C '>
+				block-color='#5B37FD '>
 			</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: #FC581C ;
+		background: #5B37FD ;
 		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: #FC581C ;
+	background-color: #5B37FD ;
 }
 
 .TUI-commom-function-item:first-child {

+ 19 - 30
components/tabbar/tabbar.vue

@@ -71,36 +71,22 @@
 			},
 			themeicon() {
 				this.tabbarList = [{
-						iconPath: "https://zlwh.obs.cn-southwest-2.myhuaweicloud.com/orangeShop/home.png",
-						selectedIconPath: "https://zlwh.obs.cn-southwest-2.myhuaweicloud.com/orangeShop/home_sel.png",
+						iconPath: "../../static/tabbar/home.png",
+						selectedIconPath: "../../static/tabbar/home_sel.png",
 						Text: '首页',
 						url: '/pages/home/index',
 						isshowed:true
 					},
-					// {
-					// 	iconPath: "https://zlwh.obs.cn-southwest-2.myhuaweicloud.com/orangeShop/health.png",
-					// 	selectedIconPath: "https://zlwh.obs.cn-southwest-2.myhuaweicloud.com/orangeShop/health_sel.png",
-					// 	Text: '健康百科',
-					// 	url: '/pages/healthy/index',
-					// 	isshowed:true
-					// },
 					{
-						iconPath: "https://zlwh.obs.cn-southwest-2.myhuaweicloud.com/orangeShop/archive.png",
-						selectedIconPath: "https://zlwh.obs.cn-southwest-2.myhuaweicloud.com/orangeShop/archive_sel.png",
-						Text: '健康档案',
-						url: '/pages/healthy/idea',
-						isshowed:false
-					},
-					{
-						iconPath: "https://zlwh.obs.cn-southwest-2.myhuaweicloud.com/orangeShop/shop_mall.png",
-						selectedIconPath: "https://zlwh.obs.cn-southwest-2.myhuaweicloud.com/orangeShop/shop_mall_sel.png",
-						Text: '健康产品',
-						url: '/pages/shopping/index',
-						isshowed:false
+						iconPath: "../../static/manageTabIcon/training.png",
+						selectedIconPath: "../../static/manageTabIcon/training_on.png",
+						Text: '学习',
+						url: '/pages/learn/index',
+						isshowed:true
 					},
 					{
-						iconPath: "https://zlwh.obs.cn-southwest-2.myhuaweicloud.com/orangeShop/my.png",
-						selectedIconPath: "https://zlwh.obs.cn-southwest-2.myhuaweicloud.com/orangeShop/my_sel.png",
+						iconPath: "../../static/tabbar/my.png",
+						selectedIconPath: "../../static/tabbar/my_sel.png",
 						Text: '我的',
 						url: '/pages/user/index',
 						isshowed:true
@@ -122,27 +108,30 @@
 		background-color: #fff;
 		z-index: 1000;
 		height: 100rpx;
-		padding: 20rpx 0rpx;
+		padding: 10rpx 0rpx 20rpx;
+		box-shadow: 0 -2rpx 10rpx rgba(0,0,0,0.05);
+
 		image{
 			margin-bottom: 4rpx;
-			width: 48rpx;
-			height: 48rpx;
+			width: 44rpx;
+			height: 44rpx;
 		}
 	}
 
 	.tablist {
-		width: 25%;
+		flex: 1;
 	}
 	.morecolor{
-		color: #626468;
+		color: #999;
 	}
 	.actcolor{
-		color: #FC581C ;
+		color: #5C4BFF;
 	}
 	.tabbar-list{
 		display: flex;
 		flex-direction: column;
 		align-items: center;
-		font-size: 24rpx
+		font-size: 20rpx;
+		font-weight: 500;
 	}
 </style>

+ 21 - 9
pages.json

@@ -305,6 +305,12 @@
 				"enablePullDownRefresh": false
 			}
 
+		},
+		{
+			"path": "pages/learn/index",
+			"style": {
+				"navigationBarTitleText": ""
+			}
 		}
 		// ,{
 		//     "path" : "pages/shopping/confirmPackageOrder",
@@ -1290,7 +1296,7 @@
 	},
 	"tabBar": {
 		"color": "#666666",
-		"selectedColor": "#098CFE",
+		"selectedColor": "#5B37FD",
 		// "custom": true, 
 		"borderStyle": "white",
 		"backgroundColor": "#ffffff",
@@ -1316,18 +1322,24 @@
 			// 	"selectedIconPath": "/static/orangetabbar/shop_mall_sel.png",
 			// 	"text": "健康产品"
 			// },
-			
+			// {
+			// 	"pagePath": "pages/live/index",
+			// 	"iconPath": "/static/orangetabbar/new.png",
+			// 	"selectedIconPath": "/static/orangetabbar/new_pre.png",
+			// 	"text": "学习"
+			// },
 			{
-				"pagePath": "pages/live/index",
-				"iconPath": "/static/orangetabbar/live_stream.png",
-				"selectedIconPath": "/static/orangetabbar/live_stream_pre.png",
-				"text": "直播课"
-			},{
-				"pagePath": "pages/message/index",
+				"pagePath": "pages/learn/index",
 				"iconPath": "/static/orangetabbar/new.png",
 				"selectedIconPath": "/static/orangetabbar/new_pre.png",
-				"text": "消息"
+				"text": "学习"
 			},
+			// {
+			// 	"pagePath": "pages/message/index",
+			// 	"iconPath": "/static/orangetabbar/new.png",
+			// 	"selectedIconPath": "/static/orangetabbar/new_pre.png",
+			// 	"text": "消息"
+			// },
 			
 			// {
 			// 	"pagePath": "pages/healthy/idea",

+ 10 - 10
pages/auth/login.vue

@@ -250,8 +250,8 @@ export default {
 			position: absolute;
 			width: 630rpx;
 			height: 80rpx;
-			background: linear-gradient(to right, #FC581C  0%, #2aa7B9 100%);
-			background: -moz-linear-gradient(to right, #FC581C  0%, #2aa7B9 100%);
+			background: linear-gradient(to right, #5B37FD  0%, #2aa7B9 100%);
+			background: -moz-linear-gradient(to right, #5B37FD  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, #efa566  0%, #FC581C  100%);
-      background: -moz-linear-gradient(to right, #efa566 0%, #FC581C  100%);
+      background: linear-gradient(to right, #5B37FD  0%, #5B37FD  100%);
+      background: -moz-linear-gradient(to right, #5B37FD 0%, #5B37FD  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 #FC581C ;
+      border: 2rpx solid #5B37FD ;
       background: none;
       font-size: 30rpx;
       font-family: PingFang SC;
       font-weight: 500;
-      color: #FC581C ;
+      color: #5B37FD ;
     }
   }
 }
@@ -375,7 +375,7 @@ export default {
 	checkbox{
 	}
 	.btn{
-		color: #FC581C ;
+		color: #5B37FD ;
 	}
 }
 
@@ -424,7 +424,7 @@ export default {
 				width: 50%;
 				height: 80rpx;
 				border-radius: 5rpx;
-				background-color: #FC581C ;
+				background-color: #5B37FD ;
 				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 #FC581C ;
+				border: 2rpx solid #5B37FD ;
 				background: none;
 				font-size: 30rpx;
 				font-family: PingFang SC;
 				font-weight: 500;
-				color: #FC581C ;
+				color: #5B37FD ;
 			}
 		}
 	}

+ 2 - 2
pages/healthy/detail.vue

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

+ 1 - 1
pages/healthy/idea.vue

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

+ 4 - 4
pages/healthy/index.vue

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

+ 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="#FC581C "
+								activeColor="#5B37FD "
 								:audioId="'audio'+index"
 								:url='item.replyAudioUrl'
 							></free-audio>

+ 256 - 452
pages/home/index.vue

@@ -7,15 +7,26 @@
 				<view class="fixed-top-box" :style="{ background: bgColor }">
 					<!-- 这里是状态栏 -->
 					<view class="status_bar" :style="{height: statusBarHeight}"></view>
-					<view class="top-title">
-						<image class="user-avatar" src="../../static/avatar.png" mode="aspectFill"></image>
-						<view class="name">云联融智</view>
+					<view class="header-content">
+						<view class="top-title">
+							<view class="name">云联融智</view>
+						</view>
+						<view class="header-search-box">
+							<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="message-box" @click="navTo('/pages/message/index')">
+								<image class="message-icon" src=" /static/message.png" mode="aspectFit"></image>
+								<view class="red-dot"></view>
+							</view>
+						</view>
 					</view>
 				</view>
 			</view>
 			<!-- 头部间距 -->
-			<view style="padding-bottom:100rpx">
-				<view class="status_bar" :style="{height: statusBarHeight}"></view>
+			<view :style="{paddingBottom: headerHeight + 'px'}">
+				<!-- <view class="status_bar" :style="{height: statusBarHeight}"></view> -->
 			</view>
 			<!-- 轮播图 -->
 			<view class="banner-box">
@@ -34,89 +45,60 @@
 			<view class="menu-content">
 				<view class="menu-box">
 					<view @click="yangshengClick(item)" class="menu-item" :key="index" v-for="(item,index) in yangshengs">
-						<image class="icon" :src="item.icon"></image>
+						<view class="icon-wrap">
+							<image class="icon" :src="item.icon"></image>
+						</view>
 						<view class="title">{{item.title}} </view>
 					</view>
 				</view>
-				<view class="scroll-bar-box">
-					<view class="scroll-bar">
-						<view class="scroll-dot active"></view>
-						<view class="scroll-dot"></view>
-					</view>
-				</view>
 			</view>
 
-			<!-- 推荐课程 -->
-			<view class="recommend-box">
-				<view class="title-box">
-					<text class="title">推荐课程</text>
+			<!-- 最新发布 -->
+			<view class="section-box latest-release">
+				<view class="section-header">
+					<view class="left">
+						<view class="vertical-bar"></view>
+						<text class="title">最新发布</text>
+					</view>
+					<view class="more" @click="goClassList(1)">
+						<text>查看全部</text>
+						<image src=" /static/right_arrow_right.png" mode="aspectFit"></image>
+					</view>
 				</view>
-				<view class="course-list">
-					<view class="course-item" v-for="(item, index) in classList" :key="index" @click="goClass(item.courseId, 1)">
-						<image class="course-img" :src="item.imgUrl || '../../static/course_img.png'" mode="aspectFill"></image>
-						<view class="course-info">
-							<view class="course-title ellipsis2">{{item.courseName}}</view>
-							<view class="course-countdown">
-								<text class="label">倒计时</text>
-								<view class="time-box">
-									<text class="time">04</text>
-									<text class="split">:</text>
-									<text class="time">32</text>
-									<text class="split">:</text>
-									<text class="time">18</text>
-								</view>
-								<text class="limit">限量100份</text>
-							</view>
-							<view class="course-price-box">
-								<view class="price-left">
-									<text class="symbol">¥</text>
-									<text class="price">50</text>
-									<text class="old-price">¥ 499</text>
-								</view>
-								<view class="order-btn">预约听课</view>
-							</view>
+				<scroll-view class="horizontal-scroll" scroll-x="true">
+					<view class="scroll-content">
+						<view class="item" v-for="(item, index) in latestList" :key="index" @click="goClass(item.courseId, 1)">
+							<image class="cover" :src="item.imgUrl || ' /static/course_img.png'" mode="aspectFill"></image>
+							<view class="name ellipsis">{{item.courseName}}</view>
 						</view>
 					</view>
-				</view>
+				</scroll-view>
 			</view>
 
-			<!-- 名医精讲 -->
-			<view class="famous-doctor-box">
-				<view class="title-box">
-					<text class="title">名医精讲</text>
-					<view class="more" @click="navTo('/pages_index/index/doctorArticleList')">
-						<text>更多</text>
-						<image src="/static/right_arrow_right.png"></image>
+			<!-- 精品录播 -->
+			<view class="section-box featured-courses">
+				<view class="section-header">
+					<view class="left">
+						<view class="vertical-bar"></view>
+						<text class="title">精品录播</text>
+					</view>
+					<view class="more" @click="goClassList(2)">
+						<text>查看全部</text>
+						<image src=" /static/right_arrow_right.png" mode="aspectFit"></image>
 					</view>
 				</view>
-				<scroll-view class="doctor-scroll" scroll-x="true">
-					<view class="doctor-list">
-						<view class="doctor-item" v-for="(item, index) in doctocArticles" :key="index" @click="navTo('/pages_index/index/doctorArticleDetails?articleId='+item.articleId)">
-							<view class="doctor-img-box">
-								<image class="doctor-img" :src="item.imageUrl || '/static/famous_doctor_img.png'" mode="aspectFill"></image>
-								<view class="view-count">
-									<image src="/static/eye_open.png"></image>
-									<text>{{item.views}}</text>
-								</view>
-								<view class="play-btn">
-									<view class="play-icon-inner"></view>
-								</view>
-							</view>
-							<view class="doctor-title ellipsis">{{item.title}}</view>
-							<view class="doctor-info">
-								<view class="doctor-user">
-									<image class="avatar" :src="item.avatar || '/static/avatar.png'"></image>
-									<text class="name">{{item.doctorName}}</text>
-								</view>
-								<view class="like-box" @click.stop="likeClick(item)">
-									<image v-if="isLike" src="/static/f_like_red.png"></image>
-									<image v-else src="/static/zan_icon.png"></image>
-									<text>2.0万</text>
-								</view>
+				<view class="grid-list">
+					<view class="item" v-for="(item, index) in featuredList" :key="index" @click="goClass(item.courseId, 1)">
+						<view class="cover-box">
+							<image class="cover" :src="item.imgUrl || ' /static/course_img.png'" mode="aspectFill"></image>
+							<view class="overlay bottom-info">
+								<text class="left-text">{{item.playCount}}次播放</text>
+								<text class="right-text">共{{item.lessonCount}}讲</text>
 							</view>
 						</view>
+						<view class="name ellipsis">{{item.courseName}}</view>
 					</view>
-				</scroll-view>
+				</view>
 			</view>
 
 				<!--养生干货-->
@@ -155,7 +137,6 @@
 		</view>
 		<z-modal :show="tuiModalControl" placeholderText="请输入邀请码" :btnGroup="btnGroup" :contentType="2"
 			titleText="填写邀请码" @cancle="cancleTui" @sure="submitTui"></z-modal>
-		<!-- <tabbar :actindex="0"></tabbar> -->
 	</view>
 </template>
 
@@ -224,7 +205,7 @@
 				}, {
 					text: '确定',
 					color: '#FFFFFF',
-					bgColor: '#FC581C ',
+					bgColor: '#5B37FD ',
 					width: '150rpx',
 					height: '80rpx',
 					shape: 'fillet',
@@ -255,7 +236,8 @@
 				doctocArticles: [], //养生讲堂
 				articles: [], //养生干货
 				// 状态栏的高度
-				statusBarHeight: uni.getStorageSync('menuInfo').statusBarHeight,
+				statusBarHeight: uni.getStorageSync('menuInfo') ? uni.getStorageSync('menuInfo').statusBarHeight : 20,
+				headerHeight: 88, // 默认高度,后续动态计算
 				tabBg: "https://zlwh.obs.cn-southwest-2.myhuaweicloud.com/orangeShop/tab_bg.png", // tab切换背景
 				// 问诊案例类型
 				orderTypes: [{
@@ -272,35 +254,40 @@
 				messageShow: true,
 				yangshengs: [{
 						id: "1",
-						title: "疾病",
-						page: "/pages_index/index/diseaseList",
-						icon: "../../static/disease.png"
+						title: "精选课程",
+						page: "/pages_course/teacherClassroom?type=1",
+						icon: "/static/menu1.png",
 					},
 					{
 						id: "2",
-						title: "名医",
-						page: "/pages_doctor/doctorList",
-						icon: "../../static/famous_doctor.png"
+						title: "分享社区",
+						page: "/pages_index/index/articleList",
+						icon: "/static/menu2.png",
 					},
 					{
 						id: "3",
-						title: "养生",
-						page: "/pages_index/index/articleList",
-						icon: "../../static/health_preservation.png"
+						title: "付费课程",
+						page: "/pages_course/teacherClassroom?type=2",
+						icon: "/static/menu3.png",
 					},
 					{
 						id: "4",
-						title: "用药",
-						page: "/pages/shopping/index",
-						icon: "../../static/medication.png"
-					},
-					{
-						id: "5",
-						title: "用药",
-						page: "/pages/shopping/index",
-						icon: "../../static/medication.png"
+						title: "全部课程",
+						page: "/pages_course/teacherClassroom",
+						icon: "/static/menu4.png",
 					}
 				],
+				latestList: [
+					{ courseId: 1, courseName: '中医降脂养肝课', imgUrl: ' /static/famous_doctor_img.png' },
+					{ courseId: 2, courseName: '五脏养生操', imgUrl: ' /static/famous_doctor_img2.png' },
+					{ courseId: 3, courseName: '杜丁秋冬肠胃养生课', imgUrl: ' /static/course_img.png' }
+				],
+				featuredList: [
+					{ courseId: 4, courseName: '中医降脂养肝课', imgUrl: ' /static/famous_doctor_img.png', playCount: '8.1万', lessonCount: 15 },
+					{ courseId: 5, courseName: '五脏养生操', imgUrl: ' /static/famous_doctor_img2.png', playCount: '8.1万', lessonCount: 15 },
+					{ courseId: 6, courseName: '杜丁秋冬肠胃养生课', imgUrl: ' /static/course_img.png', playCount: '8.1万', lessonCount: 15 },
+					{ courseId: 7, courseName: '冬季养生', imgUrl: ' /static/famous_doctor_img.png', playCount: '8.1万', lessonCount: 15 }
+				],
 				userinfoa: [],
 				isuser: false,
 				menvKey: [],
@@ -342,6 +329,7 @@
 		mounted() {
 			this.getCourseList()
 			//this.getDepartmentList();
+			this.calculateHeaderHeight();
 		},
 		onShareAppMessage(res) {
 			return {
@@ -402,6 +390,14 @@
 			likeClick(item){
 				this.isLike = !this.isLike
 			},
+			calculateHeaderHeight() {
+				const query = uni.createSelectorQuery().in(this);
+				query.select('.fixed-top-box').boundingClientRect(data => {
+					if (data) {
+						this.headerHeight = data.height;
+					}
+				}).exec();
+			},
 			getCourseList() {
 				courseList().then(res => {
 					if (res.code == 200 && res.data && res.data.length > 0) {
@@ -413,12 +409,12 @@
 							{
 								courseId: 1,
 								courseName: '第一期超nice的健康博主大盘点,带你领略健康生活',
-								imgUrl: '../../static/course_img.png'
+								imgUrl: ' /static/course_img.png'
 							},
 							{
 								courseId: 2,
 								courseName: '家庭医生健康顾问服务,全家人的健康保障',
-								imgUrl: '../../static/course_img.png'
+								imgUrl: ' /static/course_img.png'
 							}
 						]
 					}
@@ -428,7 +424,7 @@
 						{
 							courseId: 1,
 							courseName: '第一期超nice的健康博主大盘点,带你领略健康生活',
-							imgUrl: '../../static/course_img.png'
+							imgUrl: ' /static/course_img.png'
 						}
 					]
 				})
@@ -881,18 +877,18 @@
 							{
 								articleId: 1,
 								title: '中医降脂养肝课',
-								imageUrl: '../../static/famous_doctor_img.png',
+								imageUrl: ' /static/famous_doctor_img.png',
 								views: 3724,
 								doctorName: '崔医生',
-								avatar: '../../static/avatar.png'
+								avatar: ' /static/avatar.png'
 							},
 							{
 								articleId: 2,
 								title: '春季养生与防病',
-								imageUrl: '../../static/famous_doctor_img2.png',
+								imageUrl: ' /static/famous_doctor_img2.png',
 								views: 2850,
 								doctorName: '崔医生',
-								avatar: '../../static/avatar.png'
+								avatar: ' /static/avatar.png'
 							}
 						]
 					}
@@ -902,10 +898,10 @@
 						{
 							articleId: 1,
 							title: '中医降脂养肝课',
-							imageUrl: '../../static/famous_doctor_img.png',
+							imageUrl: ' /static/famous_doctor_img.png',
 							views: 3724,
 							doctorName: '崔医生',
-							avatar: '../../static/avatar.png'
+							avatar: ' /static/avatar.png'
 						}
 					]
 				});
@@ -941,58 +937,90 @@
 		left: 0;
 		z-index: 1000;
 		transition: all 0.5s;
-		background-color: transparent;
+		background-color: #fff;
 
 		.status_bar {
 			width: 100%;
 		}
-	}
-
-	.content {
-		width: 100%;
-		position: relative;
-		background-color: #F8F9FB;
-		min-height: 100vh;
-
-		.bg {
-			width: 100%;
-			height: 450rpx;
-			position: absolute;
-			top: 0;
-			left: 0;
-		}
 
-		.top-inner {
-			width: 100%;
-			position: absolute;
-			top: 0;
-			left: 0;
-			z-index: 5;
+		.header-content {
+			padding: 10rpx 30rpx 20rpx;
 
 			.top-title {
 				height: 88upx;
-				line-height: 88upx;
 				display: flex;
 				align-items: center;
 				justify-content: flex-start;
-				padding-left: 30upx;
-
-				.user-avatar {
-					width: 64upx;
-					height: 64upx;
-					border-radius: 50%;
-					border: 2rpx solid #fff;
-				}
 
 				.name {
-					font-size: 32upx;
+					font-size: 44rpx;
 					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333;
-					margin-left: 16upx;
+					font-weight: bold;
+					color: #1A1A1A;
+				}
+			}
+
+			.header-search-box {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				margin-top: 10rpx;
+
+				.search-bar {
+					flex: 1;
+					height: 72rpx;
+					background: #F5F6F8;
+					border-radius: 36rpx;
+					display: flex;
+					align-items: center;
+					padding: 0 30rpx;
+					margin-right: 20rpx;
+
+					.search-icon {
+						width: 32rpx;
+						height: 32rpx;
+						margin-right: 16rpx;
+					}
+
+					.placeholder {
+						font-size: 28rpx;
+						color: #999;
+					}
+				}
+
+				.message-box {
+					position: relative;
+					width: 56rpx;
+					height: 56rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+
+					.message-icon {
+						width: 48rpx;
+						height: 48rpx;
+					}
+
+					.red-dot {
+						position: absolute;
+						top: 4rpx;
+						right: 4rpx;
+						width: 16rpx;
+						height: 16rpx;
+						background: #FF4D4F;
+						border-radius: 50%;
+						border: 2rpx solid #fff;
+					}
 				}
 			}
 		}
+	}
+
+	.content {
+		width: 100%;
+		position: relative;
+		background-color: #fff;
+		min-height: 100vh;
 
 		.banner-box {
 			padding: 0 30upx;
@@ -1000,10 +1028,9 @@
 
 			.inner {
 				width: 100%;
-				height: 320upx;
-				border-radius: 24upx;
+				height: 300upx;
+				border-radius: 20upx;
 				overflow: hidden;
-				box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.05);
 
 				.swiper,
 				.swiper-item,
@@ -1030,198 +1057,57 @@
 				align-items: center;
 				width: 25%;
 
-				.icon {
+				.icon-wrap {
 					width: 100upx;
 					height: 100upx;
-					margin-bottom: 12upx;
+					border-radius: 50%;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					margin-bottom: 16upx;
+
+					.icon {
+						width: 88upx;
+						height: 88upx;
+					}
 				}
 
 				.title {
 					font-size: 26upx;
-					color: #666;
+					color: #333;
 					font-family: PingFang SC;
+					font-weight: 500;
 				}
 			}
 		}
 
-		.scroll-bar-box {
-			display: flex;
-			justify-content: center;
-			margin-top: 24upx;
+		.section-box {
+			padding: 20rpx 30rpx;
 
-			.scroll-bar {
+			.section-header {
 				display: flex;
-				width: 48upx;
-				height: 8upx;
-				background: #E5E9F2;
-				border-radius: 4upx;
-				overflow: hidden;
-
-				.scroll-dot {
-					flex: 1;
-					height: 100%;
-
-					&.active {
-						background: #2B85FF;
-					}
-				}
-			}
-		}
-
-		.recommend-box {
-			margin: 20rpx 30rpx;
-			background: #FFFFFF;
-			border-radius: 24rpx;
-			padding: 30rpx;
-
-			.title-box {
+				justify-content: space-between;
+				align-items: center;
 				margin-bottom: 24rpx;
-				padding-bottom: 24rpx;
-				border-bottom: 1rpx solid #F5F5F5;
-
-				.title {
-					font-size: 34rpx;
-					font-family: PingFang SC;
-					font-weight: 800;
-					color: #1A1A1A;
-				}
-			}
 
-			.course-list {
-				.course-item {
+				.left {
 					display: flex;
-					padding: 20rpx 0;
-
-					&:last-child {
-						padding-bottom: 0;
-					}
+					align-items: center;
 
-					.course-img {
-						width: 180rpx;
-						height: 180rpx;
-						border-radius: 16rpx;
-						margin-right: 24rpx;
+					.vertical-bar {
+						width: 8rpx;
+						height: 32rpx;
+						background: #5C4BFF;
+						border-radius: 4rpx;
+						margin-right: 16rpx;
 					}
 
-					.course-info {
-						flex: 1;
-						display: flex;
-						flex-direction: column;
-						justify-content: space-between;
-
-						.course-title {
-							font-size: 32rpx;
-							font-weight: bold;
-							color: #1A1A1A;
-						 display: -webkit-box;
-  -webkit-line-clamp: 1; /* 显示行数 */
-  -webkit-box-orient: vertical;
-  overflow: hidden;
-  text-overflow: ellipsis;
-						}
-
-						.course-countdown {
-							display: flex;
-							align-items: center;
-							margin: 8rpx 0;
-
-							.label {
-								font-size: 22rpx;
-								color: #999;
-								margin-right: 12rpx;
-							}
-
-							.time-box {
-								display: flex;
-								align-items: center;
-
-								.time {
-									width: 36rpx;
-									height: 36rpx;
-									background: #F5F5F5;
-									border-radius: 4rpx;
-									font-size: 22rpx;
-									color: #333;
-									text-align: center;
-									line-height: 36rpx;
-									font-family: Roboto;
-								}
-
-								.split {
-									margin: 0 4rpx;
-									color: #999;
-									font-size: 20rpx;
-								}
-							}
-
-							.limit {
-								font-size: 22rpx;
-								color: #CCC;
-								margin-left: 20rpx;
-							}
-						}
-
-						.course-price-box {
-							display: flex;
-							align-items: center;
-							justify-content: space-between;
-
-							.price-left {
-								display: flex;
-								align-items: baseline;
-
-								.symbol {
-									font-size: 24rpx;
-									color: #FF6B00;
-									font-weight: bold;
-								}
-
-								.price {
-									font-size: 38rpx;
-									color: #FF6B00;
-									font-weight: bold;
-									margin: 0 12rpx 0 4rpx;
-								}
-
-								.old-price {
-									font-size: 24rpx;
-									color: #CCC;
-									text-decoration: line-through;
-								}
-							}
-
-							.order-btn {
-								width: 160rpx;
-								height: 56rpx;
-								background: #4CC67F;
-								border-radius: 28rpx;
-								font-size: 24rpx;
-								color: #FFFFFF;
-								text-align: center;
-								line-height: 56rpx;
-								font-weight: 500;
-							}
-						}
+					.title {
+						font-size: 36rpx;
+						font-weight: bold;
+						color: #1A1A1A;
 					}
 				}
-			}
-		}
-
-		.famous-doctor-box {
-			margin: 20rpx 30rpx 40rpx;
-
-			.title-box {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				margin-bottom: 24rpx;
-
-				.title {
-					font-size: 34rpx;
-					font-family: PingFang SC;
-					font-weight: 800;
-					color: #1A1A1A;
-				}
 
 				.more {
 					display: flex;
@@ -1234,166 +1120,84 @@
 					}
 
 					image {
-						width:48rpx;
+						width: 48rpx;
 						height: 48rpx;
 					}
 				}
 			}
 
-			.doctor-scroll {
+			.horizontal-scroll {
 				width: 100%;
 				white-space: nowrap;
+
+				.scroll-content {
+					display: flex;
+
+					.item {
+						width: 220rpx;
+						margin-right: 20rpx;
+						flex-shrink: 0;
+
+						.cover {
+							width: 220rpx;
+							height: 160rpx;
+							border-radius: 12rpx;
+							background: #f0f0f0;
+						}
+
+						.name {
+							margin-top: 12rpx;
+							font-size: 26rpx;
+							color: #333;
+							text-align: center;
+						}
+					}
+				}
 			}
 
-			.doctor-list {
+			.grid-list {
 				display: flex;
+				flex-wrap: wrap;
+				justify-content: space-between;
 
-				.doctor-item {
-					display: inline-block;
+				.item {
 					width: 334rpx;
-					background: #FFFFFF;
-					border-radius: 24rpx;
-					margin-right: 20rpx;
-					padding-bottom: 20rpx;
-					overflow: hidden;
-
-					&:last-child {
-						margin-right: 0;
-					}
+					margin-bottom: 30rpx;
 
-					.doctor-img-box {
+					.cover-box {
 						position: relative;
 						width: 100%;
-						height: 334rpx;
+						height: 190rpx;
+						border-radius: 16rpx;
+						overflow: hidden;
 
-						.doctor-img {
+						.cover {
 							width: 100%;
 							height: 100%;
+							background: #f0f0f0;
 						}
 
-						.doctor-tag {
+						.overlay {
 							position: absolute;
-							top: 0;
+							bottom: 0;
 							left: 0;
-							padding: 8rpx 20rpx;
-							font-size: 22rpx;
-							color: #FFFFFF;
-							border-radius: 0 0 24rpx 0;
-							z-index: 1;
-
-							&::after {
-								content: "";
-								position: absolute;
-								top: 0;
-								left: 0;
-								width: 100%;
-								height: 100%;
-								background: inherit;
-								transform: skewX(-15deg);
-								transform-origin: left bottom;
-								z-index: -1;
-								border-radius: 0 0 12rpx 0;
-							}
-
-							&.blue-tag {
-								background: linear-gradient(135deg, #4da9ff 0%, #2b85ff 100%);
-							}
-
-							&.orange-tag {
-								background: linear-gradient(135deg, #ff9d4d 0%, #ff6b00 100%);
-							}
-						}
-
-						.view-count {
-							position: absolute;
-							bottom: 20rpx;
-							left: 20rpx;
-							display: flex;
-							align-items: center;
-							padding: 4rpx 16rpx;
-							background: rgba(0, 0, 0, 0.3);
-							border-radius: 20rpx;
-
-							image {
-								width: 24rpx;
-								height: 24rpx;
-								margin-right: 8rpx;
-							}
-
-							text {
-								font-size: 20rpx;
-								color: #FFFFFF;
-							}
-						}
-
-						.play-btn {
-							position: absolute;
-							bottom: 20rpx;
-							right: 20rpx;
-							width: 48rpx;
-							height: 48rpx;
-							background: #FFFFFF;
-							border-radius: 50%;
+							width: 100%;
+							height: 60rpx;
+							background: linear-gradient(to top, rgba(0,0,0,0.5), transparent);
 							display: flex;
 							align-items: center;
-							justify-content: center;
-
-							.play-icon-inner {
-								width: 0;
-								height: 0;
-								border-style: solid;
-								border-width: 10rpx 0 10rpx 16rpx;
-								border-color: transparent transparent transparent #2B85FF;
-								margin-left: 4rpx;
-							}
+							justify-content: space-between;
+							padding: 0 16rpx;
+							color: #fff;
+							font-size: 22rpx;
 						}
 					}
 
-					.doctor-title {
-						padding: 20rpx;
+					.name {
+						margin-top: 16rpx;
 						font-size: 28rpx;
-						font-weight: 800;
-						color: #1A1A1A;
-					}
-
-					.doctor-info {
-						padding: 0 20rpx;
-						display: flex;
-						justify-content: space-between;
-						align-items: center;
-
-						.doctor-user {
-							display: flex;
-							align-items: center;
-
-							.avatar {
-								width: 36rpx;
-								height: 36rpx;
-								border-radius: 50%;
-								margin-right: 12rpx;
-							}
-
-							.name {
-								font-size: 24rpx;
-								color: #999;
-							}
-						}
-
-						.like-box {
-							display: flex;
-							align-items: center;
-
-							image {
-								width: 28rpx;
-								height: 28rpx;
-								margin-right: 8rpx;
-							}
-
-							text {
-								font-size: 24rpx;
-								color: #999;
-							}
-						}
+						color: #333;
+						font-weight: 500;
 					}
 				}
 			}
@@ -1444,7 +1248,7 @@
 							}
 
 							.active {
-								color: #FC581C ;
+								color: #5B37FD ;
 							}
 						}
 
@@ -1615,7 +1419,7 @@
 									font-family: PingFang SC;
 									font-weight: 500;
 									color: #FFFFFF;
-									background: #FC581C ;
+									background: #5B37FD ;
 									border-radius: 10upx 4upx 10upx 4upx;
 									margin-right: 12upx;
 								}
@@ -1714,14 +1518,14 @@
 									.label {
 										font-size: 26upx;
 										font-weight: 500;
-										color: #FC581C ;
+										color: #5B37FD ;
 										margin-right: 5upx;
 									}
 
 									.num {
 										font-size: 28upx;
 										font-weight: bold;
-										color: #FC581C ;
+										color: #5B37FD ;
 									}
 								}
 							}
@@ -1741,7 +1545,7 @@
 						font-size: 26rpx;
 						font-family: PingFang SC;
 						font-weight: bold;
-						color: #FC581C ;
+						color: #5B37FD ;
 
 						image {
 							margin-left: 8rpx;
@@ -2699,7 +2503,7 @@
 
 									.price {
 										padding: 5rpx 10rpx;
-										background-color: #FC581C ;
+										background-color: #5B37FD ;
 										border-radius: 30rpx;
 										font-size: 20upx;
 										font-family: PingFang SC;
@@ -2769,7 +2573,7 @@
 				font-size: 28upx;
 				font-family: PingFang SC;
 				font-weight: 500;
-				color: #FC581C ;
+				color: #5B37FD ;
 			}
 		}
 
@@ -2783,7 +2587,7 @@
 			font-weight: 500;
 			color: #FFFFFF;
 			border: 1px solid #D2E6FF;
-			background: linear-gradient(135deg, #efa566 0%, #FC581C  100%);
+			background: linear-gradient(135deg, #5B37FD 0%, #5B37FD  100%);
 			border-radius: 24upx;
 			margin-left: 30upx;
 		}

+ 12 - 12
pages/home/indexOld.vue

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

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

@@ -173,7 +173,7 @@
 			font-family: PingFang SC;
 			font-weight: 500;
 			color: #FFFFFF;
-			background: #FC581C ;
+			background: #5B37FD ;
 			border-radius: 40upx;
 			display: flex;
 			align-items: center;
@@ -218,7 +218,7 @@
 				font-size: 22upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #FC581C ;
+				color: #5B37FD ;
 				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: #FC581C ;
+			color: #5B37FD ;
 			background: #ffffff;
-			border: 1px solid #FC581C ;
+			border: 1px solid #5B37FD ;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #FC581C ;
-				border: 1px solid #FC581C ;
+				background: #5B37FD ;
+				border: 1px solid #5B37FD ;
 			}
 		}
 	}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -169,7 +169,7 @@
 			font-family: PingFang SC;
 			font-weight: 500;
 			color: #FFFFFF;
-			background: #FC581C ;
+			background: #5B37FD ;
 			border-radius: 40upx;
 			display: flex;
 			align-items: center;
@@ -214,7 +214,7 @@
 				font-size: 22upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #FC581C ;
+				color: #5B37FD ;
 				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: #FC581C ;
+			color: #5B37FD ;
 			background: #ffffff;
-			border: 1px solid #efa566   ;
+			border: 1px solid #5B37FD   ;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #FC581C    ;
-				border: 1px solid #FC581C ;
+				background: #5B37FD    ;
+				border: 1px solid #5B37FD ;
 			}
 		}
 	}

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

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

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

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

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

@@ -172,8 +172,8 @@
 			.bg{
 				width: 100%;
 				height:100%;
-				// background-color: #FC581C ;
-				// background: linear-gradient(#efa566, #FC581C );
+				// background-color: #5B37FD ;
+				// background: linear-gradient(#5B37FD, #5B37FD );
 				position: fixed;
 				image{
 					width: 100%;
@@ -289,7 +289,7 @@
 								.title-line{
 									width: 8rpx;
 									height: 28rpx;
-									background: #FC581C ;
+									background: #5B37FD ;
 									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:#FC581C  !important;
+ 		background:#5B37FD  !important;
  		border-radius: 44upx;
  	}
  }

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

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

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

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

+ 1 - 1
pages/home/productList.vue

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

+ 232 - 0
pages/learn/index.vue

@@ -0,0 +1,232 @@
+<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>
+				<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>
+				<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>
+
+						</view>
+					</view>
+				</view>
+			</view>
+		</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`
+			});
+		}
+	}
+};
+</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 {
+			display: flex;
+			align-items: baseline;
+			margin-bottom: 12rpx;
+
+			.num {
+				font-size: 48rpx;
+				font-weight: bold;
+				color: #1A1A1A;
+			}
+
+			.unit {
+				font-size: 24rpx;
+				color: #999;
+				margin-left: 8rpx;
+			}
+		}
+
+		.label {
+			font-size: 26rpx;
+			color: #666;
+		}
+	}
+
+	.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%;
+			}
+
+			.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;
+			}
+		}
+
+		.course-right {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+
+			.title {
+				font-size: 32rpx;
+				font-weight: bold;
+				color: #1A1A1A;
+				margin-bottom: 8rpx;
+			}
+
+			.subtitle {
+				font-size: 24rpx;
+				color: #999;
+				margin-bottom: 20rpx;
+			}
+
+			.progress-box {
+				display: flex;
+				align-items: center;
+
+				.progress-bar {
+					flex: 1;
+					height: 12rpx;
+					background: #F5F6F8;
+					border-radius: 6rpx;
+					margin-right: 20rpx;
+					display: flex;
+					align-items: center;
+					overflow: hidden;
+
+					.progress-inner {
+						height: 100%;
+						background: #FEB413;
+						border-radius: 6rpx;
+					}
+				}
+
+				.percent-text {
+					font-size:14rpx;
+					color: #FFFFFF;
+					flex: 1;
+					text-align: center;
+				}
+			}
+		}
+	}
+}
+</style>

+ 132 - 229
pages/live/index.vue

@@ -2,40 +2,25 @@
 	<view class="page-container">
 		<view class="status_bar" :style="{ height: statusBarHeight }"></view>
 		<!-- 顶部标题栏 -->
-		<view class="top-bar">
-			<view class="top-left">
-				<image class="avatar" src="/static/avatar.png" mode="aspectFill"></image>
-				<text class="user-name">云联融智</text>
+		<view class="nav-header">
+			<view class="back-btn" @click="goBack">
+				<image class="back-icon" src="/static/right_arrow.png" mode="aspectFit"></image>
 			</view>
+			<text class="page-title">精选课程</text>
+			<view class="placeholder"></view>
 		</view>
 
-		<!-- 直播列表 -->
-		<view class="live-list">
-			<view class="live-row" v-for="(row, rowIndex) in liveData" :key="rowIndex">
-				<view class="live-item" v-for="(item, index) in row" :key="index" @click="enterLive(item)">
-					<view class="live-image-box">
-						<image class="live-image" :src="item.image" mode="aspectFill"></image>
-						<view class="live-tag">
-							<image class="live-icon" src="/static/play.gif" mode="aspectFit"></image>
-							<text class="live-text">直播中</text>
-						</view>
-						<view class="live-date">
-							<text class="date-text">{{ item.date }}</text>
-						</view>
-						<view class="live-title">
-							<text class="title-text">{{ item.title }}</text>
-						</view>
-					</view>
-					<view class="live-info">
-						<text class="live-room-name">{{ item.roomName }}</text>
-						<view class="live-host">
-							<image class="host-avatar" :src="item.hostAvatar" mode="aspectFill"></image>
-							<text class="host-name">{{ item.hostName }}</text>
-							<view class="live-viewers">
-								<image class="viewer-icon" src="/static/watch_number.png" mode="aspectFit"></image>
-								<text class="viewer-count">{{ item.viewers }}</text>
-							</view>
-						</view>
+		<!-- 课程列表 -->
+		<view class="course-grid">
+			<view class="course-item" v-for="(item, index) in courseList" :key="index" @click="goDetail(item)">
+				<view class="course-cover-box">
+					<image class="course-cover" :src="item.image" mode="aspectFill"></image>
+				</view>
+				<view class="course-info">
+					<view class="course-name">{{ item.title }}</view>
+					<view class="course-footer">
+						<text class="play-count">{{ item.playCount }}次播放</text>
+						<image class="share-icon" src="/static/layer_share_icon16@3x.png" mode="aspectFit"></image>
 					</view>
 				</view>
 			</view>
@@ -47,74 +32,54 @@
 export default {
 	data() {
 		return {
-			statusBarHeight: uni.getStorageSync('menuInfo').statusBarHeight,
-
-			liveData: [
-				[
-					{
-						id: 1,
-						image: "/static/famous_doctor_img.png",
-						date: "08月19日",
-						title: "向中国医生致敬",
-						subtitle: "中国医师节",
-						roomName: "光辉岁月直播间",
-						hostAvatar: "/static/avatar.png",
-						hostName: "月牙白很美",
-						viewers: "14121"
-					},
-					{
-						id: 2,
-						image: "/static/famous_doctor_img.png",
-
-						date: "08月19日",
-						title: "向中国医生致敬",
-						subtitle: "中国医师节",
-						roomName: "光辉岁月直播间",
-						hostAvatar: "/static/avatar.png",
-						hostName: "月牙白很美",
-						viewers: "14121"
-					}
-				],
-				[
-					{
-						id: 3,
-						image: "/static/famous_doctor_img.png",
-
-						date: "08月19日",
-						title: "向中国医生致敬",
-						subtitle: "中国医师节",
-						roomName: "光辉岁月直播间",
-						hostAvatar: "/static/avatar.png",
-						hostName: "月牙白很美",
-						viewers: "14121"
-					},
-					{
-						id: 4,
-						image: "/static/famous_doctor_img.png",
-
-						date: "08月19日",
-						title: "向中国医生致敬",
-						subtitle: "中国医师节",
-						roomName: "光辉岁月直播间",
-						hostAvatar: "/static/avatar.png",
-						hostName: "月牙白很美",
-						viewers: "14121"
-					}
-				]
+			statusBarHeight: uni.getStorageSync('menuInfo') ? uni.getStorageSync('menuInfo').statusBarHeight : 20,
+			courseList: [
+				{
+					id: 1,
+					image: "/static/famous_doctor_img.png",
+					title: "健身操",
+					playCount: "16.5万"
+				},
+				{
+					id: 2,
+					image: "/static/famous_doctor_img2.png",
+					title: "比赛",
+					playCount: "16.5万"
+				},
+				{
+					id: 3,
+					image: "/static/course_img.png",
+					title: "八段锦",
+					playCount: "16.5万"
+				},
+				{
+					id: 4,
+					image: "/static/famous_doctor_img.png",
+					title: "广场舞",
+					playCount: "16.5万"
+				},
+				{
+					id: 5,
+					image: "/static/course_img.png",
+					title: "八段锦",
+					playCount: "16.5万"
+				},
+				{
+					id: 6,
+					image: "/static/famous_doctor_img2.png",
+					title: "广场舞",
+					playCount: "16.5万"
+				}
 			]
 		};
 	},
 	methods: {
-		enterLive(item) {
-			// 进入直播间
-			uni.showToast({
-				title: `进入${item.roomName}`,
-				icon: 'none'
-			});
+		goBack() {
+			uni.navigateBack();
 		},
-		navigateTo(url) {
-			uni.switchTab({
-				url: url
+		goDetail(item) {
+			uni.navigateTo({
+				url: `/pages_course/learn?courseId=${item.id}&type=1`
 			});
 		}
 	}
@@ -125,163 +90,101 @@ export default {
 .page-container {
 	width: 100%;
 	min-height: 100vh;
-	background-color: #f8f8f8;
-	padding-bottom: 120upx; // 为底部导航栏留出空间
+	background-color: #F8F9FB;
+	padding-bottom: 120upx;
 
-	.top-bar {
+	.status_bar {
+		width: 100%;
+		background-color: #ffffff;
+	}
+
+	.nav-header {
+		height: 88rpx;
+		background-color: #ffffff;
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		padding: 16rpx 24upx;
-
-		.top-left {
+		padding: 0 30rpx;
+		position: sticky;
+		top: 0;
+		z-index: 100;
+
+		.back-btn {
+			width: 60rpx;
+			height: 60rpx;
 			display: flex;
 			align-items: center;
+			justify-content: flex-start;
 
-			.avatar {
-				width: 50upx;
-				height: 50upx;
-				border-radius: 50%;
-				margin-right: 12upx;
+			.back-icon {
+				width: 36rpx;
+				height: 36rpx;
+				transform: rotate(180deg);
 			}
+		}
 
-			.user-name {
-				font-size: 28rpx;
-				color: #626468;
-			}
+		.page-title {
+			font-size: 36rpx;
+			font-weight: bold;
+			color: #1A1A1A;
+		}
+
+		.placeholder {
+			width: 60rpx;
 		}
 	}
 
-	.live-list {
-		padding: 20upx;
+	.course-grid {
+		padding: 30rpx;
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-between;
 
-		.live-row {
-			display: flex;
-			justify-content: space-between;
-			margin-bottom: 20upx;
+		.course-item {
+			width: 334rpx;
+			background-color: #ffffff;
+			border-radius: 20rpx;
+			margin-bottom: 30rpx;
+			overflow: hidden;
+			box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.02);
 
-			.live-item {
-				width: 48%;
-				background-color: #ffffff;
-				border-radius: 16upx;
-				overflow: hidden;
+			.course-cover-box {
+				width: 100%;
+				height: 250rpx;
 
-				.live-image-box {
-					position: relative;
+				.course-cover {
 					width: 100%;
-					height: 400rpx;
-
-					.live-image {
-						width: 100%;
-						height: 100%;
-					}
-
-					.live-tag {
-						position: absolute;
-						top: 15upx;
-						left: 15upx;
-						display: flex;
-						align-items: center;
-						background-color: rgba(255, 0, 0, 0.8);
-						border-radius: 10upx;
-						padding: 5upx 10upx;
-
-						.live-icon {
-							width: 20upx;
-							height: 20upx;
-							margin-right: 5upx;
-						}
-
-						.live-text {
-							font-size: 20upx;
-							font-family: PingFang SC;
-							font-weight: 500;
-							color: #ffffff;
-						}
-					}
-
-					.live-date {
-						position: absolute;
-						bottom: 60upx;
-						left: 0;
-						right: 0;
-						display: flex;
-						align-items: center;
-						justify-content: center;
-
-						.date-text {
-							font-size: 20upx;
-							font-family: PingFang SC;
-							font-weight: 500;
-							color: #ffffff;
-							text-shadow: 0px 2px 4px rgba(0, 0, 0, 0.5);
-						}
-					}
-
-					.live-title {
-						position: absolute;
-						bottom: 30upx;
-						left: 0;
-						right: 0;
-						display: flex;
-						align-items: center;
-						justify-content: center;
+					height: 100%;
+					background-color: #f5f5f5;
+				}
+			}
 
-						.title-text {
-							font-size: 24upx;
-							font-family: PingFang SC;
-							font-weight: 500;
-							color: #ffffff;
-							text-shadow: 0px 2px 4px rgba(0, 0, 0, 0.5);
-						}
-					}
+			.course-info {
+				padding: 20rpx;
+
+				.course-name {
+					font-size: 30rpx;
+					font-weight: bold;
+					color: #1A1A1A;
+					margin-bottom: 20rpx;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					white-space: nowrap;
 				}
 
-				.live-info {
-					padding: 20upx 20upx 28upx;
+				.course-footer {
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
 
-					.live-room-name {
-						font-size: 28upx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #333333;
+					.play-count {
+						font-size: 24rpx;
+						color: #999999;
 					}
 
-					.live-host {
-						margin-top: 20upx;
-
-						display: flex;
-						align-items: center;
-
-						.host-avatar {
-							width: 32upx;
-							height: 32upx;
-							border-radius: 50%;
-							margin-right: 10upx;
-						}
-
-						.host-name {
-							font-size: 22rpx;
-							color: #757575;
-							color: #666666;
-							flex: 1;
-						}
-
-						.live-viewers {
-							display: flex;
-							align-items: center;
-
-							.viewer-icon {
-								width: 32upx;
-								height: 32upx;
-								margin-right: 8upx;
-							}
-
-							.viewer-count {
-								font-size: 22rpx;
-								color: #999999;
-							}
-						}
+					.share-icon {
+						width: 32rpx;
+						height: 32rpx;
 					}
 				}
 			}

+ 2 - 2
pages/shopping/cart.vue

@@ -301,7 +301,7 @@
 							font-family: PingFang SC;
 							font-weight: bold;
 							color: #FFFFFF;
-							background: linear-gradient(90deg, #efa566 0%, #FC581C  100%);
+							background: linear-gradient(90deg, #5B37FD 0%, #5B37FD  100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							flex-shrink: 0;
@@ -452,7 +452,7 @@
 					font-family: PingFang SC;
 					font-weight: bold;
 					color: #FFFFFF;
-					background: #FC581C ;
+					background: #5B37FD ;
 					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="#FC581C " inactiveColor="rgba(0, 0, 0, 0.1)"></evan-switch>
+					<evan-switch @change="integralChange" v-model="checked" activeColor="#5B37FD " 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, #efa566 0%, #FC581C  100%);
+							background: linear-gradient(90deg, #5B37FD 0%, #5B37FD  100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							font-size: 22upx;
@@ -683,7 +683,7 @@
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #FC581C ;
+				background: #5B37FD ;
 				border-radius: 44upx;
 			}
 		}

+ 2 - 2
pages/shopping/index.vue

@@ -363,13 +363,13 @@
 					position: relative;
 
 					&.active {
-						color: #FC581C;
+						color: #5B37FD;
 
 						&::after {
 							content: "";
 							width: 8upx;
 							height: 50upx;
-							background: #FC581C;
+							background: #5B37FD;
 							position: absolute;
 							top: 25upx;
 							left: 0;

+ 1 - 1
pages/shopping/payOrder.vue

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

+ 3 - 3
pages/shopping/paymentOrder.vue

@@ -565,7 +565,7 @@
 				font-weight: bold;
 				color: #FFFFFF;
 				text-align: center;
-				background: #FC581C ;
+				background: #5B37FD ;
 				border-radius: 44upx;
 				margin-bottom: 10rpx;
 			}
@@ -576,8 +576,8 @@
 				font-size: 30upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #FC581C ;
-				border: 1rpx solid #FC581C ;
+				color: #5B37FD ;
+				border: 1rpx solid #5B37FD ;
 				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, #efa566 0%, #FC581C  100%);
+			background: linear-gradient(135deg, #5B37FD 0%, #5B37FD  100%);
 			position: fixed;
 			top: 0;
 			left: 0;
@@ -479,7 +479,7 @@
 					color: #666666;
 					&.active{
 						font-weight: bold;
-						color: #FC581C ;
+						color: #5B37FD ;
 					}
 				}
 				.arrow{
@@ -574,7 +574,7 @@
 							}
 							&.active{
 								background: rgba(230, 250, 247, 0);
-								border: 2upx solid #FC581C ;
+								border: 2upx solid #5B37FD ;
 								position: relative;
 							}
 							.active-img{
@@ -647,15 +647,15 @@
 							font-size: 28upx;
 							font-family: PingFang SC;
 							font-weight: 500;
-							color: #FC581C ;
+							color: #5B37FD ;
 							background: #F5FFFE;
 							border: 1px solid #8AD5CE;
 							padding: 0 20upx;
 							border-radius: 32upx;
 							margin: 0 20upx 20upx 0;
 							&.active{
-								background: #FC581C ;
-								border: 1px solid #FC581C ;
+								background: #5B37FD ;
+								border: 1px solid #5B37FD ;
 								color: #FFFFFF;
 							}
 						}
@@ -821,7 +821,7 @@
 				font-weight: bold;
 				color: #FFFFFF;
 				text-align: center;
-				background: #FC581C ;
+				background: #5B37FD ;
 				border-radius: 44upx;
 			}
 		}

+ 6 - 6
pages/shopping/productDetails.vue

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

+ 154 - 582
pages/user/index.vue

@@ -1,253 +1,101 @@
 <template>
 	<view class="page-container">
-		<view class="top-cont">
-			<image class="background-image" src="/static/message_top_bg.png" mode="aspectFill"></image>
-			<view class="top-inner">
-				<!-- 状态栏 -->
-				<view class="status_bar" :style="{ height: statusBarHeight }"></view>
-
-				<!-- 顶部标题 -->
-				<view class="top-title">
-					<text class="title-text">我的</text>
-				</view>
-
-				<!-- 用户信息区域 -->
-				<view class="user-info">
-					<view class="left">
-						<view class="head-img">
-							<image :src="user.avatarUrl ? user.avatarUrl : '/static/avatar.png'" mode="aspectFill">
-							</image>
-						</view>
-						<view class="name-phone" v-if="UserInfo">
-							<view class="name">{{ user.nickname }}
-								<text class="fs24 ml12 mb20" style="color: #FF6633;" v-if="user.isShow == 1">会员</text>
-								<text class="fs24 ml12 mb20" style="color: #666;" v-else>非会员</text>
-							</view>
-							<view class="phone">{{ user.phone }}</view>
-						</view>
-						<view class="fs40 bold name-phone center" @click='getOrderCount()' v-else>立即登录</view>
-					</view>
-					<!-- <view class="right">
-						<uni-badge size="small" :text="msgNum" absolute="rightTop" type="error">
-							<view class="set" @click="navgetTo('/pages_user/user/personInfo')">
-								<image src="https://zlwh.obs.cn-southwest-2.myhuaweicloud.com/orangeShop/icon-set.png"
-									mode=""></image>
-							</view>
-						</uni-badge>
-					</view> -->
-				</view>
-
-				<!-- ✅ 四个栏目图标 - 移到 user-info 外面 -->
-				<view class="columns">
-					<view class="column-item" v-for="(item, index) in columns" :key="index">
-						<view class="column-icon">
-							<image :src="item.icon" mode="aspectFit"></image>
-						</view>
-						<text class="column-text">{{ item.text }}</text>
-					</view>
-				</view>
+		<!-- 顶部背景 -->
+		<view class="top-bg">
+			<view class="status_bar" :style="{ height: statusBarHeight }"></view>
+			<view class="top-title">个人中心</view>
+		</view>
 
-				<!-- ✅ 邀请好友横幅 - 移到 user-info 外面 -->
-				<view class="invite-banner">
-					<view class="invite-text">
-						<view class="invite-title">邀请好友,可解锁xx课程</view>
-						<view class="invite-subtitle">邀请减免无上限</view>
-					</view>
-					<view class="invite-icon">
-						<image src="/static/course_img.png" mode="aspectFit"></image>
+		<!-- 用户卡片 -->
+		<view class="user-card">
+			<view class="user-info" @click="navgetTo('/pages_user/user/personInfo')">
+				<image class="avatar" :src="user.avatarUrl ? user.avatarUrl : '/static/avatar.png'" mode="aspectFill"></image>
+				<view class="info-content">
+					<view class="name-row">
+						<text class="nickname">{{ user.nickname || '立即登录' }}</text>
+						<image class="arrow-right" src="/static/right_arrow_right.png" mode="aspectFit"></image>
 					</view>
+					<view class="welcome-text">Hi,欢迎来到小程序</view>
 				</view>
 			</view>
-
-			<view style="padding-bottom: 20rpx;" v-if="UserInfo">
-				<view @tap="loginOUt" class="log-out x-c">退出登录</view>
-			</view>
 		</view>
 
-		<!-- 功能列表 -->
-		<view class="function-list">
-			<view class="function-item" @click="navgetTo('/pages_user/user/myCourses')">
-				<view class="function-left">
-					<image class="function-icon" src="/static/my_courses.png" mode="aspectFit"></image>
-					<text class="function-text">我的课程</text>
+		<!-- 菜单列表 -->
+		<view class="menu-list">
+			<view class="menu-item" @click="navgetTo('/pages_user/user/storeOrder')">
+				<view class="left">
+					<image class="icon" src="/static/manageTabIcon/training.png" mode="aspectFit"></image>
+					<text class="label">我的课程</text>
 				</view>
-				<image class="function-arrow" src="/static/right_arrow_right.png" mode="aspectFit"></image>
+				<image class="arrow" src="/static/right_arrow_right.png" mode="aspectFit"></image>
 			</view>
-			<view class="function-item" @click="navgetTo('/pages_user/user/myCollection')">
-				<view class="function-left">
-					<image class="function-icon" src="/static/my_collection.png" mode="aspectFit"></image>
-					<text class="function-text">我的收藏</text>
+			<view class="menu-item" @click="navgetTo('/pages_user/user/message')">
+				<view class="left">
+					<image class="icon" src="/static/manageTabIcon/liveclasses.png" mode="aspectFit"></image>
+					<text class="label">我的消息</text>
 				</view>
-				<image class="function-arrow" src="/static/right_arrow_right.png" mode="aspectFit"></image>
+				<image class="arrow" src="/static/right_arrow_right.png" mode="aspectFit"></image>
 			</view>
 		</view>
-		<view class="function-list">
-			
-			<view class="function-item" @click="navgetTo('/pages_user/user/contactService')">
-				<view class="function-left">
-					<image class="function-icon" src="/static/service_center.png" mode="aspectFit"></image>
-					<text class="function-text">联系客服</text>
+
+		<view class="menu-list mt24">
+			<view class="menu-item" @click="makePhoneCall">
+				<view class="left">
+					<image class="icon" src="/static/service_center.png" mode="aspectFit"></image>
+					<text class="label">客服中心</text>
+				</view>
+				<view class="right">
+					<text class="phone-num">400-023-8558</text>
+					<image class="arrow" src="/static/right_arrow_right.png" mode="aspectFit"></image>
 				</view>
-				<image class="function-arrow" src="/static/right_arrow_right.png" mode="aspectFit"></image>
 			</view>
-			<view class="function-item" @click="navgetTo('/pages_user/user/settings')">
-				<view class="function-left">
-					<image class="function-icon" src="/static/set_icon.png" mode="aspectFit"></image>
-					<text class="function-text">设置</text>
+			<view class="menu-item" @click="navgetTo('/pages_user/user/personInfo')">
+				<view class="left">
+					<image class="icon" src="/static/set_icon.png" mode="aspectFit"></image>
+					<text class="label">设置</text>
 				</view>
-				<image class="function-arrow" src="/static/right_arrow_right.png" mode="aspectFit"></image>
+				<image class="arrow" src="/static/right_arrow_right.png" mode="aspectFit"></image>
 			</view>
 		</view>
+
+		<!-- 退出登录 -->
+		<view class="logout-btn" v-if="UserInfo" @tap="loginOUt">
+			退出登录
+		</view>
 	</view>
 </template>
 
 <script>
-import {
-	getOrderCount
-} from '@/api/storeOrder'
 import {
 	getUserInfo
 } from '@/api/user'
-import likeProduct from '@/components/likeProduct.vue'
 export default {
-	components: {
-		likeProduct
-	},
 	data() {
 		return {
-			columns: [{
-				text: '栏目1',
-				icon: '/static/consultation_order_icon.png',
-			},
-			{
-				text: '栏目2',
-				icon: '/static/prescription_order.png',
-			},
-			{
-				text: '栏目3',
-				icon: '/static/service_pack.png',
-			},
-			{
-				text: '栏目4',
-				icon: '/static/my_service.png',
-			}
-			],
-			count0: 0,
-			count1: 0,
-			count2: 0,
-			afterSalesCount: 0,
 			user: {
-				isPromoter: 0,
-				isWeixinAuth: 0,
-				phone: "",
-				nickname: "用户昵称",
-				avatarUrl: "https://zlwh.obs.cn-southwest-2.myhuaweicloud.com/orangeShop/detault_head.png"
+				nickname: "",
+				avatarUrl: "/static/avatar.png"
 			},
-			// 状态栏的高度
-			statusBarHeight: uni.getStorageSync('menuInfo').statusBarHeight,
-			// 消息数量
-			msgNum: 0,
+			statusBarHeight: uni.getStorageSync('menuInfo') ? uni.getStorageSync('menuInfo').statusBarHeight : 20,
 			UserInfo: uni.getStorageSync('AppToken')
 		};
 	},
-	watch: {
-		UserInfo() {
-			return uni.getStorageSync('AppToken')
-		}
-	},
-	onLoad() {
-		console.log("onload")
-	},
 	onShow() {
-		console.log("onshow")
-		this.UserInfo = uni.getStorageSync('AppToken') // 强制更新登录状态
+		this.UserInfo = uni.getStorageSync('AppToken')
 		if (this.UserInfo) {
 			this.getUserInfo()
-		} else {
-			// this.isuser=true
 		}
-		// this.getUserInfo();
-		// this.getOrderCount();
-	},
-	onReachBottom() {
-		console.log("onReachBottom")
-		// 由于likeProduct组件已隐藏,暂时注释掉此调用
-		// this.$refs.product.getGoodsProducts();
 	},
 	methods: {
-		callService() {
-			let orderKey = '5d81cf01-6f8d-4e1a-ae7a-dbc26c965b01';
-			uni.navigateTo({
-				url: '/pages_company/order/confirmOrder?orderKey=' + orderKey
-			})
-			return;
-		},
-
-		getOrderCount() {
-			getOrderCount().then(
-				res => {
-					if (res.code == 200) {
-						this.count0 = res.count0;
-						this.count1 = res.count1;
-						this.count2 = res.count2;
-						this.afterSalesCount = res.afterSalesCount;
-					}
-				},
-				rej => { }
-			);
-		},
-		toManager() {
-			if (this.utils.checkCompanyUserLoginState()) {
-				uni.navigateTo({
-					url: '/pages_company/index'
-				})
-			} else {
-				uni.navigateTo({
-					url: '/pages_company/auth/login'
-				})
-			}
-
-		},
-		toManagerCourse() {
-			if (uni.getStorageSync('ManageToken')) {
-				uni.navigateTo({
-					url: '/pages_manage/index'
-				})
-			} else {
-				uni.navigateTo({
-					url: '/pages_manage/login'
-				})
-			}
-
-		},
-		openH5(url) {
-			var requestPath = uni.getStorageSync('requestPath');
-			uni.setStorageSync('url', requestPath + url);
-			uni.navigateTo({
-				url: '../home/h5?data=' + url
-			})
-		},
 		getUserInfo() {
 			getUserInfo().then(
 				res => {
-					if (res.code == 200) {
-						if (res.user != null) {
-							this.user = res.user;
-						} else {
-							this.utils.loginOut();
-						}
-
-					} else {
-						uni.showToast({
-							icon: 'none',
-							title: "请求失败",
-						});
+					if (res.code == 200 && res.user != null) {
+						this.user = res.user;
 					}
-				},
-				rej => { }
+				}
 			);
 		},
-		// 跳转页面
 		navgetTo(url) {
 			this.utils.isLogin().then(res => {
 				if (res) {
@@ -257,15 +105,18 @@ export default {
 				}
 			})
 		},
-		// 查看订单
-		showOrder(status) {
-			uni.navigateTo({
-				url: '/pages_user/user/storeOrder?status=' + status
-			})
+		makePhoneCall() {
+			uni.makePhoneCall({
+				phoneNumber: '400-023-8558'
+			});
 		},
 		loginOUt() {
 			this.utils.loginOut();
-			this.getUserInfo();
+			this.UserInfo = "";
+			this.user = {
+				nickname: "",
+				avatarUrl: "/static/avatar.png"
+			};
 		}
 	}
 }
@@ -275,425 +126,146 @@ export default {
 .page-container {
 	width: 100%;
 	min-height: 100vh;
-	background-color: #f8f8f8;
-	padding-bottom: 120rpx; // 为底部导航栏留出空间
+	background-color: #F8F9FB;
+	padding-bottom: 120rpx;
 }
 
-.top-cont {
+.top-bg {
 	width: 100%;
-	min-height: 494rpx;
-	position: relative;
+	height: 380rpx;
+	background: linear-gradient(180deg, #5C4BFF 0%, #7E71FF 100%);
+	display: flex;
+	flex-direction: column;
 
-	.background-image {
-		position: absolute;
-		top: 0;
-		left: 0;
+	.status_bar {
 		width: 100%;
-		height: 100%;
-		z-index: 1;
 	}
 
-	.top-inner {
-		width: 100%;
-		height: 100%;
-		position: relative;
-		top: 0;
-		left: 0;
-		z-index: 2;
-
-		.top-title {
-	
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			padding: 20rpx 30rpx;
-
-			.title-text {
-						font-weight: 500;
-font-size: 34rpx;
-color: #000000;
-			}
-
-			.top-right {
-				display: flex;
-				align-items: center;
-
-				.icon {
-					width: 40rpx;
-					height: 40rpx;
-					margin-left: 20rpx;
-				}
-			}
-		}
-
-		.columns {
-			display: flex;
-			align-items: center;
-			justify-content: space-around;
-			padding: 30rpx 0;
-
-			.column-item {
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				justify-content: center;
-				font-size: 24rpx;
-				color: #222222;
-
-				.column-icon {
-					width: 56rpx;
-					height: 56rpx;
-					border-radius: 20rpx;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					margin-bottom: 10rpx;
-
-					image {
-						width: 100%;
-						height: 100%;
-					}
-				}
-
-				.column-text {
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 400;
-					color: #333333;
-				}
-			}
-		}
-
-		.invite-banner {
-			margin: 20rpx 30rpx;
-			border-radius: 12rpx;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			background: linear-gradient(90deg, #FDF1BF 0%, #FFDB83 100%);
-			border-radius: 64rpx 64rpx 64rpx 64rpx;
-
-			.invite-text {
-				flex: 1;
-				margin-left: 46rpx;
-
-				.invite-title {
-					line-height: 1.2;
-					font-weight: 500;
-					font-size: 32rpx;
-					color: #592706;
-				}
-
-				.invite-subtitle {
-					font-size: 24rpx;
-					color: rgba(89, 39, 6, 0.7);
-					line-height: 1.2;
-				}
-			}
-
-			.invite-icon {
-				width: 128rpx;
-				height: 128rpx;
-
-				image {
-					width: 100%;
-					height: 100%;
-				}
-			}
-		}
-
-		.user-info {
-			padding: 20rpx 30rpx 0 30rpx;
-			display: flex;
-			align-items: center;
-			justify-content: flex-start;
-
-			.left {
-				position: relative;
-				display: flex;
-
-				.head-img {
-					width: 100rpx;
-					height: 100rpx;
-					border-radius: 50%;
-					overflow: hidden;
-					margin-right: 20rpx;
-					border: 3rpx solid #FFFFFF;
-					box-shadow: 0px 3px 10px rgba(0, 0, 0, 0.1);
-
-					image {
-						width: 100%;
-						height: 100%;
-					}
-				}
-
-				.name-phone {
-					.name {
-						font-size: 32rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #333333;
-						line-height: 1;
-					}
-
-					.phone {
-						font-size: 24rpx;
-						font-family: PingFang SC;
-						font-weight: 400;
-						color: #666666;
-						line-height: 1;
-						margin-top: 10rpx;
-					}
-				}
+	.top-title {
+		height: 88rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 36rpx;
+		font-weight: bold;
+		color: #FFFFFF;
+	}
+}
 
+.user-card {
+	margin: -160rpx 30rpx 0;
+	background: #FFFFFF;
+	border-radius: 24rpx;
+	padding: 40rpx;
+	box-shadow: 0 4rpx 20rpx rgba(92, 75, 255, 0.1);
 
-			}
+	.user-info {
+		display: flex;
+		align-items: center;
 
-			.right {
-				display: none;
-			}
+		.avatar {
+			width: 120rpx;
+			height: 120rpx;
+			border-radius: 50%;
+			margin-right: 30rpx;
+			background-color: #f5f5f5;
 		}
-	}
 
-	.my-order {
-		padding: 50rpx 20rpx 0;
+		.info-content {
+			flex: 1;
 
-		.inner {
-			box-sizing: border-box;
-			height: 245rpx;
-			// height: 105rpx;
-			background: #FFFFFF;
-			border-radius: 16rpx;
-			padding: 40rpx 30rpx;
-			display: flex;
-			flex-direction: column;
-			justify-content: space-between;
-
-			.title-box {
+			.name-row {
 				display: flex;
 				align-items: center;
-				justify-content: space-between;
+				margin-bottom: 12rpx;
 
-				.title {
-					font-size: 34rpx;
-					font-family: PingFang SC;
+				.nickname {
+					font-size: 40rpx;
 					font-weight: bold;
-					color: #222222;
-					line-height: 1;
+					color: #1A1A1A;
+					margin-right: 12rpx;
 				}
 
-				.all-order {
-					display: flex;
-					align-items: center;
-
-					.text {
-						font-size: 26rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #999999;
-						line-height: 1;
-						margin-right: 8rpx;
-					}
-
-					image {
-						width: 14rpx;
-						height: 24rpx;
-					}
+				.arrow-right {
+					width: 24rpx;
+					height: 24rpx;
 				}
 			}
 
-			.status-box {
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				padding: 0 10rpx;
-
-				.item {
-					display: flex;
-					flex-direction: column;
-					align-items: center;
-					justify-content: center;
-
-					image {
-						width: 40rpx;
-						height: 40rpx;
-						margin-bottom: 18rpx;
-					}
-
-					.text {
-						font-size: 26rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #111111;
-						line-height: 1;
-					}
-				}
-			}
-		}
-	}
-
-	.content {
-		margin-top: 20rpx;
-		padding: 0 20rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-
-		.used-tools {
-			box-sizing: border-box;
-			background: #FFFFFF;
-			border-radius: 16rpx;
-			padding: 40rpx 30rpx;
-
-			.title {
-				font-size: 34rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #222222;
-				line-height: 1;
-			}
-
-			.tools-list {
-				margin-top: 50rpx;
-				display: flex;
-				flex-wrap: wrap;
-				width: 100%;
-
-				.item {
-					box-sizing: border-box;
-					width: 25%;
-					display: flex;
-					flex-direction: column;
-					align-items: center;
-					justify-content: center;
-					margin-bottom: 50rpx;
-					position: relative;
-
-					image {
-						width: 44rpx;
-						height: 44rpx;
-					}
-
-					.text {
-						font-size: 24rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #111111;
-						line-height: 1;
-						margin-top: 20rpx;
-					}
-
-					.contact-btn {
-						display: inline-block;
-						position: absolute;
-						top: 0;
-						left: 0;
-						width: 100%;
-						height: 100%;
-						opacity: 0;
-					}
-				}
+			.welcome-text {
+				font-size: 26rpx;
+				color: #999999;
 			}
 		}
 	}
-
-	.log-out {
-		height: 80rpx;
-		line-height: 80rpx;
-		text-align: center;
-		font-size: 26rpx;
-		font-family: PingFang SC;
-		font-weight: 500;
-		color: #666666;
-		background: #FFFFFF;
-		border-radius: 16rpx;
-		margin-top: 20rpx;
-	}
-
-	.sub-btn {
-		position: absolute;
-		width: 100%;
-		height: 100%;
-		opacity: 0;
-	}
-
-	.like-product {
-		padding: 0 20rpx;
-	}
-
-	.banner {
-		padding: 20rpx 20rpx 0rpx 20rpx;
-		height: 200rpx;
-		position: relative;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-
-		image {
-			width: 100%;
-			height: 100%;
-		}
-
-		.tel_btn {
-			width: 100%;
-			height: 100%;
-			top: 0rpx;
-			position: absolute;
-			opacity: 0.0;
-		}
-	}
-
-	.log-out {
-		height: 100rpx;
-		line-height: 100rpx;
-		margin: 10px;
-		border-radius: 20rpx;
-	}
-
-
 }
 
-/* 功能列表 */
-.function-list {
-	margin: 24rpx 24rpx 0;
-	background-color: #FFFFFF;
-	border-radius: 16rpx;
-	overflow: hidden;
-	// box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.05);
+.menu-list {
+	margin: 30rpx 30rpx 0;
+	background: #FFFFFF;
+	border-radius: 24rpx;
+	padding: 0 30rpx;
 
-	.function-item {
+	.menu-item {
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		padding: 30rpx;
-		// border-bottom: 1rpx solid #F0F0F0;
+		height: 110rpx;
+		border-bottom: 1rpx solid #F5F6F8;
 
 		&:last-child {
 			border-bottom: none;
 		}
 
-		.function-left {
+		.left {
 			display: flex;
 			align-items: center;
 
-			.function-icon {
-				width: 48rpx;
-				height: 48rpx;
+			.icon {
+				width: 44rpx;
+				height: 44rpx;
 				margin-right: 20rpx;
 			}
 
-			.function-text {
+			.label {
+				font-size: 30rpx;
+				color: #1A1A1A;
+				font-weight: 500;
+			}
+		}
+
+		.right {
+			display: flex;
+			align-items: center;
+
+			.phone-num {
 				font-size: 28rpx;
-				font-family: PingFang SC;
-				font-weight: 400;
-				color: #333333;
+				color: #666666;
+				margin-right: 12rpx;
 			}
 		}
 
-		.function-arrow {
+		.arrow {
 			width: 24rpx;
 			height: 24rpx;
 		}
 	}
 }
-</style>
+
+.mt24 {
+	margin-top: 24rpx;
+}
+
+.logout-btn {
+	margin: 40rpx 30rpx;
+	height: 100rpx;
+	background: #FFFFFF;
+	border-radius: 24rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 32rpx;
+	font-weight: bold;
+	color: #5C4BFF;
+}
+</style>

+ 1 - 1
pages_company/alipayImg.vue

@@ -97,7 +97,7 @@ page {
  		font-family: PingFang SC;
  		font-weight: 400;
  		color: #FFFFFF;
- 		background:#FC581C  !important;
+ 		background:#5B37FD  !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: #FC581C ;
+				background: #5B37FD ;
 				border-radius: 44upx;
 			}
 		}

+ 1 - 1
pages_company/card.vue

@@ -99,7 +99,7 @@ page {
  		font-family: PingFang SC;
  		font-weight: 400;
  		color: #FFFFFF;
- 		background:#FC581C  !important;
+ 		background:#5B37FD  !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: #FC581C ;
+			color: #5B37FD ;
 			background: #F5FFFE;
 			border: 1px solid #8AD5CE;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #FC581C ;
-				border: 1px solid #FC581C ;
+				background: #5B37FD ;
+				border: 1px solid #5B37FD ;
 			}
 		}
 	}

+ 1 - 1
pages_company/index.vue

@@ -243,7 +243,7 @@
 				font-weight: 500;
 				color: #FFFFFF;
 				border-radius: 8rpx;
-				background-color: #FC581C ;
+				background-color: #5B37FD ;
 			}
 		}
 		.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, #efa566 0%, #FC581C  100%);
+							background: linear-gradient(90deg, #5B37FD 0%, #5B37FD  100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							flex-shrink: 0;
@@ -444,7 +444,7 @@
 					font-family: PingFang SC;
 					font-weight: bold;
 					color: #FFFFFF;
-					background: #FC581C ;
+					background: #5B37FD ;
 					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, #efa566 0%, #FC581C  100%);
+							background: linear-gradient(90deg, #5B37FD 0%, #5B37FD  100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							font-size: 22upx;
@@ -430,7 +430,7 @@
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #FC581C ;
+				background: #5B37FD ;
 				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, #efa566 0%, #FC581C  100%);
+							background: linear-gradient(90deg, #5B37FD 0%, #5B37FD  100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							font-size: 22upx;
@@ -415,7 +415,7 @@
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #FC581C ;
+				background: #5B37FD ;
 				border-radius: 44upx;
 			}
 		}
@@ -536,7 +536,7 @@
 				font-size: 28upx;
 				font-family: PingFang SC;
 				font-weight: 500;
-				color: #FC581C ;
+				color: #5B37FD ;
 			}
 		}
 		.btn{
@@ -549,7 +549,7 @@
 			font-weight: 500;
 			color: #FFFFFF;
 			border: 1px solid #D2E6FF;
-			background: linear-gradient(135deg, #efa566 0%, #FC581C  100%);
+			background: linear-gradient(135deg, #5B37FD 0%, #5B37FD  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: #FC581C ;
+			color: #5B37FD ;
 			background: #F5FFFE;
 			border: 1px solid #8AD5CE;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #FC581C ;
-				border: 1px solid #FC581C ;
+				background: #5B37FD ;
+				border: 1px solid #5B37FD ;
 			}
 		}
 	}

+ 6 - 6
pages_company/order/productDetails.vue

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

+ 3 - 3
pages_company/order/productShowDetails.vue

@@ -264,7 +264,7 @@
 			.share-box{
 				width: 120upx;
 				height: 46upx;
-				border: 1px solid #FC581C ;
+				border: 1px solid #5B37FD ;
 				border-radius: 23upx;
 				display: flex;
 				align-items: center;
@@ -274,7 +274,7 @@
 					font-size: 26upx;
 					font-family: PingFang SC;
 					font-weight: 500;
-					color: #FC581C ;
+					color: #5B37FD ;
 				}
 				image{
 					margin-left: 2rpx;
@@ -310,7 +310,7 @@
 				display: inline-block;
 				padding: 0 6upx;
 				height: 30upx;
-				background: linear-gradient(90deg, #efa566 0%, #FC581C  100%);
+				background: linear-gradient(90deg, #5B37FD 0%, #5B37FD  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: #FC581C ;
+							color: #5B37FD ;
 						}
 						&.black{
 							color: #111111;
@@ -310,7 +310,7 @@
 								display: inline-block;
 								padding: 0 6upx;
 								height: 30upx;
-								background: linear-gradient(90deg, #efa566 0%, #FC581C  100%);
+								background: linear-gradient(90deg, #5B37FD 0%, #5B37FD  100%);
 								border-radius: 4upx;
 								margin-right: 10upx;
 								font-size: 22upx;
@@ -420,7 +420,7 @@
 								color: #666666;
 							}
 							&.pay{
-								background: #FC581C ;
+								background: #5B37FD ;
 								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, #efa566 0%, #FC581C  100%);
+		background: linear-gradient(135deg, #5B37FD 0%, #5B37FD  100%);
 		position: fixed;
 		top: 0;
 		left: 0;
@@ -546,7 +546,7 @@
 							display: inline-block;
 							padding: 0 6upx;
 							height: 30upx;
-							background: linear-gradient(90deg, #efa566 0%, #FC581C  100%);
+							background: linear-gradient(90deg, #5B37FD 0%, #5B37FD  100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							font-size: 22upx;
@@ -737,7 +737,7 @@
 			border-radius: 32upx;
 			margin-left: 15upx;
 			&.share-btn{
-				background: #FC581C ;
+				background: #5B37FD ;
 				color: #FFFFFF;
 				position: relative;
 				.share{
@@ -838,7 +838,7 @@
 					font-family: PingFang SC;
 					font-weight: bold;
 					color: #FFFFFF;
-					background: #FC581C ;
+					background: #5B37FD ;
 					border-radius: 44upx;
 				}
 			}

+ 6 - 6
pages_company/storeProductPackage.vue

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

+ 9 - 9
pages_company/storeProductPackageDetails.vue

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

+ 1 - 1
pages_company/wechatcode.vue

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

+ 2 - 2
pages_doctor/doctorIm.vue

@@ -385,7 +385,7 @@
 								text-align: right;
 							}
 							.words{
-								background: #FC581C ;
+								background: #5B37FD ;
 								color: #FFFFFF;
 								border-radius: 20upx 0 20upx 20upx;
 							}
@@ -453,7 +453,7 @@
 					height: 64upx;
 					line-height: 64upx;
 					border-radius: 32upx;
-					background: #FC581C ;
+					background: #5B37FD ;
 					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: #FC581C ;
+						background: #5B37FD ;
 						border-radius: 10upx 4upx 10upx 4upx;
 						margin-right: 12upx;
 					}
@@ -418,13 +418,13 @@
 						.label{
 							font-size: 26upx;
 							font-weight: 500;
-							color: #FC581C ;
+							color: #5B37FD ;
 							margin-right: 5upx;
 						}
 						.num{
 							font-size: 28upx;
 							font-weight: bold;
-							color: #FC581C ;
+							color: #5B37FD ;
 						}
 					}
 				}

+ 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="#FC581C "
+										activeColor="#5B37FD "
 										: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: #FC581C ;
+				background: #5B37FD ;
 				border-radius: 44upx;
 			}
 		}

+ 2 - 2
pages_doctor/submitOrder.vue

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

+ 2 - 2
pages_index/index/articleDetails.vue

@@ -173,7 +173,7 @@
 			font-family: PingFang SC;
 			font-weight: 500;
 			color: #FFFFFF;
-			background: #FC581C ;
+			background: #5B37FD ;
 			border-radius: 40upx;
 			display: flex;
 			align-items: center;
@@ -218,7 +218,7 @@
 				font-size: 22upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #FC581C ;
+				color: #5B37FD ;
 				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: #FC581C ;
+			color: #5B37FD ;
 			background: #ffffff;
-			border: 1px solid #FC581C ;
+			border: 1px solid #5B37FD ;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #FC581C ;
-				border: 1px solid #FC581C ;
+				background: #5B37FD ;
+				border: 1px solid #5B37FD ;
 			}
 		}
 	}

+ 3 - 3
pages_index/index/chineseMedicineDetails.vue

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

+ 4 - 4
pages_index/index/chineseMedicineList.vue

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

+ 1 - 1
pages_index/index/diseaseDetails.vue

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

+ 4 - 4
pages_index/index/diseaseList.vue

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

+ 2 - 2
pages_index/index/doctorArticleDetails.vue

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

+ 4 - 4
pages_index/index/doctorArticleList.vue

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

+ 3 - 3
pages_index/index/famousPrescribeDetails.vue

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

+ 4 - 4
pages_index/index/famousPrescribeList.vue

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

+ 3 - 3
pages_index/index/medicatedFoodDetails.vue

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

+ 4 - 4
pages_index/index/medicatedFoodList.vue

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

+ 2 - 2
pages_index/index/questionsDetails.vue

@@ -169,7 +169,7 @@
 			font-family: PingFang SC;
 			font-weight: 500;
 			color: #FFFFFF;
-			background: #FC581C ;
+			background: #5B37FD ;
 			border-radius: 40upx;
 			display: flex;
 			align-items: center;
@@ -214,7 +214,7 @@
 				font-size: 22upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #FC581C ;
+				color: #5B37FD ;
 				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: #FC581C ;
+			color: #5B37FD ;
 			background: #ffffff;
-			border: 1px solid #efa566   ;
+			border: 1px solid #5B37FD   ;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #FC581C    ;
-				border: 1px solid #FC581C ;
+				background: #5B37FD    ;
+				border: 1px solid #5B37FD ;
 			}
 		}
 	}

+ 1 - 1
pages_index/index/testDetails.vue

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

+ 2 - 2
pages_index/index/testList.vue

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

+ 3 - 3
pages_index/index/testResult.vue

@@ -186,8 +186,8 @@
 			.bg{
 				width: 100%;
 				height:100%;
-				// background-color: #FC581C ;
-				// background: linear-gradient(#efa566, #FC581C );
+				// background-color: #5B37FD ;
+				// background: linear-gradient(#5B37FD, #5B37FD );
 				position: fixed;
 				image{
 					width: 100%;
@@ -303,7 +303,7 @@
 								.title-line{
 									width: 8rpx;
 									height: 28rpx;
-									background: #FC581C ;
+									background: #5B37FD ;
 									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:#FC581C  !important;
+ 		background:#5B37FD  !important;
  		border-radius: 44upx;
  	}
  }

+ 3 - 3
pages_index/index/vesselDetails.vue

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

+ 4 - 4
pages_index/index/vesselList.vue

@@ -12,7 +12,7 @@
 				 <u-tabs
 				  :scrollable="false"
 				  :list="tabs"  
-				  lineColor="#FC581C "
+				  lineColor="#5B37FD "
 				 @change="tabChange">
 				 </u-tabs>
 			</view>
@@ -242,14 +242,14 @@
 						border-radius: 5rpx;
 						width: 8rpx;
 						height:30rpx;
-						background-color: #FC581C ;
+						background-color: #5B37FD ;
 					}
 					
 				}
 				.active{
 					background-color: #fff;
 					font-weight: bold;
-					color: #FC581C ;
+					color: #5B37FD ;
 					padding-left: 0;
 					width: 100%;
 				}
@@ -270,7 +270,7 @@
 				font-size: 40upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #FC581C ;
+				color: #5B37FD ;
 				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="#FC581C " inactiveColor="rgba(0, 0, 0, 0.1)"></evan-switch>
+					<evan-switch @change="integralChange" v-model="checked" activeColor="#5B37FD " 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, #efa566 0%, #FC581C  100%);
+							background: linear-gradient(90deg, #5B37FD 0%, #5B37FD  100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							font-size: 22upx;
@@ -682,7 +682,7 @@
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #FC581C ;
+				background: #5B37FD ;
 				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, #efa566 0%, #FC581C  100%);
+							background: linear-gradient(90deg, #5B37FD 0%, #5B37FD  100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							font-size: 22upx;
@@ -624,7 +624,7 @@
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #FC581C ;
+				background: #5B37FD ;
 				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="#FC581C " inactiveColor="rgba(0, 0, 0, 0.1)"></evan-switch>
+				<evan-switch v-model="isDefault" activeColor="#5B37FD " 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: #FC581C ;
+							background: #5B37FD ;
 							color: #FFFFFF;
 						}
 					}
@@ -397,7 +397,7 @@
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #FC581C ;
+				background: #5B37FD ;
 				border-radius: 44upx;
 			}
 		}

+ 1 - 1
pages_user/user/addDoc.vue

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

+ 1 - 1
pages_user/user/addDocRecord.vue

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

+ 1 - 1
pages_user/user/addPatient.vue

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

+ 2 - 2
pages_user/user/address.vue

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

+ 1 - 1
pages_user/user/doc.vue

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

+ 1 - 1
pages_user/user/docRecord.vue

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

+ 2 - 2
pages_user/user/doctorOrder.vue

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

+ 1 - 1
pages_user/user/otherPaymentOrder.vue

@@ -337,7 +337,7 @@
 				font-weight: bold;
 				color: #FFFFFF;
 				text-align: center;
-				background: #FC581C ;
+				background: #5B37FD ;
 				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: #FC581C ;
+				background: #5B37FD ;
 				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: #FC581C ;
+				background: #5B37FD ;
 				border-radius: 44upx;
 			}
 		}

Неке датотеке нису приказане због велике количине промена