liujiaxin 2 hafta önce
ebeveyn
işleme
0541c8ec79
100 değiştirilmiş dosya ile 11589 ekleme ve 1566 silme
  1. 25 0
      .hbuilderx/launch.json
  2. 3 3
      androidPrivacy.json
  3. 1 1
      api/integral.js
  4. 1 1
      api/living.js
  5. 1 1
      assets/css/common.less
  6. 4 4
      assets/css/czy/es.2.color.css
  7. 3 1
      common/request.js
  8. 1 1
      components/Menu.vue
  9. 7 7
      components/choosePatient/choosePatient.vue
  10. 14 14
      components/es-integral-sign/es-integral-sign.vue
  11. 1 1
      components/es-nav-title/es-nav-title.vue
  12. 3 3
      components/h5-down-app-tip/h5-down-app-tip.vue
  13. 1 1
      components/lx-calendar/lx-calendar.vue
  14. 2 2
      components/me-tabs/me-tabs.vue
  15. 2 2
      components/myGuide/myGuide.vue
  16. 1 1
      components/n-tabs/n-tabs.vue
  17. 7 7
      components/pushangyuqi-calendar/pushangyuqi-calendar.vue
  18. 4 4
      components/signPop/activityPop.vue
  19. 5 5
      components/signPop/signPop.vue
  20. 1 1
      components/todo-list.vue
  21. 3 1
      main.js
  22. 37 70
      manifest.json
  23. 9878 1
      package-lock.json
  24. 1 1
      package.json
  25. 23 23
      pages.json
  26. 4 4
      pages/agent/components/rewardDoctor.vue
  27. 1 1
      pages/agent/doctorDetail.vue
  28. 1 1
      pages/agent/doctorList.vue
  29. 5 5
      pages/agent/doctorRegister.vue
  30. 3 3
      pages/ai/chat.vue
  31. 2 2
      pages/ai/chatOld.vue
  32. 3 3
      pages/ai/consultation.vue
  33. 2 2
      pages/article/chineseMedicineDetails.vue
  34. 4 4
      pages/article/chineseMedicineList.vue
  35. 1 1
      pages/article/diseaseDetails.vue
  36. 4 4
      pages/article/diseaseList.vue
  37. 2 2
      pages/article/famousPrescribeDetails.vue
  38. 4 4
      pages/article/famousPrescribeList.vue
  39. 4 4
      pages/article/medicatedFoodList.vue
  40. 4 4
      pages/article/questionsList.vue
  41. 573 573
      pages/article/test.vue
  42. 1 1
      pages/article/testDetails.vue
  43. 4 4
      pages/article/testResult.vue
  44. 4 4
      pages/article/vesselList.vue
  45. 5 5
      pages/auth/bindMobile.vue
  46. 3 3
      pages/auth/findpass.vue
  47. 1 1
      pages/auth/h5Login/oneLogin.html
  48. 3 3
      pages/auth/h5WxLogin.vue
  49. 11 11
      pages/auth/login.vue
  50. 7 7
      pages/auth/loginIndex.vue
  51. 4 4
      pages/auth/register.vue
  52. 1 1
      pages/auth/wechatList.vue
  53. 2 2
      pages/common/nav.vue
  54. 2 2
      pages/company/bindInfo.vue
  55. 4 4
      pages/company/couponDetails.vue
  56. 5 5
      pages/company/couponList.vue
  57. 1 1
      pages/company/index.vue
  58. 1 1
      pages/company/inquiryOrderDetails.vue
  59. 4 4
      pages/company/inquiryOrderIMList.vue
  60. 4 4
      pages/company/inquiryOrderList.vue
  61. 2 2
      pages/company/login.vue
  62. 8 8
      pages/company/packageDetails.vue
  63. 6 6
      pages/company/packageList.vue
  64. 6 6
      pages/company/packageOrderDetails.vue
  65. 6 6
      pages/company/packageOrderList.vue
  66. 3 3
      pages/company/storeOrderDetail.vue
  67. 3 3
      pages/company/storeOrderList.vue
  68. 2 2
      pages/company/voice.vue
  69. 3 3
      pages/company/voiceItem.vue
  70. 4 4
      pages/company/voiceList.vue
  71. 5 5
      pages/course/catalogue.vue
  72. 4 4
      pages/course/catalogueN.nvue
  73. 1 1
      pages/course/commentN.nvue
  74. 1 1
      pages/course/components/docterItem.vue
  75. 244 176
      pages/course/components/doctorHall.vue
  76. 1 1
      pages/course/components/giftPopup.vue
  77. 1 1
      pages/course/components/goodsItem.vue
  78. 2 2
      pages/course/components/goodsItemVertical.vue
  79. 5 2
      pages/course/components/hallItem.vue
  80. 8 8
      pages/course/components/integralGoods.vue
  81. 1 1
      pages/course/components/myAudio.vue
  82. 9 9
      pages/course/components/studyCenter.vue
  83. 4 4
      pages/course/famousHall.vue
  84. 1 1
      pages/course/famousHallPage.vue
  85. 2 2
      pages/course/favoritePage.vue
  86. 6 6
      pages/course/index.vue
  87. 22 22
      pages/course/info.vue
  88. 6 6
      pages/course/info1.vue
  89. 14 14
      pages/course/infoOld.vue
  90. 3 3
      pages/course/learning.vue
  91. 2 2
      pages/course/learningPage.vue
  92. 2 2
      pages/course/myNote.vue
  93. 1 1
      pages/course/noteList.vue
  94. 7 7
      pages/course/privilege.nvue
  95. 2 2
      pages/course/privilege1.nvue
  96. 1 1
      pages/course/studyCenter/courseCollect.vue
  97. 4 4
      pages/course/studyCenter/orderList.vue
  98. 1 1
      pages/course/video/commentN.nvue
  99. 30 30
      pages/course/video/living-app-searchInfo.nvue
  100. 443 364
      pages/course/video/living-app.nvue

+ 25 - 0
.hbuilderx/launch.json

@@ -0,0 +1,25 @@
+{
+    "version" : "1.0",
+    "configurations" : [
+        {
+            "playground" : "custom",
+            "type" : "uni-app:app-android"
+        },
+        {
+            "app" : {
+                "launchtype" : "local"
+            },
+            "default" : {
+                "launchtype" : "local"
+            },
+            "h5" : {
+                "launchtype" : "local"
+            },
+            "mp-weixin" : {
+                "launchtype" : "local"
+            },
+            "provider" : "aliyun",
+            "type" : "uniCloud"
+        }
+    ]
+}

+ 3 - 3
androidPrivacy.json

@@ -2,7 +2,7 @@
     "version" : "1",
     "prompt" : "template",
     "title" : "服务协议和隐私政策",
-    "message" : "非常感谢您使用芳华未来,我们深知保护个人隐私的重要性,所以请您在使用前,仔细阅读并充分理解<a href=\"https://userapp.his.cdwjyyh.com/web/userAgreement\">《用户协议》</a>和<a href=\"https://userapp.his.cdwjyyh.com/web/privacyPolicy\">《隐私政策》</a>的内容。<br/>如您同意,请点击\"同意并使用开始\"开始使用我们的产品和服务。",
+    "message" : "非常感谢您使用河山恒康,我们深知保护个人隐私的重要性,所以请您在使用前,仔细阅读并充分理解<a href=\"https://userapp.his.cdwjyyh.com/web/userAgreement\">《用户协议》</a>和<a href=\"https://userapp.his.cdwjyyh.com/web/privacyPolicy\">《隐私政策》</a>的内容。<br/>如您同意,请点击\"同意并使用开始\"开始使用我们的产品和服务。",
     "buttonAccept" : "同意并接受",
     "buttonRefuse" : "暂不同意",
     "hrefLoader" : "system",
@@ -29,10 +29,10 @@
             "color" : "#333"
         },
         "buttonRefuse" : {
-            "color" : "#FF5C03"
+            "color" : "#FF5030"
         },
         "buttonVisitor" : {
-            "color" : "#FF5C03"
+            "color" : "#FF5030"
         }
     }
 }

+ 1 - 1
api/integral.js

@@ -30,7 +30,7 @@ export function doSign(data) {
 }
 
 
-//添加芳华
+//添加健康
 export function addIntegral(type, extra, userId) { //类型 1浏览商品 2刷视频  
 
 	// 类型说明:1-浏览商品 2-刷视频 5-广告奖励

+ 1 - 1
api/living.js

@@ -181,7 +181,7 @@ export function liveInternetTraffic(data) {
 	return request('/appLive/app/live/liveTrafficLog/getLiveInternetTraffic', data, 'POST', 'application/json;charset=UTF-8');
 }
 
-// 芳华
+// 健康
 export function getUserIntegralInfo(data) {
 	return request('/liveAPP/appLive/app/live/liveData/getUserIntegralInfo', data, 'GET', 'application/json;charset=UTF-8');
 }

+ 1 - 1
assets/css/common.less

@@ -190,7 +190,7 @@
  	height: 80rpx;
  	// background: linear-gradient(to right, #35d861 0%, #35d861 100%);
  	// background: -moz-linear-gradient(to right, #35d861 0%, #35d861 100%);
- 	background: #FF5C03;
+ 	background: #FF5030;
  	box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22);
  	border-radius: 40rpx;
  	font-size: 30rpx;

+ 4 - 4
assets/css/czy/es.2.color.css

@@ -1,7 +1,7 @@
 /* backgroundColor color borderColor */
