Signed-off-by: 李妹妹 <1639016684@qq.com>

App.vue

@@ -479,27 +479,27 @@
 					offlineMsg = msg;
 				});
 				// 获取启动时的通知
-				plus.push.getClientInfoAsync(function(info) { //unipush2.0连离线推送/点击桌面启动 (小米)
-					console.log("qxj getClientInfoAsync", info);
-					if (info.id && info.id == "unipush") { //unipush1.0 荣耀离线推送
-						offlineMsg = info;
-					}
-					if (info.title && info.content && info.payload) {
-						uni.switchTab({
-							url: 'pages_im/pages/conversation/conversationList/index'
-						});
-					}
-					if (info.launch && info.launch.payload) {
-						let newServerMsg = info.launch.payload;
-						console.log('应用通过通知启动:', info);
-						uni.switchTab({
-							url: 'pages_im/pages/conversation/conversationList/index'
-						});
-						//uni.$u.throttle(() => that.notifyGoToChat(newServerMsg), 1000);
-					}
-				}, function(err) {
+				// plus.push.getClientInfoAsync(function(info) { //unipush2.0连离线推送/点击桌面启动 (小米)
+				// 	console.log("qxj getClientInfoAsync", info);
+				// 	if (info.id && info.id == "unipush") { //unipush1.0 荣耀离线推送
+				// 		offlineMsg = info;
+				// 	}
+				// 	if (info.title && info.content && info.payload) {
+				// 		uni.switchTab({
+				// 			url: 'pages_im/pages/conversation/conversationList/index'
+				// 		});
+				// 	}
+				// 	if (info.launch && info.launch.payload) {
+				// 		let newServerMsg = info.launch.payload;
+				// 		console.log('应用通过通知启动:', info);
+				// 		uni.switchTab({
+				// 			url: 'pages_im/pages/conversation/conversationList/index'
+				// 		});
+				// 		//uni.$u.throttle(() => that.notifyGoToChat(newServerMsg), 1000);
+				// 	}
+				// }, function(err) {
 
-				});
+				// });
 			},
 			getSystemFontScale: function() {
 				let scale = 1;

androidPrivacy.json

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

api/address.js

@@ -8,7 +8,7 @@ let request = new Request().http
  	 return request('/app/address/getCitys',null,'GET');
  }
  export function getAddressList() {
- 	 return request('/app/address/getAddressList',null,'GET');
+ 	 return request('/store/app/address/getAddressList',null,'GET');
  }
 
  export function getAddressById(data) {

api/common.js

@@ -70,9 +70,9 @@ export function getQwCompanyList(data) {
 export function isOpen() {
 	return request('/app/common/im/isOpen', {}, 'POST');
 }
-export function getWeixinOrderTemps() {
-	return request('/store/app/common/getWeixinOrderTemps', null, 'GET');
-}
+ export function getWeixinOrderTemps() {
+ 	 return request('/store/app/common/getWeixinOrderTemps',null,'GET');
+ }
 export function getWeixinPrescribeTemps() {
 	return request('/app/common/getWeixinPrescribeTemps', null, 'GET');
 }

api/index.js

@@ -8,6 +8,9 @@ let request = new Request().http
  export function getDicts(data) {
   	 return request('/store/app/common/getDicts',data,'GET');
  }
+ // export function getDicts(data) {
+ //  	 return request('/app/common/getDicts',data,'GET');
+ // }
  export function getFamousPrescribeList(data) {
  	 return request('/app/index/getFamousPrescribeList',data,'GET');
  }

api/liveOrder.js

@@ -3,6 +3,7 @@ let request = new Request().http
 const api = {
 	// 直播订单
 	liveOrderList: '/appLive/app/live/liveOrder/list', // 订单列表
+	//liveOrderList: '/app/live/liveOrder/getMyStoreOrderList', // 订单列表
 	createliveOrder: '/appLive/app/live/liveOrder/create', // 创建订单
 	createReward: '/appLive/app/live/liveOrder/createReward', // 创建中奖订单
 	

api/product.js

@@ -40,9 +40,18 @@ let request = new Request().http
  export function getTuiProducts(data) {
  	 return request('/store/app/product/getTuiProducts',data,'GET');
  }
- export function getStoreProductAttrValueList(data) {
- 	 return request('/store/app/product/getStoreProductAttrValueList',data,'GET');
- }
+export function getStoreProductAttrValueList(data) {
+	 return request('/store/app/product/getStoreProductAttrValueList',data,'GET');
+}
+export function checkPurchaseLimit(data) {
+	 return request('/store/app/product/checkPurchaseLimit',data,'GET');
+}
+export function checkCartPurchaseLimit(data) {
+	 return request('/store/app/product/checkCartPurchaseLimit',data,'POST','application/json;charset=UTF-8');
+}
+export function checkOrderPurchaseLimit(data) {
+	 return request('/store/app/product/checkOrderPurchaseLimit',data,'GET');
+}
  
  
  

api/storeOrder.js

@@ -3,62 +3,34 @@ let request = new Request().http
 
  
  export function getMyStoreOrderList(data) {
- 	 return request('/store/app/storeOrder/getMyStoreOrderList',data,'GET');
+ 	 return request('/store/app/storeOrder/getMyStoreOrderList',data,'GET');//旧版
+	 //return request('/app/order/getMyMergedOrderList',data,'GET')
+ } 
+ export function getCompanyStoreOrderList(data) {
+ 	 return request('/store/app/storeOrder/getCompanyStoreOrderList',data,'GET');
  } 
- 
- export function getCompanyUserStoreOrderList(data) {
- 	 return request('/store/app/storeOrder/getCompanyUserStoreOrderList',data,'GET');
- }
- 
- 
  export function getMyStoreOrderById(data) {
  	 return request('/store/app/storeOrder/getMyStoreOrderById',data,'GET');
  } 
  
+ 
  export function getStoreOrderById(data) {
  	 return request('/store/app/storeOrder/getStoreOrderById',data,'GET');
  } 
  
- export function getCompanyUserStoreOrderById(data) {
- 	 return request('/app/storeOrder/getCompanyUserStoreOrderById',data,'GET');
- } 
- 
- 
-  
- export function pay(data) {
- 	 return request('/app/storeOrder/pay',data,'POST','application/json;charset=UTF-8');
- }
- export function compute(data) {
- 	 return request('/app/storeOrder/compute',data,'POST','application/json;charset=UTF-8');
- }
- export function cancelOrder(data) {
- 	 return request('/store/app/storeOrder/cancelOrder',data,'POST','application/json;charset=UTF-8');
- }
- export function finishOrder(data) {
- 	 return request('/app/storeOrder/finishOrder',data,'POST','application/json;charset=UTF-8');
- }
- export function getExpress(data) {
- 	 return request('/app/storeOrder/getExpress',data,'POST','application/json;charset=UTF-8');
- }
- export function getOrderCount() {
- 	 return request('/app/storeOrder/getOrderCount',null,'GET');
- } 
  
- export function zfbPayment(data) {
-  	return request('/app/storeOrder/zfbPayment',data,'POST','application/json;charset=UTF-8');
+ export function confirm(data) {
+ 	 return request('/store/app/storeOrder/confirm',data,'POST','application/json;charset=UTF-8');
  }
- 
- 
-export function confirm(data) {
- return request('/store/app/storeOrder/confirm',data,'POST','application/json;charset=UTF-8');
-}
-
  export function computed(data) {
  	 return request('/store/app/storeOrder/computed',data,'POST','application/json;charset=UTF-8');
  }
  export function create(data) {
  	 return request('/store/app/storeOrder/create',data,'POST','application/json;charset=UTF-8');
  }
+ export function pay(data) {
+ 	 return request('/store/app/storeOrder/pay',data,'POST','application/json;charset=UTF-8');
+ }
  
  export function editPayType(data) {
  	 return request('/store/app/storeOrder/editPayType',data,'POST','application/json;charset=UTF-8');
@@ -76,6 +48,23 @@ export function confirm(data) {
  	 return request('/store/app/storeOrder/otherPaymentRemain',data,'POST','application/json;charset=UTF-8');
  }
  
+ 
+ export function cancelOrder(data) {
+ 	 return request('/store/app/storeOrder/cancelOrder',data,'POST','application/json;charset=UTF-8');
+	 
+ }
+ // 取消直播订单
+ export function cancelLiveOrder(data) {
+ 	return request('/store/app/live/liveOrder/cancelOrder', data, 'POST', 'application/json;charset=UTF-8')
+ }
+ export function finishOrder(data) {
+ 	 return request('/store/app/storeOrder/finishOrder',data,'POST','application/json;charset=UTF-8');
+ }
+ export function getExpress(data) {
+ 	 return request('/store/app/storeOrder/getExpress',data,'POST','application/json;charset=UTF-8');
+ }
+ 
+ 
  export function confirmPackageOrder(data) {
  	 return request('/store/app/storeOrder/confirmPackageOrder',data,'POST','application/json;charset=UTF-8');
  }
@@ -87,19 +76,20 @@ export function confirm(data) {
  	 return request('/store/app/storeOrder/createPackageOrder',data,'POST','application/json;charset=UTF-8');
  }
  
+ export function getOrderCount() {
+ 	 return request('/store/app/storeOrder/getOrderCount',null,'GET');
+ } 
+ 
  export function orderBindUser(data) {
  	 return request('/store/app/storeOrder/orderBindUser',data,'POST','application/json;charset=UTF-8');
  }  
-  export function getCompanyStoreOrderList(data) {
-  	 return request('/store/app/storeOrder/getCompanyStoreOrderList',data,'GET');
+export function clearPayType(data) {
+ 	 return request('/store/app/live/liveOrder/clearPayType',data,'POST','application/json;charset=UTF-8');
   }
  
- //支付宝
- export function aliPayment(data) {
- 	 return request('/app/api/aliPayment',data,'POST','application/json;charset=UTF-8');
- }
+// 删除订单
+export function deleteOrder(data) {
+	return request('/store/app/order/deleteOrder', data, 'POST', 'application/json;charset=UTF-8');
+}
  
- //微信
- export function wxPayment(data) {
- 	 return request('/app/api/wxPayment',data,'POST','application/json;charset=UTF-8');
- }
+ 

assets/css/common.less

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

assets/css/czy/es.2.color.css

@@ -1,7 +1,7 @@
 /* backgroundColor color borderColor */
-.es-bc,.es-max-btn{ background: #2583EB;color:white; }
-.es-c{ color: #2583EB !important; }
-.es-brc{ border:1px #2583EB solid !important; }
+.es-bc,.es-max-btn{ background: #FF233C;color:white; }
+.es-c{ color: #FF233C !important; }
+.es-brc{ border:1px #FF233C 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:#2583EB; color:white; }
+.es-bc-theme{ background-color:#FF233C; color:white; }
 
 .es-bc-yellow{ background:#F57221; color:white; }
 .es-c-yellow{ color:#F57221; }

common/request.js

@@ -2,42 +2,58 @@
 export default class Request {
 	http(router, data = {}, method, contentType) {
 		let that = this;
-		let path = 'https://userapp.zkhj6.com'; //app
+		// let path2 = 'https://userapp.klbycp.com'; //百域承品
+	    let path = 'https://userapp.klbycp.com'; //百域承品
+		// let path2 = 'https://userapp.zkhj6.com';
+		// let path = 'https://userapp.zkhj6.com';
 		let token = uni.getStorageSync('AppToken');
-		let live= uni.getStorageSync('AppToken')
-		uni.setStorageSync('liveToken',live)
-		// #ifdef H5
-		path = 'https://userapp.zkhj6.com'; //h5接口
-		// #endif
-
+		//let live= uni.getStorageSync('AppToken')
+		//uni.setStorageSync('liveToken',live)
+		// // #ifdef H5
+		// path = 'https://userapp.klbycp.com'; //h5接口
+		// // #endif
+        if (router.indexOf("/live/liveData/like") != -1) {
+        	path = 'https://im.fhhx.runtzh.com';
+        }
+        // if (router.indexOf("/common") != -1) {
+        // 	path = path2;
+        // }
+        // if (router.indexOf("/app/order/getMyMergedOrderList") != -1 || router.indexOf("/app/order/deleteOrder") != -
+        // 	1) {
+        // 	path = path2
+        // }
+        
+        // if (router.indexOf("/app/order/getMergedAfterSalesList") != -1) {
+        // 	path = path2
+        // }
 		// 看课模块
 		if (router.indexOf("/app/course/getRealLink") != -1) {
-			path = 'https://userapp.zkhj6.com';
+			path = 'https://userapp.klbycp.com';
 		}
 		if(router.indexOf("/appLive") !== -1) {
 			router = router.replace('/appLive','')
-			path ='https://userapp.zkhj6.com';
+			path ='https://userapp.klbycp.com';
 			// router = router.replace('/appLive','')
 			
 			// path ='http://z2fae9e9.natappfree.cc'
 		}
 		// 腕表模块
-		if (router.indexOf("/watch-api") != -1) {
-			router = router.replace('/watch-api', '')
-			// path = 'http://42.194.245.189:8114'
-		}
-		// doctorAi模块
-		if (router.indexOf("/doctorAi") != -1) {
-			router = router.replace('/doctorAi', '')
-			// path = 'http://doctor.ai.cdwjyyh.com'
-		}
+		// if (router.indexOf("/watch-api") != -1) {
+		// 	router = router.replace('/watch-api', '')
+		// 	// path = 'http://42.194.245.189:8114'
+		// }
+		// // doctorAi模块
+		// if (router.indexOf("/doctorAi") != -1) {
+		// 	router = router.replace('/doctorAi', '')
+		// 	// path = 'http://doctor.ai.cdwjyyh.com'
+		// }
 		// path = 'http://192.168.110.18:8113'  
 		// 手动发课
 		// path = 'http://192.168.110.225:8113'
 		if(router.indexOf("/companyapp") != -1 ) {
 			// path = 'http://192.168.110.225:8007'
 			// path ='https://userapp.zkhj6.com';
-			path ='https://companyapi.zkhj6.com';
+		    path ='https://userapp.klbycp.com';
 			router = router.replace('/companyapp','')
 			token = uni.getStorageSync('ManageToken');
 		}
@@ -77,8 +93,8 @@ export default class Request {
 		// 	  title: '加载中'
 		// });
 		return new Promise((resolve, reject) => {
-			let liveToken = uni.getStorageSync('liveToken');
-			console.log('indexlogin)))))))))))',uni.getStorageSync('liveToken'))
+			//let liveToken = uni.getStorageSync('liveToken');
+			///console.log('indexlogin)))))))))))',uni.getStorageSync('liveToken'))
 			let CompanyUserToken = uni.getStorageSync('CompanyUserToken');
 			var httpContentType = 'application/x-www-form-urlencoded';
 			if (contentType != undefined) {
@@ -86,12 +102,12 @@ export default class Request {
 			}
 			var routers = router;
 			// 直播模块使用liveToken
-			let useToken = token;
+			//let useToken = token;
 			// 检查是否为直播模块路径
-			const isLiveApi = router.indexOf("/live") !== -1;
-			if(isLiveApi) {
-				useToken = liveToken
-			}
+			// const isLiveApi = router.indexOf("/live") !== -1;
+			// if(isLiveApi) {
+			// 	useToken = liveToken
+			// }
 			//console.log("---qxj request url",`${path}${router}`+" params:"+JSON.stringify(data)+" \n AppToken:"+token);
 			// 请求
 			uni.request({

components/Menu.vue

@@ -136,7 +136,7 @@ export default {
 				 
 			}
 			.active{
-				color: #2583EB;
+				color: #FF233C;
 				
 			}
 		}
@@ -156,7 +156,7 @@ export default {
 		.dot-active {
 			width: 40rpx;
 			height: 3rpx;
-			background: #2583EB;
+			background: #FF233C;
 			margin-right: 10rpx;
 		}
 	}

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

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

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

components/evan-switch/evan-switch.vue

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

components/good-list/good-list.vue

@@ -141,7 +141,7 @@
 						font-weight: 500;
 						line-height: 1;
 						&.success{
-							color: #2583EB;
+							color: #FF233C;
 						}
 						&.black{
 							color: #111111;
@@ -183,7 +183,7 @@
 								display: inline-block;
 								padding: 0 6upx;
 								height: 30upx;
-								background: linear-gradient(90deg, #2583EB 0%, #2BC7A4 100%);
+								background: linear-gradient(90deg, #FF233C 0%, #2BC7A4 100%);
 								border-radius: 4upx;
 								margin-right: 10upx;
 								font-size: 22upx;
@@ -293,7 +293,7 @@
 								color: #666666;
 							}
 							&.pay{
-								background: #2583EB;
+								background: #FF233C;
 								color: #FFFFFF;
 								position: relative;
 								.share{

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="" :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: #2583EB;color: #fff">
+							style="min-height: 40px;border-radius: 10px;display: flex;align-items: center;justify-content: center;font-weight: 700;font-size: 15px;background: #FF233C;color: #fff">
 								App内打开
 							</button>
 					  	</component>

components/indexSubsection/indexSubsection.vue

@@ -69,7 +69,7 @@
 			text-align: center;
 			border-radius: 26rpx 26rpx 26rpx 26rpx;
 			color: #fff;
-			color: #2583EB;
+			color: #FF233C;
 		}
 		&-active {
 			background: #fff;

components/lx-calendar/lx-calendar.vue

@@ -614,7 +614,7 @@ export default {
 			}
 			&.today{
 				background: @color; 
-				color: #2583EB;
+				color: #FF233C;
 			}
 		}
 		.dot{

components/me-tabs/me-tabs.vue

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

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>
@@ -397,7 +397,7 @@
 						height: 68rpx;
 						line-height: 68rpx;
 						text-align: center;
-						background: #2583EB;
+						background: #FF233C;
 						border-radius: 8rpx 8rpx 8rpx 8rpx;
 						font-family: PingFang SC, PingFang SC;
 						font-weight: 400;

components/n-tabs/n-tabs.vue

@@ -53,7 +53,7 @@
 			},
 			actColor: {
 				type: String,
-				default: '#2583EB'
+				default: '#FF233C'
 			},
 		},
 		data() {

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]=='#2583EB'?'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]=='#FF233C'?'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] = '#2583EB'; // 当前日期背景颜色
+							cache[2] = '#FF233C'; // 当前日期背景颜色
 							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] = '#2583EB'
+							cache[2] = '#FF233C'
 							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] == '#2583EB') {
+							if(this.dates[i][j][0] != '#BBBBBB' && this.dates[i][j][2] == '#FF233C') {
 								this.dates[i][j][2] = '#fff'
 								this.dates[i][j][0] = '#222222'
 							}
 						}
 					}
-					this.dates[w][k][2] = '#2583EB'
+					this.dates[w][k][2] = '#FF233C'
 					this.dates[w][k][0] = '#fff'
-					let newValue = ['#fff', day[1], "#2583EB"]
+					let newValue = ['#fff', day[1], "#FF233C"]
 					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: #2583EB;
+						background-color: #FF233C;
 					}
 				}
 			}

components/todo-list.vue

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

manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "中康未来",
-    "appid" : "__UNI__A606D24",
+    "name" : "乐享韶华",
+    "appid" : "__UNI__3983062",
     "description" : "",
-    "versionName" : "1.0.8",
-    "versionCode" : 108,
+    "versionName" : "1.0.0",
+    "versionCode" : 100,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -137,7 +137,10 @@
                 "inAppPurchase" : [ "vip_month_one", "vip_month_twelve", "vip_month_three" ],
                 "capabilities" : {
                     "entitlements" : {
-                        "com.apple.developer.associated-domains" : [ "applinks:zklink.ylrzcloud.com" ]
+                        "com.apple.developer.associated-domains" : [
+                            "applinks:zklink.ylrzcloud.com",
+                            "applinks:static-mp-3b8a6ec4-9bdf-43af-81e7-d3b36a017c34.next.bspapp.com"
+                        ]
                     }
                 },
                 "privacyDescription" : {
@@ -154,15 +157,15 @@
                 "ad" : {},
                 "share" : {
                     "weixin" : {
-                        "appid" : "wx40f3de7bd405fb5c",
-                        "UniversalLinks" : ""
+                        "appid" : "wxecdaff01852ca309",
+                        "UniversalLinks" : "https://static-mp-3b8a6ec4-9bdf-43af-81e7-d3b36a017c34.next.bspapp.com/uni-universallinks/__UNI__3983062/"
                     }
                 },
                 "speech" : {},
                 "oauth" : {
                     "weixin" : {
-                        "appid" : "wx40f3de7bd405fb5c",
-                        "UniversalLinks" : ""
+                        "appid" : "wxecdaff01852ca309",
+                        "UniversalLinks" : "https://static-mp-3b8a6ec4-9bdf-43af-81e7-d3b36a017c34.next.bspapp.com/uni-universallinks/__UNI__3983062/"
                     },
                     "univerify" : {}
                 },
@@ -171,22 +174,7 @@
                         "__platform__" : [ "ios", "android" ]
                     }
                 },
-                "push" : {
-                    "unipush" : {
-                        "version" : "2",
-                        "offline" : true,
-                        "hms" : {},
-                        "vivo" : {},
-                        "honor" : {},
-                        "icons" : {
-                            "small" : {
-                                "hdpi" : "unpackage/res/icons/36x36.png"
-                            }
-                        },
-                        "oppo" : {},
-                        "mi" : {}
-                    }
-                },
+                "push" : {},
                 "maps" : {},
                 "payment" : {
                     "alipay" : {
@@ -194,8 +182,8 @@
                     },
                     "weixin" : {
                         "__platform__" : [ "ios", "android" ],
-                        "appid" : "wx40f3de7bd405fb5c",
-                        "UniversalLinks" : ""
+                        "appid" : "wxecdaff01852ca309",
+                        "UniversalLinks" : "https://static-mp-3b8a6ec4-9bdf-43af-81e7-d3b36a017c34.next.bspapp.com/uni-universallinks/__UNI__3983062/"
                     }
                 },
                 "statics" : {}
@@ -207,9 +195,9 @@
                 "androidStyle" : "default",
                 "useOriginalMsgbox" : true,
                 "android" : {
-                    "hdpi" : "static/images/launch/480_762.png",
-                    "xhdpi" : "static/images/launch/720_1242.png",
-                    "xxhdpi" : "static/images/launch/1080_2340.png"
+                    "hdpi" : "static/images/launch/480.png",
+                    "xhdpi" : "static/images/launch/720.png",
+                    "xxhdpi" : "static/images/launch/1080x2340.png"
                 },
                 "iosStyle" : "common"
             },
@@ -367,7 +355,7 @@
     //     "MODE" : 2 // 启用Vue2兼容模式
     // }
     "h5" : {
-        "title" : "中康未来",
+        "title" : "乐享韶华",
         "devServer" : {
             "disableHostCheck" : true,
             "https" : false
@@ -451,5 +439,5 @@
             "bundleName" : "com.mytek.zklive1"
         }
     },
-    "_spaceID" : "mp-788b1d8f-c300-465c-9e38-c986b162ae93"
+    "_spaceID" : "mp-3b8a6ec4-9bdf-43af-81e7-d3b36a017c34"
 }

pages.json

@@ -18,7 +18,41 @@
 			"aliasPath": "/",
 			"name": "home",
 			"style": {
-				"navigationBarBackgroundColor": "#2583EB",
+				"navigationBarBackgroundColor": "#FF233C",
+				"navigationBarTextStyle": "black",
+				"scrollIndicator": "none",
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"backgroundColor": "#f7f7f7",
+				"backgroundColorTop": "#ffffff",
+				"bounce": "none",
+				"titleNView": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/index/course",
+			"aliasPath": "/",
+			"name": "home",
+			"style": {
+				"navigationBarBackgroundColor": "#FF233C",
+				"navigationBarTextStyle": "black",
+				"scrollIndicator": "none",
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"backgroundColor": "#f7f7f7",
+				"backgroundColorTop": "#ffffff",
+				"bounce": "none",
+				"titleNView": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/index/video",
+			"aliasPath": "/",
+			"name": "home",
+			"style": {
+				"navigationBarBackgroundColor": "#FF233C",
 				"navigationBarTextStyle": "black",
 				"scrollIndicator": "none",
 				"navigationBarTitleText": "",
@@ -51,58 +85,64 @@
 		{
 			"path": "pages/shopping/index",
 			"style": {
-				"navigationBarTitleText": "健康产品",
-				// "navigationStyle": "custom",
+				"navigationBarTitleText": "商城",
+				"navigationStyle": "custom",
 				"enablePullDownRefresh": false
 			}
-
+		
 		},
 		{
+			"path": "pages/user/index",
+			"style": {
+				"navigationBarTitleText": "我的",
+				"navigationStyle": "custom",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		}, {
+			"path": "pages/shopping/productDetails",
+			"style": {
+				"navigationBarTitleText": "产品详情",
+				"enablePullDownRefresh": false
+			}
+		
+		}, {
 			"path": "pages/shopping/cart",
 			"style": {
 				"navigationBarTitleText": "购物车",
 				"enablePullDownRefresh": false
 			}
-
+		
+		}, {
+			"path": "pages/shopping/confirmOrder",
+			"style": {
+				"navigationBarTitleText": "确认订单",
+				"enablePullDownRefresh": false
+			}
+		
+		}, {
+			"path": "pages/shopping/paymentOrder",
+			"style": {
+				"navigationBarTitleText": "去支付",
+				"enablePullDownRefresh": false
+			}
+		
+		}, {
+			"path": "pages/shopping/payOrder",
+			"style": {
+				"navigationBarTitleText": "推荐服务支付",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/shopping/success",
+			"style": {
+				"navigationBarTitleText": "支付成功",
+				"enablePullDownRefresh": false
+			}
+		
 		},
-		//     {
-		//         "path" : "pages/shopping/prescribe",
-		//         "style" :                                                                                    
-		//         {
-		//             "navigationBarTitleText": "填写处方信息",
-		// "navigationStyle": "custom",
-		//             "enablePullDownRefresh": false
-		//         }
-
-		//     },
-		// {
-		//           "path" : "pages/doctor/doctorIm",
-		//           "style" :                                                                                    
-		//           {
-		//               "navigationBarTitleText": "问诊会话",
-		//               "enablePullDownRefresh": false
-		//           }
-
-		//       },
-
-		// {
-		//     "path" : "pages/doctor/paymentOrder",
-		//     "style" :                                                                                    
-		//     {
-		//         "navigationBarTitleText": "去支付",
-		//         "enablePullDownRefresh": false
-		//     }
-
-		// }
-		// ,{
-		//     "path" : "pages/doctor/doctorOrderIM",
-		//     "style" :                                                                                    
-		//     {
-		//         "navigationBarTitleText": "问诊会话",
-		//         "enablePullDownRefresh": false
-		//     }
-
-		// }
 		{
 			"path": "pages/auth/wechatList",
 			"style": {
@@ -172,7 +212,7 @@
 		{
 			"path": "pages/course/index",
 			"style": {
-				// "navigationBarBackgroundColor": "#2583EB",
+				// "navigationBarBackgroundColor": "#FF233C",
 				"navigationBarTextStyle": "black",
 				"scrollIndicator": "none",
 				"bounce": "none",
@@ -188,7 +228,7 @@
 			"path": "pages/course/learning",
 			"name": "learning",
 			"style": {
-				"navigationBarBackgroundColor": "#2583EB",
+				"navigationBarBackgroundColor": "#FF233C",
 				"navigationBarTextStyle": "white",
 				"scrollIndicator": "none",
 				"bounce": "none",
@@ -214,7 +254,7 @@
 			"path": "pages/course/famousHall",
 			"name": "famousHall",
 			"style": {
-				"navigationBarBackgroundColor": "#2583EB",
+				"navigationBarBackgroundColor": "#FF233C",
 				"navigationBarTextStyle": "black",
 				"scrollIndicator": "none",
 				"bounce": "none",
@@ -330,7 +370,7 @@
 		{
 			"path": "pages/course/vipBuy",
 			"style": {
-				"navigationBarTitleText": "中康未来会员",
+				"navigationBarTitleText": "乐享韶华会员",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom",
 				"backgroundColor": "#1B1F22;",
@@ -769,7 +809,7 @@
 			"aliasPath": "/",
 			"name": "mine",
 			"style": {
-				"navigationBarBackgroundColor": "#2583EB",
+				"navigationBarBackgroundColor": "#FF233C",
 				"navigationBarTextStyle": "black",
 				"scrollIndicator": "none",
 				"bounce": "none",
@@ -904,7 +944,7 @@
 			"style": {
 				"navigationBarTitleText": "订单详情",
 				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#2583EB",
+				"navigationBarBackgroundColor": "#FF233C",
 				"navigationBarTextStyle": "white"
 			}
 		},
@@ -1026,7 +1066,7 @@
 			"style": {
 				"navigationBarTitleText": "医生详情",
 				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#2583EB",
+				"navigationBarBackgroundColor": "#FF233C",
 				"navigationBarTextStyle": "white"
 			}
 		},
@@ -1368,7 +1408,7 @@
 			"style": {
 				"navigationBarTitleText": "订单详情",
 				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#2583EB",
+				"navigationBarBackgroundColor": "#FF233C",
 				"navigationBarTextStyle": "white"
 			}
 		},
@@ -1386,7 +1426,7 @@
 			"style": {
 				"navigationBarTitleText": "订单详情",
 				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#2583EB",
+				"navigationBarBackgroundColor": "#FF233C",
 				"navigationBarTextStyle": "white"
 			}
 		},
@@ -1574,7 +1614,7 @@
 			"style": {
 				"navigationBarTitleText": "订单详情",
 				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#2583EB",
+				"navigationBarBackgroundColor": "#FF233C",
 				"navigationBarTextStyle": "white"
 			}
 		},
@@ -1969,7 +2009,7 @@
 			"style": {
 				"navigationBarTitleText": "售后详情",
 				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#2583EB",
+				"navigationBarBackgroundColor": "#FF233C",
 				"navigationBarTextStyle": "white"
 			}
 		},
@@ -2175,7 +2215,7 @@
 		{
 			"path": "pages/index/appDownload",
 			"style": {
-				"navigationBarTitleText": "中康未来-APP下载",
+				"navigationBarTitleText": "乐享韶华-APP下载",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black",
@@ -4225,6 +4265,25 @@
 						"navigationBarTextStyle": "black"
 					}
 				},
+					{
+						"path": "productList",
+						"style": {
+							"navigationBarTitleText": "商品列表"
+						}
+					},
+					{
+						"path": "recommendList",
+						"style": {
+							"navigationBarTitleText": "商品列表"
+						}
+					},
+					{
+						"path": "productSearch",
+						"style": {
+							"navigationBarTitleText": "产品搜索"
+						}
+					
+					},
 				{
 					"path": "productDetails",
 					"style": {
@@ -4505,31 +4564,27 @@
 	],
 	"tabBar": {
 		"color": "#999999",
-		"selectedColor": "#2583EB",
+		"selectedColor": "#FF233C",
 		"borderStyle": "white",
 		"backgroundColor": "#ffffff",
 		"height": "64px",
-		"fontSize": "12px",
-		"iconWidth": "20px",
+		"fontSize": "14px",
+		"iconWidth": "24px",
 		"spacing": "4px",
-		"list": [{
-				"pagePath": "pages_im/pages/conversation/conversationList/index",
-				"iconPath": "/static/image/tabbar/tab_new_icon.png",
-				"selectedIconPath": "/static/image/tabbar/tab_new_on_icon.png",
-				"text": "消息"
-			},
-			{
-				"pagePath": "pages/course/video/living-app",
-				"iconPath": "/static/image/tabbar/tab_video_icon.png",
-				"selectedIconPath": "/static/image/tabbar/tab_video_on_icon.png",
-				"text": "短视频"
-			},
+		"list": [
 			// {
-			// 	"pagePath": "pages/index/index",
-			// 	"iconPath": "/static/image/tabbar/tab_home_icon.png",
-			// 	"selectedIconPath": "/static/image/tabbar/tab_home_on_iconx.png",
-			// 	"text": "首页"
+			// 	"pagePath": "pages_im/pages/conversation/conversationList/index",
+			// 	"iconPath": "/static/image/tabbar/tab_new_icon.png",
+			// 	"selectedIconPath": "/static/image/tabbar/tab_new_on_icon.png",
+			// 	"text": "消息"
 			// },
+			
+			{
+				"pagePath": "pages/index/index",
+				"iconPath": "/static/image/tabbar/home.png",
+				"selectedIconPath": "/static/image/tabbar/home_sel.png",
+				"text": "首页"
+			},
 
 			// {
 			// 	"pagePath": "pages/course/index",
@@ -4539,17 +4594,23 @@
 			// },
 			{
 				"pagePath": "pages_mall/index",
-				"iconPath": "/static/image/tabbar/shop_mall.png",
-				"selectedIconPath": "/static/image/tabbar/shop_mall_sel.png",
+				"iconPath": "/static/image/tabbar/mall.png",
+				"selectedIconPath": "/static/image/tabbar/mall_sel.png",
 				"text": "商城"
 			},
 			{
-				"pagePath": "pages_enter/index",
-				"iconPath": "/static/image/tabbar/tab_hall_icon.png",
-				"selectedIconPath": "/static/image/tabbar/shop_mall_sel.png",
-				"text": "娱乐"
+				"pagePath": "pages/course/video/living-app",
+				"iconPath": "/static/image/tabbar/video.png",
+				"selectedIconPath": "/static/image/tabbar/video_sel.png",
+				"text": "短视频"
 			},
 			// {
+			// 	"pagePath": "pages_enter/index",
+			// 	"iconPath": "/static/image/tabbar/tab_hall_icon.png",
+			// 	"selectedIconPath": "/static/image/tabbar/shop_mall_sel.png",
+			// 	"text": "娱乐"
+			// },
+			// {
 			// 	"pagePath": "pages_im/pages/contact/index/index",
 			// 	"iconPath": "/static/image/tabbar/tab_video_icon.png",
 			// 	"selectedIconPath": "/static/image/tabbar/tab_video_on_icon.png",
@@ -4557,8 +4618,8 @@
 			// },
 			{
 				"pagePath": "pages/user/index",
-				"iconPath": "/static/image/tabbar/tab_my_icon.png",
-				"selectedIconPath": "/static/image/tabbar/tab_my_on_icon.png",
+				"iconPath": "/static/image/tabbar/my.png",
+				"selectedIconPath": "/static/image/tabbar/my_sel.png",
 				"text": "我的"
 			}
 

pages/ai/chat.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="#2583EB" 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="#FF233C" size="20" style="margin-right: 5rpx;"></u-icon>复制</view>
 							</view>
 						</view>
 					</view>
@@ -351,7 +351,7 @@
 		font-family: PingFang SC, PingFang SC;
 		font-weight: 500;
 		font-size: 28rpx;
-		color: #2583EB;
+		color: #FF233C;
 		background-color: #ffe2d1;
 		padding: 4rpx 10rpx;
 		border-radius: 10rpx;

pages/ai/consultation.vue

@@ -464,7 +464,7 @@
 			font-weight: 500;
 			font-size: 30rpx;
 			color: #FFFFFF;
-			background-color: #2583EB;
+			background-color: #FF233C;
 		}
 	}
 
@@ -538,7 +538,7 @@
 								border-radius: 10px;
 								padding: 10px 20px;
 								background-color: #fff;
-								color: #2583EB;
+								color: #FF233C;
 								font-size: 14px;
 							}
 						}
@@ -558,7 +558,7 @@
 						margin-right: 10px;
 						border-radius: 10px 0 10px 10px;
 						padding: 10px;
-						background-color: #2583EB;
+						background-color: #FF233C;
 						color: #fff;
 						font-size: 16px;
 						font-family: PingFang SC;

pages/article/articleDetails.vue

@@ -211,7 +211,7 @@
 			font-family: PingFang SC;
 			font-weight: 500;
 			color: #FFFFFF;
-			background: #2583EB;
+			background: #FF233C;
 			border-radius: 40upx;
 			display: flex;
 			align-items: center;

pages/article/chineseMedicineDetails.vue

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

pages/article/chineseMedicineList.vue

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

pages/article/diseaseDetails.vue

@@ -191,7 +191,7 @@
 			.line{
 				width: 6rpx;
 				height:30rpx;
-				background-color: #2583EB;
+				background-color: #FF233C;
 				 
 			}
 			.title{

pages/article/diseaseList.vue

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

pages/article/famousPrescribeDetails.vue

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

pages/article/famousPrescribeList.vue

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

pages/article/medicatedFoodDetails.vue

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

pages/article/medicatedFoodList.vue

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

pages/article/questionsDetails.vue

@@ -262,7 +262,7 @@
 			font-family: PingFang SC;
 			font-weight: 500;
 			color: #FFFFFF;
-			background: #2583EB;
+			background: #FF233C;
 			border-radius: 40upx;
 			display: flex;
 			align-items: center;
@@ -307,7 +307,7 @@
 				font-size: 22upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #2583EB;
+				color: #FF233C;
 				line-height: 1;
 			}
 			 

pages/article/questionsList.vue

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

pages/article/test.vue

@@ -338,7 +338,7 @@
 								margin-right: 10rpx;
 								border-radius: 15rpx;
 								padding: 15rpx;
-								background-color: #2583EB;
+								background-color: #FF233C;
 								color: #fff;
 								font-size: 28upx;
 								font-family: PingFang SC;
@@ -401,7 +401,7 @@
 			justify-content: center;
 			align-items: center;
 			width: 100%;
-			background-color: #2583EB;
+			background-color: #FF233C;
 			font-size: 24upx;
 			font-family: PingFang SC;
 			font-weight: bold;
@@ -534,8 +534,8 @@
 						}
 					}
 					.active{
-						border: 1rpx solid #2583EB;
-						background-color: #2583EB;
+						border: 1rpx solid #FF233C;
+						background-color: #FF233C;
 						color: #fff;
 					}
 				}
@@ -553,10 +553,10 @@
 				margin: 0rpx 30rpx;
 				border-radius: 60rpx;
 				width: 100%;
-				border: 1rpx solid #2583EB;
+				border: 1rpx solid #FF233C;
 				font-size: 32supx;				font-family: PingFang SC;				color: #fff;
 				font-weight: bold;
-				background-color: #2583EB;
+				background-color: #FF233C;
 				display: flex;
 				align-items: center;
 				justify-content: center;

pages/article/testDetails.vue

@@ -243,12 +243,12 @@
 			 		font-family: PingFang SC;
 			 		font-weight: bold;
 			 		color: #FFFFFF;
-			 		background: #2583EB;
+			 		background: #FF233C;
 			 		border-radius: 50upx;
 			 	}
 				.share{
 					color: #FFFFFF;
-					background: #2583EB;
+					background: #FF233C;
 					margin-top: 20rpx;
 				}
 			 }

pages/article/testList.vue

@@ -184,7 +184,7 @@
 					.people-num{
 						font-size: 24upx;
 						font-family: PingFang SC;
-						color: #2583EB;
+						color: #FF233C;
 						.num{
 							font-weight: bold;
 							color: #814E1B;
@@ -195,7 +195,7 @@
 						font-size: 24upx;
 						font-family: PingFang SC;
 						font-weight: 500;
-						color: #2583EB;
+						color: #FF233C;
 					}
 				}
 			}

pages/article/testResult.vue

@@ -227,8 +227,8 @@
 			.bg{
 				width: 100%;
 				height:100%;
-				// background-color: #2583EB;
-				// background: linear-gradient(#2583EB, #88e2da);
+				// background-color: #FF233C;
+				// background: linear-gradient(#FF233C, #88e2da);
 				position: fixed;
 				image{
 					width: 100%;
@@ -267,7 +267,7 @@
 							margin-left: 15rpx;
 							font-size: 40supx;
 							font-family: PingFang SC;
-							color: #2583EB;
+							color: #FF233C;
 						}
 						
 					}
@@ -307,7 +307,7 @@
 							font-family: PingFang SC;
 							font-weight: bold;
 							font-size: 60rpx;
-							color: #2583EB;
+							color: #FF233C;
 						}
 						.descs{
 							font-family: PingFang SC;
@@ -334,13 +334,13 @@
 									margin-left: 10rpx;
 									font-size: 32supx;
 									font-family: PingFang SC;
-									color: #2583EB;
+									color: #FF233C;
 									font-weight: bold;
 								}
 								.title-line{
 									width: 8rpx;
 									height: 28rpx;
-									background: #2583EB;
+									background: #FF233C;
 									border-radius: 2px 2px 2px 2px;
 									opacity: 1;
 								}
@@ -392,7 +392,7 @@
 		position: fixed;
 		bottom: 100rpx;
 		right:50rpx;
-		background-color: #2583EB;
+		background-color: #FF233C;
 		color: #fff;
 		font-weight: bold;
 		font-size: 28rpx;

pages/article/testResultImg.vue

@@ -196,7 +196,7 @@ page {
  		font-family: PingFang SC;
  		font-weight: 400;
  		color: #ffffff;
- 		background:#2583EB !important;
+ 		background:#FF233C !important;
  		border-radius: 44upx;
  	}
  }

pages/article/vesselDetails.vue

@@ -190,7 +190,7 @@ import {getAdvList} from '@/api/adv.js'
 					border-radius: 5rpx;
 					width: 8rpx;
 					height:30rpx;
-					background-color: #2583EB;
+					background-color: #FF233C;
 				}
 				.title{
 					margin-left: 15rpx;
@@ -222,7 +222,7 @@ import {getAdvList} from '@/api/adv.js'
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
-				// border: 1rpx solid #2583EB;
+				// border: 1rpx solid #FF233C;
 				border-radius: 30rpx;
 				line-height: 60rpx;
 				.tab1{
@@ -274,7 +274,7 @@ import {getAdvList} from '@/api/adv.js'
 					font-family: PingFang SC;
 				}
 				.active{
-					background-color: #2583EB;
+					background-color: #FF233C;
 					color: #fff;
 				}
 				 

pages/article/vesselList.vue

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

pages/auth/bindMobile.vue

@@ -3,7 +3,7 @@
 		 <view class="content">
 			<image class="backImg" @tap="goBack()" src="../../static/images/icon_close.png"></image>
 			 <view class="pageTop">
-					<view class="head x-c"> 绑定手机号</view>
+					<view class="head x-c">绑定手机号</view>
 					<view class="loginBox">
 							 <view class="login-item">
 								 <view class="input-account">
@@ -188,7 +188,6 @@ export default {
 	   			} 
 				else {
 	   				uni.reLaunch({
-	   					// url: '../course/index',
 	   					url: '/pages_im/pages/conversation/conversationList/index',
 	   					animationType: 'none',
 	   					animationDuration: 2000
@@ -196,8 +195,7 @@ export default {
 	   				return;
 	   				if(pages.length == 1) {
 	   					uni.reLaunch({
-	   						// url: '../course/index',
-							url: '/pages_im/pages/conversation/conversationList/index',
+	   						url: '/pages_im/pages/conversation/conversationList/index',
 	   						//url: '../course/video/living-app',
 	   						animationType: 'none',
 	   						animationDuration: 2000

pages/auth/findpass.vue

@@ -5,7 +5,7 @@
 				<view class="loginBox">
 					<view class="login-item">
 						<view class="input-account">
-							<input v-model="phone" placeholder="手机号" type="text"  maxlength="11"/>
+							<input v-model="phone" placeholder="手机号" type="text" />
 						</view>
 						<view class="line"></view>
 					</view>

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) {

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">

pages/auth/loginIndex.vue

@@ -2,33 +2,41 @@
 	<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">
+
 			<!-- <view class="phone">187****8783</view>
 			<view class="tips">认证服务由中国移动统一认证提供</view> -->
-			<!-- #ifdef APP-PLUS -->
-			<button class="login-btn x-c" style="margin-top: 74rpx;" :loading="btnLoading" :disabled="btnLoading"
-				@click="show=true">
+			<!-- #ifndef APP-HARMONY -->
+			 
+			<button class="login-btn x-c" v-if="checkWechatInstalled()" style="margin-top: 74rpx;" :loading="btnLoading" :disabled="btnLoading" @click="quickClick(1)">
 				<image class="es-icon-50 es-mr-10" src="/static/images/icon_wx.png"></image>
 				<text>微信快捷登录</text>
 			</button>
 			<!-- #endif -->
-			<button class="login-btn" style="margin-top: 74rpx;" :loading="btnLoading" :disabled="btnLoading"
-				@click="submit">本机号码一键登录</button>
+			
+			<button class="login-btn apple-login-btn x-c"  :loading="btnLoading"  v-if="$isIos()" :disabled="btnLoading" @click="quickClick(2)">
+				<image class="es-icon-50 es-mr-10" src="/static/image/login/apple.png"></image>
+				<text>苹果登录</text>
+			</button>	
+				
+				
+		   <button class="login-btn other-login-btn" :loading="btnLoading" :disabled="btnLoading" @click="submit()">手机号一键登录</button>
+			
 			<button class="login-btn other-login-btn" :disabled="btnLoading" @tap="handleOtherLogin">其他方式登录</button>
-		
 			<view class="checkbox">
 				<view class="checkbox-icon" @tap="handleAgree">
 					<image src="../../static/image/login/radio_default.png" v-show="!agree"></image>
 					<image src="../../static/image/login/radio_choose.png" v-show="agree"></image>
 				</view>
-				<view>我已阅读并同意<text @tap="goToWeb(0)">《用户协议》</text><text @tap="goToWeb(1)">《隐私政策》</text> 并使用本机号码登录</view>
+				<view class="es-fs-36" @tap="handleAgree">我已阅读并同意<text @tap.stop="goToWeb(0)">《用户协议》</text><text @tap.stop="goToWeb(1)">《隐私政策》</text> 并使用本机号码登录</view>
 			</view>
 		</view>
-		<u-popup :show="show" mode="center" round="16rpx" @close="show=false">
-			<view class="popupLoginBox u-f-ajc">
+		
+		<u-popup :show="show" :safeAreaInsetBottom="false" mode="center" round="16rpx" @close="show=false">
+			<view class="popupBox u-f-ajc">
 				<view class="es-c-33 es-fs-32 es-fw ">
 					用户协议及隐私协议
 				</view>
@@ -36,7 +44,7 @@
 					已阅读并同意<text class="colorFF5C03" @tap="goToWeb(0)"> 用户协议 </text>和<text class="colorFF5C03"
 						@tap="goToWeb(1)">隐私政策</text>
 				</view>
-				<view class="es-mt-40 popupbox-btn es-c-white" @tap="wechatLogin">
+				<view class="es-mt-40 popupbox-btn es-c-white" @tap="quickLogin">
 					同意并登录
 				</view>
 				<view class="es-mt-40 es-fs-24 es-c-99" @tap="show=false">
@@ -44,53 +52,54 @@
 				</view>
 			</view>
 		</u-popup>
+	
 	</view>
 </template>
 
 <script>
-	import { navBack } from "../../utils/common";
-	import {
-		login
-	} from "@/api/user.js"
-	import {
-		quickWechatLogin
-	} from "@/utils/login.js"
+	import {navBack} from "../../utils/common";
+	import {login} from "@/api/user.js"
+	import { quickAppleLogin,quickWechatLogin} from "@/utils/login.js"
+	import { checkWechatInstalled} from '@/utils/common.js'
 	export default {
 		data() {
 			return {
 				btnLoading: false,
 				agree: false,
 				show: false,
+				quickLoginType:1 ,// 1:微信登录  2:苹果登录，
+				
 			}
 		},
 		onLoad() {
-			if(!this.$isLogin()) {
+			if (!this.$isLogin()) {
 				let pages = getCurrentPages();
-				let url = pages[ pages.length - 3];
-				if(pages.length > 2 &&url&&(url.route=="pages/auth/login" || url.route=="pages/auth/loginIndex"||url.route=="pages/common/launch")) {
+				let url = pages[pages.length - 3];
+				if (pages.length > 2 && url && (url.route == "pages/auth/login" || url.route == "pages/auth/loginIndex" ||
+						url.route == "pages/common/launch")) {
 					uni.navigateBack({
 						delta: 2
-					})
+					});
 				} else {
-	
 					// #ifdef APP-PLUS
-					this.submit()
+					//this.submit()
+					
 					// #endif
 					// #ifndef APP-PLUS
-					if(String(navigator.userAgent.toLowerCase().match(/MicroMessenger/i)) === "micromessenger"){
+					if (String(navigator.userAgent.toLowerCase().match(/MicroMessenger/i)) === "micromessenger") {
 						const pages = getCurrentPages();
-						if(pages.length > 1) {
-							const url = pages[ pages.length - 2];
+						if (pages.length > 1) {
+							const url = pages[pages.length - 2];
 							const options = url.options //url中所带的参数
 							//拼接url的参数
-							if(options&&JSON.stringify(options)!='{}') {
-								let allurl = '/'+ url.route + uni.$u.queryParams(options)
-								uni.setStorageSync('beforLoginPage',allurl)
+							if (options && JSON.stringify(options) != '{}') {
+								let allurl = '/' + url.route + uni.$u.queryParams(options)
+								uni.setStorageSync('beforLoginPage', allurl)
 							} else {
-								uni.setStorageSync('beforLoginPage','/'+url.route);
+								uni.setStorageSync('beforLoginPage', '/' + url.route);
 							}
 							uni.redirectTo({
-								 url: "/pages/auth/h5WxLogin"
+								url: "/pages/auth/h5WxLogin"
 							});
 						} else {
 							this.submit()
@@ -105,9 +114,8 @@
 			}
 		},
 		onShow() {
-			if(this.$isLogin()) {
+			if (this.$isLogin()) {
 				uni.reLaunch({
-					// url: '../course/index',
 					url: '/pages_im/pages/conversation/conversationList/index',
 					//url: '../course/video/living-app',
 					animationType: 'none',
@@ -116,14 +124,25 @@
 			}
 		},
 		methods: {
-			wechatLogin() {
+			checkWechatInstalled,
+		    quickClick(type){
+				this.quickLoginType=type;
+				this.show=true;
+			},
+			quickLogin() {
 				this.agree=true;
-				quickWechatLogin(false)
+				if(this.quickLoginType==1){
+					quickWechatLogin(false);
+				}
+				if(this.quickLoginType==2){
+				    quickAppleLogin(false);
+				}
 			},
-			goToWeb(index){
-				uni.setStorageSync('url',index==0?getApp().globalData.userAgreement:getApp().globalData.privacyPolicy);
+			goToWeb(index) {
+				uni.setStorageSync('url', index == 0 ? "https://userapp.his.cdwjyyh.com/web/userAgreement" :
+					"https://userapp.his.cdwjyyh.com/web/privacyPolicy");
 				uni.navigateTo({
-					url:"/pages/index/h5"
+					url: "/pages/index/h5"
 				})
 			},
 			// 同意
@@ -221,7 +240,7 @@
 		box-sizing: border-box;
 
 		text {
-			color:#2583EB;
+			color: #FF5C03;
 		}
 
 		.popupbox-footer {
@@ -242,7 +261,7 @@
 		}
 
 		.agree-btn {
-			background: linear-gradient(270deg, #2583EB 0%, #FFAC64 100%);
+			background: linear-gradient(270deg, #FF5C03 0%, #FFAC64 100%);
 			border: none;
 			color: #fff;
 		}
@@ -256,16 +275,19 @@
 		line-height: 78rpx;
 		padding-top: 40rpx;
 	}
+
 	.logoimage {
 		@include u-flex(row, center, center);
 		margin-top: 5vh;
+
 		image {
 			height: 100rpx;
 			width: 100rpx;
 		}
 	}
+
 	.login-box {
-		margin-top: 20vh;
+		margin-top: 16vh;
 		font-family: PingFang SC, PingFang SC;
 		font-weight: 400;
 		font-size: 28rpx;
@@ -294,28 +316,27 @@
 		text-align: left;
 
 		text {
-			color:#2583EB;
+			color: #FF5C03;
 		}
 
 		&-icon {
 			flex-shrink: 0;
 			margin-right: 12rpx;
-
 			image {
-				height: 24rpx;
-				width: 24rpx;
+				height: 40rpx;
+				width: 40rpx;
 			}
 		}
-		
+
 	}
 
 	.login-btn {
 		min-width: 622rpx;
 		height: 88rpx;
-		margin-top: 48rpx;
+		margin-top: 40rpx;
 		line-height: 88rpx;
 		text-align: center;
-		background: linear-gradient(270deg, #2583EB 0%, #6BB2F4 100%);
+		background: linear-gradient(270deg, #FF5C03 0%, #FFAC64 100%);
 		border-radius: 44rpx 44rpx 44rpx 44rpx;
 		font-family: PingFang SC, PingFang SC;
 		font-weight: 600;
@@ -326,29 +347,35 @@
 			border: none;
 		}
 	}
+	
+	
+	.apple-login-btn {
+		background: #fff;
+		border: 2rpx solid #000000;
+		color: #000 !important;
+	}
+	
 
 	.other-login-btn {
 		background: #fff;
 		border: 2rpx solid #ECECEC;
 		color: #333333 !important;
 	}
-	
-	.popupLoginBox {
+
+	.popupBox {
 		padding: 48rpx 24rpx;
 		width: 500rpx;
 		flex-direction: column;
-	
 		.colorFF5C03 {
-			color: #2583EB;
+			color: #FF5C03;
 		}
-	
 		.popupbox-btn {
 			width: 100%;
 			border-radius: 8rpx;
 			text-align: center;
 			height: 88rpx;
 			line-height: 88rpx;
-			background-color: #2583EB;
+			background-color: #FF5C03;
 		}
 	}
 </style>

pages/auth/register.vue

@@ -5,7 +5,7 @@
 				<view class="loginBox">
 					<view class="login-item">
 						<view class="input-account">
-							<input v-model="userName" placeholder="手机号" type="number" maxlength="11" />
+							<input v-model="userName" placeholder="手机号" type="number" />
 						</view>
 						<view class="line"></view>
 					</view>
@@ -22,7 +22,7 @@
 						</view>
 						<view class="line"></view>
 					</view>
-					<view class="login-item" v-if="isSms">
+					<view class="login-item">
 						<view class="input-yzcode x-bc">
 							<input v-model="code" placeholder="验证码" type="number"></input>
 							<view style="color:#666;flex-shrink: 0;" @click="sendSms">
@@ -56,16 +56,12 @@
 		register,
 		login,
 		registerByPhone,
-		registerSendCode,
-		isSmsVerification
+		registerSendCode
 	} from '@/api/user'
 	import {
-		goPage,
-		quickWechatLogin
+		goPage
 	} from "@/utils/login.js"
-	import {
-		vipPop
-	} from '@/utils/vipPop.js'
+	import {vipPop} from '@/utils/vipPop.js'
 	export default {
 		data() {
 			return {
@@ -81,7 +77,6 @@
 				source: '',
 				coolDown: 0,
 				timer: null,
-				isSms: false,
 			}
 		},
 		onLoad(option) {
@@ -95,7 +90,6 @@
 		},
 		onShow() {
 			this.$getRegistrationID();
-			this.isSmsVerificationFun()
 		},
 		onUnload() {
 			uni.$off('getRegistrationID');
@@ -104,18 +98,6 @@
 
 		},
 		methods: {
-			async isSmsVerificationFun() {
-				const res = await isSmsVerification()
-				if (res.code == 200) {
-					this.isSms = res.isSmsVerification == 1 ? true : false
-				} else {
-					if (!res.msg) return
-					uni.showToast({
-						icon: 'none',
-						title: res.msg
-					})
-				}
-			},
 			sendSms() {
 				if (this.coolDown > 0) {
 					return
@@ -129,35 +111,33 @@
 				}
 
 				this.coolDown = 60;
-				registerSendCode({
-					phone: this.userName
-				}).then(res => {
-						if (res.code == 200) {
-							uni.showToast({
-								title: '验证码已发送',
-								icon: 'none',
-							});
-							this.coolDown = 60;
-							this.timer = setInterval(() => {
-								this.coolDown--;
-								if (this.coolDown === 0) {
-									clearInterval(this.timer);
-									this.timer = null;
-								}
-							}, 1000);
-						} else {
-							this.timer && clearInterval(this.timer);
-							this.coolDown = 0
-							uni.showToast({
-								title: res.msg,
-								icon: 'none',
-							});
-						}
-					},
-					rej => {
+				registerSendCode({phone: this.userName}).then(res => {
+					if (res.code == 200) {
+						uni.showToast({
+							title: '验证码已发送',
+							icon: 'none',
+						});
+						this.coolDown = 60;
+						this.timer = setInterval(() => {
+							this.coolDown--;
+							if (this.coolDown === 0) {
+								clearInterval(this.timer);
+								this.timer = null;
+							}
+						}, 1000);
+					} else {
 						this.timer && clearInterval(this.timer);
-						this.coolDown = 0;
-					}).catch(() => {
+						this.coolDown = 0
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+						});
+					}
+				},
+				rej => {
+					this.timer && clearInterval(this.timer);
+					this.coolDown = 0;
+				}).catch(() => {
 					this.timer && clearInterval(this.timer);
 					this.coolDown = 0;
 				})
@@ -177,7 +157,7 @@
 					});
 					return
 				}
-				if (this.password.length < 6 || this.password.length > 15) {
+				if (this.password.length<6||this.password.length>15 ) {
 					uni.showToast({
 						title: "密码长度应该在6到15个字符",
 						icon: 'none',
@@ -190,7 +170,7 @@
 						icon: 'none'
 					});
 				}
-				if (this.$isEmpty(this.code) && this.isSms) {
+				if (this.$isEmpty(this.code)) {
 					uni.showToast({
 						title: "请输入验证码",
 						icon: 'none',
@@ -215,69 +195,69 @@
 				uni.showLoading({
 					title: "注册中..."
 				});
-				if (this.isSms) {
-					registerByPhone(data).then(res => {
-							if (res.code == 200) {
-								this.doLogin();
-							} else {
-								uni.hideLoading()
-								uni.showToast({
-									title: res.msg,
-									icon: 'none'
-								});
-							}
-						},
-						rej => {}
-					);
-					return
-				}
-				data['loginType'] = 1
-				register(data).then(res => {
-					if (res.code == 200) {
-						this.doLogin();
-					} else {
-						uni.hideLoading()
-						uni.showToast({
-							title: res.msg,
-							icon: 'none'
-						});
-					}
-				})
+				registerByPhone(data).then(res => {
+						if (res.code == 200) {
+							// uni.setStorageSync('AppToken',res.data.token);
+							// this.$Router.pushTab({name: 'home'});
+							this.doLogin();
+						} else {
+							uni.hideLoading()
+							uni.showToast({
+								title: res.msg,
+								icon: 'none'
+							});
+						}
+					},
+					rej => {}
+				);
+				// var data = {
+				// 	phone: this.userName,
+				// 	password: this.password,
+				// 	jpushId: this.registrationID || uni.getStorageSync("registrationID"),
+				// 	loginType: 1
+				// };
+				// var that = this;
+				// uni.showLoading({
+				// 	title: "注册中..."
+				// });
+				// register(data).then(res => {
+				// 		if (res.code == 200) {
+				// 			// uni.setStorageSync('AppToken',res.data.token);
+				// 			// this.$Router.pushTab({name: 'home'});
+				// 			this.doLogin();
+				// 		} else {
+				// 			uni.hideLoading()
+				// 			uni.showToast({
+				// 				title: res.msg,
+				// 				icon: 'none'
+				// 			});
+				// 		}
+				// 	},
+				// 	rej => {}
+				// );
+
 			},
 
 			doLogin() {
-				let data = {
+				var data = {
 					phone: this.userName,
 					password: this.password,
 					jpushId: this.registrationID || uni.getStorageSync("registrationID"),
 					loginType: 1
 				};
-				let that = this;
+				var that = this;
 				login(data).then(res => {
 						uni.hideLoading()
-						if (res.code == 200 && res.users && Object.prototype.toString.call(res.users) ==
-							'[object Array]') {
-							uni.setStorageSync('requestParam', data)
-							uni.setStorageSync('wechatList', res.users)
+						if (res.code == 200 && res.users && Object.prototype.toString.call(res.users) == '[object Array]') {
+							uni.setStorageSync('requestParam',data)
+							uni.setStorageSync('wechatList',res.users)
 							goPage();
 							return
 						}
 						if (res.code == 200) {
-							// #ifdef APP-PLUS
-							if (res.isNew) {
-								quickWechatLogin(true, res.phone);
-								return;
-							}
-							// #endif
-							if (res.alert) {
-								vipPop({
-									alert: res.alert,
-									alert1: res.alert1
-								}, e => {
-									uni.switchTab({
-										url: '/pages_im/pages/conversation/conversationList/index',
-										// url: '/pages/course/index'
-									});
+							if(res.alert) {
+								vipPop({alert:res.alert,alert1:res.alert1},e=>{
+									uni.switchTab({url: '/pages/course/index' });
 								})
 							}
 							uni.setStorageSync('AppToken', res.token);
@@ -285,8 +265,7 @@
 							uni.$emit('refreshIM');
 							uni.$emit('showHealthButler');
 							uni.reLaunch({
-								url: '/pages_im/pages/conversation/conversationList/index',
-								// url: '../index/index',
+								url: '../index/index',
 								animationType: 'pop-in',
 								animationDuration: 100
 							})
@@ -312,8 +291,8 @@
 				this.agree = !this.agree
 			},
 			goToWeb(index) {
-				uni.setStorageSync('url', index == 0 ? "https://userapp.zkhj6.com/web/userAgreement" :
-					"https://userapp.zkhj6.com/web/privacyPolicy");
+				uni.setStorageSync('url', index == 0 ? "https://userapp.his.cdwjyyh.com/web/userAgreement" :
+					"https://userapp.his.cdwjyyh.com/web/privacyPolicy");
 				uni.navigateTo({
 					url: "/pages/index/h5"
 				})

pages/auth/wechatList.vue

@@ -6,8 +6,12 @@
 				<view class="es-mr-20">
 					<image class="es-icon-90 es-br-ban" :src="item.avatar" mode=""></image>
 				</view>
-				<view class="es-fs-40 es-fw x-c">
-					{{item.nickName}}
+				<view class="y-b" style="flex: 1;">
+					<view class="es-fs-36 es-fw u-f-ac" style="display: flex; justify-content: space-between;">
+						<text>{{item.nickName}}</text>
+						<view class="last-login-tag" v-if="item.userId === lastLoginUserId">上次登录</view>
+					</view>
+					<view class="es-fs-30">{{item.userId}}</view>
 				</view>
 			</view>
 		</view>
@@ -24,7 +28,8 @@
 	export default {
 		data() {
 			return {
-				userList: []
+				userList: [],
+				lastLoginUserId: ''
 			}
 		},
 		mounted() {
@@ -32,12 +37,34 @@
 			const wechatList = uni.getStorageSync('wechatList')
 			if (wechatList) {
 				this.userList = wechatList
+				// 找出updateTime最大的用户作为上次登录用户
+				if (this.userList.length > 0) {
+					// 假设updateTime是可比较的字符串或时间戳
+					// 如果是字符串，建议统一格式，或者转换为时间戳比较
+					// 这里先简单直接比较，如果需要更复杂的转换可以在这里处理
+					let maxTimeItem = this.userList[0];
+					for (let i = 1; i < this.userList.length; i++) {
+						const current = this.userList[i];
+						// 尝试转换为时间戳比较，兼容性更好
+						const maxTime = new Date(maxTimeItem.updateTime).getTime();
+						const curTime = new Date(current.updateTime).getTime();
+						
+						if (!isNaN(curTime) && (isNaN(maxTime) || curTime > maxTime)) {
+							maxTimeItem = current;
+						} else if (!isNaN(curTime) && curTime === maxTime) {
+							// 如果时间相同，可以根据其他逻辑处理，这里暂且保持原样
+						}
+					}
+					if (maxTimeItem && maxTimeItem.updateTime) {
+						this.lastLoginUserId = maxTimeItem.userId;
+					}
+				}
 				uni.removeStorageSync('wechatList')
 			}
 		},
 		methods: {
 			getRegistrationID() {
-				let registrationID = uni.getStorageSync("registrationID");
+				const registrationID = uni.getStorageSync("registrationID");
 				if (!registrationID) {
 					uni.getPushClientId({
 						success: res => {
@@ -57,7 +84,9 @@
 				const res = await loginByUserId(params)
 				if (res.code == 200) {
 					uni.setStorageSync('AppToken', res.token);
+					uni.setStorageSync('liveToken', res.liveToken);
 					uni.setStorageSync('userInfo', JSON.stringify(res.user));
+					uni.setStorageSync('userData',JSON.stringify(res.user));
 					uni.$emit('refreshIM');
 					uni.$emit('showHealthButler');
 					this.goPage();
@@ -83,7 +112,6 @@
 					this.$updateMsgDot();
 					this.$setSource();
 					uni.reLaunch({
-						// url: '../course/index',
 						url: '/pages_im/pages/conversation/conversationList/index',
 						animationType: 'none',
 						animationDuration: 2000
@@ -91,7 +119,6 @@
 					return;
 					if (pages.length == 1) {
 						uni.reLaunch({
-							// url: '../course/index',
 							url: '/pages_im/pages/conversation/conversationList/index',
 							//url: '../course/video/living-app',
 							animationType: 'none',
@@ -127,6 +154,16 @@
 				&:last-child {
 					border-bottom: none;
 				}
+				
+				.last-login-tag {
+					font-size: 24rpx;
+					color: #FFFFFF;
+					background-color: #FF5C03;
+					padding: 2rpx 10rpx;
+					border-radius: 6rpx;
+					margin-left: 16rpx;
+					line-height: 1.5;
+				}
 			}
 		}
 	}

pages/common/launch.vue

@@ -21,7 +21,7 @@
 				if (!this.$isLogin()) {
 						setTimeout(()=>{
 							uni.reLaunch({
-								url: '../auth/loginIndex',
+								url: '/pages/auth/loginIndex',
 								animationType: 'none',
 								animationDuration: 2000
 							})
@@ -36,8 +36,8 @@
 						return
 					}
 					uni.reLaunch({
-						// url: '../index/index',
-						url: '/pages_im/pages/conversation/conversationList/index',
+						url: '/pages/index/index',
+						//url: '/pages_im/pages/conversation/conversationList/index',
 						animationType: 'none',
 						animationDuration: 2000
 					})

pages/company/bindInfo.vue

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

pages/company/couponDetails.vue

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

pages/company/couponList.vue

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

pages/company/index.vue

@@ -274,7 +274,7 @@
 				font-weight: 500;
 				color: #FFFFFF;
 				border-radius: 8rpx;
-				background-color: #2583EB;
+				background-color: #FF233C;
 			}
 		}
 		.used-tools{

pages/company/inquiryOrderDetails.vue

@@ -520,7 +520,7 @@
 					.btn{
 						font-size: 28upx;
 						font-family: PingFang SC;
-						color: #2583EB;
+						color: #FF233C;
 					}
 				}
 				
@@ -571,7 +571,7 @@
 					color: #db5053;
 				}
 				.green{
-					color: #2583EB;
+					color: #FF233C;
 				}
 				.gray{
 					color: #9c9c9c;
@@ -611,7 +611,7 @@
 		 		font-size: 28upx;
 		 		font-family: PingFang SC;
 		 		color: #FFFFFF;
-		 		background: #2583EB;
+		 		background: #FF233C;
 		 		border-radius: 45upx;
 		 	}
 		 }

pages/company/inquiryOrderList.vue

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

pages/company/login.vue

@@ -168,7 +168,7 @@ export default {
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #2583EB;
+				background: #FF233C;
 				border-radius: 44upx;
 			}
 		}
@@ -185,7 +185,7 @@ export default {
 			
 		}
 		.btn{
-			color: #2583EB;
+			color: #FF233C;
 		}
 	}
 </style>

pages/company/packageDetails.vue

@@ -482,7 +482,7 @@
 						padding: 5rpx 15rpx;
 						font-size: 26upx;
 						font-family: PingFang SC;
-						color: #2583EB;
+						color: #FF233C;
 					}
 					.duration{
 						margin-left: 10rpx;
@@ -491,7 +491,7 @@
 						padding: 5rpx 15rpx;
 						font-size: 26upx;
 						font-family: PingFang SC;
-						color: #2583EB;
+						color: #FF233C;
 					}
 					
 				}
@@ -509,7 +509,7 @@
 						.price{
 							margin-right: 10rpx;
 							padding: 5rpx 10rpx;
-							background-color: #2583EB;
+							background-color: #FF233C;
 							border-radius: 30rpx;
 							font-size: 20upx;
 							font-family: PingFang SC;
@@ -545,7 +545,7 @@
 						margin-right: 15rpx;
 						height: 30rpx;
 						width: 6rpx;
-						background-color: #2583EB;
+						background-color: #FF233C;
 						
 					}
 					 
@@ -576,7 +576,7 @@
 						margin-right: 15rpx;
 						height: 30rpx;
 						width: 6rpx;
-						background-color: #2583EB;
+						background-color: #FF233C;
 						
 					}
 					 
@@ -615,7 +615,7 @@
 										display: inline-block;
 										padding: 0 6upx;
 										height: 30upx;
-										background: linear-gradient(90deg, #2583EB 0%, #2BC7A4 100%);
+										background: linear-gradient(90deg, #FF233C 0%, #2BC7A4 100%);
 										border-radius: 4upx;
 										margin-right: 10upx;
 										font-size: 22upx;
@@ -740,7 +740,7 @@
 				}
 			 
 				&.buy{
-					background: #2583EB;
+					background: #FF233C;
 				}
 				.contact-btn{
 					display: inline-block;
@@ -836,8 +836,8 @@
 					border-radius: 30upx;
 					font-size: 28upx;
 					font-family: PingFang SC;
-					color: #2583EB;
-					border:1rpx solid  #2583EB;
+					color: #FF233C;
+					border:1rpx solid  #FF233C;
 					 
 				}
 				

pages/company/packageList.vue

@@ -326,15 +326,15 @@
 			font-size: 28upx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #2583EB;
+			color: #FF233C;
 			background: #ffffff;
-			border: 1px solid #2583EB;
+			border: 1px solid #FF233C;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #2583EB;
-				border: 1px solid #2583EB;
+				background: #FF233C;
+				border: 1px solid #FF233C;
 			}
 		}
 	}
@@ -383,7 +383,7 @@
 					width: 100%;
 					.price{
 						padding: 5rpx 10rpx;
-						background-color: #2583EB;
+						background-color: #FF233C;
 						border-radius: 30rpx;
 						font-size: 20upx;
 						font-family: PingFang SC;
@@ -456,7 +456,7 @@
 								display: inline-block;
 								padding: 0 6upx;
 								height: 30upx;
-								background: linear-gradient(90deg, #2583EB 0%, #2583EB 100%);
+								background: linear-gradient(90deg, #FF233C 0%, #FF233C 100%);
 								border-radius: 4upx;
 								margin-right: 10upx;
 								font-size: 22upx;
@@ -581,11 +581,11 @@
 								color: #666666;
 							}
 							&.share{
-								background: #2583EB;
+								background: #FF233C;
 								color: #FFFFFF;
 							}
 							&.pay{
-								background: #2583EB;
+								background: #FF233C;
 								color: #FFFFFF;
 								position: relative;
 								.share{

pages/company/packageOrderDetails.vue

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

pages/company/packageOrderList.vue

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

pages/company/storeOrderDelivery.vue

@@ -120,8 +120,8 @@
 			top: 0;
 			left: 0;
 			z-index: 1;
-			background-color: #2583EB;
-			background: linear-gradient(#2583EB, #E0F5FF);
+			background-color: #FF233C;
+			background: linear-gradient(#FF233C, #E0F5FF);
 			border-radius: 0rpx 0rpx 100rpx 100rpx;
 		}
 		.top-inner{
@@ -258,7 +258,7 @@
 						top: 11upx;
 						z-index: 10;
 						&.active{
-							background-color: #2583EB;
+							background-color: #FF233C;
 						}
 					}
 					.img{
@@ -281,7 +281,7 @@
 						font-size: 28upx;
 						font-family: PingFang SC;
 						font-weight: 500;
-						color: #2583EB;
+						color: #FF233C;
 						line-height: 1.6;
 					}
 				}

pages/company/storeOrderDetail.vue

@@ -343,8 +343,8 @@
 			top: 0;
 			left: 0;
 			z-index: 1;
-			background-color: #2583EB;
-			background: linear-gradient(#2583EB, #E0F5FF);
+			background-color: #FF233C;
+			background: linear-gradient(#FF233C, #E0F5FF);
 			border-radius: 0rpx 0rpx 100rpx 100rpx;
 		}
 		.inner{
@@ -477,7 +477,7 @@
 							display: inline-block;
 							padding: 0 6upx;
 							height: 30upx;
-							background: linear-gradient(90deg, #2583EB 0%, #E0F5FF 100%);
+							background: linear-gradient(90deg, #FF233C 0%, #E0F5FF 100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							font-size: 22upx;
@@ -674,7 +674,7 @@
 				color: #666666;
 			}
 			&.pay{
-				background: #2583EB;
+				background: #FF233C;
 				color: #FFFFFF;
 			}
 			.contact-btn {

pages/company/storeOrderList.vue

@@ -5,7 +5,7 @@
 				 <u-tabs
 				  :scrollable="false"
 				  :list="tabs"  
-				  lineColor="#2583EB"
+				  lineColor="#FF233C"
 				 @change="tabChange">
 				 </u-tabs>
 			</view>
@@ -353,7 +353,7 @@
 						font-weight: 500;
 						line-height: 1;
 						&.success{
-							color: #2583EB;
+							color: #FF233C;
 						}
 						&.black{
 							color: #111111;
@@ -396,7 +396,7 @@
 								display: inline-block;
 								padding: 0 6upx;
 								height: 30upx;
-								background: linear-gradient(90deg, #2583EB 0%, #E0F5FF 100%);
+								background: linear-gradient(90deg, #FF233C 0%, #E0F5FF 100%);
 								border-radius: 4upx;
 								margin-right: 10upx;
 								font-size: 22upx;
@@ -507,7 +507,7 @@
 								color: #666666;
 							}
 							&.pay{
-								background: #2583EB;
+								background: #FF233C;
 								color: #FFFFFF;
 							}
 							.contact-btn {

pages/company/voice.vue

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

pages/company/voiceItem.vue

@@ -14,7 +14,7 @@
 						:scrollable="false"
 						:list="tabs"
 						:current="current"
-						lineColor="#2583EB"
+						lineColor="#FF233C"
 						@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: #2583EB;
-				border: 1rpx solid #2583EB;
+				background-color: #FF233C;
+				border: 1rpx solid #FF233C;
 				image {
 					height: 60rpx;
 					width: 60rpx;

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="#2583EB" @change="tabChange">
+				<u-tabs :scrollable="false" :list="tabs" :current="current" lineColor="#FF233C" @change="tabChange">
 				</u-tabs>
 			</view>
 		</u-sticky>
@@ -210,8 +210,8 @@
 
 		.btn {
 			padding: 10rpx 30rpx;
-			border: 1rpx solid #2583EB;
-			color: #2583EB;
+			border: 1rpx solid #FF233C;
+			color: #FF233C;
 			font-size: 28rpx;
 			border-radius: 30rpx;
 		}
@@ -228,7 +228,7 @@
 
 		&-btn {
 			height: 112rpx;
-			background: #2583EB;
+			background: #FF233C;
 			border-radius: 112rpx;
 			font-weight: 600;
 			font-size: 34rpx;

pages/course/catalogue.vue

@@ -349,7 +349,7 @@
 		border-radius: 0 16rpx 0 16rpx;
 		&-free {
 			// background: url('@/static/image/hall/free_lable_bg.png') no-repeat right / 100% 32rpx;
-			background-color: #2583EB;
+			background-color: #FF233C;
 		}
 	
 		&-member {
@@ -467,7 +467,7 @@
 			width: 124rpx;
 			height: 124rpx;
 			border-radius: 50%;
-			background: linear-gradient( 180deg, #FF9B45 0%, #2583EB 100%);
+			background: linear-gradient( 180deg, #FF9B45 0%, #FF233C 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: #2583EB;
+				background: #FF233C;
 				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: #2583EB;
+				background: #FF233C;
 				border-radius: 42rpx 42rpx 42rpx 42rpx;
 				font-family: PingFang SC, PingFang SC;
 				font-weight: 500;

pages/course/catalogueN.nvue

@@ -295,10 +295,10 @@ page {
 .cate-bg1 {
 	background-color: #eef5fd;
 	.cateitem-title {
-		color: #2583EB !important;
+		color: #FF233C !important;
 	}
 	.cateitem-sub {
-		color: #2583EB !important;
+		color: #FF233C !important;
 	}
 }
 .cate-bg2 {
@@ -319,7 +319,7 @@ page {
 	border-radius: 0 16rpx 0 16rpx;
 	&-free {
 		// background: url('@/static/image/hall/free_lable_bg.png') no-repeat right / 100% 32rpx;
-		background-color: #2583EB;
+		background-color: #FF233C;
 	}
 
 	&-member {

pages/course/commentN.nvue

@@ -602,7 +602,7 @@
 
 
 	.br{
-	  border: 1px solid #2583EB;
+	  border: 1px solid #FF233C;
 	}
 	
 	.fix-bottom{

pages/course/components/docterItem.vue

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

pages/course/components/doctorHall.vue

@@ -347,7 +347,7 @@
 			content: "";
 			width: 16rpx;
 			height: 16rpx;
-			background: #2583EB;
+			background: #FF233C;
 			border-radius: 50%;
 			position: absolute;
 			right: 0;
@@ -400,7 +400,7 @@
 			&-active{
 				font-weight: 600;
 				font-size: 28rpx;
-				color: #2583EB;
+				color: #FF233C;
 			}
 		}
 	}

pages/course/components/giftPopup.vue

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

pages/course/components/goodsItem.vue

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

pages/course/components/goodsItemVertical.vue

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

pages/course/components/integralGoods.vue

@@ -24,7 +24,7 @@
 				</uni-search-bar>
 			</view>
 			<view class="tabs" v-if="tabs.length>0">
-				<u-tabs :current="tabIndex" :scrollable="true" :list="tabs" lineColor="#2583EB" @change="tabChange">
+				<u-tabs :current="tabIndex" :scrollable="true" :list="tabs" lineColor="#FF233C" @change="tabChange">
 				</u-tabs>
 			</view>
 		</view>
@@ -228,7 +228,7 @@
 		.my-integral {
 			height: 200rpx;
 			box-shadow: 0px 0px 5px 2px rgba(0, 0, 0, 0.05);
-			background: linear-gradient(#2583EB, #E0F5FF);
+			background: linear-gradient(#FF233C, #E0F5FF);
 			border-radius: 30rpx;
 			display: flex;
 			align-items: flex-start;
@@ -253,7 +253,7 @@
 				padding: 10rpx 15rpx;
 				font-size: 20upx;
 				font-family: PingFang SC;
-				color: #2583EB;
+				color: #FF233C;
 			}
 
 			.left {
@@ -336,7 +336,7 @@
 
 					.price {
 						padding: 5rpx 10rpx;
-						background-color: #2583EB;
+						background-color: #FF233C;
 						border-radius: 30rpx;
 						font-size: 20upx;
 						font-family: PingFang SC;

pages/course/components/myAudio.vue

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

pages/course/famousHall.vue

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

pages/course/famousHallPage.vue

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

pages/course/favoritePage.vue

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

pages/course/index.vue

@@ -777,7 +777,7 @@
 			width: 272rpx;
 			height: 84rpx;
 			margin: 0 auto;
-			background: #2583EB;
+			background: #FF233C;
 			border-radius: 42rpx 42rpx 42rpx 42rpx;
 			font-family: PingFang SC, PingFang SC;
 			font-weight: 500;
@@ -871,7 +871,7 @@
 			.active {
 				font-weight: 600;
 				font-size: 40rpx;
-				color: #2583EB;
+				color: #FF233C;
 				position: relative;
 			}
 		}

pages/course/info.vue

@@ -93,13 +93,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 ?'#2583EB':'#757575'}" @click="clickStyle('font',size)">{{size=='16px'?'默认':'较小'}}</view>
+									<view class="es-mr-24px" v-for="size in danmuFontSize" :style="{color: danmuIput.fontSize==size ?'#FF233C':'#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 ?'#2583EB':'#757575'}" @click="clickStyle('mode',mode)">
+									<view class="es-mr-24px" v-for="mode in danmuMode" :style="{color: danmuIput.mode==mode ?'#FF233C':'#757575'}" @click="clickStyle('mode',mode)">
 										{{mode=='top'?'置顶':mode=='bottom'?'置底':'滚动'}}
 									</view>
 								</view>
@@ -108,14 +108,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 ?'#2583EB':'#F5F7FA'}`}"
+									:style="{background: color,border:`2px solid ${danmuIput.color== color ?'#FF233C':'#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 ?'#2583EB':'#757575'}" @click="clickArea(item)">
+									<view class="es-mr-24px" v-for="item in danmuArea" :style="{color: danmuFunInfo.area==item ?'#FF233C':'#757575'}" @click="clickArea(item)">
 										{{item*100+'%'}}
 									</view>
 								</view>
@@ -158,7 +158,7 @@
 				<view class="video-info-footer">
 					<view @tap="handleListen()">
 						<image src="@/static/image/hall/sound_icon24.png" mode="aspectFill"></image>
-						<text :style="{color: showAudio ? '#2583EB':'#757575'}">听声</text>
+						<text :style="{color: showAudio ? '#FF233C':'#757575'}">听声</text>
 					</view>
 
 					<view @tap="$navTo('./note?courseId='+courseId)" v-if="!$qconfig.isAppStore">
@@ -1997,7 +1997,7 @@
 					// },
 					commonStyle: {
 						// 播放完成部分进度条底色
-						playedColor: '#2583EB',
+						playedColor: '#FF233C',
 						cachedColor: 'transparent'
 					},
 					seekedStatus: 'auto',
@@ -2279,7 +2279,7 @@
 			justify-content: center;
 			padding: 5px 15px;
 			box-sizing: border-box;
-			background: #2583EB !important;
+			background: #FF233C !important;
 			border-radius: 22px;
 			font-family: PingFang SC, PingFang SC;
 			font-weight: 500;
@@ -2483,7 +2483,7 @@
 			height: 56rpx;
 			min-width: 154rpx;
 			padding: 0 23rpx;
-			background: #2583EB;
+			background: #FF233C;
 			border-radius: 28rpx 28rpx 28rpx 28rpx;
 			color: #FFFFFF;
 			font-size: 28rpx;
@@ -2662,15 +2662,15 @@
 
 		&-active {
 			background: #fff;
-			border: 1rpx solid #2583EB;
+			border: 1rpx solid #FF233C;
 
 			.therapy-goodsname {
-				color: #2583EB !important;
+				color: #FF233C !important;
 			}
 
 			&::after {
 				background: #fff;
-				color: #2583EB !important;
+				color: #FF233C !important;
 			}
 		}
 
@@ -2724,7 +2724,7 @@
 			border-radius: 0 8rpx 0 8rpx;
 			&-free {
 				// background: url('@/static/image/hall/free_lable_bg.png') no-repeat right / 100% 32rpx;
-				background-color: #2583EB;
+				background-color: #FF233C;
 			}
 
 			&-member {
@@ -2787,10 +2787,10 @@
 
 		.active-scrollitem {
 			background: #eef5fd;
-			color: #2583EB;
+			color: #FF233C;
 
 			.video-directory-title {
-				color: #2583EB;
+				color: #FF233C;
 			}
 		}
 	}
@@ -2858,7 +2858,7 @@
 		font-family: PingFang SC, PingFang SC;
 		font-weight: 600;
 		font-size: 26rpx;
-		color: #2583EB;
+		color: #FF233C;
 		text-align: center;
 		line-height: 68rpx;
 	}

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>

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='#2583EB' :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='#FF233C' :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 ? '#2583EB':'#757575'}">听声</text>
+						<text :style="{color: showAudio ? '#FF233C':'#757575'}">听声</text>
 					</view>
 				
 		  			<view @tap="$navTo('./note?courseId='+courseId)" v-if="!$qconfig.isAppStore">
@@ -1900,7 +1900,7 @@
 			height: 56rpx;
 			min-width: 154rpx;
 			padding: 0 23rpx;
-			background: #2583EB;
+			background: #FF233C;
 			border-radius: 28rpx 28rpx 28rpx 28rpx;
 			color: #FFFFFF;
 			font-size: 28rpx;
@@ -2062,13 +2062,13 @@
 		}
 		&-active {
 			background: #fff;
-			border: 1rpx solid #2583EB;
+			border: 1rpx solid #FF233C;
 			.therapy-goodsname {
-				color: #2583EB !important;
+				color: #FF233C !important;
 			}
 			&::after {
 				background: #fff;
-				color: #2583EB !important;
+				color: #FF233C !important;
 			}
 		}
 		&-goodsname {
@@ -2172,9 +2172,9 @@
 		
 		.active-scrollitem {
 			background: #eef5fd;
-			color: #2583EB;
+			color: #FF233C;
 			.video-directory-title {
-				color: #2583EB;
+				color: #FF233C;
 			}
 		}
 	}
@@ -2237,7 +2237,7 @@
 		font-family: PingFang SC, PingFang SC;
 		font-weight: 600;
 		font-size: 26rpx;
-		color: #2583EB;
+		color: #FF233C;
 		text-align: center;
 		line-height: 68rpx;
 	}

pages/course/learning.vue

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

pages/course/learningNew.vue

@@ -282,7 +282,7 @@
 				align-items: center;
 
 				.focus-bar {
-					background: #2583EB;
+					background: #FF233C;
 					border-radius: 20rpx;
 					height: 100%;
 
@@ -291,7 +291,7 @@
 				.number {
 					font-size: 22rpx;
 					color: #fff;
-					background: #2583EB;
+					background: #FF233C;
 					border-radius: 10rpx;
 					border-left: 2rpx solid #fff;
 					padding: 0rpx 12rpx;

pages/course/learningPage.vue

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

pages/course/myNote.vue

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

pages/course/noteList.vue

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

pages/course/studyCenter/courseCollect.vue

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

pages/course/studyCenter/orderList.vue

@@ -181,7 +181,7 @@
 				content: "";
 				width: 48rpx;
 				height: 6rpx;
-				background: #2583EB;
+				background: #FF233C;
 				border-radius: 3rpx 3rpx 3rpx 3rpx;
 				position: absolute;
 				bottom: 2rpx;

pages/course/video/live.vue

@@ -147,7 +147,7 @@
 	.banner {
 		margin: 20rpx 30rpx;
 		height: 200rpx;
-		background: linear-gradient(45deg, #2583EB, #4FACFE);
+		background: linear-gradient(45deg, #FF233C, #4FACFE);
 		border-radius: 16rpx;
 		padding: 30rpx;
 		display: flex;

pages/course/video/liveDetail.vue

@@ -134,7 +134,7 @@
 			position: relative;
 			
 			&.active {
-				color: #2583EB;
+				color: #FF233C;
 				font-weight: bold;
 				
 				&::after {
@@ -145,7 +145,7 @@
 					transform: translateX(-50%);
 					width: 40rpx;
 					height: 4rpx;
-					background-color: #2583EB;
+					background-color: #FF233C;
 					border-radius: 2rpx;
 				}
 			}
@@ -171,7 +171,7 @@
 				background-color: rgba(37, 131, 235, 0.1);
 				padding: 10rpx;
 				border-radius: 8rpx;
-				color: #2583EB;
+				color: #FF233C;
 				justify-content: center;
 				margin-bottom: 20rpx;
 			}
@@ -226,7 +226,7 @@
 			
 			.follow-btn {
 				padding: 8rpx 24rpx;
-				background-color: #2583EB;
+				background-color: #FF233C;
 				color: #fff;
 				font-size: 24rpx;
 				border-radius: 30rpx;
@@ -272,7 +272,7 @@
 			padding: 0 24rpx;
 			height: 60rpx;
 			line-height: 60rpx;
-			background-color: #2583EB;
+			background-color: #FF233C;
 			color: #fff;
 			font-size: 24rpx;
 			border-radius: 30rpx;

pages/course/video/search.vue

@@ -27,7 +27,7 @@
 			<view class="result-list" v-if="isSearching">
 				<view class="result-item" v-for="(item, index) in resultList" :key="index" @click="goDetail(item)">
 					<view class="left-icon">
-						<u-icon name="play-circle-fill" color="#2583EB" size="24"></u-icon>
+						<u-icon name="play-circle-fill" color="#FF233C" size="24"></u-icon>
 					</view>
 					<view class="info">
 						<text class="name">{{item.title}}</text>
@@ -135,7 +135,7 @@
 				margin-bottom: 20rpx;
 				
 				&.hot {
-					color: #2583EB;
+					color: #FF233C;
 					background-color: rgba(37, 131, 235, 0.1);
 				}
 			}