-.es-bc,.es-max-btn{ background: #FF5C03;color:white; }
-.es-c{ color: #FF5C03 !important; }
-.es-brc{ border:1px #FF5C03 solid !important; }
+.es-bc,.es-max-btn{ background: #FF5030;color:white; }
+.es-c{ color: #FF5030 !important; }
+.es-brc{ border:1px #FF5030 solid !important; }
 .es-bc-tint{
 	background-color: rgba(255, 92, 3, 0.1);
 }
@@ -14,7 +14,7 @@
 	background-color: rgba(255, 92, 3, 0.05);
 }
 
-.es-bc-theme{ background-color:#FF5C03; color:white; }
+.es-bc-theme{ background-color:#FF5030; color:white; }
 
 .es-bc-yellow{ background:#F57221; color:white; }
 .es-c-yellow{ color:#F57221; }

+ 3 - 1
common/request.js

@@ -2,7 +2,9 @@
 export default class Request {
 	http(router, data = {}, method,contentType,timeout=60000, hideLoading=true) {
 		let that = this;
-		let path ='https://api.cdwjyyh.com';//app正式环境
+		// let path ='https://api.cdwjyyh.com';//app正式环境
+		let path ='https://userapp.hshsyy.com';//河山正式环境
+		
 		//let path = 'http://192.168.110.247:8113'
 		// #ifdef H5
 		//path = 'http://192.168.110.245:8113'

+ 1 - 1
components/Menu.vue

@@ -134,7 +134,7 @@ export default {
 				 
 			}
 			.active{
-				color: #FF5C03;
+				color: #FF5030;
 				
 			}
 		}

+ 7 - 7
components/choosePatient/choosePatient.vue

@@ -19,8 +19,8 @@
 				</view>
 				<view :id="'patient_'+patientList.length" class="patient-item"  @click="addPatient()">
 					<view class="additem">
-						<uni-icons type="plusempty" size="36rpx" color="#FF5C03" style="font-weight: bold;"></uni-icons>
-						<view class="patient-name" style="color: #ff5c03;margin-bottom: 0;margin-top: 8rpx;">添加</view>
+						<uni-icons type="plusempty" size="36rpx" color="#FF5030" style="font-weight: bold;"></uni-icons>
+						<view class="patient-name" style="color: #FF5030;margin-bottom: 0;margin-top: 8rpx;">添加</view>
 					</view>
 				</view>
 			</scroll-view>
@@ -89,12 +89,12 @@
 	}
 	.additem {
 		text-align: center;
-		color: #ff5c03 !important;
+		color: #FF5030 !important;
 		@include u-flex(column, center, center);
 		height: 100%;
 	}
 	.addbtn {
-		background-color: #FF5C03;
+		background-color: #FF5030;
 		padding: 5rpx 10rpx;
 		box-sizing: border-box;
 		border-radius: 10rpx;
@@ -138,7 +138,7 @@
 			position: relative;
 		}
 		&-active{
-			border: 1px solid #FF5C03;
+			border: 1px solid #FF5030;
 			&::after {
 				position: absolute;
 				bottom: 0;
@@ -147,8 +147,8 @@
 				height: 0;
 				width: 0;
 				border-top: 24rpx solid transparent;
-				border-right: 24rpx solid #FF5C03;
-				border-bottom: 24rpx solid #FF5C03;
+				border-right: 24rpx solid #FF5030;
+				border-bottom: 24rpx solid #FF5030;
 				border-left: 24rpx solid transparent;
 				border-radius: 0 0 12rpx 0;
 			}

+ 14 - 14
components/es-integral-sign/es-integral-sign.vue

@@ -50,38 +50,38 @@
 				integralData: {
 					index: 2, //当前选中第几个,从1开始
 					list: [{
-							icon: 2, //1-显示芳华币  2-显示勾  3-显示红包
-							title: '+10芳华币',
+							icon: 2, //1-显示健康币  2-显示勾  3-显示红包
+							title: '+10健康币',
 							remark: '第一天',
 						},
 						{
-							icon: 2, //1-显示芳华币  2-显示勾  3-显示红包
-							title: '+10芳华币',
+							icon: 2, //1-显示健康币  2-显示勾  3-显示红包
+							title: '+10健康币',
 							remark: '第二天',
 						},
 						{
-							icon: 1, //1-显示芳华币  2-显示勾  3-显示红包
-							title: '+30芳华币',
+							icon: 1, //1-显示健康币  2-显示勾  3-显示红包
+							title: '+30健康币',
 							remark: '第三天',
 						},
 						{
-							icon: 1, //1-显示芳华币  2-显示勾  3-显示红包
-							title: '+50芳华币',
+							icon: 1, //1-显示健康币  2-显示勾  3-显示红包
+							title: '+50健康币',
 							remark: '第四天',
 						},
 						{
-							icon: 1, //1-显示芳华币  2-显示勾  3-显示红包
-							title: '+50芳华币',
+							icon: 1, //1-显示健康币  2-显示勾  3-显示红包
+							title: '+50健康币',
 							remark: '第五天',
 						},
 						{
-							icon: 1, //1-显示芳华币  2-显示勾  3-显示红包
-							title: '+60芳华币',
+							icon: 1, //1-显示健康币  2-显示勾  3-显示红包
+							title: '+60健康币',
 							remark: '第六天',
 						},
 						{
-							icon: 3, //1-显示芳华币  2-显示勾  3-显示红包
-							title: '芳华币礼包',
+							icon: 3, //1-显示健康币  2-显示勾  3-显示红包
+							title: '健康币礼包',
 							remark: '签到完成',
 						},
 

+ 1 - 1
components/es-nav-title/es-nav-title.vue

@@ -101,7 +101,7 @@
 		width: 100%;
 		height: 500rpx;
 		position: absolute;
-		background: #FF5C03;
+		background: #FF5030;
 	}
 	
 	.top-img1 {

+ 3 - 3
components/h5-down-app-tip/h5-down-app-tip.vue

@@ -3,13 +3,13 @@
 		<!-- #ifdef H5 -->
 		<view class="es-c es-share-bg-box">
 			<image class="image x-c" src="/static/images/other/bg_bar.png"></image>
-			<view class="es-bc-white x-c es-pt-10" style="width: 100%;">下载芳华未来App,查看更多内容↓</view> 
+			<view class="es-bc-white x-c es-pt-10" style="width: 100%;">下载河山恒康App,查看更多内容↓</view> 
 			<view class="line flex es-h-1 es-bc-fa"></view>
 			<view class="es-bc-white x-bc es-pl-20 es-pr-20 es-pb-20 es-pt-10">
 				<view class="left x-f">
 					<image class="es-w-100 es-h-100 es-mr-20" style="flex-shrink: 0;" src="@/static/logo.png"></image>
 					<view class="y-b">
-						<view class="es-fs-30 es-fw-bold es-c-33 es-mb-10 x-f">芳华未来</view>
+						<view class="es-fs-30 es-fw-bold es-c-33 es-mb-10 x-f">河山恒康</view>
 						<view class="es-fs-26 es-fw-n es-c-33" style="text-align: left;">古籍·中药·方剂大全</view>
 					</view>
 				</view>
@@ -20,7 +20,7 @@
 					<wx-open-launch-app appid="wx703c4bd07bbd1695" :extinfo="extinfo" @launch="AppLaunch" @error="AppError">
 						<component :is="'script'" type="text/wxtag-template">
 							<button id="footer-btn" 
-							style="min-height: 40px;border-radius: 10px;display: flex;align-items: center;justify-content: center;font-weight: 700;font-size: 15px;background: #ff5c03;color: #fff">
+							style="min-height: 40px;border-radius: 10px;display: flex;align-items: center;justify-content: center;font-weight: 700;font-size: 15px;background: #FF5030;color: #fff">
 								App内打开
 							</button>
 					  	</component>

+ 1 - 1
components/lx-calendar/lx-calendar.vue

@@ -614,7 +614,7 @@ export default {
 			}
 			&.today{
 				background: @color; 
-				color: #FF5C03;
+				color: #FF5030;
 			}
 		}
 		.dot{

+ 2 - 2
components/me-tabs/me-tabs.vue

@@ -72,7 +72,7 @@ export default {
     },
     actColor: {
       type: String,
-      default: '#FF5C03'
+      default: '#FF5030'
     },
     lineWidth: {
       type: String,
@@ -310,7 +310,7 @@ export default {
     
     &.active{
       font-weight: bold;
-      color: #FF5C03;
+      color: #FF5030;
     }
   }
   

+ 2 - 2
components/myGuide/myGuide.vue

@@ -7,7 +7,7 @@
 					<view class="guide1">
 						<view class="guide1-title">
 							<image class="qinghe_icon" src="@/static/images/guide/qinghe_icon.png" mode="aspectFill"></image>
-							<text>欢迎使用芳华未来APP</text>
+							<text>欢迎使用河山恒康APP</text>
 						</view>
 						<view>{{guideInfo.tips}}</view>
 					</view>
@@ -399,7 +399,7 @@
 						height: 68rpx;
 						line-height: 68rpx;
 						text-align: center;
-						background: #FF5C03;
+						background: #FF5030;
 						border-radius: 8rpx 8rpx 8rpx 8rpx;
 						font-family: PingFang SC, PingFang SC;
 						font-weight: 400;

+ 1 - 1
components/n-tabs/n-tabs.vue

@@ -57,7 +57,7 @@
 			},
 			actColor: {
 				type: String,
-				default: '#FF5C03'
+				default: '#FF5030'
 			},
 		},
 		data() {

+ 7 - 7
components/pushangyuqi-calendar/pushangyuqi-calendar.vue

@@ -43,7 +43,7 @@
 
 
 			<view class="date-tr" v-for="(i,index) in dates" :key="index">
-				<view v-for="(j,k) in i" :key="k" :style="{color:j[0]}" :class="j[2]=='#FF5C03'?'td active':'td'" @click="itemChose(j,index,k)">{{j[1]}}</view>
+				<view v-for="(j,k) in i" :key="k" :style="{color:j[0]}" :class="j[2]=='#FF5030'?'td active':'td'" @click="itemChose(j,index,k)">{{j[1]}}</view>
 			</view>
 		</view>
 	</view>
@@ -146,7 +146,7 @@
 						   选21是因为前3周不可能到21号(1号在周日的话会放在第二周),
 						   并且上个月的最后一个星期日必然是21号之后 */
 						else if (this.year == y && this.month == m && this.date == d) {
-							cache[2] = '#FF5C03'; // 当前日期背景颜色
+							cache[2] = '#FF5030'; // 当前日期背景颜色
 							cache[0] = '#fff'; // 当前日期文字颜色
 						}
 						if (this.date <= premaxday) {
@@ -164,7 +164,7 @@
 						if (this.date < 14 || this.date == maxday + 1) {
 							cache[0] = '#BBBBBB'
 						} else if (this.year == y && this.month == m && this.date == d) {
-							cache[2] = '#FF5C03'
+							cache[2] = '#FF5030'
 							cache[0] = '#fff'; // 当前日期文字颜色
 						}
 						if (this.date <= maxday) {
@@ -327,15 +327,15 @@
 				if(day[0] == '#222222'){ // 取消所有选中数据
 					for(let i=0;i<6;i++) {
 						for(let j=0;j<7;j++) {
-							if(this.dates[i][j][0] != '#BBBBBB' && this.dates[i][j][2] == '#FF5C03') {
+							if(this.dates[i][j][0] != '#BBBBBB' && this.dates[i][j][2] == '#FF5030') {
 								this.dates[i][j][2] = '#fff'
 								this.dates[i][j][0] = '#222222'
 							}
 						}
 					}
-					this.dates[w][k][2] = '#FF5C03'
+					this.dates[w][k][2] = '#FF5030'
 					this.dates[w][k][0] = '#fff'
-					let newValue = ['#fff', day[1], "#FF5C03"]
+					let newValue = ['#fff', day[1], "#FF5030"]
 					this.$set(this.dates[w], k, newValue)
 				}
 				let mothnum = this.months[this.m]
@@ -444,7 +444,7 @@
 					color: #222222;
 					border-radius: 6upx;
 					&.active{
-						background-color: #FF5C03;
+						background-color: #FF5030;
 					}
 				}
 			}

+ 4 - 4
components/signPop/activityPop.vue

@@ -31,13 +31,13 @@
 									</view>
 								</view>
 							</view>
-							<view  :style="{color: item.isSign ? '#FF5C03':''}">{{item.date}}号</view>
+							<view  :style="{color: item.isSign ? '#FF5030':''}">{{item.date}}号</view>
 						<!-- </block>
 						<block v-else>
 							<view class="imgbox">
 								<image class="imgbox" src="@/static/images/integral/gift_img.png" mode="aspectFill"></image>
 							</view>
-							<view :style="{color: 7 <= userSign.signNum ? '#FF5C03':''}">礼包</view>
+							<view :style="{color: 7 <= userSign.signNum ? '#FF5030':''}">礼包</view>
 						</block> -->
 						  
 					</view>
@@ -202,7 +202,7 @@
 			font-family: PingFang SC, PingFang SC;
 			font-weight: 500;
 			font-size: 26rpx;
-			color: #FF5C03;
+			color: #FF5030;
 		}
 		&-con {
 			padding: 44rpx 26rpx;
@@ -243,7 +243,7 @@
 				border-radius: 50%;
 				font-weight: 500;
 				font-size: 22rpx;
-				color: #FF5C03;
+				color: #FF5030;
 			}
 			.integral-box {
 				width: 72rpx;

+ 5 - 5
components/signPop/signPop.vue

@@ -9,7 +9,7 @@
 					 <image class="signbox-topbg" src="@/static/images/ad/Frame.png" mode="widthFix"></image>
 					 <view class="signbox-headcon">
 						 <view>
-							 <text>连续签到领</text><text style="color: #FFFC76;">芳华币</text>
+							 <text>连续签到领</text><text style="color: #FFFC76;">健康币</text>
 						 </view>
 						 <view class="signbox-signnum">{{userSign.signNum==0?'您还没有签到':'已签到'+userSign.signNum+'天'}}</view>
 					 </view>
@@ -31,13 +31,13 @@
 									</view>
 								</view>
 							</view>
-							<view  :style="{color: index + 1 <= userSign.signNum ? '#FF5C03':''}">第{{index + 1}}天</view>
+							<view  :style="{color: index + 1 <= userSign.signNum ? '#FF5030':''}">第{{index + 1}}天</view>
 						</block>
 						<block v-else>
 							<view class="imgbox">
 								<image class="imgbox" src="@/static/images/integral/gift_img.png" mode="aspectFill"></image>
 							</view>
-							<view :style="{color: 7 <= userSign.signNum ? '#FF5C03':''}">礼包</view>
+							<view :style="{color: 7 <= userSign.signNum ? '#FF5030':''}">礼包</view>
 						</block>
 						  
 					</view>
@@ -179,7 +179,7 @@
 			font-family: PingFang SC, PingFang SC;
 			font-weight: 500;
 			font-size: 26rpx;
-			color: #FF5C03;
+			color: #FF5030;
 		}
 		&-con {
 			padding: 44rpx 26rpx;
@@ -220,7 +220,7 @@
 				border-radius: 50%;
 				font-weight: 500;
 				font-size: 22rpx;
-				color: #FF5C03;
+				color: #FF5030;
 			}
 			.integral-box {
 				width: 72rpx;

+ 1 - 1
components/todo-list.vue

@@ -196,7 +196,7 @@
 					// border-radius: 8rpx;
 					font-size: 24rpx;
 					text-align: center;
-				    color: #FF5C03;
+				    color: #FF5030;
 				}
 			}
 		}

+ 3 - 1
main.js

@@ -4,7 +4,9 @@ import Vue from 'vue'
 
 import store from './store'
 // 引入全局uView
-import uView from "@/node_modules/uview-ui";
+// import uView from "@/node_modules/uview-ui";
+import uView from 'uview-ui';
+Vue.use(uView);
 
 import {parseIDCardInfo,logout,clearVideoCacheOnLogout,parseText,getDictLabelName,parseIdCard,getAge,parsePhone,isEmpty,
 isLogin,navBack,navTo,getUserInfo,formatHour,dateFormatStr,registerIdCode,updateMsgDot,handleBindCompanyFsUser,

+ 37 - 70
manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "芳华未来",
-    "appid" : "__UNI__33EAA2D",
+    "name" : "河山恒康",
+    "appid" : "__UNI__EED3DB4",
     "description" : "",
-    "versionName" : "1.7.3",
-    "versionCode" : 1730,
+    "versionName" : "1.0.0",
+    "versionCode" : 100,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -209,26 +209,7 @@
                         "__platform__" : [ "ios", "android" ]
                     }
                 },
-                "push" : {
-                    "unipush" : {
-                        "offline" : true,
-                        "icons" : {
-                            "small" : {
-                                "ldpi" : "unpackage/res/icons/18x18.png",
-                                "mdpi" : "unpackage/res/icons/24x24.png",
-                                "hdpi" : "unpackage/res/icons/36x36.png",
-                                "xhdpi" : "unpackage/res/icons/48x48.png",
-                                "xxhdpi" : "unpackage/res/icons/72x72.png"
-                            }
-                        },
-                        "hms" : {},
-                        "vivo" : {},
-                        "honor" : {},
-                        "oppo" : {},
-                        "mi" : {},
-                        "version" : "2"
-                    }
-                },
+                "push" : {},
                 "maps" : {},
                 "payment" : {
                     "appleiap" : {},
@@ -246,9 +227,9 @@
                 "androidStyle" : "default",
                 "useOriginalMsgbox" : true,
                 "android" : {
-                    "hdpi" : "static/images/launch/480x762.png",
-                    "xhdpi" : "static/images/launch/720x1242.png",
-                    "xxhdpi" : "static/images/launch/1080x2340.png"
+                    "hdpi" : "C:/Users/Administrator/Downloads/启动页480x828.png",
+                    "xhdpi" : "C:/Users/Administrator/Downloads/启动页720x1242(2).png",
+                    "xxhdpi" : "C:/Users/Administrator/Downloads/启动页1080x1882.png"
                 },
                 "iosStyle" : "common"
             },
@@ -286,34 +267,20 @@
             }
         },
         "nativePlugins" : {
-            "Ba-IdCode" : {
-                "__plugin_info__" : {
-                    "name" : "获取设备唯一标识(OAID、AAID、IMEI等) Ba-IdCode",
-                    "description" : "Ba-IdCode 是一款可以获取国内各大手机厂商 OAID 及海外手机平台 AAID 的插件。另外也支持 IMEI/MEID、AndroidID、WidevineID、PseudoID、GUID 等",
-                    "platforms" : "Android",
-                    "url" : "https://ext.dcloud.net.cn/plugin?id=10318",
-                    "android_package_name" : "com.mytek.rtlive",
-                    "ios_bundle_id" : "com.mytek.rtlive",
-                    "isCloud" : true,
-                    "bought" : 1,
-                    "pid" : "10318",
-                    "parameters" : {}
-                }
-            },
-            "leven-vasDolly" : {
-                "__plugin_info__" : {
-                    "name" : "安卓多渠道VasDolly原生插件",
-                    "description" : "安卓多渠道VasDolly原生插件,VasDolly 是腾讯开源的一个极速多渠道打包组件,同时支持基于 V1 和 V2 签名进行渠道打包,一般用于app推广统计等场景",
-                    "platforms" : "Android",
-                    "url" : "https://ext.dcloud.net.cn/plugin?id=18826",
-                    "android_package_name" : "com.mytek.rtlive",
-                    "ios_bundle_id" : "com.mytek.rtlive",
-                    "isCloud" : true,
-                    "bought" : 1,
-                    "pid" : "18826",
-                    "parameters" : {}
-                }
-            },
+            // "leven-vasDolly" : {
+            //     "__plugin_info__" : {
+            //         "name" : "安卓多渠道VasDolly原生插件",
+            //         "description" : "安卓多渠道VasDolly原生插件,VasDolly 是腾讯开源的一个极速多渠道打包组件,同时支持基于 V1 和 V2 签名进行渠道打包,一般用于app推广统计等场景",
+            //         "platforms" : "Android",
+            //         "url" : "https://ext.dcloud.net.cn/plugin?id=18826",
+            //         "android_package_name" : "com.mytek.rtlive",
+            //         "ios_bundle_id" : "com.mytek.rtlive",
+            //         "isCloud" : true,
+            //         "bought" : 1,
+            //         "pid" : "18826",
+            //         "parameters" : {}
+            //     }
+            // },
             "TZBank-Cashier" : {
                 "__plugin_info__" : {
                     "name" : "TZBank-Cashier",
@@ -328,20 +295,20 @@
                     "parameters" : {}
                 }
             },
-            "Wework-SdkWX" : {
-                "__plugin_info__" : {
-                    "name" : "企业微信授权登录和分享插件(Android和iOS)",
-                    "description" : "企业微信授权登录和分享插件,可使用企业微信帐号直接登录,把文件、图片、链接等内容便捷的分享给企业微信用户",
-                    "platforms" : "Android,iOS",
-                    "url" : "https://ext.dcloud.net.cn/plugin?id=6560",
-                    "android_package_name" : "com.mytek.rtlive",
-                    "ios_bundle_id" : "com.mytek.rtlive",
-                    "isCloud" : true,
-                    "bought" : 1,
-                    "pid" : "6560",
-                    "parameters" : {}
-                }
-            },
+            // "Wework-SdkWX" : {
+            //     "__plugin_info__" : {
+            //         "name" : "企业微信授权登录和分享插件(Android和iOS)",
+            //         "description" : "企业微信授 权登录和分享插件,可使用企业微信帐号直接登录,把文件、图片、链接等内容便捷的分享给企业微信用户",
+            //         "platforms" : "Android,iOS",
+            //         "url" : "https://ext.dcloud.net.cn/plugin?id=6560",
+            //         "android_package_name" : "com.mytek.rtlive",
+            //         "ios_bundle_id" : "com.mytek.rtlive",
+            //         "isCloud" : true,
+            //         "bought" : 1,
+            //         "pid" : "6560",
+            //         "parameters" : {}
+            //     }
+            // },
             "Ba-CameraView" : {
                 "__plugin_info__" : {
                     "name" : "Ba-CameraView",
@@ -434,7 +401,7 @@
     //     "MODE" : 2 // 启用Vue2兼容模式
     // }
     "h5" : {
-        "title" : "芳华未来",
+        "title" : "河山恒康",
         "devServer" : {
             "https" : false,
             "disableHostCheck" : true

Dosya farkı çok büyük olduğundan ihmal edildi
+ 9878 - 1
package-lock.json


+ 1 - 1
package.json

@@ -13,7 +13,7 @@
         "aegis-weex-sdk": "^1.38.1",
         "crypto-js": "^4.2.0",
         "date-fns": "^2.30.0",
-        "dayjs": "^1.11.19",
+        "dayjs": "^1.11.20",
         "image-tools": "^1.4.0",
         "jsqr": "^1.4.0",
         "jweixin-module": "^1.6.0",

+ 23 - 23
pages.json

@@ -18,7 +18,7 @@
 			"aliasPath": "/",
 			"name": "home",
 			"style": {
-				"navigationBarBackgroundColor": "#FF5C03",
+				"navigationBarBackgroundColor": "#FF5030",
 				"navigationBarTextStyle": "black",
 				"scrollIndicator": "none",
 				"navigationBarTitleText": "",
@@ -166,7 +166,7 @@
 			"path" : "pages/course/index",
 			"style" : 
 			{
-				"navigationBarBackgroundColor":"#FF5C03",
+				"navigationBarBackgroundColor":"#FF5030",
 				"navigationBarTextStyle":"black",
 				"scrollIndicator": "none",
 				"bounce": "none",
@@ -183,7 +183,7 @@
 			"name": "learning",
 			"style" : 
 			{
-				"navigationBarBackgroundColor":"#FF5C03",
+				"navigationBarBackgroundColor":"#FF5030",
 				"navigationBarTextStyle":"white",
 				"scrollIndicator": "none",
 				"bounce": "none",
@@ -200,7 +200,7 @@
 			"name": "famousHall",
 			"style" : 
 			{
-				"navigationBarBackgroundColor":"#FF5C03",
+				"navigationBarBackgroundColor":"#FF5030",
 				"navigationBarTextStyle":"black",
 				"scrollIndicator": "none",
 				"bounce": "none",
@@ -756,7 +756,7 @@
 			"aliasPath": "/",
 			"name": "mine",
 			"style": {
-				"navigationBarBackgroundColor": "#FF5C03",
+				"navigationBarBackgroundColor": "#FF5030",
 				"navigationBarTextStyle": "black",
 				"scrollIndicator": "none",
 				"bounce": "none",
@@ -892,7 +892,7 @@
 			"style": {
 				"navigationBarTitleText": "订单详情",
 				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#FF5C03",
+				"navigationBarBackgroundColor": "#FF5030",
 				"navigationBarTextStyle": "white"
 			}
 		},
@@ -1029,7 +1029,7 @@
 			"style": {
 				"navigationBarTitleText": "医生详情",
 				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#FF5C03",
+				"navigationBarBackgroundColor": "#FF5030",
 				"navigationBarTextStyle": "white"
 			}
 		},
@@ -1371,7 +1371,7 @@
 			"style": {
 				"navigationBarTitleText": "订单详情",
 				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#FF5C03",
+				"navigationBarBackgroundColor": "#FF5030",
 				"navigationBarTextStyle": "white"
 			}
 		},
@@ -1389,7 +1389,7 @@
 			"style": {
 				"navigationBarTitleText": "订单详情",
 				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#FF5C03",
+				"navigationBarBackgroundColor": "#FF5030",
 				"navigationBarTextStyle": "white"
 			}
 		},
@@ -1589,7 +1589,7 @@
 			"style": {
 				"navigationBarTitleText": "订单详情",
 				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#FF5C03",
+				"navigationBarBackgroundColor": "#FF5030",
 				"navigationBarTextStyle": "white"
 			}
 		},
@@ -1678,7 +1678,7 @@
 		{
 			"path": "pages/user/integral/integral",
 			"style": {
-				"navigationBarTitleText": "我的芳华币",
+				"navigationBarTitleText": "我的健康币",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
@@ -1687,7 +1687,7 @@
 		{
 			"path": "pages/user/integral/points",
 			"style": {
-				"navigationBarTitleText": "我的芳华币",
+				"navigationBarTitleText": "我的健康币",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black",
@@ -1699,7 +1699,7 @@
 		{
 			"path": "pages/user/integral/integralGoodsList",
 			"style": {
-				"navigationBarTitleText": "芳华币商城",
+				"navigationBarTitleText": "健康币商城",
 				"navigationStyle": "custom",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff",
@@ -1718,7 +1718,7 @@
 		{
 			"path": "pages/user/integral/integralOrderPay",
 			"style": {
-				"navigationBarTitleText": "芳华币兑换",
+				"navigationBarTitleText": "健康币兑换",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
@@ -1736,7 +1736,7 @@
 		{
 			"path": "pages/user/integral/integralOrderCartPay",
 			"style": {
-				"navigationBarTitleText": "芳华币兑换",
+				"navigationBarTitleText": "健康币兑换",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
@@ -1772,7 +1772,7 @@
 		{
 			"path": "pages/user/integral/integralLogsList",
 			"style": {
-				"navigationBarTitleText": "芳华币记录",
+				"navigationBarTitleText": "健康币记录",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
@@ -1819,7 +1819,7 @@
 		{
 			"path": "pages/user/integralMall",
 			"style": {
-				"navigationBarTitleText": "芳华币商城",
+				"navigationBarTitleText": "健康币商城",
 				"navigationStyle": "custom",
 				"titleNView": false,
 				"enablePullDownRefresh": false,
@@ -1941,7 +1941,7 @@
 		{
 			"path": "pages/user/integralInfo",
 			"style": {
-				"navigationBarTitleText": "我的芳华币",
+				"navigationBarTitleText": "我的健康币",
 				"navigationStyle": "custom",
 				"titleNView": false,
 				"enablePullDownRefresh": false,
@@ -2042,7 +2042,7 @@
 			"style": {
 				"navigationBarTitleText": "售后详情",
 				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#FF5C03",
+				"navigationBarBackgroundColor": "#FF5030",
 				"navigationBarTextStyle": "white"
 			}
 		},
@@ -2249,7 +2249,7 @@
 		{
 			"path": "pages/index/appDownload",
 			"style": {
-				"navigationBarTitleText": "芳华未来-APP下载",
+				"navigationBarTitleText": "河山恒康-APP下载",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black",
@@ -2864,7 +2864,7 @@
 		{
 			"path" : "pages_live/shopping/integral",
 			"style": {
-					  "navigationBarTitleText": "芳华币",
+					  "navigationBarTitleText": "健康币",
 					  "enablePullDownRefresh": false,
 					  				"navigationBarBackgroundColor": "#ffffff",
 
@@ -4061,7 +4061,7 @@
 				{
 					"path": "shopping/integral",
 					"style": {
-						"navigationBarTitleText": "芳华币",
+						"navigationBarTitleText": "健康币",
 						"enablePullDownRefresh": false,
 						"navigationBarTextStyle": "black",
 						"navigationBarBackgroundColor": "#ffffff"
@@ -4171,7 +4171,7 @@
 	],
 	"tabBar": {
 		"color": "#333333",
-		"selectedColor": "#FF5C03",
+		"selectedColor": "#2583EB",
 		"borderStyle": "white",
 		"backgroundColor": "#ffffff",
 		"height": "60px",

+ 4 - 4
pages/agent/components/rewardDoctor.vue

@@ -11,7 +11,7 @@
 					</view>
 					<view class="">
 						<view class="es-c-22 es-fs-34 es-fw-600">
-							芳华币打赏
+							健康币打赏
 						</view>
 						<view class="es-c-99 es-fs-26">
 							可抵现金
@@ -35,7 +35,7 @@
 						</view>
 					</view>
 					<view class="es-mt-6 es-c-99 es-fs-24">
-						芳华币余额
+						健康币余额
 					</view>
 				</view>
 			</view>
@@ -234,7 +234,7 @@
 				}
 
 				.colorFF5C03 {
-					color: #FF5C03;
+					color: #FF5030;
 				}
 
 				.bgF5F7FA {
@@ -248,7 +248,7 @@
 
 			.rewardDoctor-box-btn {
 				height: 96rpx;
-				background: #FF5C03;
+				background: #FF5030;
 				border-radius: 48rpx;
 			}
 		}

+ 1 - 1
pages/agent/doctorDetail.vue

@@ -842,7 +842,7 @@ export default {
 		max-width: 80%;
 		word-wrap: break-word;
 		word-break: break-all;
-		background: linear-gradient(89deg, #ff5c03 0%, #ffab3b 100%);
+		background: linear-gradient(89deg, #FF5030 0%, #ffab3b 100%);
 		border-radius: 32rpx 8rpx 32rpx 32rpx;
 		padding: 30rpx 24rpx;
 	}

+ 1 - 1
pages/agent/doctorList.vue

@@ -354,7 +354,7 @@
 		}
 
 		.right-tip {
-			color: #FF5C03;
+			color: #FF5030;
 			padding: 2rpx 8rpx;
 			border-radius: 8rpx 8rpx 8rpx 8rpx;
 			border: 1rpx solid #FFA599;

+ 5 - 5
pages/agent/doctorRegister.vue

@@ -366,8 +366,8 @@
 			padding: 4rpx 12rpx;
 			background: #FCF0E7;
 			border-radius: 8rpx 8rpx 8rpx 8rpx;
-			border: 1rpx solid #FF5C03;
-			color: #FF5C03;
+			border: 1rpx solid #FF5030;
+			color: #FF5030;
 		}
 
 		.image {
@@ -383,7 +383,7 @@
 			content: '';
 			width: 24rpx;
 			height: 8rpx;
-			background: #FF5C03;
+			background: #FF5030;
 			border-radius: 4rpx 4rpx 4rpx 4rpx;
 			position: absolute;
 			left: 52rpx;
@@ -417,7 +417,7 @@
 			}
 
 			.bgFF5C03 {
-				background: #FF5C03;
+				background: #FF5030;
 			}
 
 
@@ -425,7 +425,7 @@
 	}
 
 	.colorFF5C03 {
-		color: #FF5C03;
+		color: #FF5030;
 	}
 
 	.popupBox {

+ 3 - 3
pages/ai/chat.vue

@@ -46,7 +46,7 @@
 								</view>
 								<view class="x-f" style="align-items: center;">
 									<view v-if="item.type != 1&&item.content" class="x-c copybtn" @click="copyData(item.content)"><u-icon
-											name="file-text" color="#FF5C03" size="20"
+											name="file-text" color="#FF5030" size="20"
 											style="margin-right: 5rpx;"></u-icon>复制</view>
 								</view>
 							</view>
@@ -66,7 +66,7 @@
 								</view>
 								<view class="x-f" style="align-items: center;">
 									<view v-if="item.type != 1&&item.content" class="x-c copybtn" @click="copyData(item.content)"><u-icon
-											name="file-text" color="#FF5C03" size="20"
+											name="file-text" color="#FF5030" size="20"
 											style="margin-right: 5rpx;"></u-icon>复制</view>
 									<view style="margin-top: 6px;margin-left: 10rpx;" v-if="item.retry==1" @click="handleInput()">
 										<u-icon name="reload" color="#999" size="20" labelPos="right" labelSize="24rpx" label="重试"></u-icon>
@@ -585,7 +585,7 @@
 		font-family: PingFang SC, PingFang SC;
 		font-weight: 500;
 		font-size: 28rpx;
-		color: #FF5C03;
+		color: #FF5030;
 		background-color: #ffe2d1;
 		padding: 4rpx 10rpx;
 		border-radius: 10rpx;

+ 2 - 2
pages/ai/chatOld.vue

@@ -41,7 +41,7 @@
 								<view class="msg-text">
 									<uaMarkdown :source="item.content" :showLine="false" />
 								</view>
-								<view v-if="item.type != 1" class="x-c copybtn" @click="copyData(item.content)"><u-icon name="file-text" color="#FF5C03" size="20" style="margin-right: 5rpx;"></u-icon>复制</view>
+								<view v-if="item.type != 1" class="x-c copybtn" @click="copyData(item.content)"><u-icon name="file-text" color="#FF5030" size="20" style="margin-right: 5rpx;"></u-icon>复制</view>
 							</view>
 						</view>
 					</view>
@@ -384,7 +384,7 @@
 		font-family: PingFang SC, PingFang SC;
 		font-weight: 500;
 		font-size: 28rpx;
-		color: #FF5C03;
+		color: #FF5030;
 		background-color: #ffe2d1;
 		padding: 4rpx 10rpx;
 		border-radius: 10rpx;

+ 3 - 3
pages/ai/consultation.vue

@@ -471,7 +471,7 @@
 			font-weight: 500;
 			font-size: 30rpx;
 			color: #FFFFFF;
-			background-color: #FF5C03;
+			background-color: #FF5030;
 		}
 	}
 
@@ -545,7 +545,7 @@
 								border-radius: 10px;
 								padding: 10px 20px;
 								background-color: #fff;
-								color: #FF5C03;
+								color: #FF5030;
 								font-size: 14px;
 							}
 						}
@@ -565,7 +565,7 @@
 						margin-right: 10px;
 						border-radius: 10px 0 10px 10px;
 						padding: 10px;
-						background-color: #FF5C03;
+						background-color: #FF5030;
 						color: #fff;
 						font-size: 16px;
 						font-family: PingFang SC;

+ 2 - 2
pages/article/chineseMedicineDetails.vue

@@ -209,7 +209,7 @@
 					border-radius: 5rpx;
 					width: 8rpx;
 					height:30rpx;
-					background-color: #FF5C03;
+					background-color: #FF5030;
 				}
 				.title{
 					margin-left: 15rpx;
@@ -293,7 +293,7 @@
 					font-family: PingFang SC;
 				}
 				.active{
-					background-color: #FF5C03;
+					background-color: #FF5030;
 					color: #fff;
 				}
 				 

+ 4 - 4
pages/article/chineseMedicineList.vue

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

+ 1 - 1
pages/article/diseaseDetails.vue

@@ -193,7 +193,7 @@
 			.line{
 				width: 6rpx;
 				height:30rpx;
-				background-color: #FF5C03;
+				background-color: #FF5030;
 				 
 			}
 			.title{

+ 4 - 4
pages/article/diseaseList.vue

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

+ 2 - 2
pages/article/famousPrescribeDetails.vue

@@ -212,7 +212,7 @@
 					border-radius: 5rpx;
 					width: 8rpx;
 					height:30rpx;
-					background-color: #FF5C03;
+					background-color: #FF5030;
 				}
 				.title{
 					margin-left: 15rpx;
@@ -296,7 +296,7 @@
 					font-family: PingFang SC;
 				}
 				.active{
-					background-color: #FF5C03;
+					background-color: #FF5030;
 					color: #fff;
 				}
 				 

+ 4 - 4
pages/article/famousPrescribeList.vue

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

+ 4 - 4
pages/article/medicatedFoodList.vue

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

+ 4 - 4
pages/article/questionsList.vue

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

+ 573 - 573
pages/article/test.vue

@@ -1,587 +1,587 @@
 <template>
-	<view class="content">
-		<view class="patient-cont">
-			<view class="chose-patient">
-				<view class="patient-box" @click="addPatient()" v-if="patient==null">
-					<text class="patient-title">选择体验者</text>
-					<view class="right" >
-						<text class="value">请点击添加</text>
-						<image src="/static/images/arrow_gray.png" mode=""></image>
-					</view>
-				</view>
-				<view class="patient" @click="addPatient()" v-if="patient!=null">
-					<view  class="left">
-						<view class="name">{{patient.patientName}}</view>
-						<view class="info">
-							<text class="text" v-if="patient.sex==1">男</text>
-							<text class="text" v-if="patient.sex==2">女</text>
-							<text class="text">{{$getAge(patient.birthday)}}岁</text>
-							<text class="text">{{$parseIdCard(patient.idCard)}}</text>
-						</view>
-					</view>
-					<view class="right" >
-						<image src="/static/images/arrow_gray.png" mode=""></image>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="msg-cont">
-			<scroll-view
-				class="msg-scroll"
-				:scroll-top="scrollTop"
-				scroll-y="true"
-				:scroll-with-animation="true"
-			>
-			<view class="msgs">
-				<view class="msg-item" v-for="(item,index) in msgs" >
-					<view class="left" v-if="item.type==1">
-						<image class="img" src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/5fd36547a3ca4d0b9935e623d3d8e1c5.png"></image>
-						<view class="msg-content">{{item.content}}</view>
-					</view>
-					<view class="right" v-if="item.type==2">
-						<view class="msg-content">{{item.content}}</view>
-						<image class="img" src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/d7d49263e2e04f56a7a86fa7bfd35687.jpg"></image>
-					</view>
-					
-				</view>
-			</view>
-			</scroll-view>
-		</view>
-		<view class="option-cont" v-if="item!=null">
-			<view class="option-title" >{{item.title}}</view>
-			<view class="options" >
-				<view class="option-item" @click="optionClick(item,option)" v-for="(option) in JSON.parse(item.scoreJson)" >{{option.name}}</view>
-			</view>
-			
-		</view>
-		<!-- <view class="title">
-			体质测试以当下感受为准作答,人的体质有可能会随季节变化。 
-		</view>
-		<view class="chose-patient">
-			<view class="patient-box" @click="addPatient()" v-if="patient==null">
-				<text class="patient-title">选择体验者</text>
-				<view class="right" >
-					<image src="/static/images/arrow_gray.png" mode=""></image>
-				</view>
-			</view>
-			<view class="patient" @click="addPatient()" v-if="patient!=null">
-				<view  class="left">
-					<view class="name">{{patient.patientName}}</view>
-					<view class="info">
-						<text class="text" v-if="patient.sex==1">男</text>
-						<text class="text" v-if="patient.sex==2">女</text>
-						<text class="text">{{$getAge(patient.birthday)}}岁</text>
-						<text class="text">{{$parseIdCard(patient.idCard)}}</text>
-					</view>
-				</view>
-				<view class="right" >
-					<image src="/static/images/arrow_gray.png" mode=""></image>
-				</view>
-			</view>
-		</view>
-		<view class="items">
-			<view class="item" v-for="(item,index) in items">
-				<view class="name">{{index+1}}{{item.title}}?</view>
-				<view class="options">
-					<view :class="item.option!=null&&item.option==option.name?'option active':'option'" @click="optionClick(item,option)"   v-for="(option) in JSON.parse(item.scoreJson)">
-						{{option.name}}
-					</view>
-				</view>
-			</view>
-			 
-		</view>
-		<view class="btns">
-			<view class="btn" @click="submit()">提交</view>
-		</view>
-		<view class="tips">
-			<view class="tip-title">提交代表你已接受以下声明</view>
-			<view class="desc">
-			  本测试不作为诊断和治疗的依据,对于已经医生确诊的疾病,应按照医嘱积极治疗。所提及的内容仅作为生活保健的咨询建议。如遇不适请及时就医。
-			</view>
-		</view> -->
+	<view class="content">
+		<view class="patient-cont">
+			<view class="chose-patient">
+				<view class="patient-box" @click="addPatient()" v-if="patient==null">
+					<text class="patient-title">选择体验者</text>
+					<view class="right" >
+						<text class="value">请点击添加</text>
+						<image src="/static/images/arrow_gray.png" mode=""></image>
+					</view>
+				</view>
+				<view class="patient" @click="addPatient()" v-if="patient!=null">
+					<view  class="left">
+						<view class="name">{{patient.patientName}}</view>
+						<view class="info">
+							<text class="text" v-if="patient.sex==1">男</text>
+							<text class="text" v-if="patient.sex==2">女</text>
+							<text class="text">{{$getAge(patient.birthday)}}岁</text>
+							<text class="text">{{$parseIdCard(patient.idCard)}}</text>
+						</view>
+					</view>
+					<view class="right" >
+						<image src="/static/images/arrow_gray.png" mode=""></image>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="msg-cont">
+			<scroll-view
+				class="msg-scroll"
+				:scroll-top="scrollTop"
+				scroll-y="true"
+				:scroll-with-animation="true"
+			>
+			<view class="msgs">
+				<view class="msg-item" v-for="(item,index) in msgs" >
+					<view class="left" v-if="item.type==1">
+						<image class="img" src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/5fd36547a3ca4d0b9935e623d3d8e1c5.png"></image>
+						<view class="msg-content">{{item.content}}</view>
+					</view>
+					<view class="right" v-if="item.type==2">
+						<view class="msg-content">{{item.content}}</view>
+						<image class="img" src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/d7d49263e2e04f56a7a86fa7bfd35687.jpg"></image>
+					</view>
+					
+				</view>
+			</view>
+			</scroll-view>
+		</view>
+		<view class="option-cont" v-if="item!=null">
+			<view class="option-title" >{{item.title}}</view>
+			<view class="options" >
+				<view class="option-item" @click="optionClick(item,option)" v-for="(option) in JSON.parse(item.scoreJson)" >{{option.name}}</view>
+			</view>
+			
+		</view>
+		<!-- <view class="title">
+			体质测试以当下感受为准作答,人的体质有可能会随季节变化。 
+		</view>
+		<view class="chose-patient">
+			<view class="patient-box" @click="addPatient()" v-if="patient==null">
+				<text class="patient-title">选择体验者</text>
+				<view class="right" >
+					<image src="/static/images/arrow_gray.png" mode=""></image>
+				</view>
+			</view>
+			<view class="patient" @click="addPatient()" v-if="patient!=null">
+				<view  class="left">
+					<view class="name">{{patient.patientName}}</view>
+					<view class="info">
+						<text class="text" v-if="patient.sex==1">男</text>
+						<text class="text" v-if="patient.sex==2">女</text>
+						<text class="text">{{$getAge(patient.birthday)}}岁</text>
+						<text class="text">{{$parseIdCard(patient.idCard)}}</text>
+					</view>
+				</view>
+				<view class="right" >
+					<image src="/static/images/arrow_gray.png" mode=""></image>
+				</view>
+			</view>
+		</view>
+		<view class="items">
+			<view class="item" v-for="(item,index) in items">
+				<view class="name">{{index+1}}{{item.title}}?</view>
+				<view class="options">
+					<view :class="item.option!=null&&item.option==option.name?'option active':'option'" @click="optionClick(item,option)"   v-for="(option) in JSON.parse(item.scoreJson)">
+						{{option.name}}
+					</view>
+				</view>
+			</view>
+			 
+		</view>
+		<view class="btns">
+			<view class="btn" @click="submit()">提交</view>
+		</view>
+		<view class="tips">
+			<view class="tip-title">提交代表你已接受以下声明</view>
+			<view class="desc">
+			  本测试不作为诊断和治疗的依据,对于已经医生确诊的疾病,应按照医嘱积极治疗。所提及的内容仅作为生活保健的咨询建议。如遇不适请及时就医。
+			</view>
+		</view> -->
 	</view> 
 </template>
 
-<script>
-	import {getTestTempDetails,getTestDetails ,doReport} from '@/api/test.js'
+<script>
+	import {getTestTempDetails,getTestDetails ,doReport} from '@/api/test.js'
 	export default {
 		data() {
-			return {
-			 
-				scrollTop:0,//滚动条位置
-				formJson:null,
-				tempId:null,
-				patient:null,
-				items:{},
-				msgs:[],
-				index:0,
-				item:null,
+			return {
+			 
+				scrollTop:0,//滚动条位置
+				formJson:null,
+				tempId:null,
+				patient:null,
+				items:{},
+				msgs:[],
+				index:0,
+				item:null,
 			};
-		},
-		onLoad(option) {
-			this.tempId=option.tempId;
-			var that=this;
-			uni.$on('refreshOrderPatient', (res) => {
-				that.patient=res
-			})
-			
-		},
-		onShow() {
-			this.getTestTempDetails();
-			this.getTestDetails();
-		},
-		//发送给朋友
-		onShareAppMessage(res) {
-			if(this.$isLogin()){
-				return {
-					title: "健康体质检测",
-					path: '/pages/article/test?tempId='+this.tempId,
-					imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230106/6b459adfb1004c1a96219bcdf07e337c.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
-				}
-			}
-			
-		},
-		//分享到朋友圈
-		onShareTimeline(res) {
-			if(this.$isLogin()){
-				return {
-					title: "健康体质检测",
-					path: '/pages/article/test?tempId='+this.tempId,
-					imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230106/6b459adfb1004c1a96219bcdf07e337c.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
-				}
-			}
-			
-		},
-		methods:{
-			getTestDetails(){
-				let data = {tempId:this.tempId};
-				getTestDetails(data).then(
-					res => {
-						if(res.code==200){
-							uni.setNavigationBarTitle({
-							      title: res.data.name+"自测"
-							});
-							 
-						}else{
-							uni.showToast({
-								icon:'none',
-								title: "请求失败",
-							});
-						}
-					},
-					rej => {}
-				);
-			},
-			addMsg(type,content){
-				var msg={type:type,content:content}
-				this.msgs.push(msg)
-				var that=this;
-				uni
-				  .createSelectorQuery()
-				  .select(".msgs")
-				  .boundingClientRect((res) => {
-				    const scrollH = res.height;
-					that.scrollTop = scrollH;
-					console.log(that.scrollTop)
-				    
-				  })
-				  .exec();
-				 
-				
-			},
-			optionClick(item,option){
-				if(this.patient==null){
-					uni.showToast({
-						icon:'none',
-						title: "请选择体验者",
-					});
-					return;
-				}
-				item.option=option.name;
-				console.log(item.option);
-				this.addMsg(2,option.name);
-				this.index++;
-				if(this.index<=this.items.length-1){
-					this.item=this.items[this.index];
-					this.addMsg(1,this.item.title)
-				}
-				else{
-					//提交
-					this.submit();
-				}
-				
-			},
-			getTestTempDetails(){
-				var data={tempId:this.tempId}
-				getTestTempDetails(data).then(
-					res => {
-						if(res.code==200){
-							this.items=res.items;
-							if(this.items.length>0){
-								this.item=this.items[0];
-								this.addMsg(1,this.item.title)
-							}
-						}
-					},
-					err => {
-					}
-				);
-				
-			},
-			addPatient(){
-				uni.navigateTo({
-					url: '/pages/user/patient'
-				})
-			},
-			submit(){
-				
-				var data={
-					tempId:this.tempId,
-					patientId:this.patient.patientId,
-					formJson:JSON.stringify(this.items),
-				}
-				var that=this;
-				doReport(data).then(res => {
-					if(res.code==200){
-						uni.redirectTo({
-							url:"/pages/article/testResult?reportId="+res.reportId
-						})
-					}else{
-						uni.showToast({
-							icon:'none',
-							title: res.msg,
-						});
-					}
-				});
-				// uni.showModal({
-				//     title: '提示',
-				//     content: '确定提交吗',
-				//     success: function (res) {
-				//         if (res.confirm) {
-				// 			doReport(data).then(res => {
-				// 				if(res.code==200){
-				// 					uni.navigateTo({
-				// 						url:"/pages_index/testResult?reportId="+res.reportId
-				// 					})
-				// 				}else{
-				// 					uni.showToast({
-				// 						icon:'none',
-				// 						title: res.msg,
-				// 					});
-				// 				}
-				// 			});
-				//         } 
-				// 		else if (res.cancel) {
-				//         }
-				//     }
-				// });
-			}
+		},
+		onLoad(option) {
+			this.tempId=option.tempId;
+			var that=this;
+			uni.$on('refreshOrderPatient', (res) => {
+				that.patient=res
+			})
+			
+		},
+		onShow() {
+			this.getTestTempDetails();
+			this.getTestDetails();
+		},
+		//发送给朋友
+		onShareAppMessage(res) {
+			if(this.$isLogin()){
+				return {
+					title: "健康体质检测",
+					path: '/pages/article/test?tempId='+this.tempId,
+					imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230106/6b459adfb1004c1a96219bcdf07e337c.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+				}
+			}
+			
+		},
+		//分享到朋友圈
+		onShareTimeline(res) {
+			if(this.$isLogin()){
+				return {
+					title: "健康体质检测",
+					path: '/pages/article/test?tempId='+this.tempId,
+					imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230106/6b459adfb1004c1a96219bcdf07e337c.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+				}
+			}
+			
+		},
+		methods:{
+			getTestDetails(){
+				let data = {tempId:this.tempId};
+				getTestDetails(data).then(
+					res => {
+						if(res.code==200){
+							uni.setNavigationBarTitle({
+							      title: res.data.name+"自测"
+							});
+							 
+						}else{
+							uni.showToast({
+								icon:'none',
+								title: "请求失败",
+							});
+						}
+					},
+					rej => {}
+				);
+			},
+			addMsg(type,content){
+				var msg={type:type,content:content}
+				this.msgs.push(msg)
+				var that=this;
+				uni
+				  .createSelectorQuery()
+				  .select(".msgs")
+				  .boundingClientRect((res) => {
+				    const scrollH = res.height;
+					that.scrollTop = scrollH;
+					console.log(that.scrollTop)
+				    
+				  })
+				  .exec();
+				 
+				
+			},
+			optionClick(item,option){
+				if(this.patient==null){
+					uni.showToast({
+						icon:'none',
+						title: "请选择体验者",
+					});
+					return;
+				}
+				item.option=option.name;
+				console.log(item.option);
+				this.addMsg(2,option.name);
+				this.index++;
+				if(this.index<=this.items.length-1){
+					this.item=this.items[this.index];
+					this.addMsg(1,this.item.title)
+				}
+				else{
+					//提交
+					this.submit();
+				}
+				
+			},
+			getTestTempDetails(){
+				var data={tempId:this.tempId}
+				getTestTempDetails(data).then(
+					res => {
+						if(res.code==200){
+							this.items=res.items;
+							if(this.items.length>0){
+								this.item=this.items[0];
+								this.addMsg(1,this.item.title)
+							}
+						}
+					},
+					err => {
+					}
+				);
+				
+			},
+			addPatient(){
+				uni.navigateTo({
+					url: '/pages/user/patient'
+				})
+			},
+			submit(){
+				
+				var data={
+					tempId:this.tempId,
+					patientId:this.patient.patientId,
+					formJson:JSON.stringify(this.items),
+				}
+				var that=this;
+				doReport(data).then(res => {
+					if(res.code==200){
+						uni.redirectTo({
+							url:"/pages/article/testResult?reportId="+res.reportId
+						})
+					}else{
+						uni.showToast({
+							icon:'none',
+							title: res.msg,
+						});
+					}
+				});
+				// uni.showModal({
+				//     title: '提示',
+				//     content: '确定提交吗',
+				//     success: function (res) {
+				//         if (res.confirm) {
+				// 			doReport(data).then(res => {
+				// 				if(res.code==200){
+				// 					uni.navigateTo({
+				// 						url:"/pages_index/testResult?reportId="+res.reportId
+				// 					})
+				// 				}else{
+				// 					uni.showToast({
+				// 						icon:'none',
+				// 						title: res.msg,
+				// 					});
+				// 				}
+				// 			});
+				//         } 
+				// 		else if (res.cancel) {
+				//         }
+				//     }
+				// });
+			}
 		}
 	}
 </script>
 
-<style lang="scss">
-	page{
-		height: 100%;
-	}
-	.content{
-		height: 100vh;
-		.msg-cont{
-			padding-bottom: 550rpx;
-			width: 100%;
-			height: calc(100vh - 760rpx);
-			.msg-scroll{
-				height: calc(100vh - 760rpx);
-				.msgs{
-					overflow: hidden;
-					width: 100%;
-					.msg-item{
-						padding: 10rpx 15rpx;
-						display: flex;
-						flex-direction: column;
-						justify-content: center;
-						align-items: flex-start;
-						width: 100%;
-						.left{
-							width: 100%;
-							display: flex;
-							justify-content: flex-start;
-							align-items: flex-start;
-							.img{
-								min-width: 100rpx;
-								width: 100rpx;
-								height:100rpx;
-								border-radius: 50%;
-								image{
-									width: 100%;
-									height:100%;
-								}
-							}
-							.msg-content{
-								margin-top: 15rpx;
-								margin-left: 10rpx;
-								border-radius: 15rpx;
-								padding: 15rpx;
-								background-color: #fff;
-								color: #111;
-								font-size: 28upx;
-								font-family: PingFang SC;
-							}
-						}
-						.right{
-							width: 100%;
-							display: flex;
-							justify-content: flex-end;
-							align-items: flex-start;
-							.msg-content{
-								margin-top: 15rpx;
-								margin-right: 10rpx;
-								border-radius: 15rpx;
-								padding: 15rpx;
-								background-color: #FF5C03;
-								color: #fff;
-								font-size: 28upx;
-								font-family: PingFang SC;
-							}
-							.img{
-								min-width: 100rpx;
-								width: 100rpx;
-								height:100rpx;
-								border-radius: 50%;
-								image{
-									width: 100%;
-									height:100%;
-								}
-							}
-						}
-					}
-				}
-			}
-			
-			
-		}
-		.option-cont{
-			position: fixed;
-			bottom: 0rpx;
-			height: 550rpx;
-			width: 100%;
-			background-color: #fff;
-			border-radius: 60rpx 60rpx 0rpx 0rpx;
-			padding: 30rpx;
-			.option-title{
-				width: 100%;
-				padding-bottom: 15rpx;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				font-size: 32upx;
-				font-family: PingFang SC;
-				color: #111;
-			}
-			.options{
-				display: flex;
-				flex-direction: column;
-				justify-content: center;
-				align-items: center;
-				.option-item{
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					width: 100%;
-					border: 1rpx solid #eee;
-					margin-bottom: 10rpx;
-					padding: 15rpx;
-					border-radius: 5rpx;
-				}
-			}
-		}
-		.title{
-			padding: 15rpx 30rpx;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			width: 100%;
-			background-color: #FF5C03;
-			font-size: 24upx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #fff;
-		}
-		.patient-cont{
-			padding: 15rpx;
-			.chose-patient{
-				padding: 30rpx;
-				box-shadow: 0px 0px 5px 2px rgba(0,0,0,0.05);
-				background-color: #fff;
-				border-radius: 15rpx;
-				.patient-box{
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-					.patient-title{
-						font-size: 32upx;
-						font-family: PingFang SC;
-						font-weight: bold;
-						color: #111111;
-					}
-					.right{
-						height: 100%;
-						display: flex;
-						align-items: center;
-						justify-content: center;
-						.value{
-							font-size: 28upx;
-							font-family: PingFang SC;
-							color: #999;
-							margin-right: 10rpx;
-						}
-						image{
-							width: 15upx;
-							height: 30upx;
-						}
-						 
-					}
-				}
-				.patient{
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-					height: 110upx;
-					.left{
-						.name{
-							font-size: 30upx;
-							line-height: 1;
-							font-family: PingFang SC;
-							font-weight: bold;
-							color: #111111;
-						}
-						.info{
-							margin-top: 30rpx;
-							display: flex;
-							align-items: center;
-							.text{
-								font-size: 26upx;
-								font-family: PingFang SC;
-								line-height: 1;
-								font-weight: 500;
-								color: #999;
-								margin-right: 19upx;
-							}
-							 
-						}
-					}
-					.right{
-						display: flex;
-						align-items: center;
-						image{
-							width: 15upx;
-							height: 30upx;
-						}
-					}
-				}
-			}
-		}
-		
-		.items{
-			padding: 15rpx;
-			width: 100%;
-			padding: 30rpx;
-			border-radius: 15rpx;
-			background-color: #fff;
-			display: flex;
-			flex-direction: column;
-			align-items: flex-start;
-			justify-content: flex-start;
-			.item{
-				display: flex;
-				flex-direction: column;
-				align-items: flex-start;
-				justify-content: flex-start;
-				width: 100%;
-				background-color: #f8f8f8;
-				margin-bottom: 15rpx;
-				.name{
-					font-size: 32upx;
-					font-family: PingFang SC;
-					color: #2a2b2e;
-					font-weight: bold;
-					margin-bottom: 15rpx;
-				}
-				.options{
-					margin: 15rpx 0rpx;
-					width: 100%;
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-					.option{
-						margin-right: 10rpx;
-						margin-bottom: 10rpx;
-						display: flex;
-						align-items: center;
-						justify-content: center;
-						border-radius: 10rpx;
-						width:20%;
-						height:80rpx;
-						border: 1rpx solid #9b9b9b;
-						font-size: 28upx;
-						font-family: PingFang SC;
-						color: #2a2b2e;
-						background-color: #fff;
-						
-						&:last-child{
-							margin-right: 0rpx;
-							margin-bottom: 0rpx;
-						}
-					}
-					.active{
-						border: 1rpx solid #FF5C03;
-						background-color: #FF5C03;
-						color: #fff;
-					}
-				}
-			}
-			
-		}
-		.btns{
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			width: 100%;
-			padding: 30rpx;
-			.btn{
-				height:80rpx;
-				margin: 0rpx 30rpx;
-				border-radius: 60rpx;
-				width: 100%;
-				border: 1rpx solid #FF5C03;
-				font-size: 32supx;
				font-family: PingFang SC;
				color: #fff;
-				font-weight: bold;
-				background-color: #FF5C03;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-			}
-		}
-		.tips{
-			flex-direction: column;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			width: 100%;
-			padding: 30rpx;
-			.tip-title{
-				font-size: 26supx;
-				font-family: PingFang SC;
-				color: #888;
-				font-weight: bold;
-			}
-			.desc{
-				margin-top: 15rpx;
-				font-size: 24rpx;
-				font-family: PingFang SC;
-				color: #b8bdb5;
-			}
-		}
+<style lang="scss">
+	page{
+		height: 100%;
+	}
+	.content{
+		height: 100vh;
+		.msg-cont{
+			padding-bottom: 550rpx;
+			width: 100%;
+			height: calc(100vh - 760rpx);
+			.msg-scroll{
+				height: calc(100vh - 760rpx);
+				.msgs{
+					overflow: hidden;
+					width: 100%;
+					.msg-item{
+						padding: 10rpx 15rpx;
+						display: flex;
+						flex-direction: column;
+						justify-content: center;
+						align-items: flex-start;
+						width: 100%;
+						.left{
+							width: 100%;
+							display: flex;
+							justify-content: flex-start;
+							align-items: flex-start;
+							.img{
+								min-width: 100rpx;
+								width: 100rpx;
+								height:100rpx;
+								border-radius: 50%;
+								image{
+									width: 100%;
+									height:100%;
+								}
+							}
+							.msg-content{
+								margin-top: 15rpx;
+								margin-left: 10rpx;
+								border-radius: 15rpx;
+								padding: 15rpx;
+								background-color: #fff;
+								color: #111;
+								font-size: 28upx;
+								font-family: PingFang SC;
+							}
+						}
+						.right{
+							width: 100%;
+							display: flex;
+							justify-content: flex-end;
+							align-items: flex-start;
+							.msg-content{
+								margin-top: 15rpx;
+								margin-right: 10rpx;
+								border-radius: 15rpx;
+								padding: 15rpx;
+								background-color: #FF5030;
+								color: #fff;
+								font-size: 28upx;
+								font-family: PingFang SC;
+							}
+							.img{
+								min-width: 100rpx;
+								width: 100rpx;
+								height:100rpx;
+								border-radius: 50%;
+								image{
+									width: 100%;
+									height:100%;
+								}
+							}
+						}
+					}
+				}
+			}
+			
+			
+		}
+		.option-cont{
+			position: fixed;
+			bottom: 0rpx;
+			height: 550rpx;
+			width: 100%;
+			background-color: #fff;
+			border-radius: 60rpx 60rpx 0rpx 0rpx;
+			padding: 30rpx;
+			.option-title{
+				width: 100%;
+				padding-bottom: 15rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				font-size: 32upx;
+				font-family: PingFang SC;
+				color: #111;
+			}
+			.options{
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				align-items: center;
+				.option-item{
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					width: 100%;
+					border: 1rpx solid #eee;
+					margin-bottom: 10rpx;
+					padding: 15rpx;
+					border-radius: 5rpx;
+				}
+			}
+		}
+		.title{
+			padding: 15rpx 30rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			width: 100%;
+			background-color: #FF5030;
+			font-size: 24upx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #fff;
+		}
+		.patient-cont{
+			padding: 15rpx;
+			.chose-patient{
+				padding: 30rpx;
+				box-shadow: 0px 0px 5px 2px rgba(0,0,0,0.05);
+				background-color: #fff;
+				border-radius: 15rpx;
+				.patient-box{
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					.patient-title{
+						font-size: 32upx;
+						font-family: PingFang SC;
+						font-weight: bold;
+						color: #111111;
+					}
+					.right{
+						height: 100%;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						.value{
+							font-size: 28upx;
+							font-family: PingFang SC;
+							color: #999;
+							margin-right: 10rpx;
+						}
+						image{
+							width: 15upx;
+							height: 30upx;
+						}
+						 
+					}
+				}
+				.patient{
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					height: 110upx;
+					.left{
+						.name{
+							font-size: 30upx;
+							line-height: 1;
+							font-family: PingFang SC;
+							font-weight: bold;
+							color: #111111;
+						}
+						.info{
+							margin-top: 30rpx;
+							display: flex;
+							align-items: center;
+							.text{
+								font-size: 26upx;
+								font-family: PingFang SC;
+								line-height: 1;
+								font-weight: 500;
+								color: #999;
+								margin-right: 19upx;
+							}
+							 
+						}
+					}
+					.right{
+						display: flex;
+						align-items: center;
+						image{
+							width: 15upx;
+							height: 30upx;
+						}
+					}
+				}
+			}
+		}
+		
+		.items{
+			padding: 15rpx;
+			width: 100%;
+			padding: 30rpx;
+			border-radius: 15rpx;
+			background-color: #fff;
+			display: flex;
+			flex-direction: column;
+			align-items: flex-start;
+			justify-content: flex-start;
+			.item{
+				display: flex;
+				flex-direction: column;
+				align-items: flex-start;
+				justify-content: flex-start;
+				width: 100%;
+				background-color: #f8f8f8;
+				margin-bottom: 15rpx;
+				.name{
+					font-size: 32upx;
+					font-family: PingFang SC;
+					color: #2a2b2e;
+					font-weight: bold;
+					margin-bottom: 15rpx;
+				}
+				.options{
+					margin: 15rpx 0rpx;
+					width: 100%;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					.option{
+						margin-right: 10rpx;
+						margin-bottom: 10rpx;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						border-radius: 10rpx;
+						width:20%;
+						height:80rpx;
+						border: 1rpx solid #9b9b9b;
+						font-size: 28upx;
+						font-family: PingFang SC;
+						color: #2a2b2e;
+						background-color: #fff;
+						
+						&:last-child{
+							margin-right: 0rpx;
+							margin-bottom: 0rpx;
+						}
+					}
+					.active{
+						border: 1rpx solid #FF5030;
+						background-color: #FF5030;
+						color: #fff;
+					}
+				}
+			}
+			
+		}
+		.btns{
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			width: 100%;
+			padding: 30rpx;
+			.btn{
+				height:80rpx;
+				margin: 0rpx 30rpx;
+				border-radius: 60rpx;
+				width: 100%;
+				border: 1rpx solid #FF5030;
+				font-size: 32supx;				font-family: PingFang SC;				color: #fff;
+				font-weight: bold;
+				background-color: #FF5030;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+		}
+		.tips{
+			flex-direction: column;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 100%;
+			padding: 30rpx;
+			.tip-title{
+				font-size: 26supx;
+				font-family: PingFang SC;
+				color: #888;
+				font-weight: bold;
+			}
+			.desc{
+				margin-top: 15rpx;
+				font-size: 24rpx;
+				font-family: PingFang SC;
+				color: #b8bdb5;
+			}
+		}
 	}
 	 
 </style>

+ 1 - 1
pages/article/testDetails.vue

@@ -246,7 +246,7 @@
 			 		font-family: PingFang SC;
 			 		font-weight: bold;
 			 		color: #FFFFFF;
-			 		background: #FF5C03;
+			 		background: #FF5030;
 			 		border-radius: 50upx;
 			 	}
 				.share{

+ 4 - 4
pages/article/testResult.vue

@@ -267,7 +267,7 @@
 							margin-left: 15rpx;
 							font-size: 40supx;
 							font-family: PingFang SC;
-							color: #FF5C03;
+							color: #FF5030;
 						}
 						
 					}
@@ -307,7 +307,7 @@
 							font-family: PingFang SC;
 							font-weight: bold;
 							font-size: 60rpx;
-							color: #FF5C03;
+							color: #FF5030;
 						}
 						.descs{
 							font-family: PingFang SC;
@@ -334,7 +334,7 @@
 									margin-left: 10rpx;
 									font-size: 32supx;
 									font-family: PingFang SC;
-									color: #FF5C03;
+									color: #FF5030;
 									font-weight: bold;
 								}
 								.title-line{
@@ -392,7 +392,7 @@
 		position: fixed;
 		bottom: 100rpx;
 		right:50rpx;
-		background-color: #FF5C03;
+		background-color: #FF5030;
 		color: #fff;
 		font-weight: bold;
 		font-size: 28rpx;

+ 4 - 4
pages/article/vesselList.vue

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

+ 5 - 5
pages/auth/bindMobile.vue

@@ -230,8 +230,8 @@ export default {
 	font-size: 30rpx;
 	font-family: PingFang SC;
 	font-weight: 500;
-	color: #FF5C03;
- 	border: 2rpx solid #FF5C03;
+	color: #FF5030;
+ 	border: 2rpx solid #FF5030;
 	margin-top: 30rpx;
 	&::after {
 		border: none;
@@ -335,7 +335,7 @@ export default {
 		 margin:0 10px;
 		 .reg-btn{
 		 	 font-size:16px ;
-		 	 color: #FF5C03;
+		 	 color: #FF5030;
 		 }
 	}
  }
@@ -350,8 +350,8 @@ export default {
 	justify-content: center;
 	width: 100%;
 	height: 80rpx;
-	background: linear-gradient(to right, #FF5C03 0%, #FF5C03 100%);
-	background: -moz-linear-gradient(to right, #FF5C03 0%, #FF5C03 100%);
+	background: linear-gradient(to right, #FF5030 0%, #FF5030 100%);
+	background: -moz-linear-gradient(to right, #FF5030 0%, #FF5030 100%);
 	box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22);
 	border-radius: 40rpx;
 	font-size: 30rpx;

+ 3 - 3
pages/auth/findpass.vue

@@ -399,8 +399,8 @@
 		justify-content: center;
 		width: 100%;
 		height: 80rpx;
-		background: linear-gradient(to right, #FF5C03 0%, #FF5C03 100%);
-		background: -moz-linear-gradient(to right, #FF5C03 0%, #FF5C03 100%);
+		background: linear-gradient(to right, #FF5030 0%, #FF5030 100%);
+		background: -moz-linear-gradient(to right, #FF5030 0%, #FF5030 100%);
 		box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22);
 		border-radius: 40rpx;
 		font-size: 30rpx;
@@ -415,7 +415,7 @@
 
 		.reg-btn {
 			font-size: 16px;
-			color: #FF5C03;
+			color: #FF5030;
 		}
 	}
 

+ 1 - 1
pages/auth/h5Login/oneLogin.html

@@ -53,7 +53,7 @@
     function initGy() {
         GyManager.setDebugMode(true)
         GyManager.init({
-            app: "芳华未来",
+            app: "河山恒康",
             appid: appid, timeout: 3000, onResult: function (res) {
                 console.log("demo init ", res);
                 if (res.success) {

+ 3 - 3
pages/auth/h5WxLogin.vue

@@ -6,7 +6,7 @@
 					<view class="logo-img">
 						<image src="/static/logo.png"></image>
 					</view>
-					<view class="title">芳华未来</view>
+					<view class="title">河山恒康</view>
 				</view>
 				<view class="login-notice">为了提供更优质的服务,请先登录</view>
 				<view class="btns">
@@ -193,8 +193,8 @@ export default {
 				position: absolute;
 				width: 630rpx;
 				height: 80rpx;
-				background: linear-gradient(to right, #FF5C03 0%, #E2C99E 100%);
-				background: -moz-linear-gradient(to right, #FF5C03 0%, #E2C99E 100%);
+				background: linear-gradient(to right, #2583EB 0%, #72a7eb 100%);
+				background: -moz-linear-gradient(to right, #2583EB 0%, #72a7eb 100%);
 				// box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22);
 				border-radius: 40rpx;
 				font-size: 30rpx;

+ 11 - 11
pages/auth/login.vue

@@ -475,8 +475,8 @@ export default {
 						fullScreen: false,
 						authButton: {
 							title: '绑定手机号',
-							normalColor: '#FF5C03',
-							highlightColor: '#FF5C03'
+							normalColor: '#2583EB',
+							highlightColor: '#2583EB'
 						},
 						privacyTerms: {
 							defaultCheckBoxState: true, // 条款勾选框初始状态 默认值: true
@@ -485,7 +485,7 @@ export default {
 							checkedImage: '', // 可选 条款勾选框选中状态图片(仅支持本地图片 建议尺寸24x24px)(3.2.0+ 版本支持)
 							checkBoxSize: 18, // 可选 条款勾选框大小
 							textColor: '#BBBBBB', // 文字颜色 默认值:#BBBBBB
-							termsColor: '#FF5C03', //  协议文字颜色 默认值: #5496E3
+							termsColor: '#2583EB', //  协议文字颜色 默认值: #5496E3
 							prefix: '我已阅读并同意', // 条款前的文案 默认值:“我已阅读并同意”
 							suffix: '并使用本机号码登录', // 条款后的文案 默认值:“并使用本机号码登录”
 							privacyItems: [
@@ -874,7 +874,7 @@ page {
 
 .logintype {
 	font-size: 16px;
-	color: #ff5c03;
+	color: #2583EB;
 	padding: 24rpx;
 	text-align: left;
 	width: 100%;
@@ -894,7 +894,7 @@ page {
 	}
 
 	.active {
-		background-color: #ff5c03 !important;
+		background-color: #2583EB !important;
 		color: #fff !important;
 	}
 }
@@ -922,8 +922,8 @@ page {
 	font-size: 30rpx;
 	font-family: PingFang SC;
 	font-weight: 500;
-	color: #ff5c03;
-	border: 2rpx solid #ff5c03;
+	color: #2583EB;
+	border: 2rpx solid #2583EB;
 	margin-top: 30rpx;
 
 	&::after {
@@ -1041,7 +1041,7 @@ page {
 
 		.reg-btn {
 			font-size: 16px;
-			color: #ff5c03;
+			color: #2583EB;
 		}
 	}
 }
@@ -1056,8 +1056,8 @@ page {
 	justify-content: center;
 	width: 100%;
 	height: 80rpx;
-	background: linear-gradient(to right, #ff5c03 0%, #ff5c03 100%);
-	background: -moz-linear-gradient(to right, #ff5c03 0%, #ff5c03 100%);
+	background: linear-gradient(to right, #2583EB 0%, #2583EB 100%);
+	background: -moz-linear-gradient(to right, #2583EB 0%, #2583EB 100%);
 	box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22);
 	border-radius: 40rpx;
 	font-size: 30rpx;
@@ -1104,7 +1104,7 @@ page {
 	text-align: left;
 
 	text {
-		color: #ff5c03;
+		color: #2583EB;
 	}
 
 	&-icon {

+ 7 - 7
pages/auth/loginIndex.vue

@@ -2,7 +2,7 @@
 	<view class="container">
 		<view class="login-title">
 			<view>您好,</view>
-			<view>欢迎来到芳华未来!</view>
+			<view>欢迎来到河山恒康!</view>
 		</view>
 		<!-- <view class="logoimage"><image src="/static/logo.png" mode="aspectFill"></image></view> -->
 		<view class="login-box">
@@ -223,7 +223,7 @@
 		box-sizing: border-box;
 
 		text {
-			color: #FF5C03;
+			color: #2583EB;
 		}
 
 		.popupbox-footer {
@@ -244,7 +244,7 @@
 		}
 
 		.agree-btn {
-			background: linear-gradient(270deg, #FF5C03 0%, #FFAC64 100%);
+			background: linear-gradient(270deg, #2583EB 0%, #5a9ceb 100%);
 			border: none;
 			color: #fff;
 		}
@@ -299,7 +299,7 @@
 		text-align: left;
 
 		text {
-			color: #FF5C03;
+			color: #2583EB;
 		}
 
 		&-icon {
@@ -319,7 +319,7 @@
 		margin-top: 40rpx;
 		line-height: 88rpx;
 		text-align: center;
-		background: linear-gradient(270deg, #FF5C03 0%, #FFAC64 100%);
+		background: linear-gradient(270deg, #2583EB 0%, #FFAC64 100%);
 		border-radius: 44rpx 44rpx 44rpx 44rpx;
 		font-family: PingFang SC, PingFang SC;
 		font-weight: 600;
@@ -342,7 +342,7 @@
 		width: 500rpx;
 		flex-direction: column;
 		.colorFF5C03 {
-			color: #FF5C03;
+			color: #2583EB;
 		}
 		.popupbox-btn {
 			width: 100%;
@@ -350,7 +350,7 @@
 			text-align: center;
 			height: 88rpx;
 			line-height: 88rpx;
-			background-color: #FF5C03;
+			background-color: #2583EB;
 		}
 	}
 </style>

+ 4 - 4
pages/auth/register.vue

@@ -438,8 +438,8 @@
 		justify-content: center;
 		width: 100%;
 		height: 80rpx;
-		background: linear-gradient(to right, #FF5C03 0%, #FF5C03 100%);
-		background: -moz-linear-gradient(to right, #FF5C03 0%, #FF5C03 100%);
+		background: linear-gradient(to right, #2583EB 0%, #2583EB 100%);
+		background: -moz-linear-gradient(to right, #2583EB 0%, #2583EB 100%);
 		box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22);
 		border-radius: 40rpx;
 		font-size: 30rpx;
@@ -454,7 +454,7 @@
 
 		.reg-btn {
 			font-size: 16px;
-			color: #FF5C03;
+			color: #2583EB;
 		}
 	}
 
@@ -494,7 +494,7 @@
 		text-align: left;
 
 		text {
-			color: #FF5C03;
+			color: #2583EB;
 		}
 
 		&-icon {

+ 1 - 1
pages/auth/wechatList.vue

@@ -158,7 +158,7 @@
 				.last-login-tag {
 					font-size: 24rpx;
 					color: #FFFFFF;
-					background-color: #FF5C03;
+					background-color: #2583EB;
 					padding: 2rpx 10rpx;
 					border-radius: 6rpx;
 					margin-left: 16rpx;

+ 2 - 2
pages/common/nav.vue

@@ -70,7 +70,7 @@
 						url: '/pages/user/test/order',
 					},
 					{
-						name: ' 6.4我的-芳华币商城 ',
+						name: ' 6.4我的-健康币商城 ',
 						url: '/pages/user/integralMall',
 					},
 					{
@@ -110,7 +110,7 @@
 						url: '/pages/user/share',
 					},
 					{
-						name: '7.17芳华币页面 ',
+						name: '7.17健康币页面 ',
 						url: '/pages/user/integralInfo',
 					},
 					{

+ 2 - 2
pages/company/bindInfo.vue

@@ -230,8 +230,8 @@
 	.downbtn {
 		width: 160rpx;
 		min-height: 68rpx;
-		border: 1px solid #FF5C03 !important;
-		color: #FF5C03 !important;
+		border: 1px solid #FF5030 !important;
+		color: #FF5030 !important;
 		background-color: #fff !important;
 		border-radius: 168rpx;
 		font-family: PingFang SC, PingFang SC;

+ 4 - 4
pages/company/couponDetails.vue

@@ -278,7 +278,7 @@ page {
 .tui-coupon-btn {
   padding: 6rpx;
   background: #ffebeb;
-  color: #FF5C03;
+  color: #FF5030;
   font-size: 25rpx;
   line-height: 25rpx;
   display: flex;
@@ -370,11 +370,11 @@ page {
   	margin-left: 15upx;
 
   	&.cancel{
-  		border: 1px solid #FF5C03;
-  		color: #FF5C03;
+  		border: 1px solid #FF5030;
+  		color: #FF5030;
   	}
   	&.receive{
-  		background: #FF5C03;
+  		background: #FF5030;
   		color: #FFFFFF;
   	}
   }

+ 5 - 5
pages/company/couponList.vue

@@ -296,14 +296,14 @@ export default {
 				font-size: 28upx;
 				font-family: PingFang SC;
 				font-weight: 500;
-				color: #FF5C03;
+				color: #FF5030;
 				border: 1px solid #E2C99E;
 				border-radius: 32upx;
 				margin: 0 20upx 20upx 0;
 				&.active{
 					color: #FFFFFF;
-					background: #FF5C03;
-					border: 1px solid #FF5C03;
+					background: #FF5030;
+					border: 1px solid #FF5030;
 				}
 			}
 		}
@@ -423,7 +423,7 @@ export default {
 	.tui-coupon-btn {
 	  padding: 6rpx;
 	  background: #ffebeb;
-	  color: #FF5C03;
+	  color: #FF5030;
 	  font-size: 25rpx;
 	  line-height: 25rpx;
 	  display: flex;
@@ -518,7 +518,7 @@ export default {
 	  		color: red;
 	  	}
 	  	&.receive{
-	  		background: #FF5C03;
+	  		background: #FF5030;
 	  		color: #FFFFFF;
 	  	}
 		&.share{

+ 1 - 1
pages/company/index.vue

@@ -314,7 +314,7 @@ export default {
 			font-weight: 500;
 			color: #ffffff;
 			border-radius: 8rpx;
-			background-color: #ff5c03;
+			background-color: #FF5030;
 		}
 	}
 	.used-tools {

+ 1 - 1
pages/company/inquiryOrderDetails.vue

@@ -611,7 +611,7 @@
 		 		font-size: 28upx;
 		 		font-family: PingFang SC;
 		 		color: #FFFFFF;
-		 		background: #FF5C03;
+		 		background: #FF5030;
 		 		border-radius: 45upx;
 		 	}
 		 }

+ 4 - 4
pages/company/inquiryOrderIMList.vue

@@ -5,7 +5,7 @@
 				 <u-tabs
 				  :scrollable="false"
 				  :list="tabs"  
-				  lineColor="#FF5C03"
+				  lineColor="#FF5030"
 				 @change="inquiryTypeChange">
 				 </u-tabs>
 			</view>
@@ -365,7 +365,7 @@
 						color: #db5053;
 					}
 					.green{
-						color: #FF5C03;
+						color: #FF5030;
 					}
 					.gray{
 						color: #9c9c9c;
@@ -401,8 +401,8 @@
 						.right{
 							.btn{
 								padding: 10rpx 30rpx;
-								border: 1rpx solid #FF5C03;
-								color: #FF5C03;
+								border: 1rpx solid #FF5030;
+								color: #FF5030;
 								font-size: 28rpx;
 								border-radius: 30rpx;
 							}

+ 4 - 4
pages/company/inquiryOrderList.vue

@@ -5,7 +5,7 @@
 				 <u-tabs
 				  :scrollable="false"
 				  :list="tabs"  
-				  lineColor="#FF5C03"
+				  lineColor="#FF5030"
 				 @change="inquiryTypeChange">
 				 </u-tabs>
 			</view>
@@ -364,7 +364,7 @@
 						color: #db5053;
 					}
 					.green{
-						color: #FF5C03;
+						color: #FF5030;
 					}
 					.gray{
 						color: #9c9c9c;
@@ -400,8 +400,8 @@
 						.right{
 							.btn{
 								padding: 10rpx 30rpx;
-								border: 1rpx solid #FF5C03;
-								color: #FF5C03;
+								border: 1rpx solid #FF5030;
+								color: #FF5030;
 								font-size: 28rpx;
 								border-radius: 30rpx;
 							}

+ 2 - 2
pages/company/login.vue

@@ -208,7 +208,7 @@ export default {
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #FF5C03;
+				background: #FF5030;
 				border-radius: 44upx;
 			}
 		}
@@ -225,7 +225,7 @@ export default {
 			
 		}
 		.btn{
-			color: #FF5C03;
+			color: #FF5030;
 		}
 	}
 </style>

+ 8 - 8
pages/company/packageDetails.vue

@@ -482,7 +482,7 @@
 						padding: 5rpx 15rpx;
 						font-size: 26upx;
 						font-family: PingFang SC;
-						color: #FF5C03;
+						color: #FF5030;
 					}
 					.duration{
 						margin-left: 10rpx;
@@ -491,7 +491,7 @@
 						padding: 5rpx 15rpx;
 						font-size: 26upx;
 						font-family: PingFang SC;
-						color: #FF5C03;
+						color: #FF5030;
 					}
 					
 				}
@@ -509,7 +509,7 @@
 						.price{
 							margin-right: 10rpx;
 							padding: 5rpx 10rpx;
-							background-color: #FF5C03;
+							background-color: #FF5030;
 							border-radius: 30rpx;
 							font-size: 20upx;
 							font-family: PingFang SC;
@@ -545,7 +545,7 @@
 						margin-right: 15rpx;
 						height: 30rpx;
 						width: 6rpx;
-						background-color: #FF5C03;
+						background-color: #FF5030;
 						
 					}
 					 
@@ -576,7 +576,7 @@
 						margin-right: 15rpx;
 						height: 30rpx;
 						width: 6rpx;
-						background-color: #FF5C03;
+						background-color: #FF5030;
 						
 					}
 					 
@@ -740,7 +740,7 @@
 				}
 			 
 				&.buy{
-					background: #FF5C03;
+					background: #FF5030;
 				}
 				.contact-btn{
 					display: inline-block;
@@ -836,8 +836,8 @@
 					border-radius: 30upx;
 					font-size: 28upx;
 					font-family: PingFang SC;
-					color: #FF5C03;
-					border:1rpx solid  #FF5C03;
+					color: #FF5030;
+					border:1rpx solid  #FF5030;
 					 
 				}
 				

+ 6 - 6
pages/company/packageList.vue

@@ -325,15 +325,15 @@
 			font-size: 28upx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #FF5C03;
+			color: #FF5030;
 			background: #ffffff;
-			border: 1px solid #FF5C03;
+			border: 1px solid #FF5030;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #FF5C03;
-				border: 1px solid #FF5C03;
+				background: #FF5030;
+				border: 1px solid #FF5030;
 			}
 		}
 	}
@@ -382,7 +382,7 @@
 					width: 100%;
 					.price{
 						padding: 5rpx 10rpx;
-						background-color: #FF5C03;
+						background-color: #FF5030;
 						border-radius: 30rpx;
 						font-size: 20upx;
 						font-family: PingFang SC;
@@ -584,7 +584,7 @@
 								color: #FFFFFF;
 							}
 							&.pay{
-								background: #FF5C03;
+								background: #FF5030;
 								color: #FFFFFF;
 								position: relative;
 								.share{

+ 6 - 6
pages/company/packageOrderDetails.vue

@@ -217,8 +217,8 @@
 			top: 0;
 			left: 0;
 			z-index: 1;
-			background-color: #FF5C03;
-			background: linear-gradient(#FF5C03, #E2C99E);
+			background-color: #FF5030;
+			background: linear-gradient(#FF5030, #E2C99E);
 			border-radius: 0rpx 0rpx 100rpx 100rpx;
 		}
 		.inner{
@@ -316,7 +316,7 @@
 						padding: 5rpx 15rpx;
 						font-size: 26upx;
 						font-family: PingFang SC;
-						color: #FF5C03;
+						color: #FF5030;
 					}
 					.duration{
 						margin-left: 10rpx;
@@ -325,7 +325,7 @@
 						padding: 5rpx 15rpx;
 						font-size: 26upx;
 						font-family: PingFang SC;
-						color: #FF5C03;
+						color: #FF5030;
 					}
 					
 				}
@@ -337,7 +337,7 @@
 					width: 100%;
 					.price{
 						padding: 5rpx 10rpx;
-						background-color: #FF5C03;
+						background-color: #FF5030;
 						border-radius: 30rpx;
 						font-size: 20upx;
 						font-family: PingFang SC;
@@ -457,7 +457,7 @@
 				color: #666666;
 			}
 			&.pay{
-				background: #FF5C03;
+				background: #FF5030;
 				color: #FFFFFF;
 			}
 		}

+ 6 - 6
pages/company/packageOrderList.vue

@@ -5,7 +5,7 @@
 				 <u-tabs
 				  :scrollable="true"
 				  :list="tabs"  
-				  lineColor="#FF5C03"
+				  lineColor="#FF5030"
 				 @change="tabChange">
 				 </u-tabs>
 			</view>
@@ -235,7 +235,7 @@
 							font-weight: 500;
 							line-height: 1;
 							&.success{
-								color: #FF5C03;
+								color: #FF5030;
 							}
 							&.black{
 								color: #111111;
@@ -287,7 +287,7 @@
 								padding: 5rpx 15rpx;
 								font-size: 26upx;
 								font-family: PingFang SC;
-								color: #FF5C03;
+								color: #FF5030;
 							}
 							.duration{
 								margin-left: 10rpx;
@@ -296,7 +296,7 @@
 								padding: 5rpx 15rpx;
 								font-size: 26upx;
 								font-family: PingFang SC;
-								color: #FF5C03;
+								color: #FF5030;
 							}
 							
 						}
@@ -308,7 +308,7 @@
 							width: 100%;
 							.price{
 								padding: 5rpx 10rpx;
-								background-color: #FF5C03;
+								background-color: #FF5030;
 								border-radius: 30rpx;
 								font-size: 20upx;
 								font-family: PingFang SC;
@@ -383,7 +383,7 @@
 								color: #666666;
 							}
 							&.pay{
-								background: #FF5C03;
+								background: #FF5030;
 								color: #FFFFFF;
 							}
 						}

+ 3 - 3
pages/company/storeOrderDetail.vue

@@ -343,8 +343,8 @@
 			top: 0;
 			left: 0;
 			z-index: 1;
-			background-color: #FF5C03;
-			background: linear-gradient(#FF5C03, #E2C99E);
+			background-color: #FF5030;
+			background: linear-gradient(#FF5030, #E2C99E);
 			border-radius: 0rpx 0rpx 100rpx 100rpx;
 		}
 		.inner{
@@ -674,7 +674,7 @@
 				color: #666666;
 			}
 			&.pay{
-				background: #FF5C03;
+				background: #FF5030;
 				color: #FFFFFF;
 			}
 			.contact-btn {

+ 3 - 3
pages/company/storeOrderList.vue

@@ -5,7 +5,7 @@
 				 <u-tabs
 				  :scrollable="false"
 				  :list="tabs"  
-				  lineColor="#FF5C03"
+				  lineColor="#FF5030"
 				 @change="tabChange">
 				 </u-tabs>
 			</view>
@@ -353,7 +353,7 @@
 						font-weight: 500;
 						line-height: 1;
 						&.success{
-							color: #FF5C03;
+							color: #FF5030;
 						}
 						&.black{
 							color: #111111;
@@ -507,7 +507,7 @@
 								color: #666666;
 							}
 							&.pay{
-								background: #FF5C03;
+								background: #FF5030;
 								color: #FFFFFF;
 							}
 							.contact-btn {

+ 2 - 2
pages/company/voice.vue

@@ -265,8 +265,8 @@
 			&-voice {
 				height: 150rpx;
 				width: 150rpx;
-				background-color: #FF5C03;
-				border: 1rpx solid #FF5C03;
+				background-color: #FF5030;
+				border: 1rpx solid #FF5030;
 				image {
 					height: 60rpx;
 					width: 60rpx;

+ 3 - 3
pages/company/voiceItem.vue

@@ -14,7 +14,7 @@
 						:scrollable="false"
 						:list="tabs"
 						:current="current"
-						lineColor="#FF5C03"
+						lineColor="#FF5030"
 						@change="tabChange">
 					</u-tabs>
 					<view class="mask" v-show="status=='start'||status=='end'" @click.stop>
@@ -450,8 +450,8 @@
 			&-voice {
 				height: 150rpx;
 				width: 150rpx;
-				background-color: #FF5C03;
-				border: 1rpx solid #FF5C03;
+				background-color: #FF5030;
+				border: 1rpx solid #FF5030;
 				image {
 					height: 60rpx;
 					width: 60rpx;

+ 4 - 4
pages/company/voiceList.vue

@@ -2,7 +2,7 @@
 	<view class="content">
 		<u-sticky>
 			<view class="tabs">
-				<u-tabs :scrollable="false" :list="tabs" :current="current" lineColor="#FF5C03" @change="tabChange">
+				<u-tabs :scrollable="false" :list="tabs" :current="current" lineColor="#FF5030" @change="tabChange">
 				</u-tabs>
 			</view>
 		</u-sticky>
@@ -251,8 +251,8 @@
 
 		.btn {
 			padding: 10rpx 30rpx;
-			border: 1rpx solid #FF5C03;
-			color: #FF5C03;
+			border: 1rpx solid #FF5030;
+			color: #FF5030;
 			font-size: 28rpx;
 			border-radius: 30rpx;
 		}
@@ -269,7 +269,7 @@
 
 		&-btn {
 			height: 112rpx;
-			background: #FF5C03;
+			background: #FF5030;
 			border-radius: 112rpx;
 			font-weight: 600;
 			font-size: 34rpx;

+ 5 - 5
pages/course/catalogue.vue

@@ -349,12 +349,12 @@
 		border-radius: 0 16rpx 0 16rpx;
 		&-free {
 			// background: url('@/static/image/hall/free_lable_bg.png') no-repeat right / 100% 32rpx;
-			background-color: #FF5C03;
+			background-color: #FF5030;
 		}
 	
 		&-member {
 			// background: url('@/static/image/hall/member_label_bg.png') no-repeat right / 100% 32rpx;
-			background-color: #FFB205;
+			background-color: #FEC75C;
 		}
 	}
 	
@@ -467,7 +467,7 @@
 			width: 124rpx;
 			height: 124rpx;
 			border-radius: 50%;
-			background: linear-gradient( 180deg, #FF9B45 0%, #FF5C03 100%);
+			background: linear-gradient( 180deg, #FF9B45 0%, #FF5030 100%);
 			border: 12rpx solid #FFFFFF;
 			@include u-flex(row, center, center);
 			position: absolute;
@@ -502,7 +502,7 @@
 				height: 84rpx;
 				line-height: 84rpx;
 				text-align: center;
-				background: #FF5C03;
+				background: #FF5030;
 				border-radius: 42rpx 42rpx 42rpx 42rpx;
 				font-family: PingFang SC, PingFang SC;
 				font-weight: 500;
@@ -544,7 +544,7 @@
 				height: 84rpx;
 				line-height: 84rpx;
 				text-align: center;
-				background: #FF5C03;
+				background: #FF5030;
 				border-radius: 42rpx 42rpx 42rpx 42rpx;
 				font-family: PingFang SC, PingFang SC;
 				font-weight: 500;

+ 4 - 4
pages/course/catalogueN.nvue

@@ -296,10 +296,10 @@ page {
 .cate-bg1 {
 	background-color: #FCF0E7;
 	.cateitem-title {
-		color: #FF5C03 !important;
+		color: #FF5030 !important;
 	}
 	.cateitem-sub {
-		color: #FF5C03 !important;
+		color: #FF5030 !important;
 	}
 }
 .cate-bg2 {
@@ -320,12 +320,12 @@ page {
 	border-radius: 0 16rpx 0 16rpx;
 	&-free {
 		// background: url('@/static/image/hall/free_lable_bg.png') no-repeat right / 100% 32rpx;
-		background-color: #FF5C03;
+		background-color: #FF5030;
 	}
 
 	&-member {
 		// background: url('@/static/image/hall/member_label_bg.png') no-repeat right / 100% 32rpx;
-		background-color: #FFB205;
+		background-color: #FEC75C;
 	}
 }
 

+ 1 - 1
pages/course/commentN.nvue

@@ -604,7 +604,7 @@
 
 
 	.br{
-	  border: 1px solid #FF5C03;
+	  border: 1px solid #FF5030;
 	}
 	
 	.fix-bottom{

+ 1 - 1
pages/course/components/docterItem.vue

@@ -88,7 +88,7 @@
 			font-family: Roboto, Roboto;
 			font-weight: bold;
 			font-size: 36rpx;
-			color: #FF5C03;
+			color: #FF5030;
 			margin: 22rpx 0;
 			&-unit {
 				font-weight: 600;

+ 244 - 176
pages/course/components/doctorHall.vue

@@ -1,9 +1,10 @@
 <template>
 	<view class="content">
-		
+
 		<!-- 搜索 -->
 		<view class="search-box">
-			<uni-search-bar class="search" radius="34" v-model="keyword" placeholder="搜索课程内容" clearButton="auto" cancelButton="none" @confirm="search">
+			<uni-search-bar class="search" radius="34" v-model="keyword" placeholder="请输入关键字搜索" clearButton="auto"
+				cancelButton="none" @confirm="search">
 				<template v-slot:searchIcon>
 					<image src="@/static/image/hall/search_gray_icon.png" mode="aspectFill"></image>
 				</template>
@@ -12,55 +13,70 @@
 				<image :class="isNew ? 'badge':''" src="@/static/image/hall/new_hall_icon.png" mode="aspectFill"></image>
 			</view> -->
 		</view>
-		
+
 		<!-- banner -->
-		<swiper class="swiper" style="height: 390rpx;" circular :indicator-dots="indicatorDots" :autoplay="autoplay"
+		<!-- <swiper class="swiper" style="height: 390rpx;" circular :indicator-dots="indicatorDots" :autoplay="autoplay"
 			:interval="interval" :duration="duration">
 			<swiper-item  v-for="(url,index) in advImgs" :key="index"  class="swiper-item" @click="handleAdvClick(index)">
 				<image style="width: 100%;height: 100%;" :src="url" mode="aspectFit"></image>
 			</swiper-item>
+		</swiper> -->
+		<swiper class="swiper" circular :indicator-dots="indicatorDots" :autoplay="autoplay" :interval="interval"
+			:duration="duration">
+			<swiper-item v-for="(url,index) in advImgs" :key="index" class="swiper-item" @click="handleAdvClick(index)">
+				<image style="width: 100%;" :src="url" mode="aspectFill"></image>
+			</swiper-item>
 		</swiper>
-		
+
 		<!-- 名医讲堂 -->
 		<view id="guide3">
-			 <view class="box-nav">
-					 <view class="title">名医讲堂</view>
-					 <view class="box-nav-right" @click="navTo('./famousHall?type=0')">
-						<text>更多讲堂</text>
-						<image class="right-arrow" src="@/static/image/home/my_right_arrow.png" mode="aspectFill"></image>
-					</view>
+			<view class="box-nav">
+				<view class="title">名医讲堂</view>
+				<view class="box-nav-right" @click="navTo('./famousHall?type=0')">
+					<text>更多讲堂</text>
+					<image class="right-arrow" src="@/static/image/home/my_right_arrow.png" mode="aspectFill"></image>
+				</view>
 			</view>
-			
-			<scroll-view scroll-x="true" class="cate-scroll" :scroll-into-view="scrollViewId" scroll-with-animation="true"
-				overflow-anchor="none">
-				<view :id="'scrollView' + index" class="cate-scroll-item" v-for="(item, index) in mtabs"
-					:key="index" @click="tabChange(index)" :class="tabIndex == index ? 'cate-scroll-item-active' : ''">
+
+			<scroll-view scroll-x="true" class="cate-scroll" :scroll-into-view="scrollViewId"
+				scroll-with-animation="true" overflow-anchor="none">
+				<view :id="'scrollView' + index" class="cate-scroll-item" v-for="(item, index) in mtabs" :key="index"
+					@click="tabChange(index)" :class="tabIndex == index ? 'cate-scroll-item-active' : ''">
 					{{ item.dictLabel }}
 				</view>
 			</scroll-view>
 		</view>
-	
-		<swiper :style="{'height': swHeight+'px'}" @transition="onTransition" @animationfinish="animationfinish" circular :autoplay="swiperAutoplay" interval="5000" duration="1000" :current="tabIndex"  @change="swiperChange" v-if="mtabs.length>0">
-		   <swiper-item v-for="(tab,i) in mtabs" :key="i">	  
-		       <view id="swiper-content" class="hall-box">
-		            <hallItem class="gapitem guide3item"  v-for="(item, index) in dataList[i] " :key="index" :item="item"  @click.native="navTo('./info?courseId='+item.courseId)"  />
-			   </view>
-		   </swiper-item>
+
+		<swiper :style="{'height': swHeight+'px'}" @transition="onTransition" @animationfinish="animationfinish"
+			circular :autoplay="swiperAutoplay" interval="5000" duration="1000" :current="tabIndex"
+			@change="swiperChange" v-if="mtabs.length>0">
+			<swiper-item v-for="(tab,i) in mtabs" :key="i">
+				<view id="swiper-content" class="hall-box">
+					<hallItem class="gapitem guide3item" v-for="(item, index) in dataList[i] " :key="index" :item="item"
+						@click.native="navTo('./info?courseId='+item.courseId)" />
+				</view>
+			</swiper-item>
 		</swiper>
-		
+
 		<!-- 热门推荐 -->
 		<view class="box-nav">
 			<view class="title">热门推荐</view>
-			<view class="box-nav-right"  @click="navTo('./famousHall?type=1')">
+			<view class="box-nav-right" @click="navTo('./famousHall?type=1')">
 				<text>更多讲堂</text>
-				<image class="right-arrow" src="@/static/image/home/my_right_arrow.png" mode="aspectFill" :lazy-load="true"></image>
+				<image class="right-arrow" src="@/static/image/home/my_right_arrow.png" mode="aspectFill"
+					:lazy-load="true"></image>
 			</view>
 		</view>
-	
-		<view class="hothall" v-for="(item, index) in recommendList" :key="index"  @click="navTo('./info?courseId='+item.courseId)">
-			<image class="video-img" :src="item.imgUrl"></image>
+
+		<view class="hothall" v-for="(item, index) in recommendList" :key="index"
+			@click="navTo('./info?courseId='+item.courseId)">
+			<view class="video-box">
+				<image class="sound" src="@/static/image/home1/icon/bofang_icon.png"></image>
+				<image class="sound" src="@/static/image/home1/icon/bofang_no_icon.png"></image>
+				<image class="video-img" :src="item.imgUrl"></image>
+			</view>
 			<view class="hothall-infobox">
-				<view class="hothall-info">
+				<view class="hothall-info inherit">
 					<image :src="item.secondImg" mode="aspectFit"></image>
 					<view>
 						<view class="hothall-title">{{item.courseName}}</view>
@@ -71,20 +87,27 @@
 				</view>
 				<view class="tagbox">
 					<block v-if="item.tags!=null">
-						<view class="tag" v-for="(item, index) in item.tags.split(',')" :key="index" >{{item}}</view>
+						<view class="tag" v-for="(item, index) in item.tags.split(',')" :key="index">{{item}}</view>
 					</block>
 				</view>
 			</view>
 		</view>
-	
+
 	</view>
 </template>
 
 <script>
 	import hallItem from "./hallItem.vue";
-	import {getAdvList} from '@/api/adv.js'
-	import { getDictByKey } from '@/api/common'
-	import { getCourseCate,getCourseList } from '@/api/course'
+	import {
+		getAdvList
+	} from '@/api/adv.js'
+	import {
+		getDictByKey
+	} from '@/api/common'
+	import {
+		getCourseCate,
+		getCourseList
+	} from '@/api/course'
 	export default {
 		components: {
 			hallItem
@@ -99,28 +122,28 @@
 				autoplay: true,
 				interval: 3000,
 				duration: 1000,
-				cateId:0,
-				scrollViewId:'scrollView0',
+				cateId: 0,
+				scrollViewId: 'scrollView0',
 				tabIndex: 0,
-				advImgs:[],
-				advs:[],
-				mtabs:[],
-				dataList:[],
+				advImgs: [],
+				advs: [],
+				mtabs: [],
+				dataList: [],
 				swHeight: 0,
-				recommendList:[],
-				isBest:false,
-				famousItemHei:0,
+				recommendList: [],
+				isBest: false,
+				famousItemHei: 0,
 			}
 		},
 		mounted() {
 			// this.swHeight = uni.upx2px(400);
-			this.famousItemHei=uni.upx2px(376);
+			this.famousItemHei = uni.upx2px(376);
 			this.getAdvList();
 			this.getCourseCate();
 			this.getRecommendList();
 		},
 		methods: {
-			initFun(){
+			initFun() {
 				this.getAdvList();
 				this.getCourseCate();
 				this.getRecommendList();
@@ -128,80 +151,95 @@
 			getAdvList() {
 				//联网加载数据
 				var that = this;
-				var data = { advType:12,status:1}
+				var data = {
+					advType: 12,
+					status: 1
+				}
 				getAdvList(data).then(res => {
-					if(res.code==200){
-						that.advImgs=[];
-						that.advs=[];
+					if (res.code == 200) {
+						that.advImgs = [];
+						that.advs = [];
 						res.data.forEach(function(element) {
-							if(element.imageUrl!=null&&element.imageUrl!=""){
+							if (element.imageUrl != null && element.imageUrl != "") {
 								that.advs.push(element);
 								that.advImgs.push(element.imageUrl);
 							}
 						});
-						
-					}else{
-						uni.showToast({icon:'none',title: "请求失败"});
+
+					} else {
+						uni.showToast({
+							icon: 'none',
+							title: "请求失败"
+						});
 					}
 				});
 			},
-			getCourseCate:function(){
-				let that=this;
+			getCourseCate: function() {
+				let that = this;
 				getCourseCate().then(res => {
-						if(res.code==200){
-							this.mtabs=res.data;  
-							let findIdx=this.mtabs.findIndex(item=>item.dictLabel=='精选');
-							console.log("qxj findIdx:"+findIdx);
-							if(findIdx==-1){
-								let dictItem={"dictValue":0,"dictLabel": "精选"};
+						if (res.code == 200) {
+							this.mtabs = res.data;
+							let findIdx = this.mtabs.findIndex(item => item.dictLabel == '精选');
+							console.log("qxj findIdx:" + findIdx);
+							if (findIdx == -1) {
+								let dictItem = {
+									"dictValue": 0,
+									"dictLabel": "精选"
+								};
 								this.mtabs.unshift(dictItem);
 							}
-							this.isBest=true;
-							if(this.mtabs.length>0){
-								this.mtabs = this.mtabs.splice(0,4)
-								 this.cateId=this.mtabs[0].dictValue;
-								 for (let i = 0; i < this.mtabs.length; i++) {
-									 if(i<=4){
-										 this.tabChange(i); 
-									 }
-								 }
-								 this.tabChange(0);
+							this.isBest = true;
+							if (this.mtabs.length > 0) {
+								this.mtabs = this.mtabs.splice(0, 4)
+								this.cateId = this.mtabs[0].dictValue;
+								for (let i = 0; i < this.mtabs.length; i++) {
+									if (i <= 4) {
+										this.tabChange(i);
+									}
+								}
+								this.tabChange(0);
 							}
 						}
 					},
 					rej => {}
 				);
 			},
-			getFamousCourseList:function(index){
-				let that=this;
-				let params={};
-				if(this.isBest){
-					params={"isBest":1};
-				}else{
-					params={"cateId":this.cateId};
+			getFamousCourseList: function(index) {
+				let that = this;
+				let params = {};
+				if (this.isBest) {
+					params = {
+						"isBest": 1
+					};
+				} else {
+					params = {
+						"cateId": this.cateId
+					};
 				}
-				if(this.dataList.hasOwnProperty(index+"")){
-					 this.updateSwiperHeight(index);
-				     return;
+				if (this.dataList.hasOwnProperty(index + "")) {
+					this.updateSwiperHeight(index);
+					return;
 				}
-				getCourseList(params,1,4).then(res => {
-						if(res.code==200){
-							this.dataList[index+""]=res.data.list;  
-							this.$emit("loadFamousCourse",0);
-						    // this.$nextTick(() => {
-						         this.updateSwiperHeight(index);
-						    // }); 
+				getCourseList(params, 1, 4).then(res => {
+						if (res.code == 200) {
+							this.dataList[index + ""] = res.data.list;
+							this.$emit("loadFamousCourse", 0);
+							// this.$nextTick(() => {
+							this.updateSwiperHeight(index);
+							// }); 
 						}
 					},
 					rej => {}
 				);
 			},
-			getRecommendList(){
-				let that=this;
-				const params={"isTui":1};
-				getCourseList(params,1,10).then(res => {
-						if(res.code==200){
-							this.recommendList=res.data.list;  
+			getRecommendList() {
+				let that = this;
+				const params = {
+					"isTui": 1
+				};
+				getCourseList(params, 1, 10).then(res => {
+						if (res.code == 200) {
+							this.recommendList = res.data.list;
 						}
 					},
 					rej => {}
@@ -209,79 +247,77 @@
 			},
 			search() {
 				uni.navigateTo({
-					url: './famousHall?keyword='+this.keyword
+					url: './famousHall?keyword=' + this.keyword
 				})
 			},
 			// 修改当前页
-			tabChange(index){
+			tabChange(index) {
 				//if(this.tabIndex === index) return;
 				this.tabIndex = index;
-				this.scrollViewId = 'scrollView'+index;
-				const item=this.mtabs[index];
-				if(item){
-					if(item.dictLabel=='精选'){
-						this.isBest=true;
-					}else{
-						this.isBest=false;
+				this.scrollViewId = 'scrollView' + index;
+				const item = this.mtabs[index];
+				if (item) {
+					if (item.dictLabel == '精选') {
+						this.isBest = true;
+					} else {
+						this.isBest = false;
 					}
-					this.cateId=item.dictValue;
+					this.cateId = item.dictValue;
 					this.getFamousCourseList(index);
 				}
 			},
 			// SWIPER划动
-			swiperChange(e){
+			swiperChange(e) {
 				// this.tabIndex = e.detail.current;
 				// this.scrollViewId = 'scrollView'+this.tabIndex;
 				this.tabChange(e.detail.current);
 			},
-			
-			onTransition(){
+
+			onTransition() {
 				//console.log("qxj onTransition");
 			},
-			animationfinish(){
+			animationfinish() {
 				//console.log("qxj animationfinish");
 				// this.updateSwiperHeight();
 			},
 			onSwiperResize() {
-				 //console.log("qxj onSwiperResize");
-			 },
+				//console.log("qxj onSwiperResize");
+			},
 			updateSwiperHeight() {
-				 let dataArr=this.dataList[this.tabIndex.toString()];
-				 if(dataArr==undefined ||  dataArr.length==0){
-					 this.swHeight=150;
-				 }else{
-					 uni.createSelectorQuery().in(this).select('#swiper-content').boundingClientRect(rect => {
-						  //console.log("qxj swHeight:"+this.swHeight);
-						  if(rect!=null){
-							  this.swHeight = rect.height;
-						  }
-						  if(this.swHeight<=100){
-							    //所以(total + pagesize -1) / pag esize就得到总页数
-							    // console.log("qxj famousItemHei:"+this.famousItemHei);
-							    this.swHeight=(dataArr.length)/2*this.famousItemHei;
-								return;
-						  }
-						
-					 }).exec();
-				 }
-			 },
-			handleAdvClick(index){
-				var ad=this.advs[index];
-				if(ad.showType==1){
-					uni.setStorageSync('url',ad.appAdvUrl);
+				let dataArr = this.dataList[this.tabIndex.toString()];
+				if (dataArr == undefined || dataArr.length == 0) {
+					this.swHeight = 150;
+				} else {
+					uni.createSelectorQuery().in(this).select('#swiper-content').boundingClientRect(rect => {
+						//console.log("qxj swHeight:"+this.swHeight);
+						if (rect != null) {
+							this.swHeight = rect.height;
+						}
+						if (this.swHeight <= 100) {
+							//所以(total + pagesize -1) / pag esize就得到总页数
+							// console.log("qxj famousItemHei:"+this.famousItemHei);
+							this.swHeight = (dataArr.length) / 2 * this.famousItemHei;
+							return;
+						}
+
+					}).exec();
+				}
+			},
+			handleAdvClick(index) {
+				var ad = this.advs[index];
+				if (ad.showType == 1) {
+					uni.setStorageSync('url', ad.appAdvUrl);
 					uni.navigateTo({
-						url:"h5"
+						url: "h5"
 					})
-				}
-				else if(ad.showType==3){
-					 uni.setStorageSync('content',ad.content);
-					 uni.navigateTo({
-					 	url:"content"
-					 })
-				}
-				else{
+				} else if (ad.showType == 3) {
+					uni.setStorageSync('content', ad.content);
 					uni.navigateTo({
-						url:ad.appAdvUrl
+						url: "content"
+					})
+				} else {
+					uni.navigateTo({
+						url: ad.appAdvUrl
 					})
 				}
 			},
@@ -290,11 +326,11 @@
 					url: url
 				})
 			},
-			goToMsg(){
-				  // 切换到视图1 tab
-				  uni.switchTab({
-					  url: '/pages/TUIKit/TUIPages/TUIConversation/index' 
-				  });
+			goToMsg() {
+				// 切换到视图1 tab
+				uni.switchTab({
+					url: '/pages/TUIKit/TUIPages/TUIConversation/index'
+				});
 			}
 		}
 	}
@@ -308,6 +344,11 @@
 		justify-content: $justifyC;
 	}
 
+	.inherit {
+		display: flex;
+		align-items: inherit !important;
+	}
+
 	.content {
 		padding: 0 24rpx;
 		font-family: PingFang SC, PingFang SC;
@@ -327,9 +368,11 @@
 	.search-box {
 		@include u-flex(row, center, space-between);
 		padding-bottom: 22rpx;
+
 		.search {
 			padding: 0;
 			flex: 1;
+
 			image {
 				width: 28rpx;
 				height: 28rpx;
@@ -351,7 +394,7 @@
 			content: "";
 			width: 16rpx;
 			height: 16rpx;
-			background: #FF5C03;
+			background: #FF5030;
 			border-radius: 50%;
 			position: absolute;
 			right: 0;
@@ -361,11 +404,12 @@
 
 	.swiper {
 		width: 694rpx;
-		height: 390rpx;
+		height: 228rpx;
 		margin: 0 auto 16rpx auto;
 		background: #fff;
 		border-radius: 20rpx;
 		overflow: hidden;
+
 		.swiper-item {
 			width: 694rpx;
 			height: 390rpx;
@@ -378,6 +422,7 @@
 			height: 10rpx;
 			background: rgba(255, 255, 255, 0.5);
 		}
+
 		.uni-swiper-dot-active {
 			width: 24rpx;
 			height: 10rpx;
@@ -385,13 +430,14 @@
 			border-radius: 5rpx 5rpx 5rpx 5rpx;
 		}
 	}
-	
-	.cate-scroll{
+
+	.cate-scroll {
 		width: 100%;
 		min-height: 64rpx;
 		white-space: nowrap;
 		margin-bottom: 24rpx;
-		&-item{
+
+		&-item {
 			display: inline-block;
 			font-weight: 400;
 			font-size: 28rpx;
@@ -401,22 +447,27 @@
 			margin-right: 20rpx;
 			border-radius: 32rpx;
 			background: #fff;
-			&-active{
+
+			&-active {
 				font-weight: 600;
 				font-size: 28rpx;
-				color: #FF5C03;
+				color: #2583EB;
+
 			}
 		}
 	}
+
 	.box-nav {
 		width: 100%;
 		padding: 16rpx 0;
 		box-sizing: border-box;
 		display: flex;
 		justify-content: space-between;
+
 		&-right {
 			@include u-flex(row, center, flex-start);
 		}
+
 		.right-arrow {
 			height: 48rpx;
 			width: 48rpx;
@@ -427,11 +478,12 @@
 		@include u-flex(row, center, flex-start);
 		flex-wrap: wrap;
 		margin: 0 -18rpx -18rpx 0;
+
 		.gapitem {
 			margin: 0 18rpx 18rpx 0;
 		}
 	}
-	
+
 
 	.hothall {
 		width: 702rpx;
@@ -439,28 +491,46 @@
 		background: #FFFFFF;
 		border-radius: 16rpx 16rpx 16rpx 16rpx;
 		overflow: hidden;
-        position: relative;	
-		.video-img {
+		position: relative;
+
+		.video-box {
 			width: 702rpx;
 			height: 400rpx;
 			background: rgba(0, 0, 0, 0.15);
 			border-radius: 16rpx 16rpx 0rpx 0rpx;
+			position: relative;
+			overflow: hidden;
+
+			.sound {
+				position: absolute;
+				right: 20rpx;
+				bottom: 20rpx;
+				width: 40rpx;
+				height: 40rpx;
+				z-index: 2;
+			}
+
+			.video-img {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.vip {
+			position: absolute;
+			min-width: 54rpx;
+			min-height: 20rpx;
+			line-height: 20rpx;
+			background: linear-gradient(94deg, #FFE9D0 0%, #E9BD97 100%);
+			border-radius: 16rpx 0 16rpx 0;
+			top: 0;
+			left: 0;
+			color: #333;
+			font-size: 18rpx;
+			text-align: center;
+			font-weight: 500;
+			font-style: italic;
 		}
-		.vip{
-			  position: absolute;
-			  min-width: 54rpx;
-			  min-height: 20rpx;
-			  line-height: 20rpx;
-			  background: linear-gradient(94deg, #FFE9D0 0%, #E9BD97 100%);
-			  border-radius: 16rpx 0 16rpx 0;
-			  top:0;
-			  left: 0;
-			  color:#333;
-			  font-size:18rpx ;
-			  text-align: center;
-			  font-weight: 500;
-			  font-style: italic;		  
-		}				  	
 
 		&-infobox {
 			padding: 24rpx;
@@ -521,6 +591,4 @@
 			line-height: 40rpx;
 		}
 	}
-	
-
 </style>

+ 1 - 1
pages/course/components/giftPopup.vue

@@ -163,7 +163,7 @@
 			font-family: PingFang SC, PingFang SC;
 			font-weight: 400;
 			font-size: 28rpx;
-			color: #FF5C03;
+			color: #FF5030;
 
 			&::after {
 				content: "";

+ 1 - 1
pages/course/components/goodsItem.vue

@@ -53,7 +53,7 @@
 			font-family: Roboto, Roboto;
 			font-weight: bold;
 			font-size: 36rpx;
-			color: #FF5C03;
+			color: #FF5030;
 			margin: 22rpx 0;
 			&-unit {
 				font-weight: 600;

+ 2 - 2
pages/course/components/goodsItemVertical.vue

@@ -163,7 +163,7 @@
 				font-size: 36rpx;
 				display: flex;
 				align-items: center;
-				color: #FF5C03;
+				color: #FF5030;
 				&-unit {
 					font-weight: 600;
 					font-size: 20rpx;
@@ -205,7 +205,7 @@
 			.gobuy-btn {
 				width: 142rpx;
 				height: 56rpx;
-				background: linear-gradient( 270deg, #FF5C03 0%, #FFAC64 100%);
+				background: linear-gradient( 270deg, #FF5030 0%, #FFAC64 100%);
 				border-radius: 0rpx 8rpx 8rpx 0rpx;
 				font-family: PingFang SC, PingFang SC;
 				font-weight: 500;

+ 5 - 2
pages/course/components/hallItem.vue

@@ -15,7 +15,7 @@
 				</view>
 				<view class="hall-box-footerr footer-flex">
 					<image class="hall-box-img" src="@/static/image/hall/zan_icon.png"></image>
-					<text>{{ formatNum(item.likes)  }}</text>
+					<text >{{ formatNum(item.likes)  }}</text>
 				</view>
 			</view>
 		</view>
@@ -177,7 +177,10 @@
 		overflow: hidden;
 		@include u-flex(row, center, flex-start);
 	}
-	
+	.hall-box-txt{
+		font-size: 20rpx;
+		color: #757575;
+	}
 
 
 </style>

+ 8 - 8
pages/course/components/integralGoods.vue

@@ -4,7 +4,7 @@
 			<view class="my-integral">
 				<view class="left">
 					<view class="x-ac">
-						<view class="label">我的芳华币</view>
+						<view class="label">我的健康币</view>
 						<view class="x-ac" style="margin-left: 20rpx;" @click="goCart()">
 							<u-icon name="shopping-cart" color="#fff" size="28"></u-icon>
 							<view class="label">购物车</view>
@@ -13,12 +13,12 @@
 					</view>
 					<view style="display: flex;align-items: baseline;">
 						<view class="integral">{{integral}}</view>
-						<view class="integralbtn" @click="goIntegral">获取芳华币</view>
+						<view class="integralbtn" @click="goIntegral">获取健康币</view>
 					</view>
 				</view>
 				<view class="btn-box">
 					<view class="btn" @click="navTo('/pages/user/integral/integralLogsList')">获得记录</view>
-					<view class="btn" @click="navTo('/pages/user/integral/integralOrderList')">芳华币订单</view>
+					<view class="btn" @click="navTo('/pages/user/integral/integralOrderList')">健康币订单</view>
 				</view>
 			</view>
 			<!-- 搜索 -->
@@ -31,7 +31,7 @@
 				</uni-search-bar>
 			</view>
 			<view class="tabs" v-if="tabs.length>0">
-				<u-tabs :current="tabIndex" :scrollable="true" :list="tabs" lineColor="#FF5C03" @change="tabChange">
+				<u-tabs :current="tabIndex" :scrollable="true" :list="tabs" lineColor="#FF5030" @change="tabChange">
 				</u-tabs>
 			</view>
 		</view>
@@ -46,7 +46,7 @@
 						{{item.goodsName}}
 					</view>
 					<view class="price-box">
-						<view class="price">{{item.integral}}芳华币</view>
+						<view class="price">{{item.integral}}健康币</view>
 						<view class="count">价值:{{item.otPrice.toFixed(2)}}元</view>
 					</view>
 				</view>
@@ -250,7 +250,7 @@
 		.my-integral {
 			height: 200rpx;
 			box-shadow: 0px 0px 5px 2px rgba(0, 0, 0, 0.05);
-			background: linear-gradient(#FF5C03, #E2C99E);
+			background: linear-gradient(#FF5030, #E2C99E);
 			border-radius: 30rpx;
 			display: flex;
 			align-items: flex-start;
@@ -279,7 +279,7 @@
 				padding: 10rpx 15rpx;
 				font-size: 24upx;
 				font-family: PingFang SC;
-				color: #FF5C03;
+				color: #FF5030;
 			}
 
 			.left {
@@ -368,7 +368,7 @@
 
 					.price {
 						padding: 5rpx 10rpx;
-						background-color: #FF5C03;
+						background-color: #FF5030;
 						border-radius: 30rpx;
 						font-size: 20upx;
 						font-family: PingFang SC;

+ 1 - 1
pages/course/components/myAudio.vue

@@ -18,7 +18,7 @@
 			url: String,
 			activeColor: {
 				type: String,
-				default: '#FF5C03'
+				default: '#FF5030'
 			},
 			audioId: [String,Number]
 		},

+ 9 - 9
pages/course/components/studyCenter.vue

@@ -19,12 +19,12 @@
 					<text>我的收藏</text>
 				</view>
 			</view>
-			<!-- <view class="navbox-item" >
+			<view class="navbox-item" >
 				<view class="navbox-iteminfo">
 					<image src="@/static/image/hall/evaluate_icon.png" mode="aspectFill"></image>
 					<text>我的评价</text>
 				</view>
-			</view> -->
+			</view>
 		</view>
 		<template v-if="!isIos">
 			<view class="navbox navbox-other">
@@ -60,7 +60,7 @@
 		<view class="sign">
 			<view class="sign-info">
 				<view class="sign-day">已连续签到<text>{{signNum}}</text>天</view>
-				<view class="sign-num">我的芳华币:{{integral}}</view>
+				<view class="sign-num">我的健康币:{{integral}}</view>
 			</view>
 			
 			<view class="sign-box">
@@ -321,17 +321,17 @@
 				font-family: Roboto, Roboto;
 				font-weight: bold;
 				font-size: 56rpx;
-				color: #FEEBC9;
+				color:#FEFAF7;
 			}
 		}
 		&-num {
 			height: 42rpx;
 			padding: 0 16rpx;
-			background: #FFE3DE;
+			background: #FFF3D7;
 			border-radius: 20rpx 20rpx 20rpx 20rpx;
 			border: 2rpx solid rgba(255,255,255,0.3);
 			font-size: 24rpx;
-			color: #F6443C;
+			color: #FF5030;
 			line-height: 42rpx;
 		}
 		&-box {
@@ -347,7 +347,7 @@
 			height: 72rpx;
 			line-height: 72rpx;
 			margin-top: 40rpx;
-			background: linear-gradient( 90deg, #EB4A42 0%, #EE7E50 100%);
+			background: linear-gradient( 90deg, #FF5701 0%, #FFB501 100%);
 			box-shadow: 0rpx 8rpx 8rpx 0rpx rgba(238,124,80,0.2);
 			border-radius: 36rpx 36rpx 36rpx 36rpx;
 			&::after {
@@ -370,7 +370,7 @@
 			&-item {
 				flex: 1;
 				height: 4rpx;
-				background: #F8D7D3;
+				background: #FDD8A8;
 			}
 		}
 		&-item {
@@ -396,7 +396,7 @@
 			}
 		}
 		.active-text {
-			color: #EC5D46;
+			color: #FF5030;
 		}
 	}
 	.hallbox {

+ 4 - 4
pages/course/famousHall.vue

@@ -85,7 +85,7 @@
 				statusBarHeight: 0,
 				tabTop:0,
 				navigationBarHeight:44,
-				headerBG:"#FF5C03",
+				headerBG:"#FF5030",
 				statusBarBG:"none",
 				headerIndex:98,
 				swHeight: "800px",
@@ -367,7 +367,7 @@
   .cont-box{
 	   position: relative;
 	  .top-section{
-		  // background: #FF5C03;
+		  // background: #FF5030;
 		  padding-bottom: 20rpx;
 	      .search-header-nav {
 	      	width: 100%;
@@ -582,14 +582,14 @@
 				flex-direction: row;
 				align-items: center;
 				.focus-bar{
-					background:#FF5C03;
+					background:#FF5030;
 					border-radius: 20rpx;
 					height: 100%;
 				}  
 				.number{
 					font-size: 22rpx;
 					color: #fff;
-					background:#FF5C03;
+					background:#FF5030;
 					border-radius: 10rpx;
 					border-left: 2rpx solid #fff;
 					padding: 0rpx 12rpx;

+ 1 - 1
pages/course/famousHallPage.vue

@@ -92,7 +92,7 @@
 	    	flex-direction: row;
 	    	flex-wrap: nowrap;
 	    	align-items: center;
-				background: #FF5C03;
+				background: #FF5030;
 	    }
 	    .search-header-main {
 	    		width: 300rpx;

+ 2 - 2
pages/course/favoritePage.vue

@@ -257,7 +257,7 @@
 				flex-direction: row;
 				align-items: center;
 				.focus-bar{
-					background:#FF5C03;
+					background:#FF5030;
 					border-radius: 20rpx;
 					height: 100%;
 					
@@ -265,7 +265,7 @@
 				.number{
 					font-size: 22rpx;
 					color: #fff;
-					background:#FF5C03;
+					background:#FF5030;
 					border-radius: 10rpx;
 					border-left: 2rpx solid #fff;
 					padding: 0rpx 12rpx;

+ 6 - 6
pages/course/index.vue

@@ -8,7 +8,7 @@
 			</view>
 		</view>
 	    <!-- <image class="home_top_bg" src="@/static/newYear/home_top_bg.png" mode="widthFix" :lazy-load="false"></image> -->
-		<image class="home_top_bg" src="@/static/image/hall/home_top_bg.png" mode="widthFix" :lazy-load="false"></image>
+		<image class="home_top_bg" src="@/static/image/hall/yjb_home_top_bg.png" mode="widthFix" :lazy-load="false"></image>
 		<view class="tabbox">
 			<u-tabs 
 			ref="uTabs"
@@ -21,13 +21,13 @@
 			:inactiveStyle="{
 				fontWeight: 600,
 				fontSize: '32rpx',
-				color: '#222222',
+				color: 'rgba(255,255,255,0.7)',
 				lineHeight: '88rpx',
 			}"
 			:activeStyle="{
 				fontWeight: 600,
 				fontSize: '40rpx',
-				color: '#FF5C03',
+				color: '#FFFFFF',
 				lineHeight: '88rpx',
 			}"
 			itemStyle="margin: 10rpx 0"
@@ -997,7 +997,7 @@
 			width: 272rpx;
 			height: 84rpx;
 			margin: 0 auto;
-			background: #FF5C03;
+			background: #2583EB;
 			border-radius: 42rpx 42rpx 42rpx 42rpx;
 			font-family: PingFang SC, PingFang SC;
 			font-weight: 500;
@@ -1081,7 +1081,7 @@
 			.active {
 				font-weight: 600;
 				font-size: 40rpx;
-				color: #FF5C03;
+				color: #FF5030;
 				position: relative;
 			}
 		}
@@ -1130,7 +1130,7 @@
 			width: 60rpx;
 			height: 60rpx;
 			border: 4rpx solid #f3f3f3;
-			border-top: 4rpx solid #FF5C03;
+			border-top: 4rpx solid #FF5030;
 			border-radius: 50%;
 			animation: spin 1s linear infinite;
 		}

+ 22 - 22
pages/course/info.vue

@@ -90,13 +90,13 @@
 							<view class="es" style="margin-bottom: 25px;">
 								<view class="es-mr-24px">弹幕字号</view>
 								<view class="es">
-									<view class="es-mr-24px" v-for="size in danmuFontSize" :style="{color: danmuIput.fontSize==size ?'#FF5C03':'#757575'}" @click="clickStyle('font',size)">{{size=='16px'?'默认':'较小'}}</view>
+									<view class="es-mr-24px" v-for="size in danmuFontSize" :style="{color: danmuIput.fontSize==size ?'#FF5030':'#757575'}" @click="clickStyle('font',size)">{{size=='16px'?'默认':'较小'}}</view>
 								</view>
 							</view>
 							<view class="es" style="margin-bottom: 25px;">
 								<view class="es-mr-24px">弹幕位置</view>
 								<view class="es">
-									<view class="es-mr-24px" v-for="mode in danmuMode" :style="{color: danmuIput.mode==mode ?'#FF5C03':'#757575'}" @click="clickStyle('mode',mode)">
+									<view class="es-mr-24px" v-for="mode in danmuMode" :style="{color: danmuIput.mode==mode ?'#FF5030':'#757575'}" @click="clickStyle('mode',mode)">
 										{{mode=='top'?'置顶':mode=='bottom'?'置底':'滚动'}}
 									</view>
 								</view>
@@ -105,14 +105,14 @@
 								<view class="es-mr-24px">弹幕颜色</view>
 								<view class="es es-fx" style="flex-wrap: wrap;">
 									<view class="es-mr-24px coloritem" v-for="color in colorList" 
-									:style="{background: color,border:`2px solid ${danmuIput.color== color ?'#FF5C03':'#F5F7FA'}`}"
+									:style="{background: color,border:`2px solid ${danmuIput.color== color ?'#FF5030':'#F5F7FA'}`}"
 									 @click="clickStyle('color',color)"></view>
 								</view>
 							</view>
 							<view class="es">
 								<view class="es-mr-24px">弹幕位置</view>
 								<view class="es">
-									<view class="es-mr-24px" v-for="item in danmuArea" :style="{color: danmuFunInfo.area==item ?'#FF5C03':'#757575'}" @click="clickArea(item)">
+									<view class="es-mr-24px" v-for="item in danmuArea" :style="{color: danmuFunInfo.area==item ?'#FF5030':'#757575'}" @click="clickArea(item)">
 										{{item*100+'%'}}
 									</view>
 								</view>
@@ -160,7 +160,7 @@
 				<view class="video-info-footer">
 					<view @tap="handleListen()">
 						<image src="@/static/image/hall/sound_icon24.png" mode="aspectFill"></image>
-						<text :style="{color: showAudio ? '#FF5C03':'#757575'}">听声</text>
+						<text :style="{color: showAudio ? '#FF5030':'#757575'}">听声</text>
 					</view>
 
 					<view @tap="$navTo('./note?courseId='+courseId)" v-if="!$qconfig.isAppStore">
@@ -506,7 +506,7 @@
 				isShowPayType:false,
 				payTypes:["微信支付","支付宝支付"],
 				payType:1,//微信支付1  支付宝支付2
-				createType:3,//1直接购买,2芳华币兑换 3开通会员
+				createType:3,//1直接购买,2健康币兑换 3开通会员
 				orderId:null,
 				order:null,
 				showPayTips:false,
@@ -684,7 +684,7 @@
 							this.videoId = this.studyLog ? this.studyLog.videoId : null;
 							this.vipMethods = ["开通会员"];
 							if (this.data.isIntegral == 1) {
-								this.vipMethods.push("芳华币兑换")
+								this.vipMethods.push("健康币兑换")
 							}
 							if (this.data.sellPrice > 0) {
 								this.vipMethods.push(this.data.sellPrice + "元购买");
@@ -955,7 +955,7 @@
 					this.isShowPayType=true;
 					this.createType=1;
 				}
-				if(vipMethod.indexOf('芳华币兑换')!=-1){  //芳华币兑换
+				if(vipMethod.indexOf('健康币兑换')!=-1){  //健康币兑换
 					this.createType=2;
 				}
 				if(vipMethod.indexOf('开通会员')!=-1){  //开通会员
@@ -969,7 +969,7 @@
 				if(this.createType==1){  //直接购买
 					 this.createCourseOrder();
 				}
-				else if(this.createType==2){   //芳华币兑换
+				else if(this.createType==2){   //健康币兑换
 					 this.createIntegralOrder();
 				}
 				else{  //开通会员
@@ -1132,7 +1132,7 @@
 				}
 				//切换之前添加课程目录学习记录
 				this.addStudyCourse();
-				this.addIntegral();	//加芳华
+				this.addIntegral();	//加健康
 				this.pickCatalogMethod(index,type);
 			},
 			pickCatalogMethod(index,type){
@@ -1238,7 +1238,7 @@
 				);
 			},
 			addIntegral(){
-				// 观看到视频时长50%加一次芳华
+				// 观看到视频时长50%加一次健康
 				if(this.lookDuration==0 || this.playDuration==0){
 					return;
 				}
@@ -2019,7 +2019,7 @@
 					// },
 					commonStyle: {
 						// 播放完成部分进度条底色
-						playedColor: '#FF5C03',
+						playedColor: '#FF5030',
 						cachedColor: 'transparent'
 					},
 					seekedStatus: 'auto',
@@ -2301,7 +2301,7 @@
 			justify-content: center;
 			padding: 5px 15px;
 			box-sizing: border-box;
-			background: #FF5C03 !important;
+			background: #FF5030 !important;
 			border-radius: 22px;
 			font-family: PingFang SC, PingFang SC;
 			font-weight: 500;
@@ -2505,7 +2505,7 @@
 			height: 56rpx;
 			min-width: 154rpx;
 			padding: 0 23rpx;
-			background: #FF5C03;
+			background: #FF5030;
 			border-radius: 28rpx 28rpx 28rpx 28rpx;
 			color: #FFFFFF;
 			font-size: 28rpx;
@@ -2684,15 +2684,15 @@
 
 		&-active {
 			background: #fff;
-			border: 1rpx solid #FF5C03;
+			border: 1rpx solid #FF5030;
 
 			.therapy-goodsname {
-				color: #FF5C03 !important;
+				color: #FF5030 !important;
 			}
 
 			&::after {
 				background: #fff;
-				color: #FF5C03 !important;
+				color: #FF5030 !important;
 			}
 		}
 
@@ -2746,12 +2746,12 @@
 			border-radius: 0 8rpx 0 8rpx;
 			&-free {
 				// background: url('@/static/image/hall/free_lable_bg.png') no-repeat right / 100% 32rpx;
-				background-color: #FF5C03;
+				background-color: #FF5030;
 			}
 
 			&-member {
 				// background: url('@/static/image/hall/member_label_bg.png') no-repeat right / 100% 32rpx;
-				background-color: #FFB205;
+				background-color: #FEC75C;
 			}
 		}
 
@@ -2809,10 +2809,10 @@
 
 		.active-scrollitem {
 			background: #FCF0E7;
-			color: #FF5C03;
+			color: #FF5030;
 
 			.video-directory-title {
-				color: #FF5C03;
+				color: #FF5030;
 			}
 		}
 	}
@@ -2880,7 +2880,7 @@
 		font-family: PingFang SC, PingFang SC;
 		font-weight: 600;
 		font-size: 26rpx;
-		color: #FF5C03;
+		color: #FF5030;
 		text-align: center;
 		line-height: 68rpx;
 	}

+ 6 - 6
pages/course/info1.vue

@@ -157,13 +157,13 @@
 		<!-- h5下载 -->
 		<view class="es-c es-share-bg-box" v-if="false">
 			<image class="image x-c" src="/static/images/other/bg_bar.png"></image>
-			<view class="es-bc-white es-h-100" style="width: 100%;line-height: 100rpx;">下载芳华未来App,查看更多内容↓</view> 
+			<view class="es-bc-white es-h-100" style="width: 100%;line-height: 100rpx;">下载河山恒康App,查看更多内容↓</view> 
 		    <view class="line flex es-h-1 es-bc-fa"></view>
 			<view class="es-h-120 es-bc-white x-bc es-pl-20 es-pr-20 es-pb-20">
 				<view class="left x-f">
 					<image  class="es-w-100 es-h-100 es-mr-20" src="../../static/logo.png"></image>
 					<view class="y-b">
-						<view class="es-fs-30 es-fw-bold es-c-33 es-mb-10 x-f">芳华未来</view>
+						<view class="es-fs-30 es-fw-bold es-c-33 es-mb-10 x-f">河山恒康</view>
 						<view class="es-fs-26 es-fw-n es-c-33">古籍·中药·方剂大全</view>
 					</view>
 				</view>
@@ -361,7 +361,7 @@
 				isShowPayType:false,
 				payTypes:["微信支付","支付宝支付"],
 				payType:1,//微信支付1  支付宝支付2
-				createType:3,//1直接购买,2芳华币兑换 3开通会员
+				createType:3,//1直接购买,2健康币兑换 3开通会员
 				orderId:null,
 				order:null,
 				showPayTips:false,
@@ -438,7 +438,7 @@
 						}
 						this.vipMethods=["开通会员"];
 						if(this.data.isIntegral==1){
-							this.vipMethods.push("芳华币兑换")
+							this.vipMethods.push("健康币兑换")
 						}
 						if(this.data.sellPrice>0){
 							this.vipMethods.push(this.data.sellPrice+"元购买");
@@ -956,7 +956,7 @@
 					this.isShowPayType=true;
 					this.createType=1;
 				}
-				if(vipMethod.indexOf('芳华币兑换')!=-1){  //芳华币兑换
+				if(vipMethod.indexOf('健康币兑换')!=-1){  //健康币兑换
 					this.createType=2;
 				}
 				if(vipMethod.indexOf('开通会员')!=-1){  //开通会员
@@ -970,7 +970,7 @@
 				if(this.createType==1){  //直接购买
 					 this.createCourseOrder();
 				}
-				else if(this.createType==2){   //芳华币兑换
+				else if(this.createType==2){   //健康币兑换
 					 this.createIntegralOrder();
 				}
 				else{  //开通会员

+ 14 - 14
pages/course/infoOld.vue

@@ -66,7 +66,7 @@
 							</view>
 							<view class='audio-time es-ml-18 es-mr-18'>{{playTime}}</view>
 							<view class='audio-slider'>
-								<slider  :disabled="data.isFast==0"  @change="audioChange" @changing="audioChanging" activeColor='#FF5C03' :block-size="25" :min="0" :max="pickCatalog.seconds==0?1:pickCatalog.seconds.toFixed(0)"  :value="courseDuration" :step='0.1'></slider>
+								<slider  :disabled="data.isFast==0"  @change="audioChange" @changing="audioChanging" activeColor='#FF5030' :block-size="25" :min="0" :max="pickCatalog.seconds==0?1:pickCatalog.seconds.toFixed(0)"  :value="courseDuration" :step='0.1'></slider>
 							</view>
 							<view class='audio-time'>{{ $formatSeconds(pickCatalog.seconds) }}</view>
 						</view>
@@ -90,7 +90,7 @@
 		  		<view class="video-info-footer">
 					<view @tap="playAudioAction('backvideo')">
 						<image src="@/static/image/hall/sound_icon24.png" mode="aspectFill"></image>
-						<text :style="{color: showAudio ? '#FF5C03':'#757575'}">听声</text>
+						<text :style="{color: showAudio ? '#FF5030':'#757575'}">听声</text>
 					</view>
 				
 		  			<view @tap="$navTo('./note?courseId='+courseId)" v-if="!$qconfig.isAppStore">
@@ -421,7 +421,7 @@
 				isShowPayType:false,
 				payTypes:["微信支付","支付宝支付"],
 				payType:1,//微信支付1  支付宝支付2
-				createType:3,//1直接购买,2芳华币兑换 3开通会员
+				createType:3,//1直接购买,2健康币兑换 3开通会员
 				orderId:null,
 				order:null,
 				showPayTips:false,
@@ -626,7 +626,7 @@
 						}
 						this.vipMethods=["开通会员"];
 						if(this.data.isIntegral==1){
-							this.vipMethods.push("芳华币兑换")
+							this.vipMethods.push("健康币兑换")
 						}
 						if(this.data.sellPrice>0){
 							this.vipMethods.push(this.data.sellPrice+"元购买");
@@ -813,7 +813,7 @@
 				}
 				//切换之前添加课程目录学习记录
 				this.addStudyCourse();
-				this.addIntegral();	//加芳华
+				this.addIntegral();	//加健康
 				this.pickCatalogMethod(index,type);
 				this.scrollIntoViewId = 'cataLogue' + index;
 			},
@@ -1299,7 +1299,7 @@
 					this.isShowPayType=true;
 					this.createType=1;
 				}
-				if(vipMethod.indexOf('芳华币兑换')!=-1){  //芳华币兑换
+				if(vipMethod.indexOf('健康币兑换')!=-1){  //健康币兑换
 					this.createType=2;
 				}
 				if(vipMethod.indexOf('开通会员')!=-1){  //开通会员
@@ -1313,7 +1313,7 @@
 				if(this.createType==1){  //直接购买
 					 this.createCourseOrder();
 				}
-				else if(this.createType==2){   //芳华币兑换
+				else if(this.createType==2){   //健康币兑换
 					 this.createIntegralOrder();
 				}
 				else{  //开通会员
@@ -1900,7 +1900,7 @@
 			height: 56rpx;
 			min-width: 154rpx;
 			padding: 0 23rpx;
-			background: #FF5C03;
+			background: #FF5030;
 			border-radius: 28rpx 28rpx 28rpx 28rpx;
 			color: #FFFFFF;
 			font-size: 28rpx;
@@ -2062,13 +2062,13 @@
 		}
 		&-active {
 			background: #fff;
-			border: 1rpx solid #FF5C03;
+			border: 1rpx solid #FF5030;
 			.therapy-goodsname {
-				color: #FF5C03 !important;
+				color: #FF5030 !important;
 			}
 			&::after {
 				background: #fff;
-				color: #FF5C03 !important;
+				color: #FF5030 !important;
 			}
 		}
 		&-goodsname {
@@ -2172,9 +2172,9 @@
 		
 		.active-scrollitem {
 			background: #FCF0E7;
-			color: #FF5C03;
+			color: #FF5030;
 			.video-directory-title {
-				color: #FF5C03;
+				color: #FF5030;
 			}
 		}
 	}
@@ -2237,7 +2237,7 @@
 		font-family: PingFang SC, PingFang SC;
 		font-weight: 600;
 		font-size: 26rpx;
-		color: #FF5C03;
+		color: #FF5030;
 		text-align: center;
 		line-height: 68rpx;
 	}

+ 3 - 3
pages/course/learning.vue

@@ -57,7 +57,7 @@
 			return {
 				headerHeight:44,
 				navigationBarHeight:44,
-				headerBG:"#FF5C03",
+				headerBG:"#FF5030",
 				statusBarBG:"none",
 				downOption: {   //下拉刷新
 				    use:false,
@@ -197,7 +197,7 @@
   .nav_bar {
   	height: 44px;
   	width: 100%;
-  	background: #FF5C03;
+  	background: #FF5030;
   	padding: 25rpx 0;
   	padding-top: 5rpx;
   	.search-header-nav {
@@ -206,7 +206,7 @@
   		flex-direction: row;
   		flex-wrap: nowrap;
   		align-items: center;
-  		background: #FF5C03;
+  		background: #FF5030;
   	}
   	.search-header-main {
 		width: 300rpx;

+ 2 - 2
pages/course/learningPage.vue

@@ -298,7 +298,7 @@
 					flex-direction: row;
 					align-items: center;
 					.focus-bar{
-						background:#FF5C03;
+						background:#FF5030;
 						border-radius: 20rpx;
 						height: 100%;
 						
@@ -306,7 +306,7 @@
 					.number{
 						font-size: 22rpx;
 						color: #fff;
-						background:#FF5C03;
+						background:#FF5030;
 						border-radius: 10rpx;
 						border-left: 2rpx solid #fff;
 						padding: 0rpx 12rpx;

+ 2 - 2
pages/course/myNote.vue

@@ -341,7 +341,7 @@
 				color:#999;
 			}
 			.button{
-				background: #FF5C03;
+				background: #FF5030;
 				border-radius: 29rpx;
 				width: 108rpx;
 				height: 54rpx;
@@ -399,7 +399,7 @@
 			font-family: PingFang SC;
 			font-weight: bold;
 			color: #FFFFFF;
-			background: #FF5C03;
+			background: #FF5030;
 			border-radius: 44upx;
 		}
 	}

+ 1 - 1
pages/course/noteList.vue

@@ -253,7 +253,7 @@
   			color:#999;
   		}
   		.button{
-  			background: #FF5C03;
+  			background: #FF5030;
   			border-radius: 29rpx;
   			width: 108rpx;
   			height: 54rpx;

+ 7 - 7
pages/course/privilege.nvue

@@ -5,7 +5,7 @@
 			<view class="es es-fx es-pc es-h-56 es-ml-30 es-mr-30 es-mt-10">
 				<image class="es-w-74 es-h-40" style="position: absolute;left:55px;top:20rpx" src="/static/image/course/xiangyun.png"></image>
 				<text class="es-fs-32 es-h-56 es-fw-500 prititle">
-					{{(!isIos || (isIos&&showIOSPay==1)) ? '开通VIP专享以下特权':'芳华币兑换享以下特权'}}</text>
+					{{(!isIos || (isIos&&showIOSPay==1)) ? '开通VIP专享以下特权':'健康币兑换享以下特权'}}</text>
 				<image class="es-w-74 es-h-40" style="position: absolute;right:55px;top:20rpx" src="/static/image/course/xiangyun2.png"></image>
 			    <image  class="es-w-40 es-h-40" style="position: absolute;right:0;top:0" @tap="closePopup" src="/static/images/close40.png"></image>
 			</view>
@@ -108,12 +108,12 @@
 		data() {
 			return {
 				vipSelIndex:0,
-				vipMethods:["开通会员","芳华币兑换","0.01元购买"],
+				vipMethods:["开通会员","健康币兑换","0.01元购买"],
 				vipMethodIdx:1,
 				isShowPayType:false,
 				payTypes:["微信支付","微信支付备用","支付宝支付"],
 				payType:1,//微信支付1  微信支付备用2  支付宝支付3
-				createType:2,//1直接购买,2芳华币兑换 3开通会员
+				createType:2,//1直接购买,2健康币兑换 3开通会员
 				courseId:null,
 				videoId:null,
 				orderId:null,
@@ -122,7 +122,7 @@
 				sellPrice:0,
 				privilegeBoxHei:0,
 				catalogIndex:-1,
-				integral: 0, // 芳华
+				integral: 0, // 健康
 				isIos: false,
 				showIOSPay: 0,
 				isCanPay: true,
@@ -142,7 +142,7 @@
 				that.courseId=data.courseId;
 				that.sellPrice=data.sellPrice;
 				that.catalogIndex=data.catalogIndex;
-				that.vipMethods=["开通会员", data.integral + "芳华币兑换", data.sellPrice+"元购买"];
+				that.vipMethods=["开通会员", data.integral + "健康币兑换", data.sellPrice+"元购买"];
 				this.isIos = (plus.os.name == "iOS")
 				// if(this.isIos) {
 				// 	this.getIOSPayStatusFun()
@@ -185,7 +185,7 @@
 					this.createType=1;
 					//this.changeFrame(true);
 				}
-				if(vipMethod.indexOf('芳华币兑换')!=-1){  //芳华币兑换
+				if(vipMethod.indexOf('健康币兑换')!=-1){  //健康币兑换
 					this.createType=2;
 					//this.changeFrame(false);
 				}
@@ -207,7 +207,7 @@
 				if(this.createType==1){  //直接购买
 					 this.createCourseOrder();
 				}
-				else if(this.createType==2){   //芳华币兑换
+				else if(this.createType==2){   //健康币兑换
 					 this.createIntegralOrder();
 				}
 				else{  //开通会员

+ 2 - 2
pages/course/privilege1.nvue

@@ -94,12 +94,12 @@
 		data() {
 			return {
 				vipSelIndex:0,
-				vipMethods:["开通会员","芳华币兑换","0.01元购买"],
+				vipMethods:["开通会员","健康币兑换","0.01元购买"],
 				vipMethodIdx:0,
 				isShowPayType:false,
 				payTypes:["微信支付","支付宝支付"],
 				payType:1,//微信支付1  支付宝支付2
-				createType:3,//1直接购买,2芳华币兑换 3开通会员
+				createType:3,//1直接购买,2健康币兑换 3开通会员
 				orderId:null,
 				order:null,
 			}

+ 1 - 1
pages/course/studyCenter/courseCollect.vue

@@ -267,7 +267,7 @@
 		font-family: PingFang SC, PingFang SC;
 		font-weight: 500;
 		font-size: 26rpx;
-		color: #FF5C03;
+		color: #FF5030;
 		text-align: center;
 		line-height: 80rpx;
 		display: flex;

+ 4 - 4
pages/course/studyCenter/orderList.vue

@@ -181,7 +181,7 @@
 				content: "";
 				width: 48rpx;
 				height: 6rpx;
-				background: #FF5C03;
+				background: #FF5030;
 				border-radius: 3rpx 3rpx 3rpx 3rpx;
 				position: absolute;
 				bottom: 2rpx;
@@ -255,19 +255,19 @@
 				font-family: Roboto, Roboto;
 				font-weight: 600;
 				font-size: 20rpx;
-				color: #FF5C03;
+				color: #FF5030;
 			}
 			.price-integer {
 				font-family: Roboto, Roboto;
 				font-weight: bold;
 				font-size: 36rpx;
-				color: #FF5C03;
+				color: #FF5030;
 			}
 			.price-decimal {
 				font-family: Roboto, Roboto;
 				font-weight: bold;
 				font-size: 26rpx;
-				color: #FF5C03;
+				color: #FF5030;
 			}
 		}
 	}

+ 1 - 1
pages/course/video/commentN.nvue

@@ -717,7 +717,7 @@
 
 
 	.br{
-	  border: 1px solid #FF5C03;
+	  border: 1px solid #FF5030;
 	}
 	
 	.fix-bottom{

+ 30 - 30
pages/course/video/living-app-searchInfo.nvue

@@ -124,7 +124,7 @@
 		
 		 <view class="redpacked x-c es-br-ban" v-if="!iserr" @click.stop="tapRedpacked">
 				<gb-progress class="es x-c es-br-ban" :radius="43" :startPosDegree="0" originalColor="#222222" 
-					 processColor="#FF5C03" innerbgColor="#222222" :process="process" :barWidth="5">
+					 processColor="#FF5030" innerbgColor="#222222" :process="process" :barWidth="5">
 					<image class="es-w-50 es-h-50" src="@/static/images/ad/redpacked.png" mode="widthFix" ></image>
 				</gb-progress>
 		 </view>
@@ -161,49 +161,49 @@
 				searchHeight: 0,
 				showSearch: false,
 				isEmpty: false,
-				dataList: [], //用于数据循环的列表🌟💗
-				wHeight: 0, //获取的屏幕高度🌟💗
-				boxStyle: { //视频父视图样式🌟💗
+				dataList: [], //用于数据循环的列表
+				wHeight: 0, //获取的屏幕高度
+				boxStyle: { //视频父视图样式
 					'height': 0,
 					'width': 0,
 				},
-				videoStyle: { //视频,图片封面样式🌟💗
+				videoStyle: { //视频,图片封面样式
 					'height': 0,
 					'width': 0,
 					'marginTop':0
 				},
 				Heights: 0,
-				k: 0, //默认为0🌟💗
-				playIngIds: [], //正在播放的视频id列队,列队用于处理滑动过快导致的跳频问题🌟💗
+				k: 0, //默认为0
+				playIngIds: [], //正在播放的视频id列队,列队用于处理滑动过快导致的跳频问题
 				ready: false, //可忽略
-				isDragging: false, //false代表停止滑动🌟💗
-				refreshing: false, //用于下拉刷新🌟💗
-				windowWidth: 0, //获取屏幕宽度🌟💗
+				isDragging: false, //false代表停止滑动
+				refreshing: false, //用于下拉刷新
+				windowWidth: 0, //获取屏幕宽度
 				windowHeight: 0,
 				dex: [0, 0], //用于判断是上滑还是下滑,第一个存旧值,第二个存新值【目前在1.0.7已经废弃】
-				currents: 0, //用于左右滑动,0代表视频界面,1代表右滑界面🌟💗
-				platform: '', //用于获取操作系统:ios、android🌟💗
-				playIng: false, //用于视频初始化时是否播放,默认不播放🌟💗
-				videoTime: '', //视频总时长,这个主要用来截取时间数值💗
-				videoTimes: '', //视频时长,用这个来获取时间值,例如:00:30这个时间值💗
-				changeTime: '', //显示滑动进度条时变化的时间💗
+				currents: 0, //用于左右滑动,0代表视频界面,1代表右滑界面
+				platform: '', //用于获取操作系统:ios、android
+				playIng: false, //用于视频初始化时是否播放,默认不播放
+				videoTime: '', //视频总时长,这个主要用来截取时间数值
+				videoTimes: '', //视频时长,用这个来获取时间值,例如:00:30这个时间值
+				changeTime: '', //显示滑动进度条时变化的时间
 				isShowimage: false, //是否显示封面【1.0.4已废弃,但是意思需要记住】
-				currenttimes: 0, //当前时间💗
+				currenttimes: 0, //当前时间
 				isShowProgressBarTime: false, //是否拖动进度条,如果拖动(true)则显示进度条时间,否则不显示(false)【1.0.4已废弃,但是意思需要记住】
-				ProgressBarOpacity: 0.7, //进度条不拖动时的默认值,就是透明的💗
-				dotWidth: 0, //播放的小圆点,默认没有💗
-				deleteHeight: 0, //测试高度🌟💗
+				ProgressBarOpacity: 0.7, //进度条不拖动时的默认值,就是透明的
+				dotWidth: 0, //播放的小圆点,默认没有
+				deleteHeight: 0, //测试高度
 				statusBarHeight:0,
-				percent: 0, //百分小数💗
-				currentPosition: 0, //滑块当前位置💗//2.0已弃用,现已用于后端参数
-				currentPositions: 0, //滑块当前位置的副本💗//2.0已弃用,现已用于后端参数
-				newTime: 0, //跟手滑动后的最新时间💗
-				timeNumber: 0, //🌟💗
-				ProgressBarBottom: 20, //进度条离底部的距离💗
-				object_fit: 'contain', //视频样式默认包含🌟💗   contain :包含  fill:填充 cover:覆盖
-				mode: 'aspectFit', //图片封面样式🌟💗
-				timeout: "", //🌟用来阻止 setTimeout()方法
-				voice: "", //🌟用来阻止 setTimeout()方法
+				percent: 0, //百分小数
+				currentPosition: 0, //滑块当前位置//2.0已弃用,现已用于后端参数
+				currentPositions: 0, //滑块当前位置的副本//2.0已弃用,现已用于后端参数
+				newTime: 0, //跟手滑动后的最新时间
+				timeNumber: 0, //
+				ProgressBarBottom: 20, //进度条离底部的距离
+				object_fit: 'contain', //视频样式默认包含   contain :包含  fill:填充 cover:覆盖
+				mode: 'aspectFit', //图片封面样式
+				timeout: "", //用来阻止 setTimeout()方法
+				voice: "", //用来阻止 setTimeout()方法
 				oldVideo: "",
 				isAutoplay: false, //是否开启自动播放(默认不开启)
 				autoplayText: "开启自动播放",

Dosya farkı çok büyük olduğundan ihmal edildi
+ 443 - 364
pages/course/video/living-app.nvue


Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor