XSLu08042 há 1 semana atrás
pai
commit
2f89c832b7
100 ficheiros alterados com 3746 adições e 2997 exclusões
  1. 2 3
      App.vue
  2. 29 9
      api/article.js
  3. 2 2
      api/common.js
  4. 17 7
      api/index.js
  5. 4 1
      api/user.js
  6. 3 2
      common/request.js
  7. 2 2
      components/Menu.vue
  8. 234 0
      components/tuiProduct.vue
  9. 1 1
      manifest.json
  10. 3 2
      note.txt
  11. 336 5
      pages.json
  12. 8 8
      pages/auth/login.vue
  13. 2 2
      pages/components/wxAuth.vue
  14. 1 1
      pages/courseAnswer/index.vue
  15. 1 1
      pages/courseAnswer/list.vue
  16. 5 5
      pages/doctor/index.vue
  17. 1 1
      pages/im/conversationList/components/MyAvatar/index.vue
  18. 1 1
      pages/im/conversationList/index.vue
  19. 238 275
      pages/index/index.vue
  20. 1335 0
      pages/index/indexOld.vue
  21. 355 0
      pages/shopping/index.vue
  22. 2 2
      pages/store/index.vue
  23. 42 33
      pages/user/index.vue
  24. 2 2
      pages_company/bindInfo.vue
  25. 4 4
      pages_company/couponDetails.vue
  26. 7 7
      pages_company/couponList.vue
  27. 2 2
      pages_company/index.vue
  28. 3 3
      pages_company/inquiryOrderDetails.vue
  29. 5 5
      pages_company/inquiryOrderList.vue
  30. 1 1
      pages_company/login.vue
  31. 9 9
      pages_company/packageDetails.vue
  32. 8 8
      pages_company/packageList.vue
  33. 11 11
      pages_company/packageOrderDetails.vue
  34. 7 7
      pages_company/packageOrderList.vue
  35. 4 4
      pages_company/storeOrderDelivery.vue
  36. 11 11
      pages_company/storeOrderDetail.vue
  37. 5 5
      pages_company/storeOrderList.vue
  38. 4 4
      pages_course/video.vue
  39. 0 2243
      pages_course/videoOld.vue
  40. 2 2
      pages_doctor/doctorArticleDetails.vue
  41. 1 1
      pages_doctor/doctorArticleList.vue
  42. 30 30
      pages_doctor/doctorDetails.vue
  43. 5 5
      pages_doctor/doctorImgs.vue
  44. 7 7
      pages_doctor/doctorInfo.vue
  45. 4 4
      pages_doctor/doctorList.vue
  46. 3 3
      pages_doctor/doctorPingList.vue
  47. 3 3
      pages_im/common/config.js
  48. 3 3
      pages_index/articleDetails.vue
  49. 1 1
      pages_index/articleList.vue
  50. 6 6
      pages_index/chineseMedicineDetails.vue
  51. 4 4
      pages_index/chineseMedicineList.vue
  52. 4 4
      pages_index/diseaseDetails.vue
  53. 5 5
      pages_index/diseaseList.vue
  54. 6 6
      pages_index/famousPrescribeDetails.vue
  55. 4 4
      pages_index/famousPrescribeList.vue
  56. 261 0
      pages_index/healthy/detail.vue
  57. 351 0
      pages_index/healthy/index.vue
  58. 121 0
      pages_index/healthy/readUsers.vue
  59. 7 7
      pages_index/hospitalDetails.vue
  60. 1 1
      pages_index/hospitalList.vue
  61. 7 7
      pages_index/medicatedFoodDetails.vue
  62. 5 5
      pages_index/medicatedFoodList.vue
  63. 12 12
      pages_index/packageDetails.vue
  64. 2 3
      pages_index/packageForm.vue
  65. 3 3
      pages_index/packageList.vue
  66. 5 5
      pages_index/questionsDetails.vue
  67. 5 5
      pages_index/questionsList.vue
  68. 5 5
      pages_index/test.vue
  69. 5 8
      pages_index/testDetails.vue
  70. 7 7
      pages_index/testList.vue
  71. 5 5
      pages_index/testResult.vue
  72. 1 1
      pages_index/testResultImg.vue
  73. 6 6
      pages_index/vesselDetails.vue
  74. 4 4
      pages_index/vesselList.vue
  75. 4 3
      pages_order/courseOrderPayment.vue
  76. 4 4
      pages_order/inquiryForm1.vue
  77. 8 8
      pages_order/inquiryForm2_1.vue
  78. 10 10
      pages_order/inquiryForm2_2.vue
  79. 4 4
      pages_order/inquiryForm3.vue
  80. 3 3
      pages_order/inquiryOrderDetails.vue
  81. 5 5
      pages_order/inquiryOrderList.vue
  82. 2 2
      pages_order/inquiryOrderPingList.vue
  83. 5 5
      pages_order/inquiryOrderReport.vue
  84. 8 7
      pages_order/inquiryPay.vue
  85. 4 3
      pages_order/inquiryPayment.vue
  86. 3 3
      pages_order/inquirySelect.vue
  87. 2 6
      pages_order/inquirySelectType.vue
  88. 7 7
      pages_order/invoice/index.vue
  89. 1 1
      pages_order/invoice/invoiceList.vue
  90. 11 11
      pages_order/packageOrderDetails.vue
  91. 7 7
      pages_order/packageOrderList.vue
  92. 10 9
      pages_order/packageOrderPay.vue
  93. 2 1
      pages_order/packageOtherPayment.vue
  94. 6 5
      pages_order/packagePayment.vue
  95. 1 1
      pages_order/pingOrder.vue
  96. 7 7
      pages_order/prescribeDetails.vue
  97. 4 4
      pages_order/prescribeList.vue
  98. 4 4
      pages_order/storeOrderDelivery.vue
  99. 11 11
      pages_order/storeOrderDetail.vue
  100. 5 5
      pages_order/storeOrderList.vue

Diff do ficheiro suprimidas por serem muito extensas
+ 2 - 3
App.vue


+ 29 - 9
api/article.js

@@ -1,15 +1,35 @@
 import Request from '../common/request.js';
 let request = new Request().http
  
- export function getArticleList(data) {
- 	 return request('/app/article/getArticleList',data,'GET');
- }
- export function getArticleById(data) {
- 	 return request('/app/article/getArticleById',data,'GET');
- }
- export function getArticleCateList(data) {
- 	 return request('/app/article/getArticleCateList',data,'GET');
- }
+ // export function getArticleList(data) {
+ // 	 return request('/app/article/getArticleList',data,'GET');
+ // }
+ // export function getArticleById(data) {
+ // 	 return request('/app/article/getArticleById',data,'GET');
+ // }
+ // export function getArticleCateList(data) {
+ // 	 return request('/app/article/getArticleCateList',data,'GET');
+ // }
+  // 商城文章
+  export function getArticleCate() {
+  	 return request('/store/app/article/getArticleCate',null,'GET');
+  }
+  export function getArticleList(data) {
+  	 return request('/store/app/article/getArticleList',data,'GET');
+  }
+  
+  export function getArticleByArticleId(data) {
+  	 return request('/store/app/article/getArticleByArticleId',data,'GET');
+  } 
+  
+  export function updateView(articleId) {
+  	 return request('/store/app/article/updateView?articleId='+articleId,null,'POST');
+  } 
+  
+  export function getArticleViewList(data) {
+  	 return request('/store/app/article/getArticleViewList',data,'GET');
+  } 
+  
   
   
   

+ 2 - 2
api/common.js

@@ -4,7 +4,7 @@ let request = new Request().http
 	 return request('/app/common/getCitys',data,'GET');
  }
  export function getDicts(data) {
-	 return request('/app/common/getDicts',data,'GET');
+	 return request('/store/app/common/getDicts',data,'GET');
  }
  export function uploadOSS(data) {
  	 return request('/app/common/uploadOSS',data,'POST','application/json;charset=UTF-8');
@@ -22,7 +22,7 @@ let request = new Request().http
  }
  
  export function getWeixinOrderTemps() {
- 	 return request('/app/common/getWeixinOrderTemps',null,'GET');
+ 	 return request('/store/app/common/getWeixinOrderTemps',null,'GET');
  }
  
  

+ 17 - 7
api/index.js

@@ -30,10 +30,20 @@ let request = new Request().http
  export function getChineseMedicineById(data) {
  	 return request('/app/index/getChineseMedicineById',data,'GET');
  }
- 
- 
- 
- 
- 
-  
-  
+ // 商城相关接口
+ export function getTuiProducts(data) {
+ 	 return request('/store/app/product/getTuiProducts',data,'GET');
+ } 
+ export function getProductCate(data) {
+ 	 return request('/store/app/product/getProductCate',data,'GET');
+ }
+
+ export function validList(data) {
+ 	 return request('/store/app/recommend/validList',data,'GET');
+ }
+ export function recommendList(data) {
+ 	 return request('/store/app/store/recommendList',data,'GET');
+ }
+ export function storeDetail(storeId) {
+ 	 return request('/store/app/store/'+storeId,null,'GET');
+ }

+ 4 - 1
api/user.js

@@ -50,4 +50,7 @@ let request = new Request().http
  export function complaint(data) {
  	return request('/app/complaint',data,'POST','application/json;charset=UTF-8');
  }
- 
+ // 商城咨询投诉
+ export function storeComplaint(data) {
+ 	return request('/store/app/user/complaint',data,'POST','application/json;charset=UTF-8');
+ }

+ 3 - 2
common/request.js

@@ -3,10 +3,11 @@ export default class Request {
 	http(router, data = {}, method,contentType,url) {
 		let that = this;
 		// let path = 'http://127.0.0.1:8113';
-		var path=uni.getStorageSync('requestPath')
+		// var path=uni.getStorageSync('requestPath')
 		// var path = 'https://userapp.his.cdwjyyh.com';
 		// var path = 'https://app.rtys.cdwjyyh.com';
-		// var path = "http://cde2e8d4.natappfree.cc"
+		// var path = "https://userapp.bjyjbao.com/prod-api"
+		var path = "http://x834c3af.natappfree.cc"
 		let token="";
 		let type = 0
 		if(url!=null){

+ 2 - 2
components/Menu.vue

@@ -134,7 +134,7 @@ export default {
 				 
 			}
 			.active{
-				color: #E2C99E;
+				color: #2EDAD4;
 				
 			}
 		}
@@ -154,7 +154,7 @@ export default {
 		.dot-active {
 			width: 40rpx;
 			height: 3rpx;
-			background: #2BC7B9;
+			background: #2583EB;
 			margin-right: 10rpx;
 		}
 	}

+ 234 - 0
components/tuiProduct.vue

@@ -0,0 +1,234 @@
+<template>
+	<view class="medicine-box box">
+		<view class="title-box">
+			<view class="title">推荐药品</view>
+			<view class="more" @click="navTo('/pages_shopping/home/productList')">
+				<view class="text">更多药品</view>
+				<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/image/arrow_gray.png"></image>
+			</view>
+		</view>
+		<view class="medicine-item x-f" v-for="(item, index) in list" :key="index" @click="showProduct(item)">
+			<view class="medicine">
+				<image :src="item.image" mode="aspectFill"></image>
+				<!-- {{utils.getDictLabelName("storeProductType",product.productType)}} -->
+				<!-- <image class="otc" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/index/blue_lable_otc.svg" mode="aspectFill"></image> -->
+			</view>
+			<view class="medicine-r">
+				<view class="ellipsis" style="white-space: normal;">{{ item.productName || '' }}</view>
+				<view class="desc">包装规格:{{ item.unitName || '--' }}</view>
+				<view class="desc">共有 <text style="color: #2583EB;margin: 0 10rpx;">12</text> 个商家销售 </view>
+				<view class="price-box">
+					<text class="price-box-unit">¥</text>
+					<text class="price-box-integer">{{splitPrice(item.price || 0).intPart}}</text>
+					<text class="price-box-decimal">.{{splitPrice(item.price || 0).decPart}}</text>
+					<!-- <text class="price-box-text">/日</text> -->
+					<text class="old" v-show="item.price!=item.otPrice&&item.otPrice!==null&&item.otPrice!==undefined">¥{{item.otPrice.toFixed(2)}}</text>
+				</view>
+			</view>
+		</view>
+		<Loading :loaded="loaded" :loading="loading"></Loading>
+	</view>
+</template>
+
+<script>
+	import {getTuiProducts} from '@/api/index.js'
+	import Loading from "@/components/Loading";
+	export default {
+		components: {
+			Loading
+		},
+		name: "likeProduct",
+		data() {
+			return {
+				page: {
+					page: 1,
+					pageSize: 10
+				},
+				total: 0,
+				list: [],
+				loaded: false,
+				loading: false
+			};
+		},
+		created() {},
+		mounted() {
+			this.getTuiProducts();
+		},
+
+		methods: {
+			splitPrice(num) {
+			  const [intPart = '0', decPart = '00'] = String(num||0).split('.');
+			  return { intPart, decPart: decPart.padEnd(2, '0').slice(0, 2) };
+			},
+			getTuiProducts() {
+				var that = this;
+				if (that.loaded == true || that.loading == true) return;
+				that.loading = true;
+				uni.showLoading({
+					title: "加载中..."
+				})
+				getTuiProducts(that.page).then(
+					res => {
+						if (res.code == 200) {
+							that.total = res.data.total;
+							that.list.push.apply(that.list, res.data.list);
+							that.loading = false;
+							that.loaded = that.list.length < that.total ? false : true;
+							that.page.page = that.page.page + 1;
+							uni.hideLoading()
+						}
+					},
+					err => {
+						uni.hideLoading()
+						uni.showToast({
+							title: err.msg,
+							icon: 'none',
+							duration: 2000
+						});
+					}
+				);
+			},
+			showProduct(item) {
+				uni.navigateTo({
+					url: '/pages_shopping/productDetails?productId=' + item.productId
+				})
+			},
+			navTo(url){
+				uni.navigateTo({
+					url: url
+				})
+			},
+		}
+
+	};
+</script>
+<style lang="scss" scoped>
+	.old{
+		margin-left: 14rpx;
+		font-size: 26upx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		text-decoration: line-through;
+		color: #BBBBBB;
+		line-height: 1.1;
+	}
+	.box {
+		background: #FFFFFF;
+		border-radius: 16rpx 16rpx 16rpx 16rpx;
+		margin: 24rpx;
+		box-sizing: border-box;
+
+		.title-box {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: space-between;
+			padding: 28rpx 0;
+			box-sizing: border-box;
+
+			.title {
+				font-size: 32upx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #111111;
+			}
+
+			.more {
+				display: flex;
+				align-items: center;
+				justify-content: flex-end;
+
+				.text {
+					font-size: 24rpx;
+					font-family: PingFang SC;
+					color: #9B9B9B;
+				}
+
+				image {
+					margin-left: 10rpx;
+					width: 15rpx;
+					height: 20rpx;
+				}
+
+			}
+		}
+
+		.price-box {
+			font-family: Roboto, Roboto;
+			font-weight: bold;
+			font-size: 36rpx;
+			color: #FF5C03;
+			margin-top: 22rpx;
+
+			&-unit {
+				font-weight: 600;
+				font-size: 26rpx;
+			}
+
+			&-decimal {
+				font-weight: 600;
+				font-size: 26rpx;
+			}
+
+			&-text {
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 500;
+				font-size: 26rpx;
+			}
+		}
+	}
+
+	.medicine-box {
+		padding: 0 24rpx 32rpx 24rpx;
+
+		.medicine {
+			width: 200rpx;
+			height: 200rpx;
+			flex-shrink: 0;
+			border-radius: 16rpx 16rpx 16rpx 16rpx;
+			overflow: hidden;
+			position: relative;
+			margin-right: 24rpx;
+			.otc {
+				position: absolute;
+				top: 0;
+				left: 0;
+				width: 96rpx;
+				height: 40rpx;
+				border-radius: 0;
+			}
+
+			image {
+				width: 100%;
+				height: 100%;
+				border-radius: 16rpx 16rpx 16rpx 16rpx;
+			}
+
+			&-r {
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 500;
+				font-size: 32rpx;
+				color: #191A1B;
+				flex: 1;
+				overflow: hidden;
+			}
+
+			&-item {
+				align-items: flex-start !important;
+				margin-bottom: 40rpx;
+
+				&:last-child {
+					margin-bottom: 0;
+				}
+			}
+		}
+
+		.desc {
+			margin-top: 12rpx;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #939599;
+		}
+	}
+</style>

+ 1 - 1
manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "his_user_app",
+    "name" : "医健宝互联网医院",
     "appid" : "__UNI__0B04737",
     "description" : "",
     "versionName" : "1.0.0",

+ 3 - 2
note.txt

@@ -9,9 +9,10 @@
 
 wxc3f0a952b7bc2b94
 wx73f85f8d62769119
-医健宝互联网医院
+御君方互联网医院
 彩虹惠医互联网医院
-
+wx1e6d61497bba00ef
+医健宝互联网医院
 
 云联测试
 wx6535a9714d7e4e67

+ 336 - 5
pages.json

@@ -31,6 +31,16 @@
 			
 			}
 		},
+		{
+			"path": "pages/shopping/index",
+			"style": {
+				"navigationBarTextStyle": "black",
+				"navigationBarTitleText": "医健宝互联网医院",
+		        "enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			
+			}
+		},
 		{
 			"path": "pages/index/h5",
 			"style": {
@@ -79,7 +89,7 @@
 		,{
 			"path": "pages/im/conversationList/index",
 			"style": {
-				"navigationBarTitleText": "咨询消息",
+				"navigationBarTitleText": "问诊",
 				"navigationBarBackgroundColor": "#fff",
 				"navigationBarTextStyle": "black"
 				// "usingComponenets": {
@@ -389,8 +399,49 @@
 						"navigationBarBackgroundColor": "#ffffff"
 				    }
 				    
+				},
+				{
+				    "path" : "healthy/index",
+				    "style" :                                                                                    
+				    {
+				        "navigationBarTitleText": "医药资讯",
+				        "enablePullDownRefresh": false,
+						"navigationBarTextStyle": "black",
+						"navigationBarBackgroundColor": "#ffffff",
+						"app-plus": {
+							"titleNView": false
+						}
+				    }
+				    
+				},
+				{
+				    "path" : "healthy/detail",
+				    "style" :                                                                                    
+				    {
+				        "navigationBarTitleText": "详情",
+				        "enablePullDownRefresh": false,
+						"navigationBarTextStyle": "black",
+						"navigationBarBackgroundColor": "#ffffff",
+						"app-plus": {
+							"titleNView": false
+						}
+				    }
+				    
+				},
+				{
+				    "path" : "healthy/readUsers",
+				    "style" :                                                                                    
+				    {
+				        "navigationBarTitleText": "阅读用户",
+				        "enablePullDownRefresh": false,
+						"navigationBarTextStyle": "black",
+						"navigationBarBackgroundColor": "#ffffff",
+						"app-plus": {
+							"titleNView": false
+						}
+				    }
+				    
 				}
-				
 			]
 		},
 		{
@@ -1283,6 +1334,14 @@
 						"navigationBarBackgroundColor":"#f7f7f7",
 						"navigationBarTextStyle":"black"
 					}
+				 },{
+					"path": "complaint",
+					"style": {
+						"navigationBarTitleText" : "咨询投诉",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor":"#fff",
+						"navigationBarTextStyle":"black"
+					}
 				 }
 			]
 		},
@@ -1431,6 +1490,8 @@
 				        "navigationBarTitleText": "课程",
 				        "navigationStyle": "custom",
 				        "scrollIndicator": "none",
+						"navigationBarTextStyle": "black",
+						"navigationBarBackgroundColor": "#ffffff",
 				        "bounce": "none",
 						"usingComponenets": {
 							"uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup"
@@ -1447,6 +1508,8 @@
 				        "navigationBarTitleText": "投诉反馈",
 				        "navigationStyle": "custom",
 				        "scrollIndicator": "none",
+						"navigationBarTextStyle": "black",
+						"navigationBarBackgroundColor": "#ffffff",
 						"app-plus": {
 							"bounce": "none",
 							"softinputMode": "adjustResize"
@@ -1459,6 +1522,8 @@
 				    {
 				        "navigationBarTitleText": "授权登录",
 				        "scrollIndicator": "none",
+						"navigationBarTextStyle": "black",
+						"navigationBarBackgroundColor": "#ffffff",
 						"app-plus": {
 							"bounce": "none",
 							"softinputMode": "adjustResize"
@@ -1824,7 +1889,273 @@
 				}
 			]
 		}
-		
+		,{
+			"root": "pages_shopping",
+			"pages": [
+				// {
+				// 	"path" : "shopping/coupon",
+				// 	"style" :                                                                                    
+				// 	{
+				// 		"navigationBarTitleText": "优惠券",
+				// 		"enablePullDownRefresh": false
+				// 	}
+					
+				// }
+				// ,{
+				// 	"path" : "shopping/myCoupon",
+				// 	"style" :                                                                                    
+				// 	{
+				// 		"navigationBarTitleText": "我的优惠券",
+				// 		"enablePullDownRefresh": false
+				// 	}
+					
+				// }
+				// ,{
+				// 	"path" : "shopping/activityDetails",
+				// 	"style" :                                                                                    
+				// 	{
+				// 		"navigationBarTitleText": "活动",
+				// 		"enablePullDownRefresh": false
+				// 	}
+					
+				// }
+				// ,{
+				// 	"path" : "store/index",
+				// 	"style" :                                                                                    
+				// 	{
+				// 		"navigationBarTitleText": "",
+				// 		"enablePullDownRefresh": false,
+				// 						"navigationStyle": "custom"
+				// 	}
+					
+				// },
+				{
+				    "path" : "registerMerchant",
+				    "style" :                                                                                    
+				    {
+				        "navigationBarTitleText": "商家入驻",
+						"enablePullDownRefresh": false,
+						"navigationBarTextStyle": "black",
+						"navigationBarBackgroundColor": "#ffffff",
+						"app-plus": {
+							"titleNView": false
+						}
+				    }
+				    
+				},
+				{
+				    "path" : "home/productSearch",
+				    "style" :                                                                                    
+				    {
+				        "navigationBarTitleText": "商品搜索",
+						"navigationBarTextStyle": "black",
+						"navigationBarBackgroundColor": "#ffffff",
+						"enablePullDownRefresh": false,
+						"app-plus": {
+							"titleNView": false
+						}
+				    }
+				    
+				},
+				{
+				    "path" : "home/h5",
+				    "style" :                                                                                    
+				    {
+				        "navigationBarTitleText": "详情",
+				        "enablePullDownRefresh": false,
+						"navigationBarTextStyle": "black",
+						"navigationBarBackgroundColor": "#ffffff"
+				    }
+				    
+				},
+				{
+				    "path" : "home/productList",
+				    "style" :                                                                                    
+				    {
+				        "navigationBarTitleText": "商品列表",
+						"navigationBarTextStyle": "black",
+						"navigationBarBackgroundColor": "#ffffff",
+						"app-plus": {
+							"titleNView": false
+						}
+				    }
+				}
+				,{
+				    "path" : "cart",
+				    "style" :                                                                                    
+				    {
+				        "navigationBarTitleText": "购物车",
+						"navigationBarTextStyle": "black",
+						"navigationBarBackgroundColor": "#ffffff",
+				        "enablePullDownRefresh": false
+				    }
+				    
+				},{
+					"path" : "productDetails",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "商品详情",
+						"navigationBarTextStyle": "black",
+						"navigationBarBackgroundColor": "#ffffff",
+						"enablePullDownRefresh": false
+					}
+					
+				}
+				,{
+				    "path" : "productList",
+				    "style" :                                                                                    
+				    {
+				        "navigationBarTitleText": "药品列表",
+						"navigationBarTextStyle": "black",
+						"navigationBarBackgroundColor": "#ffffff",
+				        "enablePullDownRefresh": false
+				    }
+				    
+				}
+				,{
+				    "path" : "confirmOrder",
+				    "style" :                                                                                    
+				    {
+				        "navigationBarTitleText": "确认订单",
+						"navigationBarTextStyle": "black",
+						"navigationBarBackgroundColor": "#ffffff",
+				        "enablePullDownRefresh": false
+				    }
+				    
+				}
+				,{
+				    "path" : "paymentOrder",
+				    "style" :                                                                                    
+				    {
+				        "navigationBarTitleText": "支付订单",
+						"navigationBarTextStyle": "black",
+						"navigationBarBackgroundColor": "#ffffff",
+				        "enablePullDownRefresh": false
+				    }
+				    
+				}
+				,{
+				    "path" : "payOrder",
+				    "style" :                                                                                    
+				    {
+				        "navigationBarTitleText": "推荐订单支付",
+						"navigationBarTextStyle": "black",
+						"navigationBarBackgroundColor": "#ffffff",
+				        "enablePullDownRefresh": false
+				    }
+				    
+				}
+				,{
+				    "path" : "prescribe",
+				    "style" :                                                                                    
+				    {
+				        "navigationBarTitleText": "填写处方信息",
+						"navigationBarTextStyle": "black",
+						"navigationStyle": "custom",
+				        "enablePullDownRefresh": false
+				    }
+				    
+				}
+				,{
+				    "path" : "success",
+				    "style" :                                                                                    
+				    {
+				        "navigationBarTitleText": "支付成功",
+						"navigationBarTextStyle": "black",
+						"navigationBarBackgroundColor": "#ffffff",
+				        "enablePullDownRefresh": false
+				    }
+				    
+				}
+				,{
+				    "path" : "confirmCreateOrder",
+				    "style" :                                                                                    
+				    {
+				        "navigationBarTitleText": "确认订单",
+						"navigationBarTextStyle": "black",
+						"navigationBarBackgroundColor": "#ffffff",
+				        "enablePullDownRefresh": false
+				    }
+				    
+				},{
+					"path" : "user/otherPaymentOrder",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "亲友代付",
+						"navigationBarTextStyle": "black",
+						"navigationBarBackgroundColor": "#ffffff",
+						"enablePullDownRefresh": false
+					}
+					
+				}
+				,{
+					"path" : "user/otherPaySuccess",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "支付成功",
+						"navigationBarTextStyle": "black",
+						"navigationBarBackgroundColor": "#ffffff",
+						"enablePullDownRefresh": false
+					}
+					
+				},{
+					"path" : "home/content",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "详情",
+						"navigationBarTextStyle": "black",
+						"navigationBarBackgroundColor": "#ffffff",
+						"enablePullDownRefresh": false
+					}
+					
+				}
+			]
+		}
+		,{
+			"root": "pages_store",
+			"pages": [
+				{
+					"path" : "index",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "药店",
+						"enablePullDownRefresh": false,
+						"navigationBarTextStyle": "black",
+						"navigationBarBackgroundColor": "#ffffff",
+						"app-plus": {
+							"titleNView": false
+						}
+					}
+				},
+				{
+					"path" : "storeIndex",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "药店",
+						"enablePullDownRefresh": false,
+						"navigationBarTextStyle": "black",
+						"navigationBarBackgroundColor": "#ffffff",
+						"navigationStyle": "custom",
+						"app-plus": {
+							"titleNView": false
+						}
+					}
+				},
+				{
+					"path" : "storeDetail",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "详情",
+						"enablePullDownRefresh": false,
+						"navigationBarTextStyle": "black",
+						"navigationBarBackgroundColor": "#ffffff",
+						"app-plus": {
+							"titleNView": false
+						}
+					}
+				}
+			]
+		}
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
@@ -1861,10 +2192,10 @@
 				"text": "问诊"
 			},
 			{
-				"pagePath": "pages/store/index",
+				"pagePath": "pages/shopping/index",
 				"iconPath": "/static/tabbar/store.png",
 				"selectedIconPath": "/static/tabbar/store_select.png",
-				"text": "品"
+				"text": "品"
 			},
 			{
 				"pagePath": "pages/user/index",

+ 8 - 8
pages/auth/login.vue

@@ -4,7 +4,7 @@
 			<view class="force-login__content y-f">
 				<view class="logo">
 					<view class="logo-img">
-						<image src="https://cos.his.cdwjyyh.com/fs/20240423/1287b2bf7c944538905f5092e8ff7db9.png"></image>
+						<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/logo.png"></image>
 					</view>
 					<view class="title">医健宝互联网医院</view>
 				</view>
@@ -303,8 +303,8 @@ export default {
 				position: absolute;
 				width: 630rpx;
 				height: 80rpx;
-				background: linear-gradient(to right, #c39a58 0%, #e2c99e 100%);
-				background: -moz-linear-gradient(to right, #c39a58 0%, #e2c99e 100%);
+				background: linear-gradient(to right, #2583EB 0%, #2EDAD4 100%);
+				background: -moz-linear-gradient(to right, #2583EB 0%, #2EDAD4 100%);
 				// box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22);
 				border-radius: 40rpx;
 				font-size: 30rpx;
@@ -318,8 +318,8 @@ export default {
 			// position: absolute;
 			width: 630rpx;
 			height: 80rpx;
-			background: linear-gradient(to right, #c39a58 0%, #e2c99e 100%);
-			background: -moz-linear-gradient(to right, #c39a58 0%, #e2c99e 100%);
+			background: linear-gradient(to right, #2583EB 0%, #2EDAD4 100%);
+			background: -moz-linear-gradient(to right, #2583EB 0%, #2EDAD4 100%);
 			// box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22);
 			border-radius: 40rpx;
 			font-size: 30rpx;
@@ -332,12 +332,12 @@ export default {
 			height: 80rpx;
 			margin-top: 30rpx;
 			border-radius: 40rpx;
-			border: 2rpx solid #c39a58;
+			border: 2rpx solid #2583EB;
 			background: none;
 			font-size: 30rpx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #c39a58;
+			color: #2583EB;
 		}
 	}
 }
@@ -351,7 +351,7 @@ export default {
 	checkbox {
 	}
 	.btn {
-		color: #c39a58;
+		color: #2583EB;
 	}
 }
 .wxAuth {

+ 2 - 2
pages/components/wxAuth.vue

@@ -3,7 +3,7 @@
 		<view class="content">
 			<view class="info-item">
 				<view class="item">
-					<image  class="head"    :src="user.avatar==null?'https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/22cb9518a55040dea74d8f730551a7a2.jpg':user.avatar" mode=""></image>
+					<image  class="head"    :src="user.avatar==null?'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/my_heads_icon.png':user.avatar" mode=""></image>
 					<button class="wx-head" type="balanced" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
 					</button>
 				</view>
@@ -204,7 +204,7 @@
 			font-family: PingFang SC;
 			font-weight: 400;
 			color: #FFFFFF;
-			background: #C39A58;
+			background: #2583EB;
 			border-radius: 60upx;
 		}
 	}

+ 1 - 1
pages/courseAnswer/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
 		<web-view :src="pageUrl" v-if="pageUrl" update-title allow="fullscreen" @message="handleMessage"></web-view>
-		<image v-if="false" src="https://cos.his.cdwjyyh.com/fs/20240423/cf4a86b913a04341bb44e34bb4d37aa2.png" mode="aspectFill"></image>
+		<image v-if="false" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/empty_icon.png" mode="aspectFill"></image>
 		<view>{{msg}}</view>
 	</view>
 </template>

+ 1 - 1
pages/courseAnswer/list.vue

@@ -46,7 +46,7 @@
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					textNoMore:"已经到底了",
 					empty: {
-						icon:'https://cos.his.cdwjyyh.com/fs/20240423/cf4a86b913a04341bb44e34bb4d37aa2.png',
+						icon:'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/empty_icon.png',
 						tip: '暂无数据'
 					}
 				},

+ 5 - 5
pages/doctor/index.vue

@@ -197,7 +197,7 @@
 					margin-right: 15rpx;
 					height: 30rpx;
 					width: 6rpx;
-					background-color: #C39A58;
+					background-color: #2583EB;
 					
 				}
 				 
@@ -251,7 +251,7 @@
 					margin-right: 15rpx;
 					height: 30rpx;
 					width: 6rpx;
-					background-color: #C39A58;
+					background-color: #2583EB;
 					
 				}
 				 
@@ -363,7 +363,7 @@
 									flex: 1;
 									font-size: 32upx;
 									font-family: PingFang SC;
-									color: #C39A58;
+									color: #2583EB;
 								}
 								.btns{
 									margin-right: 10rpx;
@@ -371,12 +371,12 @@
 										display: flex;
 										align-items: center;
 										justify-content: center;
-										border: 2rpx solid #C39A58;
+										border: 2rpx solid #2583EB;
 										padding: 15rpx 30rpx;
 										border-radius: 30rpx;
 										font-size: 24upx;
 										font-family: PingFang SC;
-										color: #C39A58;
+										color: #2583EB;
 									}
 									
 								

+ 1 - 1
pages/im/conversationList/components/MyAvatar/index.vue

@@ -49,7 +49,7 @@ export default {
   data() {
     return {
        avatarText: undefined,
-	   defaultFaceIcon: "https://cos.his.cdwjyyh.com/fs/20250617/0d7f54fe8adc4d3689923f9bfc83d4c9.png"
+	   defaultFaceIcon: "https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/0d7f54fe8adc4d3689923f9bfc83d4c9.png"
     };
   },
   computed: {

+ 1 - 1
pages/im/conversationList/index.vue

@@ -57,7 +57,7 @@ export default {
 				noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 				textNoMore: '已经到底了',
 				empty: {
-					icon: 'https://cos.his.cdwjyyh.com/fs/20240423/cf4a86b913a04341bb44e34bb4d37aa2.png',
+					icon: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/empty_icon.png',
 					tip: '暂无数据'
 				}
 			},

+ 238 - 275
pages/index/index.vue

@@ -18,15 +18,8 @@
 				<view class="search">
 					<view class="search-box" @click="navTo('/pages_index/search')">
 						<image class="img" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/image/icon_search.png" mode=""></image>
-						<input disabled type="text" placeholder="搜索医生/疾病/知识" placeholder-class="input-place">
+						<input disabled type="text" placeholder="搜索医生、疾病、知识" placeholder-class="input-place">
 					</view>
-					<!-- <view class="msg">
-						<image v-if="!isTop" class="msg" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/image/msg.png"></image>
-						<image v-if="isTop"  class="msg" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/image/msg1.png"></image>
-						<button class='contact-btn' open-type="contact">
-						</button>
-					</view> -->
-					
 				</view>
 			</view>
 			<view class="cont-box">
@@ -35,52 +28,51 @@
 				</view>
 				<view class="banner" v-if="advImgs.length>0">
 					<u-swiper
-							:list="advImgs"
-							indicator
-							indicatorMode="line"
-							circular
-							height="233rpx"
-							@click="handleAdvClick">
-						</u-swiper>
+						:list="advImgs"
+						indicator
+						indicatorMode="line"
+						circular
+						height="233rpx"
+						@click="handleAdvClick">
+					</u-swiper>
 				</view>
-				<view class="btns">
-					<view class="btn1"  @click="navTo('/pages_doctor/doctorList')">
-						<view class="title-box">
-							<view class="title">专家问诊</view>
-							<view class="desc">名医问诊处方</view>
-						</view>
-						<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/4c28bef97d714e569e672e006ee471e2.png"></image>
-						<image class="mask" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/image/mask.png"></image>
+				<view class="menu-box box">
+					<view class="menu-item" @click="navTo('/pages_index/healthy/index')">
+						<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/index/medical_news_icon.png" mode="aspectFill"></image>
+						<view>医药资讯</view>
+					</view>
+					<view class="menu-item" @click="loginNavTo('/pages_user/complaint')">
+						<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/index/consultation_complaints_icon.png" mode="aspectFill"></image>
+						<view>咨询投诉</view>
+					</view>
+					<view class="menu-item" @click="navTo('/pages_order/inquirySelect?inquiryType=3')">
+						<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/index/consultant_pharmacist_icon.png" mode="aspectFill"></image>
+						<view>咨询药师</view>
 					</view>
-					<view class="btn2" @click="navTo('/pages_order/inquirySelectType')">
-						<view class="title-box">
-							<view class="title">健康咨询</view>
-							<view class="desc">快速健康咨询</view>
+					<view class="menu-item" @click="navTo('/pages_shopping/registerMerchant')">
+						<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/index/merchants_settle_in_icon.png" mode="aspectFill"></image>
+						<view>商家入驻</view>
+					</view>
+				</view>
+				<!-- 推荐药品 -->
+				<tuiProduct ref="tuiProduct"></tuiProduct>
+				<!-- 特色药店 -->
+				<view class="pharmacy-box box">
+					<view class="title-box">
+						<view class="title">特色药店</view>
+						<view class="more"  @click="navTo('/pages_store/index')" >
+							<view class="text">更多药店</view>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/image/arrow_gray.png"></image>
 						</view>
-						<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/86e6f39efbc54d2dadf058dde269e573.png"></image>
-						<image class="mask" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/image/mask.png"></image>
+					</view>
+					<view class="pharmacy">
+						<image :src="store.logoUrl" mode="aspectFill" v-for="(store,i) in storeIndexList" :key="i" 
+						@click="navTo('/pages_store/storeIndex?storeId='+store.id)"></image>
 					</view>
 				</view>
 				<view class="modules">
 					<view class="module" v-for="(it,index) in layouts" :key="index">
-						<view class="menus" v-if="it.id==1&&it.isShow">
-							<view class="title">{{it.name}}</view>
-							<view class="menu-box">
-								<view class="menu"  @click="navTo('/pages_index/testList')">
-									<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/6104b270481040dd8340859c9d901c09.png"></image>
-								</view>
-								<view class="menu" @click="navTo('/pages_user/integralGoodsList')">
-									<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/f9f2f6c6b4d24f1ba9a637dfed74f8c3.png"></image>
-								</view>
-								<view class="menu" @click="navTo('/pages_order/inquirySelect?inquiryType=3')">
-									<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/76f15105ebe442398da1fe57e080bcd4.png"></image>
-								</view>
-								<view class="menu" @click="switchTab('/pages/store/index')">
-									<image src="https://cos.his.cdwjyyh.com/fs/20240509/908255a8d8134a5482f0314bfbb42c02.png"></image>
-								</view>
-							</view>
-						</view>
-						<view class="depts" v-if="it.id==2&&it.isShow">
+						<!-- <view class="depts" v-if="it.id==2&&it.isShow">
 							<view class="title">
 								{{it.name}}
 							</view>
@@ -137,8 +129,8 @@
 								</view>
 							</view>
 							</scroll-view>
-						</view>
-						<view class="doctors" v-if="it.id==5&&it.isShow">
+						</view> -->
+						<view class="doctors box" v-if="it.id==5&&it.isShow">
 							<view class="title-box">
 								<view class="title">{{it.name}}</view>
 								<view class="more" @click="navTo('/pages_doctor/doctorList')">
@@ -146,7 +138,7 @@
 									<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/image/arrow_gray.png"></image>
 								</view>
 							</view>
-							<view class="doctor-box" v-if="doctors.length>0">
+							<view class="doctor-box" v-if="doctors.length>0" style="padding: 0;margin: 0;">
 								<view class="doctor" @click="navTo('/pages_doctor/doctorDetails?doctorId='+item.doctorId)" v-for="(item,index) in doctors" :key="index">
 									<view class="item">
 										<view class="left">
@@ -154,7 +146,7 @@
 												<image mode="aspectFill" class="doc-img" :src="item.avatar"></image>
 												<view class="isline" v-if="item.workStatus==1">
 													<view class="img">
-														<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/image/isline.png"></image>
+														<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/index/isline.png"></image>
 														<view class="name">在线</view>
 													</view>
 												</view>
@@ -200,18 +192,18 @@
 								</view>
 							</view>
 						</view>
-						<view class="articles" v-if="it.id==6&&it.isShow">
+						<view class="articles box" v-if="it.id==6&&it.isShow">
 							<view class="title-box">
 								<view class="title">{{it.name}}</view>
-								<view class="more" @click="navTo('/pages_index/articleList')">
+								<view class="more" @click="navTo('/pages_index/healthy/index')">
 									<view class="text">更多</view>
 									<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/image/arrow_gray.png"></image>
 								</view>
 							</view>
 							<view class="article-box" v-if="articles.length>0">
-								<view class="item" @click="navTo('/pages_index/articleDetails?articleId='+item.articleId)" v-for="(item,index) in articles" :key="index">
+								<view class="item" @click="navTo('/pages_index/healthy/detail?articleId='+item.articleId)" v-for="(item,index) in articles" :key="index">
 									<view class="left">
-										<view class="title">
+										<view class="title ellipsis2">
 											{{item.title}}
 										</view>
 										<view class="views">
@@ -219,13 +211,13 @@
 										</view>
 									</view>
 									<view class="right">
-										<image :src="item.imageUrl"></image>
+										<image :src="item.imageUrl" mode="aspectFill"></image>
 									</view>
 								</view>
 							</view>
 						</view>
 						
-						<view class="packages" v-if="it.id==7&&it.isShow">
+						<!-- <view class="packages" v-if="it.id==7&&it.isShow">
 							<view class="title-box">
 								<view class="title">{{it.name}}</view>
 								<view class="more" @click="navTo('/pages_index/packageList')">
@@ -249,16 +241,37 @@
 									</view>
 								</view>
 							</view>
+						</view> -->
+					</view>
+				</view>
+				<!-- 资质 -->
+				<view class="qualifications-box">
+					<view class="qualifications-con">
+						<image class="qualifications-icon" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/index/certificate_icon68.svg" mode=""></image>
+						<view class="qualifications-r">
+							<view class="x-bc">
+								<text>资质证书展示</text>
+								<view class="desc x-f" @click="navTo('/pages_user/cert')">
+									<text>查看详情</text>
+									<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/index/white_right_arrow_right_icon.png" mode="aspectFill"></image>
+								</view>
+							</view>
+							<view class="text" style="margin-top: 6rpx;">药品交易平台备案:XXXXX</view>
+							<view class="text" style="margin-top: 6rpx;">医疗器械交易平台备案:XXXXX</view>
 						</view>
 					</view>
+					<view>
+						<text class="text" style="margin-right: 40rpx;">投诉举报邮箱:Yijabao@163.com</text>
+						<text class="text">联系电话:13466304507</text>
+					</view>
 				</view>
-				
 			</view>
 			
 		</view>
 	</view>
 </template>
 <script>
+	import tuiProduct from "@/components/tuiProduct.vue"
 	import {getConfigByKey} from '@/api/common'
 	import {getPackageList} from '@/api/package.js'
 	import {getDoctorArticleList} from '@/api/doctorArticle.js'
@@ -267,7 +280,11 @@
 	import {getAdvList} from '@/api/adv.js'
 	import {getDepartmentList} from '@/api/department.js'
 	import {getDictByKey} from '@/api/common.js'
+	import {validList}from '@/api/index.js'
 	export default {
+		components: {
+			tuiProduct
+		},
 		data() {
 			return {
 				layouts:[],
@@ -295,7 +312,8 @@
 				depts:[],
 				doctocArticles:[],
 				hosLevelOptions:[],
-				packages:[]
+				packages:[],
+				storeIndexList: []
 			}
 		},
 		onLoad() {
@@ -335,10 +353,11 @@
 			this.getDoctorList();
 			this.getArticleList();
 			this.getAdvList();
-			this.getDepartmentList();
-			this.getDoctorArticleList();
-			this.getPackageList();
+			// this.getDepartmentList();
+			// this.getDoctorArticleList();
+			// this.getPackageList();
 			this.getConfigByKey("his.appShow");
+			this.getStore()
 			var that=this;
 			uni.$emit('refreshMsgCount');
 		},
@@ -351,17 +370,17 @@
 				return {
 					title: "医健宝互联网医院",
 					path: '/pages/index/index',
-					imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230106/6b459adfb1004c1a96219bcdf07e337c.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/sharelogo.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			
 		},
 		//分享到朋友圈
 		onShareTimeline(res) {
-			if(this.utils.isLogin()){
+			if(this.$isLogin()){
 				return {
 					title: "医健宝互联网医院",
-					imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230106/6b459adfb1004c1a96219bcdf07e337c.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/sharelogo.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			
@@ -389,6 +408,13 @@
 					title: '敬请期待'
 				})
 			},
+			getStore() {
+				validList().then(res=>{
+					if(res.code==200) {
+						this.storeIndexList =res.rows
+					}
+				})
+			},
 			getConfigByKey(key){
 				var that=this;
 				var data={key:key}
@@ -677,6 +703,48 @@
 	}
 </script>
 <style scoped lang="scss">
+	.qualifications {
+		&-box {
+			margin: 24rpx;
+			padding: 24rpx;
+			box-sizing: border-box;
+			overflow: hidden;
+			background-image: url('https://cos.his.cdwjyyh.com/fs/20250826/54a29c58e06c431cbe3286335bb0da1b.png');
+			background-repeat: no-repeat;
+			background-size: 100% 100%;
+			.text {
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 400;
+				font-size: 20rpx;
+				color: #FFFFFF;
+			}
+		}
+		&-con {
+			display: flex;
+			align-items: flex-start;
+		}
+		&-icon {
+			height: 136rpx;
+			width: 136rpx
+		}
+		&-r {
+			flex: 1;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 600;
+			font-size: 40rpx;
+			color: #FFFFFF;
+			.desc {
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #FFFFFF;
+				image {
+					height: 48rpx;
+					width: 48rpx
+				}
+			}
+		}
+	}
 	.content{
 		height: 100%;
 		.cont{
@@ -687,8 +755,8 @@
 			.bg{
 				width: 100%;
 				height:450rpx;
-				// background-color: #2BC7B9;
-				// background: linear-gradient(#2BC7B9, #88e2da);
+				// background-color: #2583EB;
+				// background: linear-gradient(#2583EB, #88e2da);
 				position: fixed;
 				image{
 					border-radius: 0rpx 0rpx 50rpx 50rpx;
@@ -791,148 +859,113 @@
 					}
 				}
 			}
-			.cont-box{
-				z-index: 100;
-				.banner{
-					margin: 20rpx auto auto;
-					width: 702rpx;
-				}
-				.btns{
-					
-					padding: 0 20upx;
-					margin-top: 20rpx;
-					width: 100%;
+			.box {
+				background: #FFFFFF;
+				border-radius: 16rpx 16rpx 16rpx 16rpx;
+				margin: 24rpx;
+				box-sizing: border-box;
+				.title-box{
 					display: flex;
+					flex-direction: row;
 					align-items: center;
-					justify-content: center;
-					.btn1{
-						position: relative;
-						background: linear-gradient(to bottom, #EEC992, #CDA569);
-						box-shadow: 0px 0px 5px 2px rgba(0,0,0,0.05);
-						margin-right: 30rpx;
-						border-radius: 15rpx;
-						height:180rpx;
-						padding: 15rpx 30rpx;
-						width:50%;
-						display: flex;
-						align-items: center;
-						justify-content: space-between;
-						&:last-child{
-							margin-right: 0rpx;
-						}
-						image{
-							width:104rpx;
-							height:104rpx;
-						}
-						.mask{
-							position: absolute;
-							top:0rpx;
-							right:0rpx;
-							width: 100rpx;
-							height:100rpx;
-						}
-						.title-box{
-							display: flex;
-							align-items: flex-start;
-							justify-content: center;
-							flex-direction: column;
-							.title{
-								font-size: 36upx;
-								font-weight: bold;
-								color: #ffffff;
-							}
-							.desc{
-								margin-top: 6rpx;
-								opacity: 0.8;
-								font-size: 26upx;
-								color: #ffffff;
-							}
-							
-						}
+					justify-content: space-between;
+					padding: 28rpx 0;
+					box-sizing: border-box;
+					.title{
+						font-size: 32upx;
+						font-family: PingFang SC;
+						font-weight: bold;
+						color: #111111;
 					}
-					.btn2{
-						position: relative;
-						background: linear-gradient(to bottom, #EE8C5F, #EA5733);
-						box-shadow: 0px 0px 5px 2px rgba(0,0,0,0.05);
-						margin-right: 30rpx;
-						border-radius: 15rpx;
-						height:180rpx;
-						padding: 15rpx 30rpx;
-						width:50%;
+					.more{
 						display: flex;
 						align-items: center;
-						justify-content: space-between;
-						&:last-child{
-							margin-right: 0rpx;
+						justify-content: flex-end;
+						.text{
+							font-size: 24rpx;
+							font-family: PingFang SC;
+							color: #9B9B9B;
 						}
 						image{
-							width:104rpx;
-							height:104rpx;
-						}
-						.mask{
-							position: absolute;
-							top:0rpx;
-							right:0rpx;
-							width: 100rpx;
-							height:100rpx;
-						}
-						.title-box{
-							display: flex;
-							align-items: flex-start;
-							justify-content: center;
-							flex-direction: column;
-							.title{
-								font-size: 36upx;
-								font-weight: bold;
-								color: #ffffff;
-							}
-							.desc{
-								margin-top: 6rpx;
-								opacity: 0.8;
-								font-size: 26upx;
-								font-weight: bold;
-								color: #ffffff;
-							}
-							
+							margin-left: 10rpx;
+							width:15rpx;
+							height:20rpx;
 						}
+						
+					}
+				}
+				.price-box {
+					font-family: Roboto, Roboto;
+					font-weight: bold;
+					font-size: 36rpx;
+					color: #FF5C03;
+					margin-top: 22rpx;
+					&-unit {
+						font-weight: 600;
+						font-size: 26rpx;
+					}
+					&-decimal {
+						font-weight: 600;
+						font-size: 26rpx;
+					}
+					&-text {
+						font-family: PingFang SC, PingFang SC;
+						font-weight: 500;
+						font-size: 26rpx;
+					}
+				}
+			}
+			.menu-box {
+				display: flex;
+				align-items: center;
+				justify-content: space-evenly;
+				padding: 26rpx 0 34rpx 0;
+				.menu-item {
+					width: 25%;
+					font-family: PingFang SC, PingFang SC;
+					font-weight: 400;
+					font-size: 24rpx;
+					color: #222222;
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					align-items: center;
+				}
+				image {
+					width: 104rpx;
+					height: 104rpx;
+					margin-bottom: 26rpx;
+				}
+			}
+			
+			.pharmacy-box {
+				padding: 8rpx 24rpx 32rpx 24rpx;
+				.pharmacy {
+					background: #FFFFFF;
+					display: flex;
+					align-items: center;
+					flex-wrap: wrap;
+					margin-right: -18rpx;
+					image {
+						flex-shrink: 0;
+						width: 150rpx;
+						height: 150rpx;
+						border-radius: 16rpx 16rpx 16rpx 16rpx;
+						border: 1rpx solid #F5F6F6;
+						margin-right: 18rpx;
+						margin-bottom: 18rpx;
+						box-sizing: border-box;
 					}
 				}
+			}
+			.cont-box{
+				z-index: 100;
+				.banner{
+					margin: 20rpx auto auto;
+					width: 702rpx;
+				}
 				.modules{
 					.module{
-						.menus{
-							z-index: 101;
-							margin: 20rpx 15rpx 0rpx;
-							padding: 20rpx;
-							box-shadow: 0px 0px 5px 2px rgba(0,0,0,0.05);
-							background-color: #fff;
-							border-radius: 15rpx;
-							.title{
-								font-size: 32upx;
-								font-family: PingFang SC;
-								font-weight: bold;
-								color: #2A2B2E;
-							}
-							.menu-box{
-								display: flex;
-								align-items: center;
-								justify-content: flex-start;
-								flex-wrap:wrap;
-								.menu{
-									padding: 15rpx;
-									width:50%;
-									display: flex;
-									flex-direction: column;
-									align-items: center;
-									justify-content: center;
-									flex-wrap: wrap;
-									image{
-										width:100%;
-										height:180rpx;
-									}
-								}
-							}
-							
-						}
 						.depts{
 							z-index: 101;
 							margin: 20rpx 15rpx 0rpx;
@@ -1010,7 +1043,6 @@
 								}
 							}
 							.article-box{
-								padding: 20rpx 0rpx;
 								overflow-x: auto;
 								box-sizing: border-box;
 								display: flex;
@@ -1107,81 +1139,12 @@
 								
 							}
 						}
-						.doctors{
-							z-index: 101;
-							margin: 20rpx 15rpx;
-							padding: 20rpx;
-							box-shadow: 0px 0px 5px 2px rgba(0,0,0,0.05);
-							background-color: #fff;
-							border-radius: 15rpx;
-							.title-box{
-								display: flex;
-								flex-direction: row;
-								align-items: center;
-								justify-content: space-between;
-								.title{
-									font-size: 32upx;
-									font-family: PingFang SC;
-									font-weight: bold;
-									color: #111111;
-								}
-								.more{
-									display: flex;
-									align-items: center;
-									justify-content: flex-end;
-									.text{
-										font-size: 24rpx;
-										font-family: PingFang SC;
-										color: #9B9B9B;
-									}
-									image{
-										margin-left: 10rpx;
-										width:15rpx;
-										height:20rpx;
-									}
-									
-								}
-							}
-							
+						.doctors {
+							padding: 0 24rpx 24rpx 24rpx;
 						}
 						.articles{
-							z-index: 101;
-							margin: 20rpx 15rpx;
-							padding: 20rpx;
-							box-shadow: 0px 0px 5px 2px rgba(0,0,0,0.05);
-							background-color: #fff;
-							border-radius: 15rpx;
-							.title-box{
-								display: flex;
-								flex-direction: row;
-								align-items: center;
-								justify-content: space-between;
-								.title{
-									font-size: 32upx;
-									font-family: PingFang SC;
-									font-weight: bold;
-									color: #111111;
-								}
-								.more{
-									display: flex;
-									align-items: center;
-									justify-content: flex-end;
-									.text{
-										font-size: 24rpx;
-										font-family: PingFang SC;
-										color: #9B9B9B;
-									}
-									image{
-										margin-left: 10rpx;
-										width:15rpx;
-										height:20rpx;
-									}
-									
-								}
-							}
+							padding: 0 24rpx 24rpx 24rpx;
 							.article-box{
-								margin-top: 15rpx;
-								padding: 20rpx 0rpx 0rpx;
 								display: flex;
 								flex-direction: column;
 								align-items: flex-start;
@@ -1217,10 +1180,10 @@
 									}
 									.right{
 										image{
-											border-radius: 10rpx;
-											width:220rpx;
-											height:160rpx;
-											border: 1px solid #eeeeee;
+											width: 180rpx;
+											height: 136rpx;
+											background: #F5F6F6;
+											border-radius: 10rpx 10rpx 10rpx 10rpx;
 										}
 									}
 								}
@@ -1304,7 +1267,7 @@
 											width: 100%;
 											.price{
 												padding: 5rpx 10rpx;
-												background-color: #C39A58;
+												background-color: #2583EB;
 												border-radius: 30rpx;
 												font-size: 20upx;
 												font-family: PingFang SC;

+ 1335 - 0
pages/index/indexOld.vue

@@ -0,0 +1,1335 @@
+<template>
+	<view class="content">
+		<view class="cont">
+			<view class="bg">
+				<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/image/index_img/home_top_bg.png"></image>
+			</view>
+			<view class="top-box" :style="{ background: bg }" >
+				<view class="status_bar" :style="{height: statusBarHeight}"></view>
+				<view class="top-title">
+					<view class="name" :style="{ color: titleColor }">医健宝互联网医院</view>
+					<view class="desc-box" >
+						<image v-if="!isTop" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/image/dui1.png"></image>
+						<image v-if="isTop" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/image/dui1.png"></image>
+						
+						<view class="desc" :style="{ color: descColor }">卫健部门权威认证机构,世界各地千万用户健康选择</view>
+					</view>
+				</view>
+				<view class="search">
+					<view class="search-box" @click="navTo('/pages_index/search')">
+						<image class="img" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/image/icon_search.png" mode=""></image>
+						<input disabled type="text" placeholder="搜索医生、疾病、知识" placeholder-class="input-place">
+					</view>
+					<!-- <view class="msg">
+						<image v-if="!isTop" class="msg" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/image/msg.png"></image>
+						<image v-if="isTop"  class="msg" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/image/msg1.png"></image>
+						<button class='contact-btn' open-type="contact">
+						</button>
+					</view> -->
+					
+				</view>
+			</view>
+			<view class="cont-box">
+				<view class="status_bar" :style="{height: statusBarHeight}"></view>
+				<view style="padding-bottom:178rpx" >
+				</view>
+				<view class="banner" v-if="advImgs.length>0">
+					<u-swiper
+							:list="advImgs"
+							indicator
+							indicatorMode="line"
+							circular
+							height="233rpx"
+							@click="handleAdvClick">
+						</u-swiper>
+				</view>
+				<view class="btns">
+					<view class="btn1"  @click="navTo('/pages_doctor/doctorList')">
+						<view class="title-box">
+							<view class="title">专家问诊</view>
+							<view class="desc">名医问诊处方</view>
+						</view>
+						<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/4c28bef97d714e569e672e006ee471e2.png"></image>
+						<image class="mask" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/image/mask.png"></image>
+					</view>
+					<view class="btn2" @click="navTo('/pages_order/inquirySelectType')">
+						<view class="title-box">
+							<view class="title">健康咨询</view>
+							<view class="desc">快速健康咨询</view>
+						</view>
+						<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/86e6f39efbc54d2dadf058dde269e573.png"></image>
+						<image class="mask" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/image/mask.png"></image>
+					</view>
+				</view>
+				<view class="modules">
+					<view class="module" v-for="(it,index) in layouts" :key="index">
+						<view class="menus" v-if="it.id==1&&it.isShow">
+							<view class="title">{{it.name}}</view>
+							<view class="menu-box">
+								<view class="menu"  @click="navTo('/pages_index/testList')">
+									<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/6104b270481040dd8340859c9d901c09.png"></image>
+								</view>
+								<view class="menu" @click="navTo('/pages_user/integralGoodsList')">
+									<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/f9f2f6c6b4d24f1ba9a637dfed74f8c3.png"></image>
+								</view>
+								<view class="menu" @click="navTo('/pages_order/inquirySelect?inquiryType=3')">
+									<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/76f15105ebe442398da1fe57e080bcd4.png"></image>
+								</view>
+								<view class="menu" @click="switchTab('/pages/store/index')">
+									<image src="https://cos.his.cdwjyyh.com/fs/20240509/908255a8d8134a5482f0314bfbb42c02.png"></image>
+								</view>
+							</view>
+						</view>
+						<view class="depts" v-if="it.id==2&&it.isShow">
+							<view class="title">
+								{{it.name}}
+							</view>
+							<view class="dept-box">
+								<view @click="navTo('/pages_doctor/doctorList?deptId='+item.deptId)"  class="dept" v-for="(item,index) in depts" :key="index">
+									<image class="icon" :src="item.iconUrl"></image>
+									<view class="title">{{item.deptName}}</view>
+								</view>
+								<view @click="navTo('/pages_doctor/doctorList?deptId=0')" class="dept">
+									<image class="icon" src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/acbb520df8284c6aaff601cb06411c2a.png"></image>
+									<view class="title">更多科室</view>
+								</view>
+							</view>
+							
+						</view>
+						<view class="depts" v-if="it.id==3&&it.isShow">
+							<view class="title">
+								{{it.name}}
+							</view>
+							<view class="dept-box">
+								<view  @click="yangshengClick(item)"  class="dept" v-for="(item,index) in yangshengs" :key="index">
+									<image class="icon" :src="item.icon"></image>
+									<view class="title" >{{item.title}}</view>
+								</view>
+							</view>
+						</view>
+						<view class="doctor-articles" v-if="it.id==4&&it.isShow" >
+							<view class="title-box">
+								<view class="title">{{it.name}}</view>
+								<view class="more"  @click="navTo('/pages_doctor/doctorArticleList')" >
+									<view class="text">更多</view>
+									<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/image/arrow_gray.png"></image>
+								</view>
+							</view>
+							<scroll-view :scroll-x="true" style="white-space: nowrap;">
+							<view class="article-box"  >
+								<view class="article" @click="navTo('/pages_doctor/doctorArticleDetails?articleId='+item.articleId)"  v-for="(item,index) in doctocArticles" :key="index">
+									<view class="image-box">
+										<image mode="aspectFill" :src="item.imageUrl"></image>
+										<view class="views">
+											{{item.views}}人观看
+										</view>
+										<view class="doctor">
+											<image mode="aspectFill" :src="item.avatar"></image>
+											<view class="right">
+												<view class="doc-name ellipsis">{{item.doctorName}}</view>
+												<view class="doc-position ellipsis">{{item.position}}</view>
+											</view>
+										</view>
+									</view>
+									<view class="article-title-box">
+										<view class="article-title ellipsis">{{item.title}}</view>
+									</view>
+								</view>
+							</view>
+							</scroll-view>
+						</view>
+						<view class="doctors" v-if="it.id==5&&it.isShow">
+							<view class="title-box">
+								<view class="title">{{it.name}}</view>
+								<view class="more" @click="navTo('/pages_doctor/doctorList')">
+									<view class="text">更多</view>
+									<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/image/arrow_gray.png"></image>
+								</view>
+							</view>
+							<view class="doctor-box" v-if="doctors.length>0">
+								<view class="doctor" @click="navTo('/pages_doctor/doctorDetails?doctorId='+item.doctorId)" v-for="(item,index) in doctors" :key="index">
+									<view class="item">
+										<view class="left">
+											<view class="head-box"> 
+												<image mode="aspectFill" class="doc-img" :src="item.avatar"></image>
+												<view class="isline" v-if="item.workStatus==1">
+													<view class="img">
+														<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/isline.png"></image>
+														<view class="name">在线</view>
+													</view>
+												</view>
+											</view>
+										</view>
+										<view class="right"> 
+											<view class="doc-box">
+												<view class="doc-name">
+													{{item.doctorName}}
+												</view>
+												<view class="doc-position">{{item.position}}</view>
+												<view class="doc-dept">{{item.deptName}}</view>
+											</view>
+											<view class="hospital-box">
+												<!-- <view class="tag" v-if="item.hospitalLevel!=null">
+													<text>{{$getDictLabelName(hosLevelOptions,item.hospitalLevel)}}</text>
+												</view> -->
+												<view class="name">{{item.hospitalName||''}} </view>
+											</view>
+											<view class="doc-spec">
+												<view class="spec ellipsis2">{{item.speciality}}</view>
+											</view>
+											<view class="doc-count">
+												<view class="name">好评:</view>
+												<view class="count">{{item.pingStar}}分</view>
+												<view class="name">接诊量:</view>
+												<view class="count">{{item.orderNumber}}</view>
+												<view class="name">平均响应:</view>
+												<view class="count"></view>
+											</view>
+											<view class="doc-price"  >
+												<view class="btn">
+													咨询医生¥
+													<text v-for="(price,index) in item.prices" :key="index">
+														{{price.price.toFixed(2)}} <text v-if="index==0">/</text>
+													</text>
+												</view>
+											</view>
+										</view>
+										
+									</view>
+									
+								</view>
+							</view>
+						</view>
+						<view class="articles" v-if="it.id==6&&it.isShow">
+							<view class="title-box">
+								<view class="title">{{it.name}}</view>
+								<view class="more" @click="navTo('/pages_index/articleList')">
+									<view class="text">更多</view>
+									<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/image/arrow_gray.png"></image>
+								</view>
+							</view>
+							<view class="article-box" v-if="articles.length>0">
+								<view class="item" @click="navTo('/pages_index/articleDetails?articleId='+item.articleId)" v-for="(item,index) in articles" :key="index">
+									<view class="left">
+										<view class="title">
+											{{item.title}}
+										</view>
+										<view class="views">
+											浏览量 {{item.views}}
+										</view>
+									</view>
+									<view class="right">
+										<image :src="item.imageUrl"></image>
+									</view>
+								</view>
+							</view>
+						</view>
+						
+						<view class="packages" v-if="it.id==7&&it.isShow">
+							<view class="title-box">
+								<view class="title">{{it.name}}</view>
+								<view class="more" @click="navTo('/pages_index/packageList')">
+									<view class="text">更多</view>
+									<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/image/arrow_gray.png"></image>
+								</view>
+							</view>
+							<view class="package-box"  >
+								<view class="item" @click="navTo('/pages_index/packageDetails?packageId='+item.packageId)" v-for="(item,index) in packages" :key="index">
+									<view class="top">
+										<image :src="item.imgUrl"></image>
+									</view>
+									<view class="bottom">
+										<view class="title ellipsis2">
+											{{item.packageName}}
+										</view>
+										<view class="price-box">
+											<view class="price">¥{{item.price.toFixed(2)}}元/日</view>
+											<view class="count">{{item.sales}}人已购</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				
+			</view>
+			
+		</view>
+	</view>
+</template>
+<script>
+	import {getConfigByKey} from '@/api/common'
+	import {getPackageList} from '@/api/package.js'
+	import {getDoctorArticleList} from '@/api/doctorArticle.js'
+	import {getDoctorList} from '@/api/doctor.js'
+	import {getArticleList} from '@/api/article.js'
+	import {getAdvList} from '@/api/adv.js'
+	import {getDepartmentList} from '@/api/department.js'
+	import {getDictByKey} from '@/api/common.js'
+	export default {
+		data() {
+			return {
+				layouts:[],
+				yangshengs:[
+					{id:"0",title:"AI舌诊",page:"/pages_user/tongue/index",icon:"https://cos.his.cdwjyyh.com/fs/20240919/647fb42de0ab4e96a6c3097f3c3d9cf5.png"},
+					{id:"1",title:"药膳食疗",page:"/pages_index/medicatedFoodList",icon:"https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/3cfbd47911cf4753aa9497eac500728d.png"},
+					{id:"2",title:"经络穴位",page:"/pages_index/vesselList",icon:"https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/e93536a9dc1a4f8ca09545097b12fdea.png"},
+					{id:"3",title:"问答专区",page:"/pages_index/questionsList",icon:"https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/e896972bd56f4e358188af36f2c5af42.png"},
+					{id:"4",title:"疾病",page:"/pages_index/diseaseList",icon:"https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/d6f1851cccae414b8baf2ba07782f91b.png"},
+					{id:"5",title:"中药图解",page:"/pages_index/chineseMedicineList",icon:"https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/ff43572d0d004285b5a3b0ef2663c471.png"},
+					{id:"6",title:"名方今用",page:"/pages_index/famousPrescribeList",icon:"https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/45db770e58c34963b0d2ba24a958b617.png"},
+					{id:"7",title:"康复医案",page:"/pages_doctor/doctorArticleList",icon:"https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/e793942797b24035b51f94d894bdfa0b.png"}
+					
+				],
+				isTop:false,
+				titleColor:"#ffffff",
+				descColor:"#ffffff",
+				top:0,
+				// 状态栏的高度
+				statusBarHeight: uni.getStorageSync('menuInfo').statusBarHeight,
+				advImgs:[],
+				doctors:[],
+				advs:[],
+				articles:[],
+				depts:[],
+				doctocArticles:[],
+				hosLevelOptions:[],
+				packages:[]
+			}
+		},
+		onLoad() {
+			this.getDictByKey("sys_hospital_level");
+			uni.$on('refreshMsgCount', () => {
+				try{
+					let totalUnreadCount = uni.$TUIKit.getTotalUnreadMessageCount();
+					if(totalUnreadCount>0){
+						try{
+							uni.setTabBarBadge({ //显示数字
+								index: 1, //tabbar下标
+								text: totalUnreadCount+"" //数字
+							})
+						}
+						catch(e){
+							
+						}
+						
+					}
+					else{
+						try{
+							uni.hideTabBarRedDot({ //隐藏红点
+								index: 1 //tabbar下标
+							})
+						}
+						catch(e){
+							
+						}
+						
+					}
+				}catch(e){
+				}
+				
+			});
+		},
+		onShow() {
+			this.getDoctorList();
+			this.getArticleList();
+			this.getAdvList();
+			this.getDepartmentList();
+			this.getDoctorArticleList();
+			this.getPackageList();
+			this.getConfigByKey("his.appShow");
+			var that=this;
+			uni.$emit('refreshMsgCount');
+		},
+		onPageScroll(e) {
+			this.top=e.scrollTop;
+		},
+		//发送给朋友
+		onShareAppMessage(res) {
+			if(this.$isLogin()){
+				return {
+					title: "医健宝互联网医院",
+					path: '/pages/index/index',
+					imageUrl: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/sharelogo.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+				}
+			}
+			
+		},
+		//分享到朋友圈
+		onShareTimeline(res) {
+			if(this.$isLogin()){
+				return {
+					title: "医健宝互联网医院",
+					imageUrl: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/sharelogo.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+				}
+			}
+			
+		},
+		computed: {
+			bg: function() {
+				var top=this.top/120;
+				if(top>0){
+					this.isTop=true;
+					this.titleColor="#fff"
+					this.descColor="#fff"
+				}
+				else{
+					this.isTop=false;
+					this.titleColor="#fff"
+					this.descColor="#fff"
+				}
+				return 'rgba(37, 131, 235, ' + top + ')';
+			},
+		},
+		methods: {
+			dev(){
+				uni.showToast({
+					icon:"none",
+					title: '敬请期待'
+				})
+			},
+			getConfigByKey(key){
+				var that=this;
+				var data={key:key}
+				getConfigByKey(data).then(
+					res => {
+						if(res.code==200){
+							this.layouts=JSON.parse(res.data);
+							this.layouts.sort((a, b) => a.sort - b.sort)
+							this.layouts.forEach(function(element) {
+								if(element.id=="4"){
+									if(!element.isShow){
+										that.yangshengs.splice(6,1);	
+									}
+								}
+								if(element.id=="7"){
+									// if(!element.isShow){
+									// 	uni.setTabBarItem({
+									// 		index:2, //从左到右 0开始
+									// 		visible:false //默认true false隐藏
+									// 	})
+									// }
+									// else{
+									// 	uni.setTabBarItem({
+									// 		index:2, //从左到右 0开始
+									// 		visible:true //默认true false隐藏
+									// 	})
+									// }
+								}
+							});
+						}
+					},
+					rej => {}
+				);
+			},
+			yangshengClick(item){
+				// uni.navigateTo({
+				//   url: '/pages/index/webview?url=' + encodeURIComponent('rtlive://course?courseId=1')
+				// });
+				// return;
+				if(item.id==0){
+					// this.$isLogin().then(
+					// 	res => {
+					// 		if(res){
+								uni.navigateTo({
+									url:item.page
+								}); 
+					// 		}
+					// 		else{
+					// 			uni.navigateTo({
+					// 				url:'/pages/auth/login'
+					// 			})
+					// 		}
+					// 	}
+					// );
+				}
+				else{
+					if(item.page==""){
+						uni.showToast({
+							icon:"none",
+							title: '暂无更多'
+						})
+						return;
+					}
+					uni.navigateTo({
+						url:item.page
+					})
+				}
+				
+			},
+			switchTab(url){
+				uni.switchTab({
+					url:url
+				})
+			},
+			navToMiniProgram(){
+				uni.navigateToMiniProgram({
+					// appid  写你要跳转的小程序的 appid
+					appId: 'wx45cf09091aead547',
+					// 路径写  src下的路径,假如你跳转的是pages下的页面,就可以写pages/index
+					path: '/pages/common/launch',
+					extraData: {
+						// 'type': 'out'
+					},
+					// 这个不写的话会显示开发环境,不能正常跳转,写上就能正常跳转了
+					envVersion: 'develop',
+					success(res) {
+						// 打开成功
+						// uni.showToast({
+						// 	title: '跳转成功'
+						// })
+					},
+					fail(err) {
+						// 打开失败/取消
+						// uni.showToast({
+						// 	title: '跳转不成功'
+						// })
+					}
+				})
+			},
+			getDictByKey(key){
+				var data={key:key}
+				getDictByKey(data).then(
+					res => {
+						if(res.code==200){
+							if(key=="sys_hospital_level"){
+								this.hosLevelOptions=res.data;
+							}
+						}
+					},
+					err => {
+					}
+				);
+				
+			},
+			getDoctorArticleList(page) {
+				//联网加载数据
+				var that = this;
+				var data = {
+					pageNum:1,
+					pageSize:10,
+				};
+				getDoctorArticleList(data).then(res => {
+					if(res.code==200){
+						this.doctocArticles=res.data.list;
+					}else{
+					}
+				});
+			},
+			getDepartmentList(page) {
+				//联网加载数据
+				var that = this;
+				var data = {
+					isTui:1
+				};
+				getDepartmentList(data).then(res => {
+					if(res.code==200){
+						this.depts=res.data;
+					} 
+				});
+			},
+			handleAdvClick(index){
+				var ad=this.advs[index];
+				console.log(ad.advUrl);
+				if(ad.showType==1){
+					uni.setStorageSync('url',ad.advUrl);
+					uni.navigateTo({
+						url:"h5"
+					})
+				}
+				else if(ad.showType==2){
+					uni.navigateTo({
+						url:ad.advUrl
+					})
+				}
+				else if(ad.showType==3){
+					 uni.setStorageSync('content',ad.content);
+					 uni.navigateTo({
+					 	url:"content"
+					 })
+				}
+				
+			},
+			getAdvList() {
+				//联网加载数据
+				var that = this;
+				var data = {
+					advType:1
+				};
+				getAdvList(data).then(res => {
+					if(res.code==200){
+						that.advImgs=[];
+						that.advs=[];
+						res.data.forEach(function(element) {
+							if(element.imageUrl!=null&&element.imageUrl!=""){
+								that.advs.push(element);
+								that.advImgs.push(element.imageUrl);
+							}
+						});
+						
+					}else{
+						uni.showToast({
+							icon:'none',
+							title: "请求失败",
+						});
+					}
+				});
+			},
+			getArticleList() {
+				//联网加载数据
+				var that = this;
+				var data = {
+					isTui:1,
+					pageNum:1,
+					pageSize:10,
+				};
+				getArticleList(data).then(res => {
+					if(res.code==200){
+						this.articles=res.data.list;
+					}else{
+						uni.showToast({
+							icon:'none',
+							title: "请求失败",
+						});
+					}
+				});
+			},
+			getDoctorList() {
+				//联网加载数据
+				var that = this;
+				var data = {
+					isTui:1,
+					pageNum:1,
+					pageSize:10,
+				};
+				getDoctorList(data).then(res => {
+					if(res.code==200){
+						this.doctors=res.data.list;
+						this.doctors.forEach(function(value,index,array){
+							value.prices=JSON.parse(value.priceJson)
+						});
+					}else{
+						uni.showToast({
+							icon:'none',
+							title: "请求失败",
+						});
+					}
+				});
+			},
+			getPackageList() {
+				//联网加载数据
+				var that = this;
+				var data = {
+					isShow:1,
+					pageNum:1,
+					pageSize:10,
+				};
+				getPackageList(data).then(res => {
+					if(res.code==200){
+						this.packages=res.data.list;
+					}else{
+						uni.showToast({
+							icon:'none',
+							title: "请求失败",
+						});
+					}
+				});
+			},
+			loginNavTo(url){
+				this.$isLogin().then(
+					res => {
+						if(res){
+							console.log(res)
+							uni.navigateTo({
+								url: url
+							})
+						}
+						else{
+							uni.navigateTo({
+								url:'/pages/auth/login'
+							})
+						}
+					}
+				);
+				 
+			},
+			navTo(url){
+				if(url=="dev"){
+					uni.showToast({
+						icon:'none',
+						title: "尽情期待...",
+					});
+					return;
+				}
+				console.log(url)
+				uni.navigateTo({
+					url: url
+				})
+			},
+			 navToTest() {
+				 const course = {"companyId":100,"companyUserId":6806,"corpId":"ww5a88c4f879f204c5","courseId":63,"link":"1899022782092541952","linkType":3,"qwExternalId":9914983,"qwUserId":"18931","videoId":409}
+				 uni.navigateTo({
+				 	url: '/pages_course/video?course='+JSON.stringify(course)
+				 })
+			 }
+		}
+	}
+</script>
+<style scoped lang="scss">
+	.content{
+		height: 100%;
+		.cont{
+			position: relative;
+			width: 100%;
+			display: flex;
+			flex-direction: column;
+			.bg{
+				width: 100%;
+				height:450rpx;
+				// background-color: #2583EB;
+				// background: linear-gradient(#2583EB, #88e2da);
+				position: fixed;
+				image{
+					border-radius: 0rpx 0rpx 50rpx 50rpx;
+					width: 100%;
+					height:100%;
+				}
+			}
+			.top-box{
+				width: 100%;
+				position: fixed;
+				top: 0;
+				left: 0;
+				z-index: 1001;
+				.top-title{
+					height: 88upx;
+					// line-height: 88upx;
+					display: flex;
+					flex-direction: column;
+					align-items: flex-start;
+					justify-content: center;
+					margin-left: 15rpx;
+					.name{
+						font-size: 32upx;
+						font-family: Source Han Sans CN;
+						font-weight: bold;
+						color: #fff;
+					}
+					.desc-box{
+						display: flex;
+						align-items: center;
+						justify-content: flex-start;
+						margin-top: 10rpx;
+						
+						image{
+							width:24rpx;
+							height:24rpx;
+						}
+						.desc{
+							margin-left: 5rpx;
+							font-size: 20upx;
+							font-family: Source Han Sans CN;
+							color: #626468;
+						}
+						
+					}
+					 
+					
+					 
+				}
+				.search{
+					box-sizing: border-box;
+					z-index: 101;
+					padding: 15rpx;
+					width: 100%;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					.search-box{
+						flex: 1;
+						margin-right: 10rpx;
+						height: 60upx;
+						line-height: 60upx;
+						border-radius: 30upx;
+						background-color: #fff;
+						padding: 0 30upx;
+						display: flex;
+						align-items: center;
+						transition: all .5s;
+						.img{
+							width: 30upx;
+							height: 30upx;
+							margin-right: 10upx;
+						}
+						input{
+							flex: 1;
+							font-size: 24upx;
+							color: #000;
+						}
+						.input-place{
+							font-size: 24upx;
+							color: #878787;
+						}
+					}
+					.msg{
+						position: relative;
+						width:50rpx;
+						height:50rpx;
+						image{
+							width: 100%;
+							height:100%;
+							
+						}
+						.contact-btn {
+							top: 0;
+							position: absolute;
+							width:100%;
+							height:100%;
+							opacity: 0;
+						}
+					}
+				}
+			}
+			.cont-box{
+				z-index: 100;
+				.banner{
+					margin: 20rpx auto auto;
+					width: 702rpx;
+				}
+				.btns{
+					
+					padding: 0 20upx;
+					margin-top: 20rpx;
+					width: 100%;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					.btn1{
+						position: relative;
+						background: linear-gradient(to bottom, #EEC992, #CDA569);
+						box-shadow: 0px 0px 5px 2px rgba(0,0,0,0.05);
+						margin-right: 30rpx;
+						border-radius: 15rpx;
+						height:180rpx;
+						padding: 15rpx 30rpx;
+						width:50%;
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+						&:last-child{
+							margin-right: 0rpx;
+						}
+						image{
+							width:104rpx;
+							height:104rpx;
+						}
+						.mask{
+							position: absolute;
+							top:0rpx;
+							right:0rpx;
+							width: 100rpx;
+							height:100rpx;
+						}
+						.title-box{
+							display: flex;
+							align-items: flex-start;
+							justify-content: center;
+							flex-direction: column;
+							.title{
+								font-size: 36upx;
+								font-weight: bold;
+								color: #ffffff;
+							}
+							.desc{
+								margin-top: 6rpx;
+								opacity: 0.8;
+								font-size: 26upx;
+								color: #ffffff;
+							}
+							
+						}
+					}
+					.btn2{
+						position: relative;
+						background: linear-gradient(to bottom, #EE8C5F, #EA5733);
+						box-shadow: 0px 0px 5px 2px rgba(0,0,0,0.05);
+						margin-right: 30rpx;
+						border-radius: 15rpx;
+						height:180rpx;
+						padding: 15rpx 30rpx;
+						width:50%;
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+						&:last-child{
+							margin-right: 0rpx;
+						}
+						image{
+							width:104rpx;
+							height:104rpx;
+						}
+						.mask{
+							position: absolute;
+							top:0rpx;
+							right:0rpx;
+							width: 100rpx;
+							height:100rpx;
+						}
+						.title-box{
+							display: flex;
+							align-items: flex-start;
+							justify-content: center;
+							flex-direction: column;
+							.title{
+								font-size: 36upx;
+								font-weight: bold;
+								color: #ffffff;
+							}
+							.desc{
+								margin-top: 6rpx;
+								opacity: 0.8;
+								font-size: 26upx;
+								font-weight: bold;
+								color: #ffffff;
+							}
+							
+						}
+					}
+				}
+				.modules{
+					.module{
+						.menus{
+							z-index: 101;
+							margin: 20rpx 15rpx 0rpx;
+							padding: 20rpx;
+							box-shadow: 0px 0px 5px 2px rgba(0,0,0,0.05);
+							background-color: #fff;
+							border-radius: 15rpx;
+							.title{
+								font-size: 32upx;
+								font-family: PingFang SC;
+								font-weight: bold;
+								color: #2A2B2E;
+							}
+							.menu-box{
+								display: flex;
+								align-items: center;
+								justify-content: flex-start;
+								flex-wrap:wrap;
+								.menu{
+									padding: 15rpx;
+									width:50%;
+									display: flex;
+									flex-direction: column;
+									align-items: center;
+									justify-content: center;
+									flex-wrap: wrap;
+									image{
+										width:100%;
+										height:180rpx;
+									}
+								}
+							}
+							
+						}
+						.depts{
+							z-index: 101;
+							margin: 20rpx 15rpx 0rpx;
+							padding: 20rpx;
+							box-shadow: 0px 0px 5px 2px rgba(0,0,0,0.05);
+							background-color: #fff;
+							border-radius: 15rpx;
+							.title{
+								font-size: 32upx;
+								font-family: PingFang SC;
+								font-weight: bold;
+								color: #2A2B2E;
+							}
+							.dept-box{
+								margin-top: 15rpx;
+								display: flex;
+								align-items: center;
+								justify-content: flex-start;
+								flex-wrap:wrap;
+								.dept{
+									padding: 15rpx 5rpx;
+									width:25%;
+									display: flex;
+									flex-direction: column;
+									align-items: center;
+									justify-content: center;
+									.icon{
+										width:58rpx;
+										height:58rpx;
+									}
+									.title{
+										margin-top: 10rpx;
+										font-size: 24upx;
+										font-family: PingFang SC;
+										font-weight: 500;
+										color: #111111;
+									}
+								}
+							}
+							
+						}
+						.doctor-articles{
+							z-index: 101;
+							margin: 20rpx 15rpx 0rpx;
+							padding: 20rpx;
+							box-shadow: 0px 0px 5px 2px rgba(0,0,0,0.05);
+							background-color: #fff;
+							border-radius: 15rpx;
+							.title-box{
+								display: flex;
+								flex-direction: row;
+								align-items: center;
+								justify-content: space-between;
+								.title{
+									font-size: 32upx;
+									font-family: PingFang SC;
+									font-weight: bold;
+									color: #111111;
+								}
+								.more{
+									display: flex;
+									align-items: center;
+									justify-content: flex-end;
+									.text{
+										font-size: 24rpx;
+										font-family: PingFang SC;
+										color: #9B9B9B;
+									}
+									image{
+										margin-left: 10rpx;
+										width:15rpx;
+										height:20rpx;
+									}
+									
+								}
+							}
+							.article-box{
+								padding: 20rpx 0rpx;
+								overflow-x: auto;
+								box-sizing: border-box;
+								display: flex;
+								align-items: center;
+								justify-content: flex-start;
+								.article{
+									width: 300rpx;
+									margin-right: 20rpx;
+									background: #f9f8fe;
+									display: flex;
+									flex-direction: column;
+									align-items: flex-start;
+									justify-content: flex-start;
+									&:last-child{
+										margin-right: 0rpx;
+									}
+									.image-box{
+										width: 300rpx;
+										height:400rpx;
+										position: relative;
+										border-radius: 20rpx;
+										image{
+											border-radius: 20rpx;
+											width: 300rpx;
+											height:400rpx;
+										}
+										.views{
+											position: absolute;
+											top:0rpx;
+											left:0rpx;
+											padding: 5rpx 10rpx;
+											background: rgba(0,0,0,0.25);
+											border-radius: 12rpx 0px 12rpx 0px;
+											opacity: 1;
+											font-size: 20rpx;
+											font-family: PingFang SC-Bold, PingFang SC;
+											font-weight: bold;
+											color: #FFFFFF;
+										}
+										.doctor{
+											margin: 10rpx;
+											display: flex;
+											align-items: center;
+											justify-content: flex-start;
+											position: absolute;
+											bottom:0rpx;
+											left:0rpx;
+											image{
+												border-radius: 50%;
+												width: 64rpx;
+												height:64rpx;
+											}
+											.right{
+												width: 200rpx;
+												margin-left: 10rpx;
+												display: flex;
+												flex-direction: column;
+												align-items: flex-start;
+												justify-content: space-between;
+												.doc-name{
+													width: 200rpx;
+													font-size: 30rpx;
+													font-weight: bold;
+													font-family: PingFang SC;
+													color: #fff;
+												}
+												.doc-position{
+													width: 100%;
+													font-size: 28rpx;
+													font-family: PingFang SC;
+													color: #fff;
+													font-weight: bold;
+													opacity: 0.8;
+												}
+											}
+										}
+									}
+									.article-title-box{
+										width: 100%;
+										margin-top: 10rpx;
+										display: flex;
+										align-items: center;
+										justify-content: flex-start;
+										.article-title{
+											font-size: 30rpx;
+											font-weight: bold;
+											font-family: PingFang SC;
+											color: #2A2B2E;
+										}
+										
+									}
+									 
+								}
+								
+							}
+						}
+						.doctors{
+							z-index: 101;
+							margin: 20rpx 15rpx;
+							padding: 20rpx;
+							box-shadow: 0px 0px 5px 2px rgba(0,0,0,0.05);
+							background-color: #fff;
+							border-radius: 15rpx;
+							.title-box{
+								display: flex;
+								flex-direction: row;
+								align-items: center;
+								justify-content: space-between;
+								.title{
+									font-size: 32upx;
+									font-family: PingFang SC;
+									font-weight: bold;
+									color: #111111;
+								}
+								.more{
+									display: flex;
+									align-items: center;
+									justify-content: flex-end;
+									.text{
+										font-size: 24rpx;
+										font-family: PingFang SC;
+										color: #9B9B9B;
+									}
+									image{
+										margin-left: 10rpx;
+										width:15rpx;
+										height:20rpx;
+									}
+									
+								}
+							}
+							
+						}
+						.articles{
+							z-index: 101;
+							margin: 20rpx 15rpx;
+							padding: 20rpx;
+							box-shadow: 0px 0px 5px 2px rgba(0,0,0,0.05);
+							background-color: #fff;
+							border-radius: 15rpx;
+							.title-box{
+								display: flex;
+								flex-direction: row;
+								align-items: center;
+								justify-content: space-between;
+								.title{
+									font-size: 32upx;
+									font-family: PingFang SC;
+									font-weight: bold;
+									color: #111111;
+								}
+								.more{
+									display: flex;
+									align-items: center;
+									justify-content: flex-end;
+									.text{
+										font-size: 24rpx;
+										font-family: PingFang SC;
+										color: #9B9B9B;
+									}
+									image{
+										margin-left: 10rpx;
+										width:15rpx;
+										height:20rpx;
+									}
+									
+								}
+							}
+							.article-box{
+								margin-top: 15rpx;
+								padding: 20rpx 0rpx 0rpx;
+								display: flex;
+								flex-direction: column;
+								align-items: flex-start;
+								justify-content: flex-start;
+								.item{
+									width: 100%;
+									margin-bottom: 20rpx;
+									display: flex;
+									align-items: flex-start;
+									justify-content: flex-start;
+									&:last-child{
+										margin-bottom: 0rpx;
+									}
+									.left{
+										flex:1;
+										height:160rpx;
+										margin-right: 15rpx;
+										display: flex;
+										flex-direction: column;
+										align-items: flex-start;
+										justify-content: space-between;
+										.title{
+											font-size: 28upx;
+											font-family: PingFang SC;
+											font-weight: bold;
+											color: #111111;
+										}
+										.views{
+											font-size: 24upx;
+											font-family: PingFang SC;
+											color: #9a9a9c;
+										}
+									}
+									.right{
+										image{
+											border-radius: 10rpx;
+											width:220rpx;
+											height:160rpx;
+											border: 1px solid #eeeeee;
+										}
+									}
+								}
+							}
+						}
+						.packages{
+							z-index: 101;
+							margin: 20rpx 15rpx;
+							padding: 20rpx;
+							box-shadow: 0px 0px 5px 2px rgba(0,0,0,0.05);
+							background-color: #fff;
+							border-radius: 15rpx;
+							.title-box{
+								display: flex;
+								flex-direction: row;
+								align-items: center;
+								justify-content: space-between;
+								.title{
+									font-size: 32upx;
+									font-family: PingFang SC;
+									font-weight: bold;
+									color: #111111;
+								}
+								.more{
+									display: flex;
+									align-items: center;
+									justify-content: flex-end;
+									.text{
+										font-size: 24rpx;
+										font-family: PingFang SC;
+										color: #9B9B9B;
+									}
+									image{
+										margin-left: 10rpx;
+										width:15rpx;
+										height:20rpx;
+									}
+									
+								}
+							}
+							.package-box{
+								padding: 20rpx 0rpx 0rpx;
+								display: flex;
+								align-items: flex-start;
+								justify-content: flex-start;
+								flex-wrap: wrap;
+								.item{
+									width: calc(50% - 20rpx);
+									border-radius: 15rpx;
+									margin: 10rpx;
+									display: flex;
+									flex-direction: column;
+									align-items: flex-start;
+									justify-content: flex-start;
+									&:last-child{
+									}
+									.top{
+										width:100%;
+										height:300rpx;
+										image{
+											border-radius: 15rpx 15rpx 0rpx 0rpx;
+											width:100%;
+											height:300rpx;
+										}
+										
+									}
+									.bottom{
+										width: 100%;
+										margin-top: 15rpx;
+										.title{
+											font-weight: bold;
+											font-size: 28upx;
+											font-family: PingFang SC;
+											color: #111111;
+										}
+										.price-box{
+											margin-top: 10rpx;
+											display: flex;
+											align-items: center;
+											justify-content: space-between;
+											width: 100%;
+											.price{
+												padding: 5rpx 10rpx;
+												background-color: #2583EB;
+												border-radius: 30rpx;
+												font-size: 20upx;
+												font-family: PingFang SC;
+												color: #ffffff;
+											}
+											.count{
+												font-size: 24upx;
+												font-family: PingFang SC;
+												color: #333333;
+											}
+											
+										}
+									}
+								}
+							}
+							
+							
+						}
+					}
+					
+				}
+				
+			}
+			
+		}
+	}
+	 
+</style>

+ 355 - 0
pages/shopping/index.vue

@@ -0,0 +1,355 @@
+<template>
+	<view class="content">
+		<view class="top-content">
+			<view class="status_bar" :style="{height: statusBarHeight}"></view>
+			<!-- 这里是状态栏 -->
+			<view class="top-title">药品商城</view>
+			<!-- 搜索框 -->
+			<view class="search-cont">
+				<view class="inner">
+					<image class="icon-search" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/image/icon_search.png" mode=""></image>
+					<input type="text" disabled   confirm-type="搜索" @click="toSearch" placeholder="输入药品名称" placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;" />
+				</view>
+			</view>
+		</view>
+		<view  :style="{height: divHeight}"   class="medic-box">
+			<view class="cate-list">
+				<view 
+					v-for="(item,index) in cates" 
+					:key="index" 
+					:class="cateSelect == item.cateId?'item active':'item'" 
+					@click="choseCate(item)"
+				>{{item.cateName }}</view>
+			</view>
+			<view class="medic">
+				<!-- 轮播图 -->
+				<view class="banner-box">
+					<swiper
+						class="swiper" 
+						:indicator-dots="true" 
+						:circular="true" 
+						:autoplay="true" 
+						:interval="3000" 
+						:duration="1000"
+						indicator-color="rgba(255, 255, 255, 0.6)"
+						indicator-active-color="#ffffff"
+					>
+						<swiper-item class="swiper-item" v-for="(item,index) in advs" :key="index" @click="handleAdvClick(item)">
+							<image :src="item.imageUrl" mode=""></image>
+						</swiper-item>
+					</swiper>
+				</view>
+				<!-- 药品列表 -->
+				<view class="medic-list">
+						<!-- <view class="item" v-for="(item,index) in subCates" :key="index">
+							<view class="title">{{item.cateName}}</view> -->
+							<view class="inner-list">
+								<view class="definite"v-for="(subItem,index) in subCates"   @click="showProductList(subItem)">
+									<view class="img-box">
+										<image :src="subItem.pic" mode="aspectFit"></image>
+									</view>
+									<view class="name ellipsis">{{subItem.cateName}}</view>
+								</view>
+							</view>
+					<!-- 	</view> -->
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {getProductCate} from '@/api/index.js'
+	// import {getAdv} from '@/api/adv'
+	export default {
+		data() {
+			return {
+				divHeight:'0px',
+				allCates:[],
+				cates:[],
+				subCates:[],
+				// 状态栏的高度
+				statusBarHeight: uni.getStorageSync('menuInfo').statusBarHeight,
+				// 选中药品分类
+				cateSelect: 0,
+				// 轮播图
+				advs: [],
+			};
+		},
+		onLoad() {
+			uni.showShareMenu({
+				withShareTicket:true,
+				//小程序的原生菜单中显示分享按钮,才能够让发送给朋友与分享到朋友圈两个按钮可以点击
+				menus:["shareAppMessage","shareTimeline"] //不设置默认发送给朋友
+			})
+			this.getProductCate();
+		},
+		onShow() {
+			var that=this;
+			setTimeout(function(){
+				let info = uni.createSelectorQuery().select(".top-content");
+		     info.boundingClientRect(function(data) { //data - 各种参数
+		       	console.log(data.height)  // 获取元素宽度
+					// console.log(uni.upx2px(10)) 
+					that.divHeight="calc(100% - "+data.height+"px)"
+		      }).exec()
+			},500);
+			// this.getAdv();
+		},
+		methods:{
+			// divHeight(){
+			//    return 'height:calc(100% - ${this.top}px);'
+			// },
+			toSearch() {
+				uni.navigateTo({
+					url: '/pages_shopping/home/productSearch'
+				})
+			},
+			handleAdvClick(item){
+				console.log(item);
+				if(item.showType==1){
+					uni.setStorageSync('url',item.advUrl);
+					uni.navigateTo({
+						url:"/pages_shopping/home/h5"
+					})
+				}
+				else if(item.showType==2){
+					 uni.navigateTo({
+					 	url:item.advUrl
+					 })
+				}
+				else if(item.showType==3){
+					 uni.setStorageSync('content',item.content);
+					 uni.navigateTo({
+					 	url:"/pages_shopping/home/content"
+					 })
+				}
+				
+			},
+			getAdv(){
+				let data = {advType:2};
+				getAdv(data).then(
+					res => {
+						if(res.code==200){
+							this.advs=res.data;
+						}
+					},
+					rej => {}
+				);
+			},
+			getProductCate(){
+				let data = {};
+				getProductCate(data).then(
+					res => {
+						if(res.code==200){
+							this.allCates=res.data;
+							this.cates = this.allCates.filter(function (item) {
+							     return item.pid==0
+							});
+							if(this.cates!=null&&this.cates.length>0){
+								this.cateSelect=this.cates[0].cateId;
+								this.getSubCate()
+							}
+						}else{
+							uni.showToast({
+								icon:'none',
+								title: "请求失败",
+							});
+						}
+					},
+					rej => {}
+				);
+			},
+			// 药品分类选择
+			choseCate(item) {
+				this.cateSelect = item.cateId;
+				this.getSubCate()
+				
+			},
+			getSubCate(){
+				var that=this;
+				this.subCates = this.allCates.filter(function (item) {
+					// let subList = that.allCates.filter(child => {
+					// 	//返回每一项的子级数组
+					// 	return child.pid === item.cateId
+					// });
+					// subList.length > 0 ? item.children = subList : [];
+				    return item.pid==that.cateSelect
+				});
+				 
+				console.log(this.subCates);
+			},
+			// 查看药品详情
+			showProductList(item) {
+				uni.navigateTo({
+					url: '/pages_shopping/productList?cateId='+item.cateId+"&pid="+item.pid
+				})
+			},
+			goSearch(e) {
+				if(e.detail.value!=null&&e.detail.value!=""){
+					this.$addHisSearch(e.detail.value);
+				}
+				uni.navigateTo({
+					url: '/pages_shopping/home/productList?searchValue=' + e.detail.value
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page{
+		height: 100%;
+		background-color: #fff;
+	}
+	
+	.content{
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		.top-content{
+			width: 100%;
+			z-index: 10;
+			.top-title{
+				height: 88upx;
+				line-height: 88upx;
+				font-size: 42upx;
+				font-family: Source Han Sans CN;
+				font-weight: bold;
+				color: #222222;
+				padding-left: 41upx;
+				background-color: #FFFFFF;
+			}
+			.search-cont{
+				padding: 16upx 30upx;
+				background-color: #FFFFFF;
+				.inner{
+					box-sizing: border-box;
+					width: 100%;
+					height: 72upx;
+					background: #F7F7F7;
+					border-radius: 36upx;
+					display: flex;
+					align-items: center;
+					padding: 0 30upx;
+					.icon-search{
+						width: 28upx;
+						height: 28upx;
+						margin-right: 20upx;
+					}
+					input{
+						height: 60upx;
+						line-height: 60upx;
+						flex: 1;
+					}
+				}
+			}
+		}
+		.medic-box{
+			display: flex;
+			.cate-list{
+				box-sizing: border-box;
+				width: 200upx;
+				background: #F2F5F9;
+				display: flex;
+				flex-direction: column;
+				padding: 20upx 0;
+				overflow-y: scroll;
+				.item{
+					height: 100upx;
+					line-height: 100upx;
+					padding-left: 30upx;
+					font-size: 28upx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+					position: relative;
+					&.active{
+						color: #2583EB;
+						&::after{
+							content: "";
+							width: 8upx;
+							height: 50upx;
+							background: #2583EB;
+							position: absolute;
+							top: 25upx;
+							left: 0;
+						}
+					}
+				}
+			}
+			.medic{
+				box-sizing: border-box;
+				width: calc(100% - 200upx);
+				height: 100%;
+				padding: 0 30upx;
+				.banner-box{
+					margin-top: 30rpx;
+					width: 100%;
+					height: 160upx;
+					border-radius: 10upx;
+					overflow: hidden;
+					.swiper,
+					.swiper-item,
+					.swiper-item image{
+						width: 100%;
+						height: 100%;
+					}
+				}
+				.medic-list{
+					box-sizing: border-box;
+					padding: 30upx 0;
+					overflow-y: auto;
+					height: calc(100% - 220upx);
+					position: relative;
+					// .item{
+					// 	.title{
+					// 		font-size: 28upx;
+					// 		font-family: PingFang SC;
+					// 		font-weight: bold;
+					// 		color: #333333;
+					// 		padding-top: 20upx;
+					// 		margin-bottom: 30upx;
+					// 	}
+						
+					// }
+					.inner-list{
+						display: flex;
+						flex-wrap: wrap;
+						.definite{
+							width: calc(33% - 20upx);
+							margin-right: 30upx;
+							margin-bottom: 30upx;
+							.img-box{
+								width: 100%;
+								height: 144upx;
+								background: #F5F5F5;
+								border-radius: 8upx;
+								overflow: hidden;
+								display: flex;
+								align-items: center;
+								image{	
+									max-width: 100%;
+								}
+							}
+							.name{
+								width: 100%;
+								margin-top: 20upx;
+								font-size: 24upx;
+								font-family: PingFang SC;
+								font-weight: 500;
+								color: #666666;
+								text-align: center;
+							}
+							&:nth-child(3n) {
+								margin-right: 0;
+							}
+						}
+					}
+				}
+			}
+		}
+		
+	}
+	
+</style>

+ 2 - 2
pages/store/index.vue

@@ -61,7 +61,7 @@
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					textNoMore:"已经到底了",
 					empty: {
-						icon:'https://cos.his.cdwjyyh.com/fs/20240423/cf4a86b913a04341bb44e34bb4d37aa2.png',
+						icon:'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/empty_icon.png',
 						tip: '暂无数据'
 					}
 				},
@@ -256,7 +256,7 @@
 						width: 100%;
 						.price{
 							padding: 5rpx 10rpx;
-							background-color: #C39A58;
+							background-color: #2583EB;
 							border-radius: 30rpx;
 							font-size: 20upx;
 							font-family: PingFang SC;

+ 42 - 33
pages/user/index.vue

@@ -10,20 +10,26 @@
 				</view>
 				<view class="user"  @click.stop="loginNavTo('/pages_user/personInfo')">
 					<view class="left"  >
-						<image   :src="user.avatar==null?'https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/90d9eb0f8f87482b977611eb36b66d82.jpg':user.avatar"></image>
+						<image   :src="user.avatar==null?'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/my_heads_icon.png':user.avatar"></image>
 					</view>
 					<view class="right" >
 						<view class="name-box" >
-							<view class="name">{{user.nickName}}</view>
+							<view class="x-f">
+								<view class="name">{{user.nickName}}</view>
+								<image class="rightimg" style="margin-left: 0rpx;" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/userimg/right_arrow_black_icon.png" mode="aspectFill"></image>
+							</view>
 							<view class="btns" >
 								<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/image/userimg/set_icon.png"></image>
 							</view>
 						</view>
-						<view class="phone" v-if="user.phone!=''">{{$parsePhone(user.phone)}}</view>
 						<view class="counts">
-							<view class="count align-center" @click="loginNavTo('/pages_user/integral')">
-								<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/image/userimg/lv_icon.png" class="h28 w28 mr10"></image>
-								<text>积分 {{user.integral}}</text>
+							<view class="count count-bg1 x-f" v-if="user.phone">
+								<image style="width: 24rpx;height: 24rpx;margin-right: 10rpx;" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/userimg/phone_icon.png" mode="aspectFill"></image>
+								<text>{{$parsePhone(user.phone) || ''}}</text>
+							</view>
+							<view class="count count-bg2 x-f" @click.stop="loginNavTo('/pages_user/integral')">
+								<image style="width: 24rpx;height: 24rpx;margin-right: 10rpx;" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/image/userimg/lv_icon.png" mode="aspectFill"></image>
+								<text>{{user.integral || 0}}积分</text>
 							</view>
 							<!-- <view class="count">我的健康金 {{user.balance}}</view> -->
 						</view>
@@ -43,10 +49,10 @@
 							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/image/userimg/my_cforder.png"></image>
 							<view class="title">处方订单</view>
 						</view>
-						<view class="menu" @click="loginNavTo('/pages_order/packageOrderList')">
+						<!-- <view class="menu" @click="loginNavTo('/pages_order/packageOrderList')">
 							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/image/userimg/service_pack.png"></image>
 							<view class="title">服务包</view>
-						</view>
+						</view> -->
 						<view class="menu" @click="loginNavTo('/pages_order/storeOrderRefundList')">
 							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/image/userimg/my_service.png"></image>
 							<view class="title">售后服务</view>
@@ -109,7 +115,7 @@
 						</view> -->
 						 
 						<!-- <view class="menu"  @click="loginNavTo('/pages_user/addHealthButler')">
-							<image class="min-image" src="https://cos.his.cdwjyyh.com/fs/20250417/0eeec4b825534bfa8833eaf212cf803c.png"></image>
+							<image class="min-image" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/0eeec4b825534bfa8833eaf212cf803c.png"></image>
 							<view class="title">健康管家</view>
 						</view> -->
 						<view class="menu" @click="loginNavTo('/pages_user/myCouponList')">
@@ -121,7 +127,7 @@
 							<view class="title">领券中心</view>
 						</view>
 						<!-- <view class="menu"  @click="loginNavTo('/pages_order/invoice/invoiceList')">
-							<image class="min-image" src="https://cos.his.cdwjyyh.com/fs/20250811/34eb8ee3f7b3471fb919c76e4d0735cf.png"></image>
+							<image class="min-image" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/34eb8ee3f7b3471fb919c76e4d0735cf.png"></image>
 							<view class="title">开票历史</view>
 						</view>
 						<view class="menu" @click="loginNavTo('/pages_user/cert')">
@@ -129,7 +135,7 @@
 							<view class="title">资质证书</view>
 						</view> -->
 					<!-- 	<view class="menu"  @click="loginNavTo('/pages_user/price')">
-							<image class="min-image" src="https://cos.his.cdwjyyh.com/fs/20240808/415e1a6a58ec49ffaa1bb62cb376d4e8.png"></image>
+							<image class="min-image" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/415e1a6a58ec49ffaa1bb62cb376d4e8.png"></image>
 							<view class="title">价格公示</view>
 						</view> -->
 						<view class="menu"  >
@@ -138,14 +144,14 @@
 							<button class='contact-btn' open-type="contact">
 							</button>
 						</view>
-						<view class="menu" @click="loginNavTo('/pages_user/feedback')">
+						<view class="menu" @click="loginNavTo('/pages_user/complaint')">
 							<image class="min-image" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/image/userimg/consultation_complaints.png"></image>
 							<view class="title">投诉建议</view>
 						</view>
-						<!-- <view class="menu" @click="navTo('/pages_user/about')">
-							<image class="min-image" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/image/icon_feedback.png"></image>
+						<view class="menu" @click="navTo('/pages_user/about')">
+							<image class="min-image" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/userimg/about_us_icon.png"></image>
 							<view class="title">关于我们</view>
-						</view> -->
+						</view>
 					</view>
 				</view>
 				
@@ -155,7 +161,7 @@
 						<view class="title">管理端</view>
 					</view>
 					<view class="menu-box">
-						<view class="menu" >
+						<view class="menu" @click="loginNavTo('/pages_shopping/registerMerchant')">
 							<image class="min-image" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/image/userimg/intelligent.png"></image>
 							<view class="title">商家入驻</view>
 						</view>
@@ -449,8 +455,8 @@
 			.bg{
 				width: 100%;
 				height:450rpx;
-				// background-color: #2BC7B9;
-				// background: linear-gradient(#2BC7B9, #88e2da);
+				// background-color: #2583EB;
+				// background: linear-gradient(#2583EB, #88e2da);
 				
 				position: fixed;
 				image{
@@ -503,7 +509,10 @@
 									height:50rpx;
 								}
 							}
-							
+							.rightimg {
+								width: 48rpx;
+								height: 48rpx;
+							}
 						}
 						.phone{
 							margin-top:10rpx ;
@@ -536,10 +545,9 @@
 				.menus{
 					z-index: 101;
 					margin: 0rpx 30rpx 20rpx;
-					padding: 15rpx;
+					padding: 32rpx;
 					display: flex;
 					flex-direction: column;
-					box-shadow: 0px 0px 5px 2px rgba(0,0,0,0.05);
 					background-color: #fff;
 					border-radius: 15rpx;
 					.title-box{
@@ -547,17 +555,18 @@
 						flex-direction: row;
 						align-items: center;
 						justify-content: flex-start;
+						margin-bottom: 16rpx;
 						.title{
-							font-size: 32upx;
-							font-family: PingFang SC;
+							font-family: Source Han Serif CN, Source Han Serif CN;
 							font-weight: bold;
-							color: #111111;
+							font-size: 36rpx;
+							color: #222222;
 						}
 						.line{
-							margin-right: 15rpx;
-							height: 30rpx;
-							width: 6rpx;
-							background-color: #C39A58;
+							// margin-right: 15rpx;
+							// height: 30rpx;
+							// width: 6rpx;
+							// background-color: #2583EB;
 							
 						}
 						 
@@ -568,7 +577,7 @@
 						justify-content: flex-start;
 						flex-wrap: wrap;
 						.menu{
-							padding: 15rpx;
+							padding: 16rpx 0;
 							width:25%;
 							min-width: 25%;
 							display: flex;
@@ -577,12 +586,12 @@
 							justify-content: center;
 							position: relative;
 							image{
-								width:58rpx;
-								height:58rpx;
+								width:48rpx;
+								height:48rpx;
 							}
 							.min-image{
-								width:40rpx;
-								height:40rpx;
+								width:48rpx;
+								height:48rpx;
 							}
 							.title{
 								margin-top: 10rpx;

+ 2 - 2
pages_company/bindInfo.vue

@@ -26,7 +26,7 @@
 		</view>
 	</view>
 	<u-empty style="padding-top: 20vh;" mode="data" v-else="imgurl"
-		icon="https://cos.his.cdwjyyh.com/fs/20240423/cf4a86b913a04341bb44e34bb4d37aa2.png" text="暂无数据"></u-empty>
+		icon="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/empty_icon.png" text="暂无数据"></u-empty>
 </template>
 
 <script>
@@ -48,7 +48,7 @@
 				title: '立即绑定,享受更多权益',
 				path: '/pages_user/bindCompanyUser?companyUserId=' + this.companyUserId,
 				imageUrl: this.imageUrl
-				// imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230106/6b459adfb1004c1a96219bcdf07e337c.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+				// imageUrl: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/sharelogo.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 			}
 			
 		},

+ 4 - 4
pages_company/couponDetails.vue

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

+ 7 - 7
pages_company/couponList.vue

@@ -85,7 +85,7 @@ export default {
 				noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 				textNoMore:"已经到底了",
 				empty: {
-					icon:'https://cos.his.cdwjyyh.com/fs/20240423/cf4a86b913a04341bb44e34bb4d37aa2.png',
+					icon:'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/empty_icon.png',
 					tip: '暂无数据'
 				}
 			},
@@ -228,15 +228,15 @@ export default {
 				font-size: 28upx;
 				font-family: PingFang SC;
 				font-weight: 500;
-				color: #C39A58;
+				color: #2583EB;
 				background: #ffffff;
-				border: 1px solid #E2C99E;
+				border: 1px solid #2EDAD4;
 				border-radius: 32upx;
 				margin: 0 20upx 20upx 0;
 				&.active{
 					color: #FFFFFF;
-					background: #C39A58;
-					border: 1px solid #C39A58;
+					background: #2583EB;
+					border: 1px solid #2583EB;
 				}
 			}
 		}
@@ -355,7 +355,7 @@ export default {
 	.tui-coupon-btn {
 	  padding: 6rpx;
 	  background: #ffebeb;
-	  color: #C39A58;
+	  color: #2583EB;
 	  font-size: 25rpx;
 	  line-height: 25rpx;
 	  display: flex;
@@ -450,7 +450,7 @@ export default {
 	  		color: red;
 	  	}
 	  	&.receive{
-	  		background: #C39A58;
+	  		background: #2583EB;
 	  		color: #FFFFFF;
 	  	}
 	  }

+ 2 - 2
pages_company/index.vue

@@ -91,7 +91,7 @@
 			return {
 				title: "问诊",
 				path: '/pages/TUIKit/TUIPages/TUIConversation/index',
-				imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230106/6b459adfb1004c1a96219bcdf07e337c.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+				imageUrl: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/sharelogo.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 			}
 			
 		},
@@ -205,7 +205,7 @@
 				font-weight: 500;
 				color: #FFFFFF;
 				border-radius: 8rpx;
-				background-color: #C39A58;
+				background-color: #2583EB;
 			}
 		}
 		.used-tools{

+ 3 - 3
pages_company/inquiryOrderDetails.vue

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

+ 5 - 5
pages_company/inquiryOrderList.vue

@@ -4,7 +4,7 @@
 			 <u-tabs
 			  :scrollable="false"
 			  :list="tabs"  
-			  lineColor="#C39A58"
+			  lineColor="#2583EB"
 			 @change="inquiryTypeChange">
 			 </u-tabs>
 		</view>
@@ -121,7 +121,7 @@
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					textNoMore:"已经到底了",
 					empty: {
-						icon:'https://cos.his.cdwjyyh.com/fs/20240423/cf4a86b913a04341bb44e34bb4d37aa2.png',
+						icon:'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/empty_icon.png',
 						tip: '暂无数据'
 					}
 				},
@@ -354,7 +354,7 @@
 						color: #db5053;
 					}
 					.green{
-						color: #C39A58;
+						color: #2583EB;
 					}
 					.gray{
 						color: #9c9c9c;
@@ -390,8 +390,8 @@
 						.right{
 							.btn{
 								padding: 10rpx 30rpx;
-								border: 1rpx solid #C39A58;
-								color: #C39A58;
+								border: 1rpx solid #2583EB;
+								color: #2583EB;
 								font-size: 28rpx;
 								border-radius: 30rpx;
 							}

+ 1 - 1
pages_company/login.vue

@@ -133,7 +133,7 @@ export default {
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #C39A58;
+				background: #2583EB;
 				border-radius: 44upx;
 			}
 		}

+ 9 - 9
pages_company/packageDetails.vue

@@ -457,7 +457,7 @@
 						padding: 5rpx 15rpx;
 						font-size: 26upx;
 						font-family: PingFang SC;
-						color: #C39A58;
+						color: #2583EB;
 					}
 					.duration{
 						margin-left: 10rpx;
@@ -466,7 +466,7 @@
 						padding: 5rpx 15rpx;
 						font-size: 26upx;
 						font-family: PingFang SC;
-						color: #C39A58;
+						color: #2583EB;
 					}
 					
 				}
@@ -484,7 +484,7 @@
 						.price{
 							margin-right: 10rpx;
 							padding: 5rpx 10rpx;
-							background-color: #C39A58;
+							background-color: #2583EB;
 							border-radius: 30rpx;
 							font-size: 20upx;
 							font-family: PingFang SC;
@@ -520,7 +520,7 @@
 						margin-right: 15rpx;
 						height: 30rpx;
 						width: 6rpx;
-						background-color: #C39A58;
+						background-color: #2583EB;
 						
 					}
 					 
@@ -551,7 +551,7 @@
 						margin-right: 15rpx;
 						height: 30rpx;
 						width: 6rpx;
-						background-color: #C39A58;
+						background-color: #2583EB;
 						
 					}
 					 
@@ -590,7 +590,7 @@
 										display: inline-block;
 										padding: 0 6upx;
 										height: 30upx;
-										background: linear-gradient(90deg, #2BC7B9 0%, #2BC7A4 100%);
+										background: linear-gradient(90deg, #2583EB 0%, #92C1F5 100%);
 										border-radius: 4upx;
 										margin-right: 10upx;
 										font-size: 22upx;
@@ -715,7 +715,7 @@
 				}
 			 
 				&.buy{
-					background: #C39A58;
+					background: #2583EB;
 				}
 				.contact-btn{
 					display: inline-block;
@@ -811,8 +811,8 @@
 					border-radius: 30upx;
 					font-size: 28upx;
 					font-family: PingFang SC;
-					color: #C39A58;
-					border:1rpx solid  #C39A58;
+					color: #2583EB;
+					border:1rpx solid  #2583EB;
 					 
 				}
 				

+ 8 - 8
pages_company/packageList.vue

@@ -114,7 +114,7 @@
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					textNoMore:"已经到底了",
 					empty: {
-						icon:'https://cos.his.cdwjyyh.com/fs/20240423/cf4a86b913a04341bb44e34bb4d37aa2.png',
+						icon:'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/empty_icon.png',
 						tip: '暂无数据'
 					}
 				},
@@ -258,15 +258,15 @@
 			font-size: 28upx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #C39A58;
+			color: #2583EB;
 			background: #ffffff;
-			border: 1px solid #E2C99E;
+			border: 1px solid #2EDAD4;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #C39A58;
-				border: 1px solid #C39A58;
+				background: #2583EB;
+				border: 1px solid #2583EB;
 			}
 		}
 	}
@@ -315,7 +315,7 @@
 					width: 100%;
 					.price{
 						padding: 5rpx 10rpx;
-						background-color: #C39A58;
+						background-color: #2583EB;
 						border-radius: 30rpx;
 						font-size: 20upx;
 						font-family: PingFang SC;
@@ -388,7 +388,7 @@
 								display: inline-block;
 								padding: 0 6upx;
 								height: 30upx;
-								background: linear-gradient(90deg, #C39A58 0%, #C39A58 100%);
+								background: linear-gradient(90deg, #2583EB 0%, #2583EB 100%);
 								border-radius: 4upx;
 								margin-right: 10upx;
 								font-size: 22upx;
@@ -513,7 +513,7 @@
 								color: #666666;
 							}
 							&.pay{
-								background: #C39A58;
+								background: #2583EB;
 								color: #FFFFFF;
 								position: relative;
 								.share{

+ 11 - 11
pages_company/packageOrderDetails.vue

@@ -8,7 +8,7 @@
 					<!-- 待付款 -->
 					<view v-if="order.status == 1" class="inner">
 						<view class="img-box">
-							<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/67eda0644e5847008096525b04cd12ca.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/67eda0644e5847008096525b04cd12ca.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">待付款</text>
@@ -18,7 +18,7 @@
 					<!-- 服务中 -->
 					<view v-if="order.status == 2" class="inner">
 						<view class="img-box">
-							<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/b71efb4b5ca54564b553569d578738b4.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/b71efb4b5ca54564b553569d578738b4.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">服务中</text>
@@ -28,7 +28,7 @@
 					<!-- 已完成 -->
 					<view v-if="order.status == 3" class="inner">
 						<view class="img-box">
-							<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/0712ba14f3a648afa69c9912fcbf9b61.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/0712ba14f3a648afa69c9912fcbf9b61.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">已完成</text>
@@ -38,7 +38,7 @@
 					<!--交易取消 -->
 					<view v-if="order.status == -1" class="inner">
 						<view class="img-box">
-							<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/02f95bd03e854a9c8076aef1e6c05e74.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/02f95bd03e854a9c8076aef1e6c05e74.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">交易关闭</text>
@@ -47,7 +47,7 @@
 					</view>
 					<view v-if="order.status == -2" class="inner">
 						<view class="img-box">
-							<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/6020712aa10f4bb08db92957cb7eb8ed.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/6020712aa10f4bb08db92957cb7eb8ed.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">退款成功</text>
@@ -217,8 +217,8 @@
 			top: 0;
 			left: 0;
 			z-index: 1;
-			background-color: #C39A58;
-			background: linear-gradient(#C39A58, #E2C99E);
+			background-color: #2583EB;
+			background: linear-gradient(#2583EB, #2EDAD4);
 			border-radius: 0rpx 0rpx 100rpx 100rpx;
 		}
 		.inner{
@@ -316,7 +316,7 @@
 						padding: 5rpx 15rpx;
 						font-size: 26upx;
 						font-family: PingFang SC;
-						color: #C39A58;
+						color: #2583EB;
 					}
 					.duration{
 						margin-left: 10rpx;
@@ -325,7 +325,7 @@
 						padding: 5rpx 15rpx;
 						font-size: 26upx;
 						font-family: PingFang SC;
-						color: #C39A58;
+						color: #2583EB;
 					}
 					
 				}
@@ -337,7 +337,7 @@
 					width: 100%;
 					.price{
 						padding: 5rpx 10rpx;
-						background-color: #C39A58;
+						background-color: #2583EB;
 						border-radius: 30rpx;
 						font-size: 20upx;
 						font-family: PingFang SC;
@@ -457,7 +457,7 @@
 				color: #666666;
 			}
 			&.pay{
-				background: #C39A58;
+				background: #2583EB;
 				color: #FFFFFF;
 			}
 		}

+ 7 - 7
pages_company/packageOrderList.vue

@@ -4,7 +4,7 @@
 			 <u-tabs
 			  :scrollable="true"
 			  :list="tabs"  
-			  lineColor="#C39A58"
+			  lineColor="#2583EB"
 			 @change="tabChange">
 			 </u-tabs>
 		</view>
@@ -98,7 +98,7 @@
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					textNoMore:"已经到底了",
 					empty: {
-						icon:'https://cos.his.cdwjyyh.com/fs/20240423/cf4a86b913a04341bb44e34bb4d37aa2.png',
+						icon:'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/empty_icon.png',
 						tip: '暂无数据'
 					}
 				},
@@ -236,7 +236,7 @@
 							font-weight: 500;
 							line-height: 1;
 							&.success{
-								color: #C39A58;
+								color: #2583EB;
 							}
 							&.black{
 								color: #111111;
@@ -288,7 +288,7 @@
 								padding: 5rpx 15rpx;
 								font-size: 26upx;
 								font-family: PingFang SC;
-								color: #C39A58;
+								color: #2583EB;
 							}
 							.duration{
 								margin-left: 10rpx;
@@ -297,7 +297,7 @@
 								padding: 5rpx 15rpx;
 								font-size: 26upx;
 								font-family: PingFang SC;
-								color: #C39A58;
+								color: #2583EB;
 							}
 							
 						}
@@ -309,7 +309,7 @@
 							width: 100%;
 							.price{
 								padding: 5rpx 10rpx;
-								background-color: #C39A58;
+								background-color: #2583EB;
 								border-radius: 30rpx;
 								font-size: 20upx;
 								font-family: PingFang SC;
@@ -384,7 +384,7 @@
 								color: #666666;
 							}
 							&.pay{
-								background: #C39A58;
+								background: #2583EB;
 								color: #FFFFFF;
 							}
 						}

+ 4 - 4
pages_company/storeOrderDelivery.vue

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

+ 11 - 11
pages_company/storeOrderDetail.vue

@@ -8,7 +8,7 @@
 					<!-- 待付款 -->
 					<view v-if="order.status == 1" class="inner">
 						<view class="img-box">
-							<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/67eda0644e5847008096525b04cd12ca.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/67eda0644e5847008096525b04cd12ca.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">待付款</text>
@@ -18,7 +18,7 @@
 					<!-- 待发货 -->
 					<view v-if="order.status == 2" class="inner">
 						<view class="img-box">
-							<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/520e24fba47441b3b0f73b5250bb0b57.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/520e24fba47441b3b0f73b5250bb0b57.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">待发货</text>
@@ -28,7 +28,7 @@
 					<!-- 已发货、待收货 -->
 					<view v-if="order.status == 3" class="inner">
 						<view class="img-box">
-							<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/1e6ba423ff7e4537bef87a022d530015.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/1e6ba423ff7e4537bef87a022d530015.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">待收货</text>
@@ -38,7 +38,7 @@
 					<!-- 已完成 -->
 					<view v-if="order.status == 4" class="inner">
 						<view class="img-box">
-							<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/0712ba14f3a648afa69c9912fcbf9b61.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/0712ba14f3a648afa69c9912fcbf9b61.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">已完成</text>
@@ -48,7 +48,7 @@
 					<!--交易取消 -->
 					<view v-if="order.status == -3" class="inner">
 						<view class="img-box">
-							<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/02f95bd03e854a9c8076aef1e6c05e74.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/02f95bd03e854a9c8076aef1e6c05e74.png" mode=""></image>
 							</view>
 						<view class="status-box">
 							<text class="status">交易关闭</text>
@@ -57,7 +57,7 @@
 					</view>
 					<view v-if="order.status == -1" class="inner">
 						<view class="img-box">
-							<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/6020712aa10f4bb08db92957cb7eb8ed.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/6020712aa10f4bb08db92957cb7eb8ed.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">申请售后</text>
@@ -66,7 +66,7 @@
 					</view>
 					<view v-if="order.status == -2" class="inner">
 						<view class="img-box">
-							<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/6020712aa10f4bb08db92957cb7eb8ed.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/6020712aa10f4bb08db92957cb7eb8ed.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">退款成功</text>
@@ -348,8 +348,8 @@
 			top: 0;
 			left: 0;
 			z-index: 1;
-			background-color: #C39A58;
-			background: linear-gradient(#C39A58, #E2C99E);
+			background-color: #2583EB;
+			background: linear-gradient(#2583EB, #2EDAD4);
 			border-radius: 0rpx 0rpx 100rpx 100rpx;
 		}
 		.inner{
@@ -482,7 +482,7 @@
 							display: inline-block;
 							padding: 0 6upx;
 							height: 30upx;
-							background: linear-gradient(90deg, #C39A58 0%, #E2C99E 100%);
+							background: linear-gradient(90deg, #2583EB 0%, #2EDAD4 100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							font-size: 22upx;
@@ -679,7 +679,7 @@
 				color: #666666;
 			}
 			&.pay{
-				background: #C39A58;
+				background: #2583EB;
 				color: #FFFFFF;
 			}
 			.contact-btn {

+ 5 - 5
pages_company/storeOrderList.vue

@@ -4,7 +4,7 @@
 			 <u-tabs
 			  :scrollable="false"
 			  :list="tabs"  
-			  lineColor="#C39A58"
+			  lineColor="#2583EB"
 			 @change="tabChange">
 			 </u-tabs>
 		</view>
@@ -101,7 +101,7 @@
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					textNoMore:"已经到底了",
 					empty: {
-						icon:'https://cos.his.cdwjyyh.com/fs/20240423/cf4a86b913a04341bb44e34bb4d37aa2.png',
+						icon:'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/empty_icon.png',
 						tip: '暂无数据'
 					}
 				},
@@ -307,7 +307,7 @@
 						font-weight: 500;
 						line-height: 1;
 						&.success{
-							color: #C39A58;
+							color: #2583EB;
 						}
 						&.black{
 							color: #111111;
@@ -350,7 +350,7 @@
 								display: inline-block;
 								padding: 0 6upx;
 								height: 30upx;
-								background: linear-gradient(90deg, #C39A58 0%, #E2C99E 100%);
+								background: linear-gradient(90deg, #2583EB 0%, #2EDAD4 100%);
 								border-radius: 4upx;
 								margin-right: 10upx;
 								font-size: 22upx;
@@ -461,7 +461,7 @@
 								color: #666666;
 							}
 							&.pay{
-								background: #C39A58;
+								background: #2583EB;
 								color: #FFFFFF;
 							}
 							.contact-btn {

+ 4 - 4
pages_course/video.vue

@@ -42,7 +42,7 @@
 			</template>
 				<cover-view class="video-danmu-btnbox" :style="{display: openCommentStatus==2&&isfull&&crtShow&&isLogin&&isAddKf==1 ? 'block':'none'}">
 					<cover-image class="video-danmu-image"
-					 src="https://cos.his.cdwjyyh.com/fs/20250418/beaf9df1a6204b8babc3e28d9b563c62.png"
+					 src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/beaf9df1a6204b8babc3e28d9b563c62.png"
 					 @click="openDanmu(1)"></cover-image>
 				</cover-view>
 			</video>
@@ -74,7 +74,7 @@
 				</view>
 				<!-- 投诉 -->
 				<view class="warning" @click="feedback" v-if="isLogin&&videoId">
-					<image src="https://cos.his.cdwjyyh.com/fs/20250606/66a44bedde6c4e9d937f4bf866aace40.png"></image>
+					<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/66a44bedde6c4e9d937f4bf866aace40.png"></image>
 					<text>投诉</text>
 				</view>
 			</view>
@@ -84,7 +84,7 @@
 				</view>
 				<!-- 投诉 -->
 				<view class="warning" @click="feedback">
-					<image src="https://cos.his.cdwjyyh.com/fs/20250606/66a44bedde6c4e9d937f4bf866aace40.png"></image>
+					<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/66a44bedde6c4e9d937f4bf866aace40.png"></image>
 					<text>投诉</text>
 				</view>
 			</view>
@@ -149,7 +149,7 @@
 		</uni-popup>
 		<!-- 发送弹幕 -->
 		<view class="video-line danmu-line" v-if="isLogin&&isAddKf==1&&openCommentStatus==2" @click="openDanmu(0)" >
-			<image class="set_image" src="https://cos.his.cdwjyyh.com/fs/20250418/5e508642737a44169061382566043ac9.png" mode="aspectFill"></image>
+			<image class="set_image" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/5e508642737a44169061382566043ac9.png" mode="aspectFill"></image>
 			<text>发弹幕</text>
 		</view>
 		<!-- 发送弹幕弹窗 -->

+ 0 - 2243
pages_course/videoOld.vue

@@ -1,2243 +0,0 @@
-<template>
-	<view class="content">
-		<view class="header-nav" :style="{height: `calc(88rpx + ${statusBarHeight}px)`,paddingTop: statusBarHeight + 'px'}">
-			<view class="header-title" :style="{width:menuButtonLeft + 'px',height:menuButtonH+'px',lineHeight:menuButtonH+'px'}">{{courseInfo.title}}</view>
-		</view>
-		<view class="video-box">
-			<image v-if="!isLogin || isAddKf!=1" class="video-poster" :src="courseInfo.imgUrl" mode="aspectFill">
-			</image>
-			<video 
-			@timeupdate="onTimeUpdate" 
-			@progress="progressChange" 
-			@error="videoErrorCallback" 
-			@play="getPlay"
-			@pause="getPause" 
-			@ended="getEnded" 
-			@fullscreenchange="fullscreenchange"
-			@controlstoggle="controlstoggle"
-			@waiting="getWaiting"
-			:title="courseInfo.title"
-			style="width: 100%;height: 420rpx;" 
-			:poster="poster"  
-			id="video-content-box"  
-			controls
-			:show-fullscreen-btn="true"
-			:auto-pause-if-open-native="true"
-			:auto-pause-if-navigate="true"
-			:enable-progress-gesture="false" 
-			:show-progress="true"
-			:picture-in-picture-mode="[]"
-			:show-background-playback-button="false"
-			:src="videoUrl"
-			>
-			<!-- :danmu-list="danmuList"
-			enable-danmu
-			danmu-btn -->
-				<!-- <template v-if="showDanmu==1">
-					<text v-for="(item, index) in activeDanmus" :key="item.id" class="danmu-item danmuMove" 
-						:style="{
-						  top: item.top + 'px',
-						  ...item.style,
-						  'animation-duration': '8s'
-						 }" @animationend="animationend(item,index)">
-						{{ item.text }}
-					</text>
-				</template>
-				<cover-view class="video-danmu-btnbox" :style="{display: isfull&&crtShow&&isLogin&&isAddKf==1 ? 'block':'none'}">
-					<cover-image class="video-danmu-image"
-					 src="https://cos.his.cdwjyyh.com/fs/20250418/beaf9df1a6204b8babc3e28d9b563c62.png"
-					 @click="openDanmu(1)"></cover-image>
-				</cover-view> -->
-			</video>
-		</view>
-		<view class="title-content" id="title-content">
-			<!-- 答题时展示小节课程名,其他展示课程名 -->
-			<!-- 小节课程名 -->
-			<view class="subtitlebox" v-if="isLogin&&isAddKf==1">
-				{{courseInfo.title}}
-			</view>
-			<!-- 课程名字 -->
-			<view class="miantitlebox" v-else>
-				{{courseInfo.courseName}}
-			</view>
-		</view>
-		<scroll-view class="scroll-view" :style="{height: height}" :scroll-top="scrollTop" scroll-y="true">
-			<!-- 介绍 -->
-			<view class="descbox">
-				<template v-if="!isLogin||isAddKf!=1">
-					<view class="descbox-title">{{courseInfo.title}}</view>
-					<view class="descbox-info">
-						<!-- <view class="descbox-info-l">
-							<view>{{courseInfo.views}}次播放</view>
-							<view class="descbox-info-time">总时长:{{courseInfo.totalDuration}}</view>
-						</view> -->
-						<view class="descbox-info-r expand" v-if="textHeight > 21">
-							<text @click="handleExpand">{{isExpand ? '收起简介' : '展开简介'}}</text>
-							<image :src="baseUrl+'/images/course_arrow_up_icon.png'" v-show="isExpand"></image>
-							<image :src="baseUrl+'/images/course_arrow_down_icon.png'" v-show="!isExpand"></image>
-						</view>
-					</view>
-				</template>
-				<view class="descbox-desc" id="descbox-desc" :style="{height: isExpand ? 'auto': '42rpx'}">
-					<text>{{courseInfo.description}}</text>
-					<view :class="isExpand ? 'expand': 'expand expand-ab'" v-if="isLogin&&isAddKf==1&&textHeight > 21">
-						<text @click="handleExpand">{{isExpand ? '收起简介' : '展开简介'}}</text>
-						<image :src="baseUrl+'/images/course_arrow_up_icon.png'" v-show="isExpand"></image>
-						<image :src="baseUrl+'/images/course_arrow_down_icon.png'" v-show="!isExpand"></image>
-					</view>
-				</view>
-			</view>
-			<!-- 问题 -->
-			<view class="ques-content" v-if="isLogin&&isAddKf==1">
-				<view class="ques-content-tit">问答题</view>
-				<view v-for="(item,index) in quesList" :key="index">
-					<view class="ques-title">
-						<text>{{index + 1}}.</text>
-						<view class="ques-type" v-show="item.type == 1 || item.type == 2">
-							{{item.type == 1 ? '单选' : item.type == 2 ? '多选' : ''}}
-						</view>
-						<text>{{item.title}}</text>
-					</view>
-					<view
-					:class="isAnswer(item,option.name) ?'ques-option ques-option-active':'ques-option'" 
-					v-for="(option,idx) in item.questionOption" 
-					:key="idx" 
-					@click="handleAnswer(item,option)">
-						<view>
-							{{numberToLetter(idx)}}.
-						</view>
-						<view>{{option.name}}</view>
-					</view>
-				</view>
-			</view>
-		</scroll-view>
-		<!-- 线路 -->
-		<view class="video-line" @click="openPop" v-if="isLogin&&isAddKf==1">
-			<image :src="baseUrl+'/images/changePlayer-icon.png'"></image>
-			<text>线路{{numberToChinese(lineIndex + 1)}}</text>
-		</view>
-		<!-- 线路弹窗 -->
-		<uni-popup ref="popup" type="bottom"  class="full-width-popup">
-			<view class="popupbox">
-				<view class="popupbox-head">
-					<text>线路选择</text>
-					<image class="close-icon" :src="baseUrl+'/images/tc_close_icon.png'" mode="aspectFill" @click="close">
-					</image>
-				</view>
-				<view class="popupbox-content">
-					<view :class="lineIndex == index ? 'line-item line-active': 'line-item'"
-						v-for="(it,index) in lineList" :key="index" @click="handleLine(index)">
-						线路{{numberToChinese(lineIndex + 1)}}</view>
-				</view>
-			</view>
-		</uni-popup>
-		<!-- 发送弹幕 -->
-		<!-- <view class="video-line danmu-line" @click="openDanmu(0)" v-if="isLogin&&isAddKf==1">
-			<image class="set_image" src="https://cos.his.cdwjyyh.com/fs/20250418/5e508642737a44169061382566043ac9.png" mode="aspectFill"></image>
-			<text>发弹幕</text>
-		</view> -->
-		<!-- 发送弹幕弹窗 -->
-		<uni-popup ref="danmuPopup" type="bottom" style="z-index: 999;" @change="changeShowPopup">
-			<view class="danmuPopup" :style="{marginLeft:isfull ? statusBarHeight+'px': 0,marginBottom: danmuboxHeight+'px'}">
-				<view class="danmuPopup-head border-line">
-					<image class="danmu-icon" :src="showDanmu==0?'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/image/danmu-off.png':'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/image/danmu-on.png'" mode="heightFix" @click="switchDanmu()"></image>
-					<u-input 
-					class="danmuPopup-input" 
-					placeholder="发个弹幕吧~" 
-					border="surround" 
-					shape="circle" 
-					:focus="focus"
-					:adjustPosition="false" 
-					:autoBlur="true" 
-					maxlength="140" 
-					clearable 
-					v-model.trim="danmuIput"></u-input>
-					<button class="danmuPopup-send"  :disabled="danmubtnLoading"  @click="sendDanmu">发送</button>
-				</view>
-			</view>
-		</uni-popup>
-		<!-- 答题弹窗 -->
-		<uni-popup ref="answerPopup" type="center" :show="answerPopup">
-			<view :class="errTitle == '恭喜你,回答正确' ? 'answerPopup-box bg':'answerPopup-box'">
-				<!-- 正确 -->
-				<image class="tipimg" v-if="errTitle == '恭喜你,回答正确'" :src="baseUrl+'/images/course_answer_img.png'"
-					mode="aspectFill"></image>
-				<!-- 错误 -->
-				<image class="tipimg" v-else :src="baseUrl+'/images/course_answer_incorrectly_img.png'" mode="aspectFill">
-				</image>
-				<view class="answerPopup-title">{{errTitle}}</view>
-				<view class="answerPopup-desc" v-html="errDesc"></view>
-				<!-- 选择奖励 -->
-				<view class="reward-list" v-if="errTitle == '恭喜你,回答正确'">
-					<radio-group class="reward-list-group" @change="rewardChange">
-						<label class="reward-list-option" v-for="(item, index) in rewardType" :key="item.value">
-							<radio :value="item.value+ ''" :checked="item.value == currentReward"
-								activeBorderColor="#FF5C03" activeBackgroundColor="#FF5C03"
-								style="transform:scale(0.7)" />
-							<view :style="{color: item.value == currentReward ? '#FF5C03':''}">{{item.name}}</view>
-						</label>
-					</radio-group>
-				</view>
-				<!-- 错误题目 -->
-				<view class="errQuesbox" v-if="errQues&&errQues.length>0">
-					<view class="errQuesbox-item textOne" v-for="(it,index) in errQues" :key="index">{{it.title}}</view>
-				</view>
-				<view class="answerPopup-btn" v-if="errTitle == '恭喜你,回答正确'" @click="closeAnswerPopup">确认</view>
-				<view class="tipsPopup-btn-box" v-else
-					:style="{marginTop: errQues&&errQues.length>0 ? '40rpx':'54rpx'}">
-					<view class="tipsPopup-btn" @click="closeAnswerPopup">{{remain > 0 ? '重新答题': '确认'}}</view>
-				</view>
-			</view>
-		</uni-popup>
-		<!-- 客服二维码弹窗 -->
-		<uni-popup ref="kfPopup" type="center" :mask-click="false">
-			<view class="kfqrcode-box">
-				<image class="kfqrcode" :src="qrcode" show-menu-by-longpress="true"></image>
-				<view v-show="qrcodeMsg" style="margin-top: 30rpx;" v-html="qrcodeMsg"></view>
-				<image class="kfqrcode-close" :src="baseUrl+'/images/course_close_white_icon.png'" mode="aspectFill"
-					@click="closeKFPop"></image>
-			</view>
-		</uni-popup>
-		<!-- footer -->
-		<view class="footer" v-if="videoId">
-			<view class="footer-btn" v-if="!isLogin || isAddKf !=1" @click="submit">
-				<text>立即学习</text>
-			</view>
-			<view v-if="isLogin&&isAddKf==1&&quesList&&quesList.length>0" class="footer-btn footer-btn-border" @click="submit">
-				<image class="footer-btn-img" :src="baseUrl+'/images/red_envelope_btnimg.png'" mode="aspectFill"></image>
-				<text>提交答案领取奖励</text>
-			</view>
-			<!-- <view @click="checked=!checked" class="agreement" v-if="!isLogin">
-				<radio value="r1" :checked="checked" color="#ff5c03" activeBorderColor="#ff5c03"
-					style="transform:scale(0.6);" />
-				<view>阅读并同意<text style="color: #ff5c03;" @click.stop="goWeb(0)">《用户协议》</text>和<text
-						style="color: #ff5c03;" @click.stop="goWeb(1)">《隐私协议》</text></view>
-			</view> -->
-			<view class="footer-tips">重庆云联融智提供技术支持</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import { generateRandomString } from "@/utils/common.js"
-	import dayjs from 'dayjs';
-	import {
-		getErrMsg,
-		getH5CourseByVideoId,
-		getH5CourseVideoDetails,
-		courseAnswer,
-		getFinishCourseVideo,
-		getIsAddKf,
-		getInternetTraffic,
-		getIntegralByH5Video,
-		sendReward,
-		loginByMp,
-		getRealLink,
-		getDanmuList,
-		errorLogUpload
-	} from "@/api/course.js"
-	export default {
-		data() {
-			return {
-				baseUrl:uni.getStorageSync('requestPath'),
-				// 1 红包 2 积分
-				rewardType: [{
-					name: '红包奖励',
-					value: 1
-				}, {
-					name: '积分奖励',
-					value: 2
-				}],
-				currentReward: 1,
-				player: null,
-				loading: true,
-				progress: 0,
-				code: null,
-				statusBarHeight: uni.getSystemInfoSync().statusBarHeight,
-				scrollTop: 0,
-				height: '0px',
-				isLogin: false,
-				videoUrl: "",
-				videoId: "",
-				//现在的时长
-				playTime: 0,
-				//总时长
-				duration: 0,
-				playDuration: 0,
-				// 用于续播
-				playDurationSeek: 0,
-				// 温馨提醒时间节点,
-				tipsTime: 0,
-				tipsOpen: false,
-				config: {},
-				courseInfo: {},
-				quesList: [],
-				lineList: [],
-				// 错题
-				errQues: [],
-				// 答题机会
-				remain: 0,
-				errTitle: "",
-				errDesc: "",
-				showPlay: true,
-				showControls: false,
-				playStatus: "",
-				isfull: false,
-				isAddKf: 0,
-				lineIndex: 0,
-				// 是否展开
-				isExpand: false,
-				textHeight: 0, //文本高度
-				qwUserId: "",
-				qrcode: "",
-				corpId: "",
-				qrcodeMsg: "",
-				urlOption: {},
-				bufferRate: 0, // 缓冲时间
-				uuId: "",
-				isEnded: false,
-				// 是否允许拖动进度条
-				linkType: 0,
-				ip: null,
-				checked: true,
-				isFinish: 0, // 是否完课
-				interval: null,
-				intervalIntegral: null, // 积分定时
-				options: {
-					sources: [{
-						src: ""
-					}],
-					poster: "",
-					live: false /* 是否直播 */ ,
-					controls: true,
-					autoplay: false,
-					licenseUrl: 'https://license.vod2.myqcloud.com/license/v2/1323137866_1/v_cube.license', // license 地址,参考准备工作部分,在视立方控制台申请 license 后可获得 licenseUrl,
-					LicenseKey: 'bcc5bd9a14b798b48c52ff005a21d926',
-					controlBar: {
-						volumePanel: false,
-						playbackRateMenuButton: false,
-						QualitySwitcherMenuButton: false,
-						// progressControl: false
-					},
-					plugins: {
-						// ProgressMarker: false,
-						ContextMenu: {
-							statistic: false
-						}
-					},
-				},
-				// 错误请求次数
-				errorCount: 0,
-				answerPopup: false,
-				sortLink:"",
-				// 课程是否过期
-				isExpire: false,
-				menuButtonLeft: 281,
-				menuButtonH: 45,
-				timer: null,
-				flag: false,
-				danmuList: [],
-				danmuIput: '',
-				focus: false,
-				danmubtnLoading: false,
-				openDanmuType: 0,
-				socket:null,
-				isSocketOpen: false,
-				isSend:true,
-				reOpenSocket: false,
-				pingpangTimes:null,
-				danmuboxHeight: 0,
-				user: {},
-				crtShow: true,
-				isCheckRealUrl: false,
-				activeDanmus:[],
-				flagTime: 0,
-				danmuItemStyle:{
-					color: '#ffffff',
-					fontSize: '16px',
-					border: 'solid 1px #ffffff',
-					borderRadius: '5px',
-					padding: '2px 2px',
-					backgroundColor: 'rgba(255, 255, 255, 0.1)'
-				},
-				showDanmu: 1,
-				ctx: null
-			}
-		},
-		computed: {
-			isAnswer() {
-				return (item, name) => {
-					if (item.type == 1) {
-						return item.answer == name
-					} else if (item.type == 2) {
-						const array = item.answer.split(',')
-						return array.some(i => i == name)
-					} else {
-						return false
-					}
-				}
-			}
-		},
-		onLoad(option) {
-			this.code = option.code
-			this.urlOption = option.course ? JSON.parse(option.course) : {}
-			this.videoId = this.urlOption.videoId
-			this.qwUserId = this.urlOption.qwUserId || ''
-			this.corpId = this.urlOption.corpId || ''
-			this.linkType = this.urlOption.linkType || 0
-			// if (this.code) {
-			// 	this.loginByMp()
-			// }
-			var that=this;
-			if (this.videoId) {
-				this.getH5CourseByVideo()
-			}
-			this.sortLink = this.urlOption.link || ''
-			this.getMenuButton()
-			// #ifndef H5
-			uni.onKeyboardHeightChange(this.keyboardHeightChange);
-			// #endif
-			if(this.socket!=null){
-				this.socket.close()
-				clearInterval(this.pingpangTimes)
-				this.socket = null
-			}
-			// this.initTracks()
-		},
-		onShow() {
-			this.tipsOpen = false
-			this.isExpand = true
-			// this.isLogin = this.$isLoginCourse()
-			this.uuId = generateRandomString(16)
-			if(uni.getStorageSync('userInfo') && JSON.stringify(uni.getStorageSync('userInfo'))!='{}') {
-				this.user = JSON.parse(uni.getStorageSync('userInfo'))
-			} else {
-				this.user = {}
-			}
-			if(this.sortLink){
-				this.getLink()
-			} else {
-				uni.showToast({
-					title: 'sortLink is not found',
-					icon: 'none'
-				});
-			}
-		},
-		mounted() {
-			this.getIP()
-			this.getHeight()
-		},
-		onHide() {
-			// this.player = uni.createVideoContext('video-content-box');
-			if (this.player) {
-				this.player.pause()
-			}
-			// if (this.interval != null) {
-			// 	clearInterval(this.interval)
-			// 	this.interval = null
-			// }
-		},
-		onUnload() {
-			if (this.interval != null) {
-				clearInterval(this.interval)
-				this.interval = null
-			}
-			if(this.socket!=null){
-				this.socket.close()
-				clearInterval(this.pingpangTimes)
-				this.socket = null
-			}
-			// #ifndef H5
-			uni.offKeyboardHeightChange(this.keyboardHeightChange);
-			// #endif
-			this.clearIntegral()
-		},
-		beforeDestroy() {
-			this.player = uni.createVideoContext('video-content-box');
-			if (this.player) {
-				this.player.stop()
-				this.player = null
-			}
-			if (this.interval != null) {
-				clearInterval(this.interval)
-				this.interval = null
-			}
-			if(this.socket!=null){
-				this.socket.close()
-				clearInterval(this.pingpangTimes)
-				this.socket = null
-			}
-			// #ifndef H5
-			uni.offKeyboardHeightChange(this.keyboardHeightChange);
-			// #endif
-			this.clearIntegral()
-		},
-		methods: {
-			numberToChinese(number) {
-				if (number) {
-					const chineseNumber = ['一', '二', '三', '四', '五', '六', '七', '八', '九'];
-					return chineseNumber[number - 1];
-				} else {
-					return ''
-				}
-			},
-			keyboardHeightChange(res) {
-				// #ifndef H5
-				console.log("this.danmuboxHeight",this.danmuboxHeight)
-				 this.danmuboxHeight = res.height
-				// #endif
-			},
-			getMenuButton(){
-				const menuButtonInfo = uni.getMenuButtonBoundingClientRect()
-				this.menuButtonLeft = menuButtonInfo.left
-				this.menuButtonH = menuButtonInfo.height
-			},
-			//播放时间更新事件方法
-			onTimeUpdate(e){
-				let currentTime = Math.round(e.detail.currentTime)
-				if (this.playDurationSeek > 0) {
-					this.playTime = this.playDurationSeek
-					this.throttle(() => this.changeTime(this), 1000, false)
-				} else {
-					if (this.linkType != 1 && (currentTime - this.playTime > 3 || currentTime - this.playTime < -3)&&this.isFinish!=1) {
-						uni.showToast({
-							title: '不能快进哦',
-							icon: 'none',
-						});
-						currentTime = this.playTime
-						this.player.seek(this.playTime);
-					}
-					this.playTime = currentTime
-				}
-				if (Math.floor(e.detail.currentTime) != this.flagTime) {
-					this.flagTime = Math.floor(e.detail.currentTime)
-					this.checkDanmu()
-				}
-			},
-			changeTime(that,e) {
-				that.playDurationSeek = 0
-			},
-			videoErrorCallback(e) {
-				this.errorCount++
-				if (this.errorCount > 3) return
-				if (this.interval != null) {
-					clearInterval(this.interval)
-				}
-				this.clearIntegral()
-				console.log(e)
-				this.getErrMsg(e.target.errMsg)
-				this.getH5CourseVideoDetails('error')
-			},
-			// 当开始/继续播放时触发play事件
-			getPlay() {
-				this.errorCount = 0
-				this.judgeDuration()
-			},
-			getPause() {
-				this.clearIntegral()
-			},
-			getEnded() {
-				this.clearIntegral()
-				this.isEnded = true
-				this.getFinishCourseVideo()
-			},
-			getWaiting() {
-				this.getErrMsg('','waiting')
-			},
-			fullscreenchange(event) {
-				this.isfull = event.detail.fullScreen
-				this.initTracks()
-			},
-			controlstoggle(event) {
-				this.crtShow =  event.detail.show
-			},
-			getIP() {
-				uni.request({
-					url: 'https://ipinfo.io/json', //仅为示例,并非真实接口地址。
-					method: 'GET',
-					success: (res) => {
-						this.ip = res.data.ip
-					}
-				});
-			},
-			getHeight() {
-				this.$nextTick(() => {
-					const query = uni.createSelectorQuery().in(this);
-					query
-						.select("#title-content")
-						.boundingClientRect((data) => {
-							this.height =
-								`calc(100vh - ${data.height}px - 420rpx - ${this.statusBarHeight}px - 164rpx - 88rpx)`
-						})
-						.exec();
-				})
-			},
-			getDescHeight() {
-				this.$nextTick(() => {
-					const query = uni.createSelectorQuery().in(this);
-					query
-						.select("#descbox-desc")
-						.boundingClientRect((data) => {
-							this.textHeight = data.height
-						})
-						.exec();
-				})
-			},
-			numberToLetter(num) {
-				// 将数字转换为字母的 ASCII 码
-				let letterCode = num + 65;
-				// 将 ASCII 码转换为大写字母
-				let letter = String.fromCharCode(letterCode);
-				return letter;
-			},
-			updateTime() {
-				var that = this;
-				if (this.interval != null) {
-					clearInterval(this.interval)
-				}
-				this.interval = setInterval(function() {
-					that.getFinishCourseVideo()
-					that.getInternetTraffic()
-				}, 60000);
-			},
-			judgeDuration() {
-				var that = this;
-				if (this.intervalIntegral != null) {
-					clearInterval(this.intervalIntegral)
-					this.intervalIntegral = null
-				}
-				// 观看10分钟获得积分
-				this.intervalIntegral = setInterval(function() {
-					that.getIntegralByH5Video()
-				}, 600000);
-			},
-			clearIntegral() {
-				if (this.intervalIntegral != null) {
-					clearInterval(this.intervalIntegral)
-					this.intervalIntegral = null
-				}
-			},
-			// 展开简介
-			handleExpand() {
-				this.isExpand = !this.isExpand
-			},
-			getH5CourseByVideo() {
-				this.loading = true
-				getH5CourseByVideoId({
-					videoId: this.videoId
-				}).then(res => {
-						this.loading = false
-						if (res.code == 200) {
-							this.courseInfo = res.data
-							uni.setNavigationBarTitle({
-								title: this.courseInfo && this.courseInfo.title ? this.courseInfo.title : ''
-							});
-						} else {
-							
-						}
-						this.getHeight()
-						this.getDescHeight()
-					},
-					rej => {
-						this.loading = false
-					}
-				).catch(() => {
-					this.loading = false
-				})
-			},
-			getH5CourseVideoDetails(type) {
-				getH5CourseVideoDetails(this.urlOption).then(res => {
-						if (res.code == 200) {
-							this.config = res.config || {}
-							this.isFinish = res.isFinish || 0
-							this.duration = res.course && res.course.duration ? res.course.duration : 0
-							this.playDuration = res.playDuration || 0
-							this.playDurationSeek = res.playDuration || 0
-							this.tipsTime = res.tipsTime || 0
-							let lineList = []
-							if (res.course && res.course.lineOne) {
-								lineList.push(res.course.lineOne)
-							}
-							if (res.course && res.course.lineTwo) {
-								lineList.push(res.course.lineTwo)
-							}
-							if (res.course && res.course.lineThree) {
-								lineList.push(res.course.lineThree)
-							}
-							this.lineList = lineList
-							if (!this.player || type == 'error') {
-								this.lineIndex = this.config.defaultLine
-								this.videoUrl = lineList[this.lineIndex]
-								this.poster= res.course && res.course.imgUrl ? res.course.imgUrl : ''
-								// this.options.sources = [{
-								// 	src: this.videoUrl
-								// }]
-								// this.options.poster = res.course && res.course.imgUrl ? res.course.imgUrl : ''
-								// this.initVideo()
-								this.playTime = this.playDuration >= this.duration ? 0 : this.playDuration
-								setTimeout(()=>{
-									this.player = uni.createVideoContext('video-content-box');
-									this.player.seek(this.playTime)
-									this.player.play();
-								},500);
-								// this.getDanmuList()
-								// if (this.socket) {
-								// 	this.socket.close({
-								// 		success:()=>{
-								// 			this.reOpenSocket = true
-								// 			clearInterval(this.pingpangTimes)
-								// 		}
-								// 	})
-								// } else {
-								// 	this.initSocket()
-								// }
-							} else {
-								// let div = document.querySelector(".vjs-progress-control");
-								// if(div) {
-								// 	if (this.isFinish == 1 || this.isEnded || this.linkType == 1) {
-								// 		div.style.pointerEvents = "auto";
-								// 	} else {
-								// 		div.style.pointerEvents = "none"; //禁止所有事件
-								// 	}
-								// }
-								this.playTime = this.playTime > this.playDuration ? this.playTime : this.playDuration >= this.duration ? 0 : this.playDuration
-								this.player.seek(this.playTime)
-								this.player.play();
-							}
-							this.updateTime();
-							this.quesList = res.questions && res.questions.length > 0 ? res.questions : [],
-								this.quesList = this.quesList.map(item => ({
-									...item,
-									questionOption: JSON.parse(item.question),
-									answer: ''
-								}))
-						} else {
-							if(res&&res.code==500&&res.msg == '未知异常,请联系管理员'){
-								this.sendErrorLog('/app/course/getH5CourseVideoDetails',this.urlOption)
-							}
-						}
-						this.getHeight()
-						this.getDescHeight()
-					},
-					rej => {}
-				)
-			},
-			handleAnswer(item, option, idx) {
-				let time = this.playTime
-				if(this.isEnded) {
-					time = this.duration
-				} else {
-					if(time < this.playDuration&&this.isFinish!=1) {
-						// 没完课且小于续播的时间
-						time = this.playDuration
-					}
-				}
-				if(Number(this.duration || 0) == 0 || time < this.duration - 60) {
-					uni.showToast({
-						title: "请先观看完整课程再答题哦~",
-						icon: "none"
-					})
-					return
-				}
-
-				if (item.type == 1) {
-					// 单选option
-					item.answer = option.name
-				} else if (item.type == 2) {
-					// 多选
-					let answer = item.answer ? item.answer.split(',') : []
-					if (answer.indexOf(option.name) === -1) {
-						answer.push(option.name)
-						item.answer = answer.join(',')
-					} else {
-						answer.splice(answer.indexOf(option.name), 1)
-						item.answer = answer.join(',')
-					}
-				}
-			},
-			submit() {
-				if(this.isExpire){
-					uni.showToast({
-						title: '课程已过期或链接无效',
-						icon: 'none'
-					});
-					return
-				}
-				// 登录
-				this.$isLoginCourse().then(
-					res => {
-						if(res){
-							if (this.isAddKf == 1&&this.isCheckRealUrl) {
-								// 答题
-								// 您已提交过答案,请领取红包
-								this.courseAnswer()
-							} else {
-								// 添加客服
-								if (this.videoId && this.qwUserId) {
-									this.getIsAddKf()
-								} else {
-									uni.showToast({
-										title: '请添加客服',
-										icon: 'none'
-									})
-								}
-							} 
-						} else{
-							this.goLogin()
-						}
-					},
-					rej => {}
-				);
-			},
-			// 答题
-			courseAnswer() {
-				let time = this.playTime
-				if (this.isEnded) {
-					time = this.duration
-				} else {
-					if (time < this.playDuration && this.isFinish != 1) {
-						// 没完课且小于续播的时间
-						time = this.playDuration
-					}
-				}
-				if (Number(this.duration || 0) == 0 || time < this.duration - 60) {
-					uni.showToast({
-						title: "请先观看完整课程再答题哦~",
-						icon: "none"
-					})
-					return
-				}
-				if (this.quesList.some(item => !item.answer)) {
-					uni.showToast({
-						title: "请确认是否答完所有题目",
-						icon: "none"
-					})
-					return
-				}
-				const questions = this.quesList.map(obj => {
-					const {
-						questionOption,
-						...rest
-					} = obj;
-					return rest;
-				});
-				if(!this.isCheckRealUrl) return;
-				const param = {
-					...this.urlOption,
-					questions: questions,
-					videoId: this.videoId,
-					duration: this.playTime,
-				}
-				this.errTitle = ""
-				this.errDesc = ""
-				this.errQues = []
-				courseAnswer(param).then(res => {
-						if (res.code == 200) {
-							if (res.incorrectQuestions) {
-								// 答题失败
-								if (res.incorrectQuestions.length > 0) {
-									this.errQues = res.incorrectQuestions
-								}
-								this.remain = res.remain || 0
-								if (res.remain > 0) {
-									this.errTitle = "很遗憾答错了"
-									this.errDesc = `<span style="color:#FF5C03">还有${res.remain}次机会,继续加油</span>`
-									this.$refs.answerPopup.open("center")
-								}
-							} else {
-								// 答题成功
-								this.errTitle = "恭喜你,回答正确"
-								this.errDesc = `请选择奖励`
-								this.$refs.answerPopup.open("center")
-							}
-						} else {
-							if (res.msg == "该课题到达答错次数限制") {
-								this.errTitle = "答题次数超过限制"
-								this.errDesc = "以后的课程要认真学习哦"
-								this.$refs.answerPopup.open("center")
-							} else {
-								uni.showToast({
-									title: res.msg,
-									icon: "none"
-								})
-							}
-							if(res&&res.code==500&&res.msg == '未知异常,请联系管理员'){
-								this.sendErrorLog('/app/course/courseAnswer',param)
-							}
-						}
-					},
-					rej => {}
-				)
-			},
-			// 选择
-			rewardChange(e) {
-				this.currentReward = e.detail.value
-			},
-			closeAnswerPopup() {
-				this.$refs.answerPopup.close()
-				if(!this.isCheckRealUrl) return;
-				if (this.errTitle == '恭喜你,回答正确') {
-					const param = {
-						...this.urlOption,
-						rewardType: Number(this.currentReward),
-						source: 2
-					}
-					sendReward(param).then(res => {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none'
-						})
-						// if(res.code == 200) {
-						// 	//重构 发红包,后台通过OPENID发零钱到 账
-						// 	//this.initWXConfig(res.package)
-						// }else {
-						// 	uni.showToast({
-						// 		title: res.msg,
-						// 		icon: 'none'
-						// 	})
-						// }
-						if(res&&res.code==500&&res.msg == '未知异常,请联系管理员'){
-							this.sendErrorLog('/app/course/sendReward',param)
-						}
-					})
-				}
-			},
-			// 线路
-			openPop() {
-				this.$refs.popup.open('bottom')
-			},
-			close() {
-				this.$refs.popup.close()
-			},
-			handleLine(index) {
-				var that=this;
-				if (this.lineIndex == index && this.videoUrl == this.lineList[index]) {
-					this.close()
-					return
-				} else {
-					// let div = document.querySelector(".vjs-progress-control");
-					// if(div) {
-					// 	if (this.isFinish == 1 || this.isEnded || this.linkType == 1) {
-					// 		div.style.pointerEvents = "auto";
-					// 	} else {
-					// 		div.style.pointerEvents = "none"; //禁止所有事件
-					// 	}
-					// }
-					this.lineIndex = index
-					this.videoUrl = this.lineList[index]
-					this.tipsOpen = false
-					this.playDurationSeek = this.playTime || 0
-					this.player = uni.createVideoContext('video-content-box');
-					setTimeout(function(){
-						that.player.seek(that.playDurationSeek)
-						that.player.play();
-					},500);
-					// this.player.src(this.lineList[index])
-					// this.player.one('loadedmetadata', () => {
-					// 	this.player.currentTime(this.playDurationSeek);
-					// 	this.player.play();
-					// });
-					this.close()
-				}
-
-			},
-			// 客服
-			getIsAddKf() {
-				this.qrcode = ''
-				this.qrcodeMsg = ''
-				this.isAddKf = 0
-				// {videoId: this.videoId,qwUserId: this.qwUserId,corpId: this.corpId}
-				getIsAddKf(this.urlOption).then(res => {
-						if (res.code == 200) {
-							this.isAddKf = 1
-							this.isCheckRealUrl = true
-							this.getH5CourseVideoDetails()
-						} else if (res.code == 400) {
-							this.isAddKf = 0
-							this.isCheckRealUrl = false
-							this.qrcode = res.qrcode
-							this.qrcodeMsg = res.msg
-							this.$refs.kfPopup.open()
-						} else if (res.code == 504) {
-							// 登录
-							this.isCheckRealUrl = false
-							this.goLogin()
-						} else if (res.code == 566) {
-							this.isAddKf = 1
-							this.isCheckRealUrl = true
-							// 官方群发通用链接
-							const url = res.courseLink.realLink.split('?course=')[1]
-							this.urlOption = JSON.parse(url)
-							this.getH5CourseVideoDetails()
-						} else {
-							this.isCheckRealUrl = false
-							this.isAddKf = 0
-							uni.showToast({
-								title: res.msg,
-								icon: 'none'
-							});
-							if(res&&res.code==500&&res.msg == '未知异常,请联系管理员'){
-								this.sendErrorLog('/app/course/isAddKf',this.urlOption)
-							}
-						}
-					},
-					err => {}
-				);
-			},
-			closeKFPop() {
-				this.$refs.kfPopup.close()
-			},
-			getFinishCourseVideo() {
-				if (!this.playTime || !this.isCheckRealUrl) return
-				// {videoId: this.videoId,duration:this.playTime}
-				const param = {
-					duration: this.playTime,
-					...this.urlOption
-				}
-				getFinishCourseVideo(param).then(res=>{
-					if(res&&res.code==500&&res.msg == '未知异常,请联系管理员'){
-						this.sendErrorLog('/app/course/updateWatchDuration',param)
-					}
-				})
-			},
-			// 每十分钟获得积分
-			getIntegralByH5Video() {
-				if(!this.isCheckRealUrl) return
-				const param = {
-					duration: this.playTime,
-					...this.urlOption
-				}
-				getIntegralByH5Video(param).then(res => {
-					if (res.code == 200) {
-						uni.showToast({
-							title: "积分+10",
-							icon: "none"
-						})
-					} else {
-						if(res&&res.code==500&&res.msg == '未知异常,请联系管理员'){
-							this.sendErrorLog('/app/course/getIntegralByH5Video',param)
-						}
-					}
-				})
-			},
-			progressChange(e) {
-				this.bufferRate = Math.ceil(e.detail.buffered)
-			},
-			// 缓冲
-			getInternetTraffic() {
-				if(!this.isCheckRealUrl) return
-				const playVideoTime = Math.ceil(this.playTime / this.duration * 100) // 播放百分比
-				if(this.bufferRate == 0 || this.bufferRate < playVideoTime) {
-					this.bufferRate = playVideoTime
-				}
-				if(this.bufferRate == 0 || Number(this.bufferRate.toFixed(2)) == 0) return
-				const param = {
-					...this.urlOption,
-					uuId: dayjs().format('YYYYMMDD') + this.uuId,
-					duration: this.playTime,
-					bufferRate: Number(this.bufferRate.toFixed(2)),
-				}
-				if(!param.bufferRate) return
-				getInternetTraffic(param).then(res=>{
-					if(res&&res.code==500&&res.msg == '未知异常,请联系管理员'){
-						this.sendErrorLog('/app/course/getInternetTraffic',param)
-					}
-				})
-			},
-			getErrMsg(err,type) {
-				let msgerr = {
-					errType: type || 'error',
-					videoUrl: this.videoUrl,
-					lineIndex: this.lineIndex,
-					errTime: new Date(),
-					ip: this.ip,
-					errMsg: err || ''
-				}
-				getErrMsg({
-					msg: JSON.stringify(msgerr)
-				})
-			},
-			goLogin() {
-				this.$getProvider().then(provider=>{
-					console.log('当前的环境商',provider)
-					if (!provider) {
-					  reject()
-					}
-					uni.login({
-						provider: provider,
-						success: async loginRes => {
-							console.log(loginRes)
-							uni.getUserInfo({
-							   provider: provider,
-							   success: (infoRes)=> {
-								    uni.showToast({
-										title: '处理中...',
-										icon: 'loading'
-								    });
-									loginByMp({code: loginRes.code,encryptedData:infoRes.encryptedData,iv:infoRes.iv}).then(res=>{
-										 uni.hideLoading();
-										 if (res.code == 200) {
-											uni.setStorageSync('AppTokenmini_RTCourse', res.token);
-											uni.setStorageSync('userInfo', JSON.stringify(res.user));
-											this.user = res.user
-											this.isLogin = true
-											this.getIsAddKf() 
-										 } else {
-											uni.showToast({
-												title: res.msg,
-												icon: 'none'
-											});
-											if(res&&res.code==500&&res.msg == '未知异常,请联系管理员'){
-												this.sendErrorLog('/app/wx/courseLogin',{code: loginRes.code,encryptedData:infoRes.encryptedData,iv:infoRes.iv})
-											}
-										 }
-									 }).catch(err=>{
-										uni.hideLoading();
-										uni.showToast({
-											icon:'none',
-											title: "登录失败,请重新登录",
-										});
-									});
-							   }
-							});
-						}
-					})
-				}).catch(err => {})
-			},
-			getLink() {
-				let that = this;
-				getRealLink({sortLink:this.sortLink}).then(res=>{
-					if(res.code == 200) {
-						this.isExpire = false
-						// 如果响应中包含真实链接,则跳转到真实链接
-						// window.location.href = res.realLink +"&sortLink="+this.sortLink+"&code="+this.code+"&time="+new Date().getTime()
-						if (this.isLogin && this.isAddKf == 1&&this.isCheckRealUrl) {
-							this.getH5CourseVideoDetails()
-						}
-						if (this.videoId &&(this.isAddKf != 1 || !this.isCheckRealUrl)) {
-							this.$isLoginCourse().then(
-								isLogin => {
-									this.isLogin = isLogin
-									if(isLogin){
-										this.getIsAddKf() 
-									} else {
-										this.goLogin()
-									}
-								},
-								rej => {}
-							);
-						}
-					} else {
-						this.isExpire = true
-						uni.showToast({
-							title: '课程已过期或链接无效',
-							icon: 'none'
-						});
-						if(res&&res.code==500&&res.msg == '未知异常,请联系管理员'){
-							this.sendErrorLog('/app/course/getRealLink',{sortLink:this.sortLink})
-						}
-					}
-				}).catch(err=>{
-					this.isExpire = true
-					uni.showToast({
-						title: '发生错误,请稍后再试',
-						icon: 'none'
-					});
-				})
-			},
-			/**
-			 * 节流原理:在一定时间内,只能触发一次
-			 *
-			 * @param {Function} func 要执行的回调函数
-			 * @param {Number} wait 延时的时间
-			 * @param {Boolean} immediate 是否立即执行
-			 * @return null
-			 */
-			throttle(func, wait = 500, immediate = true) {
-			    if (immediate) {
-			        if (!this.flag) {
-			            this.flag = true
-			            // 如果是立即执行,则在wait毫秒内开始时执行
-			            typeof func === 'function' && func()
-			            this.timer = setTimeout(() => {
-			                this.flag = false
-			            }, wait)
-			        }
-			    } else if (!this.flag) {
-			        this.flag = true
-			        // 如果是非立即执行,则在wait毫秒内的结束处执行
-			        this.timer = setTimeout(() => {
-			            this.flag = false
-			            typeof func === 'function' && func()
-			        }, wait)
-			    }
-			},
-			// 弹幕
-			openDanmu(type) {
-				this.openDanmuType = type
-				this.danmuIput= ''
-				if(type == 1) {
-					this.player.exitFullScreen()
-				}
-				this.$refs.danmuPopup.open()
-			},
-			changeShowPopup(val) {
-				this.focus = val.show
-			},
-			// 发送弹幕
-			sendDanmu() {
-				if(this.danmuIput=='') {
-					uni.showToast({
-						title: '弹幕不能为空',
-						icon: 'none'
-					})
-					return;
-				}
-				this.sendMsg()
-			},
-			// 弹幕列表
-			getDanmuList(){
-				getDanmuList(this.videoId).then(res=>{
-					if(res.code == 200&&res.data&&res.data.length>0) {
-						this.danmuList = res.data.map(item=>({
-							id: item.id,
-							text: item.content,
-							time: item.timePoint ? Number(item.timePoint) : this.playTime,
-							color: "#FFFFFF",
-							mode: item.mode|| "scroll",
-							top: null,
-							style: {
-								color: item.isColor==1 ? item.color || this.danmuItemStyle.color : this.danmuItemStyle.color,//是否彩色1是0否
-								fontSize: item.fontSize || this.danmuItemStyle.fontSize, 
-								padding: this.danmuItemStyle.padding,
-								border:this.user.userId ==item.userId ? item.color ? `solid 1px ${item.color}`: this.danmuItemStyle.border : 'none',
-								borderRadius: this.user.userId==item.userId ? this.danmuItemStyle.borderRadius : 0,
-								backgroundColor: this.user.userId==item.userId ? this.danmuItemStyle.backgroundColor : 'transparent'
-							},
-						}))
-					} else {
-						this.danmuList = []
-					}
-				})
-			},
-			//创建一个socket连接
-			initSocket() {
-				let userId = this.user.userId;
-				let that = this;
-				this.socket = uni.connectSocket({
-					url: getApp().globalData.wsUrl + "/ws/barrage/" + this.videoId,
-					multiple: true,
-					header: {
-						'token': uni.getStorageSync('AppTokenmini_RTCourse')
-					},
-					success: res => {
-						console.log('WebSocket连接已打开1!');
-						that.isSocketOpen = true
-						that.reOpenSocket = false
-						
-						// 保持心跳
-						if(that.pingpangTimes) {
-							clearInterval(that.pingpangTimes)
-							that.pingpangTimes= null
-						}
-						that.pingpangTimes=setInterval(()=>{
-							let data={cmd:"heartbeat",userId: userId};
-							that.socket.send({
-								data: JSON.stringify(data),
-								success: () => {
-									// console.log('WebSocket发送心条数据!');
-								},
-								fail: () => {
-									that.isSocketOpen=false
-								}
-							});
-						},15000)
-					},
-					error: res => {
-						console.log(res)
-					},
-				})
-				this.socket.onMessage((res) => {
-					// console.log("收到消息parse",JSON.parse(res.data))
-					const redata = JSON.parse(res.data);
-					if(redata.cmd=="heartbeat"){
-						  //心跳
-						  // console.log("heartbeat")
-					}else if(redata.cmd=="danmu"){
-						that.isSend=true;
-						that.addMsg(1,redata);
-					}
-				})
-				//监听socket打开
-				this.socket.onOpen(() => {
-					console.log('WebSocket连接已打开2!');
-					that.isSocketOpen = true
-					that.reOpenSocket = false
-					that.isSend = true;
-				})
-				//监听socket关闭
-				this.socket.onClose(() => {
-					that.isSocketOpen = false
-					that.socket = null
-					console.log('WebSocket连接已关闭!',that.reOpenSocket);
-					if(that.pingpangTimes) {
-						clearInterval(that.pingpangTimes)
-						that.pingpangTimes= null
-					}
-					if(that.reOpenSocket) {
-						//重启
-						// that.initSocket()
-					}
-				})
-				//监听socket错误
-				this.socket.onError((err) => {
-					console.log("socket err:",err)
-					that.isSocketOpen = false
-					that.reOpenSocket = false
-					that.socket = null
-					if(that.pingpangTimes) {
-						clearInterval(that.pingpangTimes)
-						that.pingpangTimes= null
-					}
-				})
-			},
-			sendMsg() {
-				if (!this.isSend) {
-					return;
-				}
-				if (this.isSocketOpen) {
-					var data = {
-						cmd: 'danmu',
-						userId: this.user.userId,
-						videoId: this.videoId,
-						content: this.danmuIput,
-						timePoint: this.playTime, // 弹幕对应视频时间节点()秒
-						platform: 'uniapp',  //发送平台,app传值“app”,小程序传值“uniapp”
-						fontSize: '16px',
-						mode: "scroll",
-						color: "#ffffff",
-					};
-					this.socket.send({
-						data: JSON.stringify(data),
-						success: () => {
-							console.log("发送成功")
-							this.$refs.danmuPopup.close()
-							this.isSend = false;
-						},
-						fail: () => {
-							uni.showToast({
-								title: '发送失败',
-								icon: 'none'
-							})
-						}
-					});
-			
-				}
-			
-			},
-			// 收到消息
-			addMsg(type, content) {
-				if (!this.player) {
-					this.player = uni.createVideoContext('video-content-box');
-				}
-				// this.player.sendDanmu({
-				// 	text: content.content,
-				// 	color: "#FF0000",
-				// 	time: this.playTime + 1
-				// })
-				const id = content.userId +'_' + new Date().getTime()
-				const mystyle = {
-					color: content.color || this.danmuItemStyle.color,
-					fontSize: content.fontSize || this.danmuItemStyle.fontSize,
-					border: content.color ? `solid 1px ${content.color}`: this.danmuItemStyle.border,
-					borderRadius: this.danmuItemStyle.borderRadius,
-					padding: this.danmuItemStyle.padding,
-					backgroundColor: this.danmuItemStyle.backgroundColor
-				}
-				const otherstyle = {
-					color: content.color || this.danmuItemStyle.color,
-					fontSize: content.fontSize || this.danmuItemStyle.fontSize,
-					padding: this.danmuItemStyle.padding,
-				}
-				const mode = content.mode || "scroll"
-				const obj = {
-					id: content.id || id,
-					userId: content.userId,
-					text: content.content,
-					time: this.flagTime + 1,
-					color: content.color || this.danmuItemStyle.color,
-					style: this.user.userId == content.userId ? mystyle : otherstyle,
-					top: null
-				}
-				console
-				if(this.showDanmu == 0) return
-				this.danmuList.push(obj)
-			},
-			initTracks() {
-				this.tracks = []
-				const trackHeight = 22; // 每行高度
-				const trackCount = 3
-				for (let i = 0; i < trackCount; i++) {
-					this.tracks.push({
-						top: i * trackHeight+10,
-						isFree: true
-					});
-				}
-			},
-			// 获取字体高度
-			getTextWidth(content) {
-				if (!this.ctx) {
-					this.ctx = uni.createCanvasContext('myCanvas')
-				}
-				const metrics = this.ctx.measureText(content)
-				return Math.ceil(metrics.width)
-			},
-			// 分配轨道
-			getFreeTrack(item) {
-				const width = this.getTextWidth(item.content)
-				const passWidth = width + uni.getSystemInfoSync().screenWidth
-				const duration = 8
-				for (let i = 0; i < this.tracks.length; i++) {
-					if (this.tracks[i].isFree) {
-						this.tracks[i].isFree = false;
-						// 等本条通过右边界的时间
-						let passtime = Math.ceil(duration * 1000 / passWidth * width)
-						passtime = passtime + 1000
-						// console.log("passtime==", passtime)
-						setTimeout(() => {
-							this.tracks[i].isFree = true;
-						}, passtime); // 5秒后释放轨道
-						return this.tracks[i].top;
-					}
-				}
-				// 无可用轨道
-				if (item.userId == this.user.userId) {
-					let trackHeight = this.tracks[this.tracks.length - 1].top
-					return Math.random() * trackHeight + 16 // 自己发的弹幕随机高度; // 无可用轨道
-				} else {
-					// console.log("无可用轨道")
-					return 'abandon'
-				}
-			},
-			// 检测并激活弹幕
-			checkDanmu() {
-				if(this.showDanmu == 0) return
-				// 筛选当前时间应出现的弹幕
-				const newDanmus = this.danmuList.filter((item) => Math.abs(item.time - this.flagTime) < 1)
-				// 分配轨道高度
-				newDanmus.forEach((item) => {
-					// 滚动弹幕随机高度
-					if(!item.top) {
-						item.top = this.getFreeTrack(item)
-					}
-				})
-				// 过滤没有分配到空闲轨道弹幕
-				const aliveNewDanmus = newDanmus.filter((item) => item.top != 'abandon')
-				// 添加到活跃列表
-				this.activeDanmus = [...this.activeDanmus, ...aliveNewDanmus]
-			},
-			animationend(moveItem, i) {
-				// 移除动画结束的弹幕(性能优化)
-				this.activeDanmus = this.activeDanmus.filter((item) => item.id != moveItem.id)
-			},
-			switchDanmu() {
-				this.showDanmu = this.showDanmu == 1 ? 0:1
-				if(this.showDanmu == 0) {
-					this.activeDanmus = []
-					this.initTracks()
-				}
-			},
-			// 未知异常,请联系管理员
-			sendErrorLog(url,param){
-				const data = {
-					url:url || '',
-					param:param?JSON.stringify(param) : ''
-				}
-				errorLogUpload(data)
-			}
-		}
-	}
-</script>
-
-<style scoped>
-.full-width-popup {
-  width: 100%;
-}
-</style>
-<style lang="scss" scoped>
-	@mixin u-flex($flexD, $alignI, $justifyC) {
-		display: flex;
-		flex-direction: $flexD;
-		align-items: $alignI;
-		justify-content: $justifyC;
-	}
-	.footer-tips {
-		margin-top: 14rpx;
-		text-align: center;
-		font-family: PingFang SC,PingFang SC;
-		font-weight: 500;
-		font-size: 12px;
-		color: #bbb;
-	}
-	.textOne {
-		overflow: hidden;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-	}
-
-	.textTwo {
-		overflow: hidden;
-		text-overflow: ellipsis;
-		display: -webkit-box;
-		-webkit-line-clamp: 2;
-		-webkit-box-orient: vertical;
-	}
-	.header-nav {
-		height: 88rpx;
-		@include u-flex(row, center, flex-start);
-		overflow: hidden;
-		background-color: #fff;
-		box-sizing: border-box;
-		.header-title {
-			text-align: center;
-			overflow: hidden;
-			white-space: nowrap;
-			text-overflow: ellipsis;
-			padding: 0 10rpx 0 100rpx;
-			font-family: PingFang SC,PingFang SC;
-			font-weight: 500;
-			font-size: 15px;
-			color: #000;
-			box-sizing: border-box;
-		}
-	}
-	.reward-list {
-		width: 100%;
-		margin-top: 20rpx;
-		margin-bottom: -40rpx;
-
-		&-group {
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 400;
-			font-size: 14px;
-			color: #222222;
-			@include u-flex(row, center, center);
-		}
-
-		&-option {
-			@include u-flex(row, center, flex-start);
-
-			&:first-child {
-				margin-right: 40rpx;
-			}
-		}
-	}
-
-	.err {
-		color: #f56c6c !important;
-	}
-
-	.kfqrcode-box {
-		background-color: #fff;
-		border-radius: 16rpx;
-		max-width: 560rpx;
-		padding: 60rpx 40rpx;
-		margin-top: -100rpx;
-		box-sizing: border-box;
-		@include u-flex(column, center, flex-start);
-		font-family: PingFang SC, PingFang SC;
-		font-weight: 400;
-		font-size: 34rpx;
-		color: #222;
-		position: relative;
-		text-align: center;
-
-		.kfqrcode {
-			height: 460rpx;
-			width: 460rpx;
-		}
-	}
-
-	.kfqrcode-close {
-		width: 64rpx;
-		height: 64rpx;
-		position: absolute;
-		bottom: -100rpx;
-		left: 50%;
-		transform: translateX(-50%);
-	}
-
-	.tipsPopup-mask {
-		position: relative;
-		width: 560rpx;
-		background-color: transparent;
-
-		.red_envelope_top {
-			width: 480rpx;
-			height: 360rpx;
-			margin: 0 auto;
-			display: inherit;
-		}
-	}
-
-	.tipsPopup-btn-box {
-		width: 456rpx;
-		height: 104rpx;
-		padding: 4rpx;
-		box-sizing: border-box;
-		background: linear-gradient(180deg, rgba(252, 209, 94, 1), rgba(254, 253, 251, 1));
-		border-radius: 52rpx;
-	}
-
-	.tipsPopup-btn {
-		width: 100%;
-		height: 100%;
-		background: linear-gradient(180deg, #FF9F22 0%, #FA1E05 100%);
-		border-radius: 52rpx 52rpx 52rpx 52rpx;
-		font-family: PingFang SC, PingFang SC;
-		font-weight: 500;
-		font-size: 36rpx;
-		color: #FFFFFF;
-		line-height: 96rpx;
-		text-align: center;
-	}
-
-	.tipsPopup {
-		width: 560rpx;
-		padding: 12rpx;
-		margin-top: -72rpx;
-		box-sizing: border-box;
-		background: linear-gradient(180deg, #FFFBEF 0%, #FFFFF5 43%, #F5EAC2 100%);
-		border-radius: 32rpx 32rpx 32rpx 32rpx;
-		position: relative;
-
-		&-close {
-			width: 64rpx;
-			height: 64rpx;
-			position: absolute;
-			right: 0;
-			top: -188rpx;
-		}
-
-		&-line {
-			padding: 3rpx;
-			box-sizing: border-box;
-			background: linear-gradient(180deg, rgba(247, 245, 220, 1), rgba(250, 220, 157, 1));
-			border-radius: 24rpx;
-		}
-
-		&-box {
-			padding: 0 40rpx 40rpx 40rpx;
-			box-sizing: border-box;
-			background: linear-gradient(180deg, #FFFBEF 0%, #FFFFF5 43%, #F5EAC2 100%);
-			border-radius: 24rpx;
-			@include u-flex(column, center, flex-start);
-		}
-
-		&-head {
-			@include u-flex(row, center, center);
-
-			&-title {
-				width: 364rpx;
-				height: auto;
-				margin-top: -22rpx;
-			}
-		}
-
-		&-content {
-			margin: 48rpx 0;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #222222;
-			text-align: center;
-
-			&-title {
-				margin-bottom: 26rpx;
-				font-weight: 600;
-				font-size: 40rpx;
-				color: #FF5C03;
-			}
-		}
-	}
-
-	.video-controls-box {
-		width: 100%;
-		height: 420rpx;
-		overflow: hidden;
-		position: absolute;
-		bottom: 0;
-		left: 0;
-		z-index: 2;
-		background: rgba(0, 0, 0, 0.2);
-
-		.video-play {
-			height: 72rpx;
-			width: 72rpx;
-			position: absolute;
-			top: 50%;
-			left: 50%;
-			transform: translate(-50%, -50%);
-		}
-	}
-
-	.video-controls {
-		width: 100%;
-		height: 80rpx;
-		padding: 0 28rpx;
-		box-sizing: border-box;
-		position: absolute;
-		bottom: 0;
-		left: 0;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		background: linear-gradient(to top, #222 0%, transparent 80%);
-
-		.video-icon {
-			height: 44rpx;
-			width: 44rpx;
-		}
-	}
-
-	.errQuesbox {
-		width: 100%;
-		max-height: 260rpx;
-		overflow-y: auto;
-		margin-top: 24rpx;
-		font-family: PingFang SC, PingFang SC;
-		font-weight: 500;
-		font-size: 30rpx;
-		color: #222222;
-
-		&-item {
-			width: 100%;
-			height: 128rpx;
-			line-height: 128rpx;
-			margin-bottom: 24rpx;
-			padding: 0 30rpx;
-			box-sizing: border-box;
-			overflow: hidden;
-			background: #fff;
-			border-radius: 16rpx 16rpx 16rpx 16rpx;
-			position: relative;
-
-			&::after {
-				content: "题目";
-				min-width: 64rpx;
-				height: 36rpx;
-				padding: 0 12rpx;
-				line-height: 36rpx;
-				background: #FF5C03;
-				box-sizing: border-box;
-				border-radius: 0rpx 0rpx 16rpx 0rpx;
-				text-align: center;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				font-size: 20rpx;
-				color: #fff;
-				position: absolute;
-				left: 0;
-				top: 0;
-			}
-		}
-	}
-
-	.bg {
-		background: #fff !important;
-	}
-
-	.answerPopup {
-		&-box {
-			width: 560rpx;
-			background: linear-gradient(180deg, #FFFAF6 0%, #FEECD8 100%);
-			border-radius: 32rpx 32rpx 32rpx 32rpx;
-			background-color: #fff;
-			font-weight: 400;
-			padding: 32rpx;
-			box-sizing: border-box;
-			position: relative;
-			@include u-flex(column, center, flex-start);
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 400;
-
-			.tipimg {
-				width: 206rpx;
-				height: 206rpx;
-				margin-bottom: 16rpx;
-			}
-		}
-
-		&-title {
-			font-weight: 600;
-			font-size: 36rpx;
-			color: #222222;
-		}
-
-		&-desc {
-			margin-top: 10rpx;
-			font-size: 28rpx;
-			color: #757575;
-		}
-
-		&-btn {
-			width: 464rpx;
-			height: 84rpx;
-			margin-top: 54rpx;
-			margin-bottom: 16rpx;
-			background: #FF5C03;
-			border-radius: 42rpx;
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #FFFFFF;
-			text-align: center;
-			line-height: 84rpx;
-		}
-	}
-
-	.popupbox {
-		width: 100%;
-		background-color: #fff;
-		border-radius: 16rpx 16rpx 0 0;
-		padding: 24rpx 32rpx;
-		position: relative;
-
-		&-head {
-			height: 60rpx;
-			margin-bottom: 30rpx;
-			text-align: center;
-			overflow-y: auto;
-			color: #414858;
-			font-size: 32rpx;
-			font-weight: bold;
-			position: relative;
-
-			.close-icon {
-				position: absolute;
-				right: 0;
-				top: 0;
-				height: 40rpx;
-				width: 40rpx;
-			}
-		}
-
-		&-content {
-			height: 20vh;
-			overflow-y: auto;
-			display: flex;
-			align-items: flex-start;
-			flex-wrap: wrap;
-			gap: 32rpx;
-
-			.line-item {
-				display: inline-block;
-				min-width: 200rpx;
-				min-height: 60rpx;
-				padding: 0 20rpx;
-				box-sizing: border-box;
-				border-radius: 50rpx;
-				overflow: hidden;
-				background-color: #f7f7f7;
-				text-align: center;
-				color: #414858;
-				font-size: 28rpx;
-				line-height: 60rpx;
-			}
-
-			.line-active {
-				color: #f56c6c !important;
-				background-color: #fef0f0 !important;
-			}
-		}
-	}
-
-	.content {
-		padding-bottom: calc(var(--window-bottom) + 164rpx);
-		.video-box {
-			width: 100%;
-			height: 420rpx;
-			overflow: hidden;
-			position: relative;
-
-			#myVideo {
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-		.video-poster {
-			width: 100%;
-			height: 420rpx;
-		}
-
-		.miantitlebox {
-			padding: 30rpx 0;
-			border-bottom: 2rpx solid #F5F7FA;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 36rpx;
-			color: #222222;
-		}
-
-		.subtitlebox {
-			padding: 30rpx 0;
-			border-bottom: 2rpx solid #F5F7FA;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 36rpx;
-			color: #222222;
-		}
-
-		.title-content {
-			padding: 0 32rpx;
-			background-color: #fff;
-			font-size: 28rpx;
-			line-height: 1.6;
-
-			.title {
-				font-size: 36rpx;
-				font-weight: 500;
-				color: #414858;
-			}
-
-			.time-or-subtitle {
-				margin-top: 12rpx;
-				color: #666666;
-			}
-		}
-
-		.descbox {
-			padding: 36rpx 32rpx;
-			margin-bottom: 20rpx;
-			background-color: #fff;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 400;
-			font-size: 28rpx;
-			color: #222222;
-			line-height: 42rpx;
-			word-break: break-word;
-
-			&-title {
-				margin-bottom: 24rpx;
-				font-weight: 500;
-				font-size: 32rpx;
-			}
-
-			&-info {
-				margin-bottom: 24rpx;
-				@include u-flex(row, center, space-between);
-				font-size: 26rpx;
-				color: #757575;
-
-				&-l {
-					flex: 1;
-					@include u-flex(row, center, flex-start);
-				}
-
-				&-time {
-					margin-left: 18rpx;
-					padding-left: 18rpx;
-					position: relative;
-
-					&::after {
-						content: "";
-						width: 4rpx;
-						height: 4rpx;
-						background: #999999;
-						border-radius: 50%;
-						position: absolute;
-						left: 0;
-						top: 50%;
-						transform: translateY(-50%);
-					}
-				}
-
-				&-r {
-					background: transparent;
-				}
-			}
-
-			&-desc {
-				overflow: hidden;
-				position: relative;
-			}
-		}
-
-		.expand {
-			flex-shrink: 0;
-			@include u-flex(row, center, flex-end);
-			color: #FF5C03;
-			font-weight: 400;
-			font-size: 24rpx;
-
-			image {
-				width: 32rpx;
-				height: 32rpx;
-			}
-		}
-
-		.expand-ab {
-			position: absolute;
-			top: 0;
-			right: 0;
-			box-shadow: -50rpx 0 20rpx 8rpx #FFFFFF;
-			background-color: #fff;
-		}
-
-		.ques-content {
-			background-color: #fff;
-			padding: 40rpx 32rpx;
-			box-sizing: border-box;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 400;
-			font-size: 28rpx;
-			color: #222222;
-		}
-
-		.ques-content-tit {
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 600;
-			font-size: 36rpx;
-			color: #222222;
-		}
-
-		.ques-title {
-			margin: 48rpx 0 34rpx 0;
-			font-weight: 500;
-			font-size: 32rpx;
-			white-space: normal;
-		}
-
-		.ques-type {
-			flex-shrink: 0;
-			min-width: 72rpx;
-			min-height: 40rpx;
-			padding: 0 12rpx;
-			margin: 0 12rpx;
-			box-sizing: border-box;
-			background: #FF5C03;
-			border-radius: 8rpx 8rpx 8rpx 8rpx;
-			line-height: 40rpx;
-			text-align: center;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 400;
-			font-size: 24rpx;
-			color: #FFFFFF;
-			display: inline-block;
-		}
-
-		.ques-option {
-			min-height: 88rpx;
-			padding: 24rpx 32rpx;
-			box-sizing: border-box;
-			margin-bottom: 24rpx;
-			background: #F5F7FA;
-			border-radius: 16rpx 16rpx 16rpx 16rpx;
-			display: flex;
-			align-items: center;
-
-			&-active {
-				color: #FF5C03 !important;
-				background: #FCF0E7 !important;
-			}
-		}
-
-		.video-line {
-			min-width: 140rpx;
-			max-width: 200rpx;
-			height: 60rpx;
-			padding: 0 20rpx;
-			box-sizing: border-box;
-			border-radius: 50rpx 0 0 50rpx;
-			overflow: hidden;
-			background-color: #fff;
-			text-align: center;
-			color: #888;
-			font-size: 28rpx;
-			line-height: 60rpx;
-			display: inline-flex;
-			align-items: center;
-			justify-content: center;
-			position: fixed;
-			right: 0;
-			z-index: 9;
-			bottom: calc(var(--window-bottom) + 280rpx);
-			box-shadow: 0 4rpx 10rpx rgba(0, 0, 0, .12);
-
-			image {
-				flex-shrink: 0;
-				height: 34rpx;
-				width: 34rpx;
-				margin-right: 6rpx;
-			}
-		}
-		.danmu-line {
-			bottom: calc(var(--window-bottom) + 370rpx);
-			word-break: keep-all;
-			.set_image {
-				height: 40rpx;
-				width: 40rpx;
-			}
-		}
-		.footer {
-			border-top: 1rpx solid #ededef;
-			background: #fff;
-			width: 100%;
-			position: fixed;
-			bottom: 0;
-			padding: 32rpx;
-			padding-bottom: calc(var(--window-bottom) + 14rpx);
-			box-sizing: border-box;
-			z-index: 9;
-
-			&-btn {
-				width: 100%;
-				height: 98rpx;
-				background: #FF5C03;
-				border-radius: 49rpx 49rpx 49rpx 49rpx;
-				line-height: 98rpx;
-				text-align: center;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 600;
-				font-size: 32rpx;
-				color: #FFFFFF;
-				@include u-flex(row, center, center);
-
-				&-img {
-					flex-shrink: 0;
-					width: 144rpx;
-					height: 144rpx;
-					margin-right: 8rpx;
-					margin-top: -24rpx;
-				}
-			}
-
-			&-btn-border {
-				position: relative;
-
-				&::after {
-					content: "";
-					background: linear-gradient(180deg, rgba(255, 255, 255, 0), rgba(255, 255, 255, 1));
-					position: absolute;
-					top: -2rpx;
-					left: 0;
-					height: 103rpx;
-					width: 100%;
-					z-index: -1;
-					border-radius: 49rpx 49rpx 49rpx 49rpx;
-					box-shadow: 0rpx 8rpx 11rpx 0rpx rgba(255, 92, 3, 0.3);
-					overflow: hidden;
-				}
-			}
-		}
-	}
-
-	.agreement {
-		display: inline-flex;
-		margin-top: 16rpx;
-		font-size: 24rpx;
-		color: #525252;
-		align-items: center;
-		justify-content: center;
-	}
-	.video-danmu-btnbox {
-		width: 50px;
-		height: 50px;
-		border-radius: 50%;
-		overflow: hidden;
-		position: absolute;
-		right: 10px;
-		bottom: calc(50% - 50px);
-		transform: translateY(-50%);
-		padding: 8px;
-		box-sizing: border-box;
-	}
-	.video-danmu-image {
-		width: 100%;
-		height: 100%;
-	}
-	.danmuPopup {
-		background-color: #fff;
-		padding-bottom: calc(var(--window-bottom) + 10px);
-		&-head {
-			width: 100%;
-			padding: 10px;
-			box-sizing: border-box;
-			overflow: hidden;
-			@include u-flex(row,center,flex-start);
-			.danmu-icon {
-				height: 24px;
-				width: 24px;
-				margin-right: 12px;
-			}
-		}
-		&-input {
-			flex: 1;
-			height: 35px;
-		}
-		&-send {
-			flex-shrink: 0;
-			height: 35px;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			padding: 5px 15px;
-			box-sizing: border-box;
-			background: #FF5C03 !important;
-			border-radius: 22px;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 15px;
-			color: #fff !important;
-			margin-left: 12px;
-			&::after {
-				border: none;
-			}
-		}
-		&-con {
-			background-color: #F5F7FA;
-			padding: 24px 12px 48px 12px;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 400;
-			font-size: 14px;
-			color: #757575;
-		}
-	}
-	.danmu-item {
-		position: absolute;
-		top: 0;
-		white-space: nowrap;
-		font-size: 16px;
-		height: 20px;
-		display: inline-flex;
-		box-sizing: border-box;
-		align-items: center;
-	}
-	.danmuMove {
-		// animation: mymove 8s linear forwards;
-		// animation-duration: 8s;
-		animation-timing-function: linear;
-		animation-delay: 0s;
-		animation-iteration-count: 1;
-		animation-direction: normal;
-		animation-fill-mode: forwards;
-		animation-play-state: running;
-		animation-name: mymove;
-		will-change: transform;
-	}
-	
-	@keyframes mymove {
-		from {
-			transform: translateX(100vw);
-		}
-	
-		to {
-			transform: translateX(-100%);
-		}
-	}
-	.danmu-icon{
-		height: 24px;
-		width: 24px;
-		margin-right: 12px;
-	}
-</style>

+ 2 - 2
pages_doctor/doctorArticleDetails.vue

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

+ 1 - 1
pages_doctor/doctorArticleList.vue

@@ -82,7 +82,7 @@
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					textNoMore:"已经到底了",
 					empty: {
-						icon:'https://cos.his.cdwjyyh.com/fs/20240423/cf4a86b913a04341bb44e34bb4d37aa2.png',
+						icon:'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/empty_icon.png',
 						tip: '暂无数据'
 					}
 				},

+ 30 - 30
pages_doctor/doctorDetails.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view class="bg">
-			<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/dd7da40764af4db0ac326db271c7f1d3.png" />
+			<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/dd7da40764af4db0ac326db271c7f1d3.png" />
 		</view>
 		 <view class="top-box"   >
 		 	<view class="status_bar" :style="{height: statusBarHeight}"></view>
@@ -12,7 +12,7 @@
 					</view>
 					<view class="line"  ></view>
 					<view class="btn" @click="gohome()" >
-						<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/5981c2cd5f23484181f5b328c820d0de.png" />
+						<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/5981c2cd5f23484181f5b328c820d0de.png" />
 					</view>
 				</view>
 			</view>
@@ -24,16 +24,16 @@
 				<view class="tip" @click="navTo('/pages_doctor/doctorImgs?doctorId='+doctor.doctorId)">
 					<view class="left">
 						<view class="title">
-							<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/a58ee2a3fb674c2e8339243cb4ca1378.png"></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/a58ee2a3fb674c2e8339243cb4ca1378.png"></image>
 							<view >实名认证</view>
 						</view>
 						<view class="cert">
-							<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/62aeeb0579974b67863a6ab56e9562f9.png"></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/62aeeb0579974b67863a6ab56e9562f9.png"></image>
 							<view   >资格证编号:{{doctor.certificateCode!=null?doctor.certificateCode.substr(0,4)+"****"+doctor.certificateCode.substr(doctor.certificateCode.length-4,doctor.certificateCode.length):""}}</view>
 						</view>
 					</view>
 					<view class="right">
-						<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/1d519ad0467e4daea843aac745ae6b40.png"></image>
+						<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/1d519ad0467e4daea843aac745ae6b40.png"></image>
 					</view>
 				</view>
 				<view class="doc-cont">
@@ -44,25 +44,25 @@
 						<view class="right">
 							<view class="doc-name-box">
 								<view class="doc-name">
-									{{doctor.doctorName}}
+									{{doctor.doctorName || ''}}
 								</view>
 								<view class="doc-btns"  >
 									<view class="btn" @click="followChange()">
 										<image v-if="isFollow" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/image/icon_strar.png"></image>
-										<image v-if="!isFollow" src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/d509e50536804703a4b7dc066b16beee.png"></image>
+										<image v-if="!isFollow" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/d509e50536804703a4b7dc066b16beee.png"></image>
 										关注
 									</view>
 									<view class="btn">
-										<image  src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/f79c3b9cbefa40be8c2beb74f616eefc.png"></image>
+										<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/f79c3b9cbefa40be8c2beb74f616eefc.png"></image>
 										分享
 										<button class="contact-btn"   data-name="shareBtn" open-type="share">分享</button>
 									</view>
 								</view>
 							</view>
 							<view class="doc-dept-box">
-								{{doctor.position}}
+								{{doctor.position || ''}}
 								<view class="line"></view>
-								{{department.deptName}} 
+								{{department.deptName || ''}} 
 							</view>
 							<view class="doc-his-box">
 								{{hospital.hospitalName || ''}}
@@ -89,15 +89,15 @@
 			<view class="price-box">
 				<view class="count-box">
 					<view class="count-item">
-						<view class="count yellow">{{doctor.pingStar}}分</view>
+						<view class="count yellow">{{doctor.pingStar||0}}分</view>
 						<view class="name">好评</view>
 					</view>
 					<view class="count-item">
-						<view class="count">{{doctor.orderNumber}}</view>
+						<view class="count">{{doctor.orderNumber||0}}</view>
 						<view class="name">接诊量</view>
 					</view>
 					<view class="count-item">
-						<view class="count">{{doctor.speed}}分钟</view>
+						<view class="count">{{doctor.speed||0}}分钟</view>
 						<view class="name">平均响应</view>
 					</view>
 					<view class="count-item">
@@ -108,8 +108,8 @@
 				<view class="price-list" v-if="doctor!=null&&doctor.prices!=null&&doctor.prices.length>0">
 					<view class="price-item" @click="doInquiry(price)" v-for="(price,index) in doctor.prices">
 						<view class="p-left">
-							<image  v-if="price.type==1" src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/645f3f298a264882b48e529342fc4074.png"></image>
-							<image  v-if="price.type==2" src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/45e904a9e74f4d1da771936a4b83f015.png"></image>
+							<image  v-if="price.type==1" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/645f3f298a264882b48e529342fc4074.png"></image>
+							<image  v-if="price.type==2" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/45e904a9e74f4d1da771936a4b83f015.png"></image>
 							<view class="price-name">
 								<view class="price">
 									<text class="title" v-if="price.type==1">图文问诊</text>
@@ -205,9 +205,9 @@
 				statusBarHeight: uni.getStorageSync('menuInfo').statusBarHeight,
 				isFollow:false,
 				doctorId:null,
-				doctor:null,
-				department:null,
-				hospital:null,
+				doctor:{},
+				department:{},
+				hospital:{},
 				pings:[]
 			}
 		},
@@ -242,7 +242,7 @@
 			return {
 				title: this.doctor.doctorName,
 				path: '/pages_doctor/doctorDetails?doctorId='+this.doctorId,
-				imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230106/6b459adfb1004c1a96219bcdf07e337c.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+				imageUrl: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/sharelogo.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 			}
 			
 		},
@@ -251,7 +251,7 @@
 			return {
 				title: this.doctor.doctorName,
 				query:'doctorId='+this.doctorId,//页面参数
-				imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230106/6b459adfb1004c1a96219bcdf07e337c.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+				imageUrl: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/sharelogo.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 			}
 			
 		},
@@ -349,10 +349,10 @@
 				};
 				getDoctorDetails(data).then(res => {
 					if(res.code==200){
-						this.doctor=res.data.doctor;
+						this.doctor=res.data.doctor || {};
 						this.doctor.prices=JSON.parse(this.doctor.priceJson)
-						this.department=res.data.department;
-						this.hospital=res.data.hospital;
+						this.department=res.data.department || {};
+						this.hospital=res.data.hospital || {};
 					}else{
 						uni.showToast({
 							icon:'none',
@@ -396,8 +396,8 @@
 		.bg{
 			width: 100%;
 			height:500rpx;
-			// background-color: #C39A58;
-			// background: linear-gradient(#C39A58, #E2C99E);
+			// background-color: #2583EB;
+			// background: linear-gradient(#2583EB, #2EDAD4);
 			border-radius: 0rpx 0rpx 50rpx 50rpx;
 			position: fixed;
 			image{
@@ -526,7 +526,7 @@
 							image{
 								box-sizing: border-box;
 								border-radius: 50%;
-								border:3rpx solid #E2C99E;
+								border:3rpx solid #2EDAD4;
 								width: 190upx;
 								height: 190upx;
 							}
@@ -556,13 +556,13 @@
 										flex-shrink: 0;
 										border-radius: 30rpx;
 										padding: 10rpx 20rpx;
-										border: 1rpx solid #C39A58;
+										border: 1rpx solid #2583EB;
 										margin-left: 10rpx;
 										display: flex;
 										align-items: center;
 										justify-content: center;
 										margin-left: 10rpx;	
-										color: #C39A58;
+										color: #2583EB;
 										font-size: 24rpx;
 										font-weight: bold;
 										position: relative;
@@ -682,7 +682,7 @@
 						}
 						.yellow{
 							font-size: 40rpx;
-							color: #C39A58;
+							color: #2583EB;
 						}
 						.name{
 							margin-top: 10rpx;
@@ -757,7 +757,7 @@
 						.p-right{
 							.btn{
 								padding: 15rpx 30rpx;
-								background-color: #C39A58;
+								background-color: #2583EB;
 								color: #fff;
 								font-size: 28rpx;
 								border-radius: 30rpx;

+ 5 - 5
pages_doctor/doctorImgs.vue

@@ -176,7 +176,7 @@
 							.btn{
 								font-size: 28upx;
 								font-family: PingFang SC;
-								color: #C39A58;
+								color: #2583EB;
 							}
 						}
 						
@@ -205,7 +205,7 @@
 						margin-right: 15rpx;
 						height: 30rpx;
 						width: 6rpx;
-						background-color: #C39A58;
+						background-color: #2583EB;
 						
 					}
 					 
@@ -283,7 +283,7 @@
 						margin-right: 15rpx;
 						height: 30rpx;
 						width: 6rpx;
-						background-color: #C39A58;
+						background-color: #2583EB;
 						
 					}
 					 
@@ -339,7 +339,7 @@
 						margin-right: 15rpx;
 						height: 30rpx;
 						width: 6rpx;
-						background-color: #C39A58;
+						background-color: #2583EB;
 						
 					}
 					 
@@ -376,7 +376,7 @@
 							margin-right: 15rpx;
 							height: 30rpx;
 							width: 6rpx;
-							background-color: #C39A58;
+							background-color: #2583EB;
 							
 						}
 					}

+ 7 - 7
pages_doctor/doctorInfo.vue

@@ -134,8 +134,8 @@
 		.bg{
 			width: 100%;
 			height:280rpx;
-			background-color: #C39A58;
-			background: linear-gradient(#C39A58, #E2C99E);
+			background-color: #2583EB;
+			background: linear-gradient(#2583EB, #2EDAD4);
 			border-radius: 0rpx 0rpx 50rpx 50rpx;
 			position: fixed;
 			// z-index: 1;
@@ -244,7 +244,7 @@
 							.btn{
 								font-size: 28upx;
 								font-family: PingFang SC;
-								color: #C39A58;
+								color: #2583EB;
 							}
 						}
 						
@@ -273,7 +273,7 @@
 						margin-right: 15rpx;
 						height: 30rpx;
 						width: 6rpx;
-						background-color: #C39A58;
+						background-color: #2583EB;
 						
 					}
 					 
@@ -351,7 +351,7 @@
 						margin-right: 15rpx;
 						height: 30rpx;
 						width: 6rpx;
-						background-color: #C39A58;
+						background-color: #2583EB;
 						
 					}
 					 
@@ -407,7 +407,7 @@
 						margin-right: 15rpx;
 						height: 30rpx;
 						width: 6rpx;
-						background-color: #C39A58;
+						background-color: #2583EB;
 						
 					}
 					 
@@ -444,7 +444,7 @@
 							margin-right: 15rpx;
 							height: 30rpx;
 							width: 6rpx;
-							background-color: #C39A58;
+							background-color: #2583EB;
 							
 						}
 					}

+ 4 - 4
pages_doctor/doctorList.vue

@@ -11,7 +11,7 @@
 			  :current="tabIndex"
 			  :scrollable="true"
 			  :list="tabs"  
-			  lineColor="#C39A58"
+			  lineColor="#2583EB"
 			 @change="deptChange">
 			 </u-tabs>
 		</view>
@@ -25,7 +25,7 @@
 								<image mode="aspectFill" class="doc-img" :src="item.avatar"></image>
 								<view class="isline" v-if="item.workStatus==1">
 									<view class="img">
-										<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/image/isline.png"></image>
+										<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/isline.png"></image>
 										<view class="name">在线</view>
 									</view>
 								</view>
@@ -107,7 +107,7 @@
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					textNoMore:"已经到底了",
 					empty: {
-						icon:'https://cos.his.cdwjyyh.com/fs/20240423/cf4a86b913a04341bb44e34bb4d37aa2.png',
+						icon:'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/empty_icon.png',
 						tip: '暂无数据'
 					}
 				},
@@ -296,7 +296,7 @@
 					margin-right: 15rpx;
 					height: 30rpx;
 					width: 6rpx;
-					background-color: #C39A58;
+					background-color: #2583EB;
 					
 				}
 				 

+ 3 - 3
pages_doctor/doctorPingList.vue

@@ -12,7 +12,7 @@
 				<view class="ping-list">
 					<view class="ping-item" v-for="(item) in dataList">
 					 	<view class="left">
-							<image :src="item.avatar==null?'https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/dfdd555016854b0d9fb623937238729f.jpg':item.avatar"></image>
+							<image :src="item.avatar==null?'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/my_heads_icon.png':item.avatar"></image>
 						</view>
 						<view class="right">
 							<view class="user-name-box">
@@ -61,7 +61,7 @@
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					textNoMore:"已经到底了",
 					empty: {
-						icon:'https://cos.his.cdwjyyh.com/fs/20240423/cf4a86b913a04341bb44e34bb4d37aa2.png',
+						icon:'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/empty_icon.png',
 						tip: '暂无数据'
 					}
 				},
@@ -144,7 +144,7 @@
 						// 	margin-right: 15rpx;
 						// 	height: 30rpx;
 						// 	width: 6rpx;
-						// 	background-color: #C39A58;
+						// 	background-color: #2583EB;
 							
 						// }
 					}

+ 3 - 3
pages_im/common/config.js

@@ -1,10 +1,10 @@
 // https
 
-const wsUrl = "wss://web.im.cdwjyyh.com/msg_gateway";
+const wsUrl = " ";
 
-const apiUrl = "https://web.im.cdwjyyh.com/api";
+const apiUrl = " ";
 
-const registerUrl = "https://web.im.cdwjyyh.com/chat";
+const registerUrl = " ";
 
 export const version = 'UER 3.8.3+1 SDK v3.8.3-patch.3-e-v1.1.11'
 // 高德地图web api key  用于根据经纬度生成快照  当前key已绑定安卓包名  需要自行申请替换

+ 3 - 3
pages_index/articleDetails.vue

@@ -14,7 +14,7 @@
 		<!-- 咨询按钮 -->
 		<view class="inquiry">
 			<view class="content">
-				<image src="https://cos.his.cdwjyyh.com/fs/20250417/2c3a31fbaad9417192b5547e7f072c45.png" mode=""></image>
+				<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/2c3a31fbaad9417192b5547e7f072c45.png" mode=""></image>
 				<text class="text">咨询</text>
 				<button class="contact-btn" open-type="contact"></button>
 			</view>
@@ -174,7 +174,7 @@
 			font-family: PingFang SC;
 			font-weight: 500;
 			color: #FFFFFF;
-			background: #C39A58;
+			background: #2583EB;
 			border-radius: 40upx;
 			display: flex;
 			align-items: center;
@@ -219,7 +219,7 @@
 				font-size: 22upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #C39A58;
+				color: #2583EB;
 				line-height: 1;
 			}
 			 

+ 1 - 1
pages_index/articleList.vue

@@ -72,7 +72,7 @@
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					textNoMore:"已经到底了",
 					empty: {
-						icon:'https://cos.his.cdwjyyh.com/fs/20240423/cf4a86b913a04341bb44e34bb4d37aa2.png',
+						icon:'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/empty_icon.png',
 						tip: '暂无数据'
 					}
 				},

+ 6 - 6
pages_index/chineseMedicineDetails.vue

@@ -74,17 +74,17 @@
 				return {
 					title: this.item.medicineName,
 					path: '/pages_index/chineseMedicineDetails?id='+this.id,
-					imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230106/6b459adfb1004c1a96219bcdf07e337c.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/sharelogo.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			
 		},
 		//分享到朋友圈
 		onShareTimeline(res) {
-			if(this.utils.isLogin()){
+			if(this.$isLogin()){
 				return {
 					title: this.item.title,
-					imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230106/6b459adfb1004c1a96219bcdf07e337c.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/sharelogo.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			
@@ -183,7 +183,7 @@
 					border-radius: 5rpx;
 					width: 8rpx;
 					height:30rpx;
-					background-color: #C39A58;
+					background-color: #2583EB;
 				}
 				.title{
 					margin-left: 15rpx;
@@ -215,7 +215,7 @@
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
-				// border: 1rpx solid #C39A58;
+				// border: 1rpx solid #2583EB;
 				border-radius: 30rpx;
 				line-height: 60rpx;
 				.tab1{
@@ -267,7 +267,7 @@
 					font-family: PingFang SC;
 				}
 				.active{
-					background-color: #C39A58;
+					background-color: #2583EB;
 					color: #fff;
 				}
 				 

+ 4 - 4
pages_index/chineseMedicineList.vue

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

+ 4 - 4
pages_index/diseaseDetails.vue

@@ -58,17 +58,17 @@
 				return {
 					title: this.item.diseaseName,
 					path: '/pages_index/diseaseDetails?id='+this.diseaseId,
-					imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230106/6b459adfb1004c1a96219bcdf07e337c.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/sharelogo.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			
 		},
 		//分享到朋友圈
 		onShareTimeline(res) {
-			if(this.utils.isLogin()){
+			if(this.$isLogin()){
 				return {
 					title: this.item.diseaseName,
-					imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230106/6b459adfb1004c1a96219bcdf07e337c.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/sharelogo.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			
@@ -162,7 +162,7 @@
 			.line{
 				width: 6rpx;
 				height:30rpx;
-				background-color: #C39A58;
+				background-color: #2583EB;
 				 
 			}
 			.title{

+ 5 - 5
pages_index/diseaseList.vue

@@ -60,7 +60,7 @@
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					textNoMore:"已经到底了",
 					empty: {
-						icon:'https://cos.his.cdwjyyh.com/fs/20240423/cf4a86b913a04341bb44e34bb4d37aa2.png',
+						icon:'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/empty_icon.png',
 						tip: '暂无数据'
 					}
 				},
@@ -200,15 +200,15 @@
 			font-size: 28upx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #C39A58;
+			color: #2583EB;
 			background: #ffffff;
-			border: 1px solid #E2C99E;
+			border: 1px solid #2EDAD4;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #C39A58;
-				border: 1px solid #C39A58;
+				background: #2583EB;
+				border: 1px solid #2583EB;
 			}
 		}
 	}

+ 6 - 6
pages_index/famousPrescribeDetails.vue

@@ -74,17 +74,17 @@
 				return {
 					title: this.item.prescribeName,
 					path: '/pages_index/famousPrescribeDetails?id='+this.id,
-					imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230106/6b459adfb1004c1a96219bcdf07e337c.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/sharelogo.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			
 		},
 		//分享到朋友圈
 		onShareTimeline(res) {
-			if(this.utils.isLogin()){
+			if(this.$isLogin()){
 				return {
 					title: this.item.title,
-					imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230106/6b459adfb1004c1a96219bcdf07e337c.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/sharelogo.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			
@@ -183,7 +183,7 @@
 					border-radius: 5rpx;
 					width: 8rpx;
 					height:30rpx;
-					background-color: #C39A58;
+					background-color: #2583EB;
 				}
 				.title{
 					margin-left: 15rpx;
@@ -215,7 +215,7 @@
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
-				// border: 1rpx solid #C39A58;
+				// border: 1rpx solid #2583EB;
 				border-radius: 30rpx;
 				line-height: 60rpx;
 				.tab1{
@@ -267,7 +267,7 @@
 					font-family: PingFang SC;
 				}
 				.active{
-					background-color: #C39A58;
+					background-color: #2583EB;
 					color: #fff;
 				}
 				 

+ 4 - 4
pages_index/famousPrescribeList.vue

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

+ 261 - 0
pages_index/healthy/detail.vue

@@ -0,0 +1,261 @@
+<template>
+	<view class="content">
+		<view class="detail-cont">
+			<view class="title">{{item.title}}</view>
+			<view class="info">
+				<view class="reads">阅读数:{{item.views}}</view>
+				<view class="time">{{item.publishTime}}</view>
+			</view>
+			<!-- 正文 -->
+			<view class="full-text">
+				<view v-html="item.contents"></view>
+			</view>
+		</view>
+		<!-- 最近阅读 -->
+	<!-- 	<view class="recent-reads">
+			<view class="left">
+				<text class="label">最近阅读</text>
+				<view class="peop-box" @click="showUsers">
+					<view class="head-box">
+						<view class="head" v-for="(subitem,j) in views" :key="j">
+							<image :src="subitem.avatar==null?'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/my_heads_icon.png':subitem.avatar" mode=""></image>
+						</view>
+					</view>
+					<image class="arrow" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/shopping/arrow_gray.png" mode=""></image>
+				</view>
+			</view>
+			<view class="share-btn">
+				<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/shopping/share.png" mode=""></image>
+				<text>分享</text>
+				<button  class="share" data-name="shareBtn" open-type="share">分享</button>
+			</view>
+		</view> -->
+		<!-- 咨询按钮 -->
+		<view class="inquiry">
+			<view class="content">
+				<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/2c3a31fbaad9417192b5547e7f072c45.png" mode=""></image>
+				<text class="text">咨询</text>
+				<button class="contact-btn" open-type="contact"></button>
+			</view>
+			
+		</view>
+	</view> 
+</template>
+
+<script>
+	import {getArticleByArticleId,updateView} from '@/api/article'
+	export default {
+		data() {
+			return {
+				articleId:null,
+				item:{},
+				views:[],
+			};
+		},
+		onLoad(option) {
+			this.articleId=option.articleId;
+			this.$isLogin().then(res => {
+				if(res){
+					this.updateView();
+				}
+			})
+		},
+		onShow() {
+			this.getArticleByArticleId();
+		},
+		methods:{
+			updateView(){
+				updateView(this.articleId).then(
+					res => {
+					},
+					rej => {}
+				);
+			},
+			getArticleByArticleId(){
+				let data = {articleId:this.articleId};
+				getArticleByArticleId(data).then(
+					res => {
+						if(res.code==200){
+							this.item=res.data;
+							this.views=res.views;
+						}else{
+							uni.showToast({
+								icon:'none',
+								title: "请求失败",
+							});
+						}
+					},
+					rej => {}
+				);
+			},
+			// 查看阅读用户
+			showUsers() {
+				uni.navigateTo({
+					url: './readUsers?articleId='+this.articleId
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page{
+		height: 100%;
+	}
+	.content{
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+	}
+	.detail-cont{
+		flex: 1;
+		padding: 40upx;
+		overflow-y: auto;
+		.title{
+			font-size: 40upx;
+			font-family: PingFang SC;
+			// font-weight: bold;
+			color: #222222;
+			line-height: 70upx;
+		}
+		.info{
+			display: flex;
+			align-items: center;
+			font-size: 24upx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #999999;
+			line-height: 48upx;
+			margin: 23upx 0;
+			.reads{
+				margin-right: 30upx;
+			}
+		}
+		.full-text{
+			font-size: 36upx;
+			font-family: PingFang SC;
+			// font-weight: 500;
+			color: #222222;
+			line-height: 60upx;
+		}
+	}
+	.recent-reads{
+		flex-shrink: 0;
+		box-sizing: border-box;
+		height: 121upx;
+		background: #FFFFFF;
+		border-top: 1px solid #F0F0F0;
+		padding: 0 40upx 0 37upx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		.left{
+			display: flex;
+			align-items: center;
+			.label{
+				font-size: 28upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #666666;
+				line-height: 1;
+				margin-right: 20upx;
+			}
+			.peop-box{
+				display: flex;
+				align-items: center;
+				.head-box{
+					margin-right: 28upx;
+					display: flex;
+					align-items: center;
+					.head{
+						width: 48upx;
+						height: 48upx;
+						border-radius: 50%;
+						overflow: hidden;
+						box-shadow: 0 0 0 1px #fff;
+						margin-right: -10upx;
+						image{
+							width: 100%;
+							height: 100%;
+						}
+					}
+				}
+				.arrow{
+					width: 13upx;
+					height: 23upx;
+				}
+			}
+		}
+		.share-btn{
+			position: relative;
+			width: 240upx;
+			height: 80upx;
+			line-height: 80upx;
+			font-size: 30upx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #FFFFFF;
+			background: #2583EB;
+			border-radius: 40upx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			image{
+				width: 32upx;
+				height: 32upx;
+				margin-right: 15upx;
+			}
+			.share{
+				position: absolute;
+				width: 100%;
+				height: 100%;
+				opacity: 0;
+			}
+		}
+	}
+	.inquiry{
+		width: 131upx;
+		height: 131upx;
+		position: fixed;
+		right: 22upx;
+		bottom: 193upx;
+		z-index: 99;
+		
+		.content{
+			position: relative;
+			image{
+				width: 100%;
+				height: 100%;
+				position: absolute;
+				top: 0;
+				left: 0;
+				z-index: 9;
+			}
+			.text{
+				position: absolute;
+				top: 70upx;
+				left: 50%;
+				transform: translateX(-50%);
+				z-index: 10;
+				font-size: 22upx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #2583EB;
+				line-height: 1;
+			}
+			 
+		}
+		
+		
+	}
+	.contact-btn{
+		display: inline-block;
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		opacity: 0;
+		z-index: 9999;
+	}
+</style>

+ 351 - 0
pages_index/healthy/index.vue

@@ -0,0 +1,351 @@
+<template>
+	<view>
+		<view class="top-content">
+			<!-- 这里是状态栏 -->
+		<!-- 	<view class="status_bar" :style="{height: statusBarHeight}"></view>
+			<view class="top-title">健康百科</view> -->
+			<!-- 搜索框 -->
+			<view class="search-cont">
+				<view class="inner">
+					<image class="icon-search" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/image/icon_search.png" mode=""></image>
+					<input type="text" v-model="searchValue" placeholder="输入关键字搜索" confirm-type="search" @confirm="doSearch" placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;" />
+				</view>
+			</view>
+			<view class="keyword-list">
+			<!-- 关键字列表 -->
+			<scroll-view   scroll-x="true" >
+				<view class="inner">
+					<view v-for="(item,index) in cates" :key="index" :class="choseCateId == item.cateId?'item active':'item'" @click="choseCate(item)">
+						{{ item.cateName }}
+					</view>
+				</view>
+			</scroll-view>
+			</view>
+		</view>
+		<!-- 知识列表 -->
+		<mescroll-body  :top="top"  ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :down="downOption" :up="upOption">
+			<view class="know-list">
+				<view class="item" v-for="(item,index) in dataList" :key="index" @click="showDetail(item)">
+					<view class="left">
+						<view class="title ellipsis2">{{ item.title }}</view>
+						<view class="info-box">
+							<view class="readers">
+								<view class="head-box" v-if="item.viewsList!=null&&item.viewsList.length>0">
+									<view class="head" v-for="(subitem,j) in item.viewsList" :key="j">
+										<image v-if="subitem!=null" :src="subitem.avatar==null?'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/my_heads_icon.png':subitem.avatar" mode=""></image>
+									</view>
+								</view>
+								<view class="readings">
+									<image class="eye" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/shopping/eye.png" ></image>
+									<text class="num">{{item.views}}</text>
+								</view>
+							</view>
+							<view class="time">{{item.publishTime}}</view>
+						</view>
+					</view>
+					<view class="right">
+						<image :src="item.imageUrl" mode="aspectFill"></image>
+					</view>
+				</view>
+			</view>
+		</mescroll-body>
+		
+	</view>
+</template>
+
+<script>
+	import {getArticleCate,getArticleList} from '@/api/article'
+	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
+	export default {
+		mixins: [MescrollMixin], 
+		data() {
+			return {
+				top:'0px',
+				cates:[],
+				choseCateId:0,
+				// 状态栏的高度
+				statusBarHeight: uni.getStorageSync('menuInfo').statusBarHeight,
+				searchValue: '',
+				mescroll:null,
+				// 上拉加载的配置
+				downOption:{
+					
+				},
+				upOption: {
+					onScroll:true,
+					use: true, // 是否启用上拉加载; 默认true
+					page: {
+						num: 0, // 当前页码,默认0,回调之前会加1,即callback(page)会从1开始
+						size: 10 // 每页数据的数量,默认10
+					},
+					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
+					empty: {
+						icon:'/static/images/no_data.png',
+						tip: '暂无数据'
+					},
+					textNoMore:'已经到底了'
+				},
+				// 列表数据
+				dataList: [],
+			};
+		},
+		onShow() {
+			this.getArticleCate();
+			var that=this;
+			setTimeout(function(){
+				let query = uni.createSelectorQuery().select(".top-content");
+		      query.boundingClientRect(function(data) { //data - 各种参数
+		       	console.log(data.height)  // 获取元素宽度
+					that.top=data.height+"px";
+		      }).exec()
+			},500);
+			
+	// 		let info1 = uni.createSelectorQuery().select(".keyword-list");
+	//      info1.boundingClientRect(function(data) { //data - 各种参数
+	//        	console.log(data.height)  // 获取元素宽度
+				 
+	//       }).exec()
+			
+		},
+		methods:{
+			doSearch(){
+				console.log(this.searchValue)
+				this.mescroll.resetUpScroll()
+			},
+			getArticleCate(){
+				var that=this;
+				let data = {};
+				getArticleCate(data).then(
+					res => {
+						if(res.code==200){
+							this.cates=res.data;
+						 
+							
+						}else{
+							uni.showToast({
+								icon:'none',
+								title: "请求失败",
+							});
+						}
+					},
+					rej => {}
+				);
+			},
+			mescrollInit(mescroll) {
+				this.mescroll = mescroll;
+			},
+			/*下拉刷新的回调 */
+			downCallback(mescroll) {
+				mescroll.resetUpScroll()
+			},
+			upCallback(page) {
+				//联网加载数据
+				var that = this;
+				var data = {
+					keyword:this.searchValue,
+					cateId:this.choseCateId,
+					page: page.num,
+					pageSize: page.size
+				};
+				getArticleList(data).then(res => {
+					if(res.code==200){
+						//设置列表数据
+						if (page.num == 1) {
+							that.dataList = res.data.list; 
+							
+						} else {
+							that.dataList = that.dataList.concat(res.data.list);
+							 
+						}
+						that.mescroll.endBySize(res.data.list.length, res.data.total);
+						
+					}else{
+						uni.showToast({
+							icon:'none',
+							title: "请求失败",
+						});
+						that.dataList = null;
+						that.mescroll.endErr();
+					}
+				});
+			},
+			// 关键词选择
+			choseCate(item) {
+				this.choseCateId = item.cateId;
+				this.mescroll.resetUpScroll()
+			},
+			// 查看详情
+			showDetail(item) {
+				uni.navigateTo({
+					url: './detail?articleId=' + item.articleId
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.status_bar {
+		width: 100%;
+		background-color: #FFFFFF;
+	}
+	.top-content{
+		width: 100%;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 10;
+	}
+	.top-title{
+		height: 88upx;
+		line-height: 88upx;
+		font-size: 42upx;
+		font-family: Source Han Sans CN;
+		font-weight: bold;
+		color: #222222;
+		padding-left: 41upx;
+		background-color: #FFFFFF;
+	}
+	.search-cont{
+		padding: 16upx 30upx;
+		background-color: #FFFFFF;
+		.inner{
+			box-sizing: border-box;
+			width: 100%;
+			height: 72upx;
+			background: #F7F7F7;
+			border-radius: 36upx;
+			display: flex;
+			align-items: center;
+			padding: 0 30upx;
+			.icon-search{
+				width: 28upx;
+				height: 28upx;
+				margin-right: 20upx;
+			}
+			input{
+				height: 60upx;
+				line-height: 60upx;
+				flex: 1;
+			}
+		}
+	}
+	.keyword-list{
+		box-sizing: border-box;
+		background: #fff;
+		padding: 10upx 27upx;
+		height: 100upx;
+		.inner{
+			display: flex;
+		}
+		.item{
+			flex-shrink: 0;
+			padding: 0 24upx;
+			height: 64upx;
+			line-height: 64upx;
+			font-size: 28upx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #2583EB;
+			background: #eef5fd;
+			border: 1px solid #2583EB;
+			border-radius: 32upx;
+			margin: 0 20upx 20upx 0;
+			&.active{
+				color: #FFFFFF;
+				background: #2583EB;
+				border: 1px solid #2583EB;
+			}
+		}
+	}
+	.know-list{
+		margin-top: 20upx;
+		padding: 0 10upx;
+		.item{
+			box-sizing: border-box;
+			height: 271upx;
+			background: #FFFFFF;
+			border-radius: 16upx;
+			padding: 40upx 30upx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			margin-bottom: 20upx;
+			.left{
+				flex: 1;
+				padding-right: 40upx;
+				height: 190upx;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				.title{
+					font-size: 32upx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #111111;
+					line-height: 48upx;
+				}
+				.info-box{
+					width: 100%;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					.readers{
+						display: flex;
+						align-items: center;
+						.head-box{
+							margin-right: 27upx;
+							display: flex;
+							align-items: center;
+							.head{
+								width: 48upx;
+								height: 48upx;
+								border-radius: 50%;
+								overflow: hidden;
+								box-shadow: 0 0 0 1px #fff;
+								margin-right: -10upx;
+								image{
+									width: 100%;
+									height: 100%;
+								}
+							}
+						}
+						.readings{
+							display: flex;
+							align-items: center;
+							.eye{
+								width: 26upx;
+								height: 20upx;
+								margin-right: 9upx;
+							}
+							.num{
+								font-size: 24upx;
+								font-family: PingFang SC;
+								font-weight: 500;
+								color: #999999;
+								line-height: 1;
+							}
+						}
+					}
+					.time{
+						font-size: 24upx;
+						line-height: 1;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #999999;
+					}
+				}
+			}
+			.right{
+				width: 250upx;
+				height: 190upx;
+				border-radius: 8upx;
+				overflow: hidden;
+				image{
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+	}
+</style>

+ 121 - 0
pages_index/healthy/readUsers.vue

@@ -0,0 +1,121 @@
+<template>
+	<view>
+		<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :down="downOption" :up="upOption">
+		<view class="user-list">
+			<view class="item" v-for="(item,index) in dataList" :key="index">
+				<view class="img-box">
+					<image :src="item.avatar==null?'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/my_heads_icon.png':item.avatar" mode=""></image>
+				</view>
+				<text class="name">{{item.nickname}}</text>
+			</view>
+		</view>
+		</mescroll-body>
+	</view>
+</template>
+
+<script>
+	import {getArticleViewList} from '@/api/article';
+	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
+	export default {
+		mixins: [MescrollMixin], 
+		data() {
+			return {
+				articleId:null,
+				mescroll:null,
+				// 上拉加载的配置
+				upOption: {
+					onScroll:true,
+					use: true, // 是否启用上拉加载; 默认true
+					page: {
+						num: 0, // 当前页码,默认0,回调之前会加1,即callback(page)会从1开始
+						size: 10 // 每页数据的数量,默认10
+					},
+					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
+					empty: {
+						icon:'/static/images/no_data.png',
+						tip: '暂无数据'
+					}
+				},
+				// 列表数据
+				dataList: [],
+				
+			};
+		},
+		onLoad(option) {
+			this.articleId=option.articleId;
+		},
+		methods:{
+			mescrollInit(mescroll) {
+				this.mescroll = mescroll;
+			},
+			/*下拉刷新的回调 */
+			downCallback(mescroll) {
+				mescroll.resetUpScroll()
+			},
+			upCallback(page) {
+				//联网加载数据
+				var that = this;
+				var data = {
+					articleId:this.articleId,
+					page: page.num,
+					pageSize: page.size
+				};
+				getArticleViewList(data).then(res => {
+					if(res.code==200){
+						//设置列表数据
+						if (page.num == 1) {
+							that.dataList = res.data.list; 
+							
+						} else {
+							that.dataList = that.dataList.concat(res.data.list);
+							 
+						}
+						that.mescroll.endBySize(res.data.list.length, res.data.total);
+						
+					}else{
+						uni.showToast({
+							icon:'none',
+							title: "请求失败",
+						});
+						that.dataList = null;
+						that.mescroll.endErr();
+					}
+				});
+			},
+			 
+		}
+	}
+</script>
+
+<style lang="scss">
+	.user-list{
+		background: #FFFFFF;
+		padding: 40upx 30upx;
+		margin-top: 20upx;
+		.item{
+			margin-bottom: 40upx;
+			display: flex;
+			align-items: center;
+			&:last-child{
+				margin-bottom: 0;
+			}
+			.img-box{
+				width: 80upx;
+				height: 80upx;
+				border-radius: 50%;
+				overflow: hidden;
+				margin-right: 30upx;
+				image{
+					width: 100%;
+					height: 100%;
+				}
+			}
+			.name{
+				font-size: 34upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #333333;
+			}
+		}
+	}
+</style>

+ 7 - 7
pages_index/hospitalDetails.vue

@@ -168,8 +168,8 @@
 		.bg{
 			width: 100%;
 			height:280rpx;
-			background-color: #C39A58;
-			background: linear-gradient(#C39A58, #E2C99E);
+			background-color: #2583EB;
+			background: linear-gradient(#2583EB, #2EDAD4);
 			border-radius: 0rpx 0rpx 100rpx 100rpx;
 			position: fixed;
 			// z-index: 1;
@@ -274,7 +274,7 @@
 						margin-right: 15rpx;
 						height: 30rpx;
 						width: 6rpx;
-						background-color: #C39A58;
+						background-color: #2583EB;
 						
 					}
 					 
@@ -307,7 +307,7 @@
 						margin-right: 15rpx;
 						height: 30rpx;
 						width: 6rpx;
-						background-color: #C39A58;
+						background-color: #2583EB;
 						
 					}
 					 
@@ -420,7 +420,7 @@
 										flex: 1;
 										font-size: 32upx;
 										font-family: PingFang SC;
-										color: #C39A58;
+										color: #2583EB;
 									}
 									.btns{
 										margin-right: 10rpx;
@@ -428,12 +428,12 @@
 											display: flex;
 											align-items: center;
 											justify-content: center;
-											border: 2rpx solid #C39A58;
+											border: 2rpx solid #2583EB;
 											padding: 15rpx 30rpx;
 											border-radius: 30rpx;
 											font-size: 24upx;
 											font-family: PingFang SC;
-											color: #C39A58;
+											color: #2583EB;
 										}
 										
 									

+ 1 - 1
pages_index/hospitalList.vue

@@ -59,7 +59,7 @@
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					textNoMore:"已经到底了",
 					empty: {
-						icon:'https://cos.his.cdwjyyh.com/fs/20240423/cf4a86b913a04341bb44e34bb4d37aa2.png',
+						icon:'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/empty_icon.png',
 						tip: '暂无数据'
 					}
 				},

+ 7 - 7
pages_index/medicatedFoodDetails.vue

@@ -48,21 +48,21 @@
 			this.getMedicatedFoodById();
 		},
 		onShareAppMessage(res) {
-			if(this.utils.isLogin()){
+			if(this.$isLogin()){
 				return {
 					title: this.item.foodName,
 					path: '/pages_index/medicatedFoodDetails?id='+this.id,
-					imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230106/6b459adfb1004c1a96219bcdf07e337c.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/sharelogo.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			
 		},
 		//分享到朋友圈
 		onShareTimeline(res) {
-			if(this.utils.isLogin()){
+			if(this.$isLogin()){
 				return {
 					title: this.item.title,
-					imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230106/6b459adfb1004c1a96219bcdf07e337c.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/sharelogo.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			
@@ -158,7 +158,7 @@
 					border-radius: 5rpx;
 					width: 8rpx;
 					height:30rpx;
-					background-color: #C39A58;
+					background-color: #2583EB;
 				}
 				.title{
 					margin-left: 15rpx;
@@ -190,7 +190,7 @@
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
-				// border: 1rpx solid #C39A58;
+				// border: 1rpx solid #2583EB;
 				border-radius: 30rpx;
 				line-height: 60rpx;
 				.tab1{
@@ -242,7 +242,7 @@
 					font-family: PingFang SC;
 				}
 				.active{
-					background-color: #C39A58;
+					background-color: #2583EB;
 					color: #fff;
 				}
 				 

+ 5 - 5
pages_index/medicatedFoodList.vue

@@ -78,7 +78,7 @@
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					textNoMore:"已经到底了",
 					empty: {
-						icon:'https://cos.his.cdwjyyh.com/fs/20240423/cf4a86b913a04341bb44e34bb4d37aa2.png',
+						icon:'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/empty_icon.png',
 						tip: '暂无数据'
 					}
 				},
@@ -227,15 +227,15 @@
 			font-size: 28upx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #C39A58;
+			color: #2583EB;
 			background: #ffffff;
-			border: 1px solid #E2C99E;
+			border: 1px solid #2EDAD4;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #E2C99E;
-				border: 1px solid #E2C99E;
+				background: #2EDAD4;
+				border: 1px solid #2EDAD4;
 			}
 		}
 	}

+ 12 - 12
pages_index/packageDetails.vue

@@ -577,7 +577,7 @@
 						padding: 5rpx 15rpx;
 						font-size: 26upx;
 						font-family: PingFang SC;
-						color: #C39A58;
+						color: #2583EB;
 					}
 					.duration{
 						margin-left: 10rpx;
@@ -586,7 +586,7 @@
 						padding: 5rpx 15rpx;
 						font-size: 26upx;
 						font-family: PingFang SC;
-						color: #C39A58;
+						color: #2583EB;
 					}
 					
 				}
@@ -604,7 +604,7 @@
 						.price{
 							margin-right: 10rpx;
 							padding: 5rpx 10rpx;
-							background-color: #C39A58;
+							background-color: #2583EB;
 							border-radius: 30rpx;
 							font-size: 20upx;
 							font-family: PingFang SC;
@@ -640,7 +640,7 @@
 						margin-right: 15rpx;
 						height: 30rpx;
 						width: 6rpx;
-						background-color: #C39A58;
+						background-color: #2583EB;
 						
 					}
 					 
@@ -676,7 +676,7 @@
 						margin-right: 15rpx;
 						height: 30rpx;
 						width: 6rpx;
-						background-color: #C39A58;
+						background-color: #2583EB;
 						
 					}
 					 
@@ -715,7 +715,7 @@
 										display: inline-block;
 										padding: 0 6upx;
 										height: 30upx;
-										background: linear-gradient(90deg, #2BC7B9 0%, #2BC7A4 100%);
+										background: linear-gradient(90deg, #2583EB 0%, #92C1F5 100%);
 										border-radius: 4upx;
 										margin-right: 10upx;
 										font-size: 22upx;
@@ -858,7 +858,7 @@
 				}
 			 
 				&.buy{
-					background: #C39A58;
+					background: #2583EB;
 				}
 			}
 		}
@@ -943,8 +943,8 @@
 					border-radius: 30upx;
 					font-size: 28upx;
 					font-family: PingFang SC;
-					color: #C39A58;
-					border:1rpx solid  #C39A58;
+					color: #2583EB;
+					border:1rpx solid  #2583EB;
 					 
 				}
 				
@@ -988,7 +988,7 @@
 		height: 84upx;
 		background: #ffffff;
 		opacity: 0.9;
-		border: 1px solid #E2C99E;
+		border: 1px solid #2EDAD4;
 		// box-shadow: 0px 4upx 12upx 0px rgba(90, 203, 138, 0.16);
 		border-radius: 16upx;
 		position: fixed;
@@ -1014,7 +1014,7 @@
 				font-size: 28upx;
 				font-family: PingFang SC;
 				font-weight: 500;
-				color: #C39A58;
+				color: #2583EB;
 			}
 		}
 		.btn{
@@ -1027,7 +1027,7 @@
 			font-weight: 500;
 			color: #FFFFFF;
 			border: 1px solid #D2E6FF;
-			background: linear-gradient(135deg, #C39A58 0%, #E2C99E 100%);
+			background: linear-gradient(135deg, #2583EB 0%, #2EDAD4 100%);
 			border-radius: 24upx;
 			margin-left: 30upx;
 		}

+ 2 - 3
pages_index/packageForm.vue

@@ -39,13 +39,12 @@
 				<view class="msgs">
 					<view class="msg-item" v-for="(item,index) in msgs" >
 						<view class="left" v-if="item.type==1">
-							<!-- <image class="img" src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/be32b8d2ae9f497297d10327656bb43c.png"></image> -->
-							<image class="img" mode="aspectFill" :src="agreement.avatar?agreement.avatar:'https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/1d7eb0607a074892964dd32e8735e540.jpg'"></image>
+							<image class="img" mode="aspectFill" :src="agreement.avatar?agreement.avatar:'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/my_heads_icon.png'"></image>
 							<view class="msg-content">{{item.content}}</view>
 						</view>
 						<view class="right" v-if="item.type==2">
 							<view class="msg-content">{{item.content}}</view>
-							<image class="img" mode="aspectFill" :src="avatar?avatar:'https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/1d7eb0607a074892964dd32e8735e540.jpg'"></image>
+							<image class="img" mode="aspectFill" :src="avatar?avatar:'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/my_heads_icon.png'"></image>
 						</view>
 					</view>
 				</view>

+ 3 - 3
pages_index/packageList.vue

@@ -67,7 +67,7 @@
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					textNoMore:"已经到底了",
 					empty: {
-						icon:'https://cos.his.cdwjyyh.com/fs/20240423/cf4a86b913a04341bb44e34bb4d37aa2.png',
+						icon:'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/empty_icon.png',
 						tip: '暂无数据'
 					}
 				},
@@ -252,7 +252,7 @@
 				}
 				&.active{
 					.title{
-						color: #E2C99E;
+						color: #2EDAD4;
 					}
 					
 				}
@@ -303,7 +303,7 @@
 						width: 100%;
 						.price{
 							padding: 5rpx 10rpx;
-							background-color: #C39A58;
+							background-color: #2583EB;
 							border-radius: 30rpx;
 							font-size: 20upx;
 							font-family: PingFang SC;

+ 5 - 5
pages_index/questionsDetails.vue

@@ -49,17 +49,17 @@
 				return {
 					title: this.item.vesselName,
 					path: '/pages_index/questionsDetails?id='+this.id,
-					imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230106/6b459adfb1004c1a96219bcdf07e337c.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/sharelogo.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			
 		},
 		//分享到朋友圈
 		onShareTimeline(res) {
-			if(this.utils.isLogin()){
+			if(this.$isLogin()){
 				return {
 					title: this.item.title,
-					imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230106/6b459adfb1004c1a96219bcdf07e337c.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/sharelogo.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			
@@ -235,7 +235,7 @@
 			font-family: PingFang SC;
 			font-weight: 500;
 			color: #FFFFFF;
-			background: #C39A58;
+			background: #2583EB;
 			border-radius: 40upx;
 			display: flex;
 			align-items: center;
@@ -280,7 +280,7 @@
 				font-size: 22upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #C39A58;
+				color: #2583EB;
 				line-height: 1;
 			}
 			 

+ 5 - 5
pages_index/questionsList.vue

@@ -68,7 +68,7 @@
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					textNoMore:"已经到底了",
 					empty: {
-						icon:'https://cos.his.cdwjyyh.com/fs/20240423/cf4a86b913a04341bb44e34bb4d37aa2.png',
+						icon:'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/empty_icon.png',
 						tip: '暂无数据'
 					}
 				},
@@ -209,15 +209,15 @@
 			font-size: 28upx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #C39A58;
+			color: #2583EB;
 			background: #ffffff;
-			border: 1px solid #E2C99E;
+			border: 1px solid #2EDAD4;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #E2C99E;
-				border: 1px solid #E2C99E;
+				background: #2EDAD4;
+				border: 1px solid #2EDAD4;
 			}
 		}
 	}

+ 5 - 5
pages_index/test.vue

@@ -35,12 +35,12 @@
 			<view class="msgs">
 				<view class="msg-item" v-for="(item,index) in msgs" >
 					<view class="left" v-if="item.type==1">
-						<image class="img" src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/5fd36547a3ca4d0b9935e623d3d8e1c5.png"></image>
+						<image class="img" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/5fd36547a3ca4d0b9935e623d3d8e1c5.png"></image>
 						<view class="msg-content">{{item.content}}</view>
 					</view>
 					<view class="right" v-if="item.type==2">
 						<view class="msg-content">{{item.content}}</view>
-						<image class="img" src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/d7d49263e2e04f56a7a86fa7bfd35687.jpg"></image>
+						<image class="img" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/d7d49263e2e04f56a7a86fa7bfd35687.jpg"></image>
 					</view>
 					
 				</view>
@@ -137,17 +137,17 @@
 				return {
 					title: "健康体质检测",
 					path: '/pages_index/test?tempId='+this.tempId,
-					imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230106/6b459adfb1004c1a96219bcdf07e337c.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/sharelogo.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			
 		},
 		//分享到朋友圈
 		onShareTimeline(res) {
-			if(this.utils.isLogin()){
+			if(this.$isLogin()){
 				return {
 					title: "健康体质检测",
-					imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230106/6b459adfb1004c1a96219bcdf07e337c.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/sharelogo.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			

+ 5 - 8
pages_index/testDetails.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view class="bg-box">
-			<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/71014b69fdcc4b56ae2a84bdc28f11c3.png"></image>
+			<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/71014b69fdcc4b56ae2a84bdc28f11c3.png"></image>
 			<view class="title-box">
 				<view class="title">
 					{{item.name}}
@@ -19,9 +19,6 @@
 			<view class="btn-box">
 				<view class="btn" @click="navTo('/pages_index/test?tempId='+item.tempId)">立即开始</view>
 			</view>
-			<view class="logo">
-				<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/b95950e4208c493d8b74ce0de220c65c.png"></image>
-			</view>
 		</view>
 		
 	</view> 
@@ -49,17 +46,17 @@
 				return {
 					title: "健康自测",
 					path: '/pages_index/testDetails?tempId='+this.tempId,
-					imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230106/6b459adfb1004c1a96219bcdf07e337c.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/sharelogo.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			
 		},
 		//分享到朋友圈
 		onShareTimeline(res) {
-			if(this.utils.isLogin()){
+			if(this.$isLogin()){
 				return {
 					title: "健康自测",
-					imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230106/6b459adfb1004c1a96219bcdf07e337c.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/sharelogo.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			
@@ -206,7 +203,7 @@
 			 		font-family: PingFang SC;
 			 		font-weight: bold;
 			 		color: #FFFFFF;
-			 		background: #C39A58;
+			 		background: #2583EB;
 			 		border-radius: 50upx;
 			 	}
 			 }

+ 7 - 7
pages_index/testList.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view class="bg">
-			<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/8e52ab17eabc4534b3ce56026fd5c624.jpg"></image>
+			<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/8e52ab17eabc4534b3ce56026fd5c624.jpg"></image>
 		</view>
 		<mescroll-body  top="0rpx"  ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :down="downOption" :up="upOption">
 			<view class="test-list">
@@ -47,7 +47,7 @@
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					textNoMore:"已经到底了",
 					empty: {
-						icon:'https://cos.his.cdwjyyh.com/fs/20240423/cf4a86b913a04341bb44e34bb4d37aa2.png',
+						icon:'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/empty_icon.png',
 						tip: '暂无数据'
 					}
 				},
@@ -63,17 +63,17 @@
 				return {
 					title: "健康自测",
 					path: '/pages_index/testList',
-					imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230106/6b459adfb1004c1a96219bcdf07e337c.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/sharelogo.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			
 		},
 		//分享到朋友圈
 		onShareTimeline(res) {
-			if(this.utils.isLogin()){
+			if(this.$isLogin()){
 				return {
 					title: "健康自测",
-					imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230106/6b459adfb1004c1a96219bcdf07e337c.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/sharelogo.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			
@@ -183,7 +183,7 @@
 					.people-num{
 						font-size: 24upx;
 						font-family: PingFang SC;
-						color: #C39A58;
+						color: #2583EB;
 						.num{
 							font-weight: bold;
 							color: #814E1B;
@@ -194,7 +194,7 @@
 						font-size: 24upx;
 						font-family: PingFang SC;
 						font-weight: 500;
-						color: #C39A58;
+						color: #2583EB;
 					}
 				}
 			}

+ 5 - 5
pages_index/testResult.vue

@@ -2,11 +2,11 @@
 	<view class="content">
 		<view class="cont">
 			<view class="bg">
-				<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/8e52ab17eabc4534b3ce56026fd5c624.jpg" ></image>
+				<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/8e52ab17eabc4534b3ce56026fd5c624.jpg" ></image>
 			</view>
 			<view class="cont-box" v-if="report!=null">
 				<view class="user">
-					<image :src="JSON.parse(report.patientJson).avatar==null?'https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/22cb9518a55040dea74d8f730551a7a2.jpg':JSON.parse(report.patientJson).avatar"></image>
+					<image :src="JSON.parse(report.patientJson).avatar==null?'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/my_heads_icon.png':JSON.parse(report.patientJson).avatar"></image>
 					<view class="user-box">
 						<view class="sex">性别 {{JSON.parse(report.patientJson).sex==1?"男":"女"}}</view>
 						<view class="username">年龄 {{JSON.parse(report.patientJson).age}}岁</view>
@@ -181,8 +181,8 @@
 			.bg{
 				width: 100%;
 				height:100%;
-				// background-color: #2BC7B9;
-				// background: linear-gradient(#2BC7B9, #88e2da);
+				// background-color: #2583EB;
+				// background: linear-gradient(#2583EB, #88e2da);
 				position: fixed;
 				image{
 					width: 100%;
@@ -294,7 +294,7 @@
 								.title-line{
 									width: 8rpx;
 									height: 28rpx;
-									background: #2BC7B9;
+									background: #2583EB;
 									border-radius: 2px 2px 2px 2px;
 									opacity: 1;
 								}

+ 1 - 1
pages_index/testResultImg.vue

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

+ 6 - 6
pages_index/vesselDetails.vue

@@ -54,17 +54,17 @@
 				return {
 					title: this.item.vesselName,
 					path: '/pages_index/vesselDetails?id='+this.id,
-					imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230106/6b459adfb1004c1a96219bcdf07e337c.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/sharelogo.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			
 		},
 		//分享到朋友圈
 		onShareTimeline(res) {
-			if(this.utils.isLogin()){
+			if(this.$isLogin()){
 				return {
 					title: this.item.vesselName,
-					imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230106/6b459adfb1004c1a96219bcdf07e337c.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/sharelogo.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			
@@ -160,7 +160,7 @@
 					border-radius: 5rpx;
 					width: 8rpx;
 					height:30rpx;
-					background-color: #C39A58;
+					background-color: #2583EB;
 				}
 				.title{
 					margin-left: 15rpx;
@@ -192,7 +192,7 @@
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
-				// border: 1rpx solid #C39A58;
+				// border: 1rpx solid #2583EB;
 				border-radius: 30rpx;
 				line-height: 60rpx;
 				.tab1{
@@ -244,7 +244,7 @@
 					font-family: PingFang SC;
 				}
 				.active{
-					background-color: #C39A58;
+					background-color: #2583EB;
 					color: #fff;
 				}
 				 

+ 4 - 4
pages_index/vesselList.vue

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

+ 4 - 3
pages_order/courseOrderPayment.vue

@@ -86,6 +86,7 @@
 			payOrder(){
 				var data = {
 					orderId:this.orderId,
+					appId: getApp().globalData.appId
 				};
 				var that=this;
 				uni.showLoading();
@@ -348,7 +349,7 @@
 	 		font-family: PingFang SC;
 	 		font-weight: 400;
 	 		color: #FFFFFF;
-	 		background: #C39A58;
+	 		background: #2583EB;
 	 		border-radius: 10upx;
 			position: relative;
 	 	}
@@ -361,8 +362,8 @@
 			font-size: 34upx;
 			font-family: PingFang SC;
 			font-weight: 400;
-			color: #C39A58;
-			border: 1rpx solid #C39A58;
+			color: #2583EB;
+			border: 1rpx solid #2583EB;
 			border-radius: 10upx;
 			position: relative;
 			.share-btn {

+ 4 - 4
pages_order/inquiryForm1.vue

@@ -54,7 +54,7 @@
 						  v-for="(item, index) in durations"
 						  :key="index"
 						  :label="item.name"
-						  :name="item.name" activeColor="#C39A58"  
+						  :name="item.name" activeColor="#2583EB"  
 						  ></u-radio>
 					</u-radio-group>
 				</view>
@@ -70,7 +70,7 @@
 						  v-for="(item, index) in isVisits"
 						  :key="index"
 						  :label="item.name"
-						  :name="item.name" activeColor="#C39A58"  
+						  :name="item.name" activeColor="#2583EB"  
 						  ></u-radio>
 					</u-radio-group>
 				</view>
@@ -336,7 +336,7 @@
 						margin-right: 15rpx;
 						height: 30rpx;
 						width: 6rpx;
-						background-color: #C39A58;
+						background-color: #2583EB;
 						
 					}
 					.red-dot{
@@ -442,7 +442,7 @@
 		 		font-family: PingFang SC;
 		 		font-weight: 400;
 		 		color: #FFFFFF;
-		 		background: #C39A58;
+		 		background: #2583EB;
 		 		border-radius: 10upx;
 		 	}
 		 }

+ 8 - 8
pages_order/inquiryForm2_1.vue

@@ -98,7 +98,7 @@
 									<u-checkbox
 										size="28"
 										shape="circle"
-										activeColor="#C39A58"
+										activeColor="#2583EB"
 										v-for="(option, subIndex) in item.options"
 										:key="option.name"
 										:label="option.name"
@@ -128,7 +128,7 @@
 									<u-checkbox
 										size="28"
 										shape="circle"
-										activeColor="#C39A58"
+										activeColor="#2583EB"
 										v-for="(option, subIndex) in item.options"
 										:key="option.name"
 										:label="option.name"
@@ -160,7 +160,7 @@
 									<u-checkbox
 										size="28"
 										shape="circle"
-										activeColor="#C39A58"
+										activeColor="#2583EB"
 										v-for="(option, subIndex) in item.options"
 										:key="option.name"
 										:label="option.name"
@@ -190,7 +190,7 @@
 									<u-checkbox
 										size="28"
 										shape="circle"
-										activeColor="#C39A58"
+										activeColor="#2583EB"
 										v-for="(option, subIndex) in item.options"
 										:key="option.name"
 										:label="option.name"
@@ -445,7 +445,7 @@
 			showImg(type){
 				if(type==1){
 					var imgs=[
-						"https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/0640bd4b80ba4491842b9d20d7238616.png"
+						"https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/0640bd4b80ba4491842b9d20d7238616.png"
 					];
 					uni.previewImage({
 						current: 0,
@@ -454,7 +454,7 @@
 				}
 				else if(type==2){
 					var imgs=[
-						"https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/2c9f24e5c3fc458f8bcb30a4fb0619be.png"
+						"https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/2c9f24e5c3fc458f8bcb30a4fb0619be.png"
 					];
 					uni.previewImage({
 						current: 0,
@@ -701,7 +701,7 @@
 						margin-right: 15rpx;
 						height: 30rpx;
 						width: 6rpx;
-						background-color: #C39A58;
+						background-color: #2583EB;
 						
 					}
 					 
@@ -825,7 +825,7 @@
 		 		font-family: PingFang SC;
 		 		font-weight: 400;
 		 		color: #FFFFFF;
-		 		background: #C39A58;
+		 		background: #2583EB;
 		 		border-radius: 10upx;
 		 	}
 		 }

+ 10 - 10
pages_order/inquiryForm2_2.vue

@@ -54,7 +54,7 @@
 					 		  v-for="(item, index) in durations"
 					 		  :key="index"
 					 		  :label="item.name"
-					 		  :name="item.name" activeColor="#C39A58"  
+					 		  :name="item.name" activeColor="#2583EB"  
 					 		  ></u-radio>
 					 	</u-radio-group>
 					</u-form-item>
@@ -66,7 +66,7 @@
 					 		  v-for="(item, index) in isVisits"
 					 		  :key="index"
 					 		  :label="item.name"
-					 		  :name="item.name" activeColor="#C39A58"  
+					 		  :name="item.name" activeColor="#2583EB"  
 					 		  ></u-radio>
 					 	</u-radio-group>
 					</u-form-item>
@@ -133,7 +133,7 @@
 									<u-checkbox
 										size="28"
 										shape="circle"
-										activeColor="#C39A58"
+										activeColor="#2583EB"
 										v-for="(option, subIndex) in item.options"
 										:key="option.name"
 										:label="option.name"
@@ -163,7 +163,7 @@
 									<u-checkbox
 										size="28"
 										shape="circle"
-										activeColor="#C39A58"
+										activeColor="#2583EB"
 										v-for="(option, subIndex) in item.options"
 										:key="option.name"
 										:label="option.name"
@@ -195,7 +195,7 @@
 									<u-checkbox
 										size="28"
 										shape="circle"
-										activeColor="#C39A58"
+										activeColor="#2583EB"
 										v-for="(option, subIndex) in item.options"
 										:key="option.name"
 										:label="option.name"
@@ -225,7 +225,7 @@
 									<u-checkbox
 										size="28"
 										shape="circle"
-										activeColor="#C39A58"
+										activeColor="#2583EB"
 										v-for="(option, subIndex) in item.options"
 										:key="option.name"
 										:label="option.name"
@@ -426,7 +426,7 @@
 			showImg(type){
 				if(type==1){
 					var imgs=[
-						"https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/0640bd4b80ba4491842b9d20d7238616.png"
+						"https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/0640bd4b80ba4491842b9d20d7238616.png"
 					];
 					uni.previewImage({
 						current: 0,
@@ -435,7 +435,7 @@
 				}
 				else if(type==2){
 					var imgs=[
-						"https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/2c9f24e5c3fc458f8bcb30a4fb0619be.png"
+						"https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/2c9f24e5c3fc458f8bcb30a4fb0619be.png"
 					];
 					uni.previewImage({
 						current: 0,
@@ -662,7 +662,7 @@
 						margin-right: 15rpx;
 						height: 30rpx;
 						width: 6rpx;
-						background-color: #C39A58;
+						background-color: #2583EB;
 						
 					}
 					 
@@ -787,7 +787,7 @@
 		 		font-family: PingFang SC;
 		 		font-weight: 400;
 		 		color: #FFFFFF;
-		 		background: #C39A58;
+		 		background: #2583EB;
 		 		border-radius: 10upx;
 		 	}
 		 }

+ 4 - 4
pages_order/inquiryForm3.vue

@@ -46,7 +46,7 @@
 						  v-for="(item, index) in durations"
 						  :key="index"
 						  :label="item.name"
-						  :name="item.name" activeColor="#C39A58"  
+						  :name="item.name" activeColor="#2583EB"  
 						  ></u-radio>
 					</u-radio-group>
 				</view>
@@ -63,7 +63,7 @@
 						  v-for="(item, index) in isVisits"
 						  :key="index"
 						  :label="item.name"
-						  :name="item.name" activeColor="#C39A58"  
+						  :name="item.name" activeColor="#2583EB"  
 						  ></u-radio>
 					</u-radio-group>
 				</view>
@@ -324,7 +324,7 @@
 					margin-right: 15rpx;
 					height: 30rpx;
 					width: 6rpx;
-					background-color: #C39A58;
+					background-color: #2583EB;
 					
 				}
 				.red-dot{
@@ -429,7 +429,7 @@
 	 		font-family: PingFang SC;
 	 		font-weight: 400;
 	 		color: #FFFFFF;
-	 		background: #C39A58;
+	 		background: #2583EB;
 	 		border-radius: 10upx;
 	 	}
 	 }

+ 3 - 3
pages_order/inquiryOrderDetails.vue

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

+ 5 - 5
pages_order/inquiryOrderList.vue

@@ -4,7 +4,7 @@
 			 <u-tabs
 			  :scrollable="false"
 			  :list="tabs"  
-			  lineColor="#C39A58"
+			  lineColor="#2583EB"
 			 @change="inquiryTypeChange">
 			 </u-tabs>
 		</view>
@@ -123,7 +123,7 @@
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					textNoMore:"已经到底了",
 					empty: {
-						icon:'https://cos.his.cdwjyyh.com/fs/20240423/cf4a86b913a04341bb44e34bb4d37aa2.png',
+						icon:'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/empty_icon.png',
 						tip: '暂无数据'
 					}
 				},
@@ -392,7 +392,7 @@
 						color: #db5053;
 					}
 					.green{
-						color: #C39A58;
+						color: #2583EB;
 					}
 					.gray{
 						color: #9c9c9c;
@@ -428,8 +428,8 @@
 						.right{
 							.btn{
 								padding: 10rpx 30rpx;
-								border: 1rpx solid #C39A58;
-								color: #C39A58;
+								border: 1rpx solid #2583EB;
+								color: #2583EB;
 								font-size: 28rpx;
 								border-radius: 30rpx;
 							}

+ 2 - 2
pages_order/inquiryOrderPingList.vue

@@ -4,7 +4,7 @@
 		<view class="doctor-box">
 			<view class="doctor"  @click="navTo('../doctor/doctorDetails?doctorId='+item.doctorId)" v-for="(item) in dataList">
 				<view class="item">
-					<image mode="aspectFill" class="doc-img" :src="item.avatar==null?'https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/22cb9518a55040dea74d8f730551a7a2.jpg':item.avatar"></image>
+					<image mode="aspectFill" class="doc-img" :src="item.avatar==null?'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/my_heads_icon.png':item.avatar"></image>
 					<view class="right"> 
 						<view class="doc-box">
 							<view class="doc-name">
@@ -51,7 +51,7 @@
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					textNoMore:"已经到底了",
 					empty: {
-						icon:'https://cos.his.cdwjyyh.com/fs/20240423/cf4a86b913a04341bb44e34bb4d37aa2.png',
+						icon:'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/empty_icon.png',
 						tip: '暂无数据'
 					}
 				},

+ 5 - 5
pages_order/inquiryOrderReport.vue

@@ -2,7 +2,7 @@
 	<view class="content">
 		<view class="cont">
 			<view class="bg">
-				<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/3305ca20c3f646c6b465918efb07f849.png"></image>
+				<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/3305ca20c3f646c6b465918efb07f849.png"></image>
 			</view>
 			<view class="top-box"   >
 				<view class="status_bar" :style="{height: statusBarHeight}"></view>
@@ -15,7 +15,7 @@
 			<view class="cont-box" v-if="patient!=null">
 				<view class="status_bar" :style="{height: statusBarHeight}"></view>
 				<view class="user">
-					<image :src="patient.avatar==null?'https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/22cb9518a55040dea74d8f730551a7a2.jpg':JSON.parse(report.patientJson).avatar"></image>
+					<image :src="patient.avatar==null?'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/my_heads_icon.png':JSON.parse(report.patientJson).avatar"></image>
 					<view class="user-box">
 						<view class="sex">性别 {{patient.sex==1?"男":"女"}}</view>
 						<view class="username">年龄 {{patient.age}}岁</view>
@@ -167,8 +167,8 @@
 			.bg{
 				width: 100%;
 				height:650rpx;
-				// background-color: #2BC7B9;
-				// background: linear-gradient(#2BC7B9, #88e2da);
+				// background-color: #2583EB;
+				// background: linear-gradient(#2583EB, #88e2da);
 				position: fixed;
 				image{
 					width: 100%;
@@ -307,7 +307,7 @@
 								.title-line{
 									width: 8rpx;
 									height: 28rpx;
-									background: #C39A58;
+									background: #2583EB;
 									border-radius: 2px 2px 2px 2px;
 									opacity: 1;
 								}

+ 8 - 7
pages_order/inquiryPay.vue

@@ -62,8 +62,8 @@
 						<view class="coupon-box" v-if="coupons.length>0" >
 						   <view @click="couponSelect(item)" class="coupon-item" v-for="(item) in coupons">
 						 	<view class="left" >
-						 	  <image v-if="item.status==0" src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/004bcf24fc7641dea9f3247fa8d59ea2.png" mode="widthFix"></image>
-						 	  <image v-if="item.status!=0" src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/3ce37842579c48e2b8e50e547adbfeb6.png" mode="widthFix"></image>
+						 	  <image v-if="item.status==0" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/004bcf24fc7641dea9f3247fa8d59ea2.png" mode="widthFix"></image>
+						 	  <image v-if="item.status!=0" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/3ce37842579c48e2b8e50e547adbfeb6.png" mode="widthFix"></image>
 						 	  <view style="z-index: 999;">
 						 		¥<span class="num">{{item.price.toFixed(2)}}</span>
 						 	  </view>
@@ -84,7 +84,7 @@
 						   </view>
 						</view>
 						<view class="empty" v-if="coupons.length==0">
-							<image src="https://cos.his.cdwjyyh.com/fs/20240423/cf4a86b913a04341bb44e34bb4d37aa2.png"></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/empty_icon.png"></image>
 						</view>
 					</view>
 				</u-popup>
@@ -135,7 +135,7 @@
 		// 		return {
 		// 			title: "订单支付",
 		// 			path: '/pages_order/inquiryPay?orderId='+that.orderId,
-		// 			imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230106/6b459adfb1004c1a96219bcdf07e337c.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+		// 			imageUrl: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/sharelogo.png' //分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 		// 		}
 		// 	}
 			
@@ -243,7 +243,8 @@
 			payOrder(){
 				var data = {
 					orderId:this.order.orderId,
-					userCouponId:this.userCouponId
+					userCouponId:this.userCouponId,
+					appId: getApp().globalData.appId
 				};
 				var that=this;
 				uni.showLoading();
@@ -379,7 +380,7 @@
 		 		font-family: PingFang SC;
 		 		font-weight: 400;
 		 		color: #FFFFFF;
-		 		background: #C39A58;
+		 		background: #2583EB;
 		 		border-radius: 10upx;
 		 	}
 		 }
@@ -478,7 +479,7 @@
 						color: #fff;
 						text-align: center;
 						line-height: 0.44 * 100rpx;
-						background-color: #C39A58;
+						background-color: #2583EB;
 						.gray{
 							 background-color: #ccc;
 						}

+ 4 - 3
pages_order/inquiryPayment.vue

@@ -84,6 +84,7 @@
 			payOrder(){
 				var data = {
 					orderId:this.orderId,
+					appId: getApp().globalData.appId
 				};
 				var that=this;
 				uni.showLoading();
@@ -346,7 +347,7 @@
 	 		font-family: PingFang SC;
 	 		font-weight: 400;
 	 		color: #FFFFFF;
-	 		background: #C39A58;
+	 		background: #2583EB;
 	 		border-radius: 10upx;
 			position: relative;
 	 	}
@@ -359,8 +360,8 @@
 			font-size: 34upx;
 			font-family: PingFang SC;
 			font-weight: 400;
-			color: #C39A58;
-			border: 1rpx solid #C39A58;
+			color: #2583EB;
+			border: 1rpx solid #2583EB;
 			border-radius: 10upx;
 			position: relative;
 			.share-btn {

+ 3 - 3
pages_order/inquirySelect.vue

@@ -1,13 +1,13 @@
 <template>
 	<view class="content">
 		<view class="bg">
-			<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/f06ec63771984f3b9f9aa65eb0c17eeb.png"></image>
+			<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/f06ec63771984f3b9f9aa65eb0c17eeb.png"></image>
 		</view>
 		<view class="title">20秒快速匹配{{inquiryType==1?"专家医生":"执业药师"}}</view>
 		<view class="cont"  >
 			<view class="inquiry-item"   v-if="price1!=null" @click="doInquiryForm(price1)">
 				<view class="left" >
-					<image  src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/939cf3ad7d1a4186a7195e84a1db84bf.png"></image>
+					<image  src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/939cf3ad7d1a4186a7195e84a1db84bf.png"></image>
 					<view class="inquiry-cont" v-if="inquiryType==1">
 						<view class="name">图文问诊 {{price1.price}}/次</view>
 						<view class="desc">和医生1对1在线图文问诊</view>
@@ -23,7 +23,7 @@
 			</view>
 			<view class="inquiry-item"   v-if="price2!=null&&inquiryType==1" @click="doInquiryForm(price2)">
 				<view class="left" >
-					<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/cf80011807af45c9af1bea6c4cf4bb3a.png"></image>
+					<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/cf80011807af45c9af1bea6c4cf4bb3a.png"></image>
 			 
 					<view class="inquiry-cont" v-if="inquiryType==1">
 						<view class="name">视频问诊 {{price2.price}}/次</view>

+ 2 - 6
pages_order/inquirySelectType.vue

@@ -1,16 +1,12 @@
 <template>
 	<view class="content">
 		<view class="cont-bg">
-			<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/42d328f9604947eea86b6331ff7013e6.jpg"></image>
+			<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/42d328f9604947eea86b6331ff7013e6.jpg"></image>
 		</view>
-		<!-- <view class="bg">
-			<view></view>
-			<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/65d12607ca874b0d8536c7201a0dfa97.png"></image>
-		</view> -->
 		<view class="cont" >
 			<view class="inquiry-item" v-for="(item) in inquirySubTypes"  @click="doInquiryForm(item.value)" >
 				<view class="left"  >
-					<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/33a4d6077e394d37a920c45ca10f8c4d.png" mode="aspectFit"></image>
+					<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/33a4d6077e394d37a920c45ca10f8c4d.png" mode="aspectFit"></image>
 					<view class="inquiry-cont">
 						<view class="name">{{item.lable}}</view>
 						<!-- <view class="desc">医疗专家团队远程咨询</view> -->

+ 7 - 7
pages_order/invoice/index.vue

@@ -7,8 +7,8 @@
 					errorType="toast">
 					<u-form-item label="抬头类型" prop="billType">
 						<u-radio-group v-model="formdata.billType" placement="row" size="30rpx"  @change="billTypeChange">
-							<u-radio activeColor="#C39A58" label="企业单位" :name="0"></u-radio>
-							<u-radio style="margin-left: 40rpx;" activeColor="#C39A58" label="个人/非企业单位"
+							<u-radio activeColor="#2583EB" label="企业单位" :name="0"></u-radio>
+							<u-radio style="margin-left: 40rpx;" activeColor="#2583EB" label="个人/非企业单位"
 								:name="1"></u-radio>
 						</u-radio-group>
 					</u-form-item>
@@ -28,14 +28,14 @@
 					<u-form-item label="总金额" prop="amount">
 						<view style="width: 100px;">
 							<u-input v-model="formdata.amount" border="none" :clearable="true" placeholder="填写总金额"
-								color="#C39A58"></u-input>
+								color="#2583EB"></u-input>
 						</view>
 						<view slot="suffix" class="title" style="padding: 0;">元</view>
 					</u-form-item>
 					<u-form-item label="备注药品信息" prop="memo" labelWidth='110'>
 						<u-radio-group v-model="formdata.memo" placement="row" size="30rpx">
-							<u-radio activeColor="#C39A58" label="是" :name="1"></u-radio>
-							<u-radio style="margin-left: 40rpx;" activeColor="#C39A58" label="否" :name="0"></u-radio>
+							<u-radio activeColor="#2583EB" label="是" :name="1"></u-radio>
+							<u-radio style="margin-left: 40rpx;" activeColor="#2583EB" label="否" :name="0"></u-radio>
 						</u-radio-group>
 					</u-form-item>
 				</u-form>
@@ -277,7 +277,7 @@
 			margin-top: 70rpx;
 			width: 100%;
 			min-height: 84rpx;
-			background: #C39A58;
+			background: #2583EB;
 			border-radius: 42rpx 42rpx 42rpx 42rpx;
 			font-weight: 500;
 			font-size: 32rpx;
@@ -298,7 +298,7 @@
 		&-btn {
 			width: 702rpx;
 			height: 96rpx;
-			background: #C39A58;
+			background: #2583EB;
 			border-radius: 96rpx;
 			font-family: PingFang SC, PingFang SC;
 			font-weight: 600;

+ 1 - 1
pages_order/invoice/invoiceList.vue

@@ -62,7 +62,7 @@
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					textNoMore:"已经到底了",
 					empty: {
-						icon:'https://cos.his.cdwjyyh.com/fs/20240423/cf4a86b913a04341bb44e34bb4d37aa2.png',
+						icon:'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/empty_icon.png',
 						tip: '暂无数据'
 					}
 				},

+ 11 - 11
pages_order/packageOrderDetails.vue

@@ -8,7 +8,7 @@
 					<!-- 待付款 -->
 					<view v-if="order.status == 1" class="inner">
 						<view class="img-box">
-							<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/67eda0644e5847008096525b04cd12ca.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/67eda0644e5847008096525b04cd12ca.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">待付款</text>
@@ -18,7 +18,7 @@
 					<!-- 服务中 -->
 					<view v-if="order.status == 2" class="inner">
 						<view class="img-box">
-							<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/b71efb4b5ca54564b553569d578738b4.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/b71efb4b5ca54564b553569d578738b4.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">服务中</text>
@@ -28,7 +28,7 @@
 					<!-- 已完成 -->
 					<view v-if="order.status == 3" class="inner">
 						<view class="img-box">
-							<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/0712ba14f3a648afa69c9912fcbf9b61.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/0712ba14f3a648afa69c9912fcbf9b61.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">已完成</text>
@@ -38,7 +38,7 @@
 					<!--交易取消 -->
 					<view v-if="order.status == -1" class="inner">
 						<view class="img-box">
-							<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/02f95bd03e854a9c8076aef1e6c05e74.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/02f95bd03e854a9c8076aef1e6c05e74.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">交易关闭</text>
@@ -47,7 +47,7 @@
 					</view>
 					<view v-if="order.status == -2" class="inner">
 						<view class="img-box">
-							<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/6020712aa10f4bb08db92957cb7eb8ed.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/6020712aa10f4bb08db92957cb7eb8ed.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">退款成功</text>
@@ -250,8 +250,8 @@
 			top: 0;
 			left: 0;
 			z-index: 1;
-			background-color: #C39A58;
-			background: linear-gradient(#C39A58, #E2C99E);
+			background-color: #2583EB;
+			background: linear-gradient(#2583EB, #2EDAD4);
 			border-radius: 0rpx 0rpx 100rpx 100rpx;
 		}
 		.inner{
@@ -349,7 +349,7 @@
 						padding: 5rpx 15rpx;
 						font-size: 26upx;
 						font-family: PingFang SC;
-						color: #C39A58;
+						color: #2583EB;
 					}
 					.duration{
 						margin-left: 10rpx;
@@ -358,7 +358,7 @@
 						padding: 5rpx 15rpx;
 						font-size: 26upx;
 						font-family: PingFang SC;
-						color: #C39A58;
+						color: #2583EB;
 					}
 					
 				}
@@ -370,7 +370,7 @@
 					width: 100%;
 					.price{
 						padding: 5rpx 10rpx;
-						background-color: #C39A58;
+						background-color: #2583EB;
 						border-radius: 30rpx;
 						font-size: 20upx;
 						font-family: PingFang SC;
@@ -490,7 +490,7 @@
 				color: #666666;
 			}
 			&.pay{
-				background: #C39A58;
+				background: #2583EB;
 				color: #FFFFFF;
 			}
 		}

+ 7 - 7
pages_order/packageOrderList.vue

@@ -5,7 +5,7 @@
 				:current="status"
 			  :scrollable="true"
 			  :list="tabs"  
-			  lineColor="#C39A58"
+			  lineColor="#2583EB"
 			 @change="tabChange">
 			 </u-tabs>
 		</view>
@@ -97,7 +97,7 @@
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					textNoMore:"已经到底了",
 					empty: {
-						icon:'https://cos.his.cdwjyyh.com/fs/20240423/cf4a86b913a04341bb44e34bb4d37aa2.png',
+						icon:'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/empty_icon.png',
 						tip: '暂无数据'
 					}
 				},
@@ -278,7 +278,7 @@
 							font-weight: 500;
 							line-height: 1;
 							&.success{
-								color: #C39A58;
+								color: #2583EB;
 							}
 							&.black{
 								color: #111111;
@@ -330,7 +330,7 @@
 								padding: 5rpx 15rpx;
 								font-size: 26upx;
 								font-family: PingFang SC;
-								color: #C39A58;
+								color: #2583EB;
 							}
 							.duration{
 								margin-left: 10rpx;
@@ -339,7 +339,7 @@
 								padding: 5rpx 15rpx;
 								font-size: 26upx;
 								font-family: PingFang SC;
-								color: #C39A58;
+								color: #2583EB;
 							}
 							
 						}
@@ -351,7 +351,7 @@
 							width: 100%;
 							.price{
 								padding: 5rpx 10rpx;
-								background-color: #C39A58;
+								background-color: #2583EB;
 								border-radius: 30rpx;
 								font-size: 20upx;
 								font-family: PingFang SC;
@@ -426,7 +426,7 @@
 								color: #666666;
 							}
 							&.pay{
-								background: #C39A58;
+								background: #2583EB;
 								color: #FFFFFF;
 							}
 						}

+ 10 - 9
pages_order/packageOrderPay.vue

@@ -154,8 +154,8 @@
 				<view class="coupon-box" v-if="coupons.length>0" >
 				   <view @click="couponSelect(item)" class="coupon-item" v-for="(item) in coupons">
 				 	<view class="left" >
-				 	  <image v-if="item.status==0" src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/0fdd75d89db84458886d38e615011048.png" mode="widthFix"></image>
-				 	  <image v-if="item.status!=0" src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/d950e4c7af1e4464be1a7777e9dca576.png" mode="widthFix"></image>
+				 	  <image v-if="item.status==0" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/0fdd75d89db84458886d38e615011048.png" mode="widthFix"></image>
+				 	  <image v-if="item.status!=0" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/d950e4c7af1e4464be1a7777e9dca576.png" mode="widthFix"></image>
 				 	  <view style="z-index: 999;">
 				 		¥<span class="num">{{item.price.toFixed(2)}}</span>
 				 	  </view>
@@ -176,7 +176,7 @@
 				   </view>
 				</view>
 				<view class="empty" v-if="coupons.length==0">
-					<image src="https://cos.his.cdwjyyh.com/fs/20240423/cf4a86b913a04341bb44e34bb4d37aa2.png"></image>
+					<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/empty_icon.png"></image>
 				</view>
 			</view>
 		</u-popup>
@@ -420,6 +420,7 @@
 					addressId:this.addressId,
 					remark:this.order.remark,
 					orderId:this.order.orderId,
+					appId: getApp().globalData.appId
 				};
 				var that=this;
 				uni.showLoading();
@@ -555,7 +556,7 @@
 							display: inline-block;
 							padding: 0 6upx;
 							height: 30upx;
-							background: linear-gradient(90deg, #C39A58 0%, #E2C99E 100%);
+							background: linear-gradient(90deg, #2583EB 0%, #2EDAD4 100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							font-size: 22upx;
@@ -687,7 +688,7 @@
 								display: inline-block;
 								padding: 0 6upx;
 								height: 30upx;
-								background: linear-gradient(90deg, #2BC7B9 0%, #2BC7A4 100%);
+								background: linear-gradient(90deg, #2583EB 0%, #92C1F5 100%);
 								border-radius: 4upx;
 								margin-right: 10upx;
 								font-size: 22upx;
@@ -851,7 +852,7 @@
 	 		font-family: PingFang SC;
 	 		font-weight: 400;
 	 		color: #FFFFFF;
-	 		background: #C39A58;
+	 		background: #2583EB;
 	 		border-radius: 10upx;
 			position: relative;
 			.contact-btn {
@@ -871,8 +872,8 @@
 			font-size: 34upx;
 			font-family: PingFang SC;
 			font-weight: 400;
-			color: #C39A58;
-			border: 1rpx solid #C39A58;
+			color: #2583EB;
+			border: 1rpx solid #2583EB;
 			border-radius: 10upx;
 			position: relative;
 			.contact-btn {
@@ -1018,7 +1019,7 @@
 						color: #fff;
 						text-align: center;
 						line-height: 0.44 * 100rpx;
-						background-color: #C39A58;
+						background-color: #2583EB;
 						.gray{
 							 background-color: #ccc;
 						}

+ 2 - 1
pages_order/packageOtherPayment.vue

@@ -98,6 +98,7 @@
 			payOrder(){
 				var data = {
 					orderId:this.orderId,
+					appId: getApp().globalData.appId
 				};
 				var that=this;
 				uni.showLoading();
@@ -328,7 +329,7 @@
 				font-weight: bold;
 				color: #FFFFFF;
 				text-align: center;
-				background: #C39A58;
+				background: #2583EB;
 				border-radius: 44upx;
 				margin-bottom: 10rpx;
 			}

+ 6 - 5
pages_order/packagePayment.vue

@@ -131,11 +131,12 @@
 				);
 			},
 			payOrder(){
-				let data = {orderId:this.orderId};
+				let data = {orderId:this.orderId,appId: getApp().globalData.appId};
 				if(this.isShow ==0&&this.splitOrderTypes&&this.splitOrderTypes.length > 0) {
 					data = {
 						orderId:this.orderId,
-						splitOrderType: this.splitOrderType
+						splitOrderType: this.splitOrderType,
+						appId: getApp().globalData.appId
 					}
 				}
 				var that=this;
@@ -401,7 +402,7 @@
 	 		font-family: PingFang SC;
 	 		font-weight: 400;
 	 		color: #FFFFFF;
-	 		background: #C39A58;
+	 		background: #2583EB;
 	 		border-radius: 10upx;
 			position: relative;
 	 	}
@@ -414,8 +415,8 @@
 			font-size: 34upx;
 			font-family: PingFang SC;
 			font-weight: 400;
-			color: #C39A58;
-			border: 1rpx solid #C39A58;
+			color: #2583EB;
+			border: 1rpx solid #2583EB;
 			border-radius: 10upx;
 			position: relative;
 			.share-btn {

+ 1 - 1
pages_order/pingOrder.vue

@@ -277,7 +277,7 @@
 			font-family: PingFang SC;
 			font-weight: 400;
 			color: #FFFFFF;
-			background: #C39A58;
+			background: #2583EB;
 			border-radius: 10upx;
 		}
 	}

+ 7 - 7
pages_order/prescribeDetails.vue

@@ -345,8 +345,8 @@
 									justify-content: center;
 									border-radius: 5rpx;
 									font-size: 24rpx;
-									border: 1rpx solid #C39A58;
-									color: #C39A58;
+									border: 1rpx solid #2583EB;
+									color: #2583EB;
 									background-color: #f6fefb;
 								}
 								.name{
@@ -395,8 +395,8 @@
 					.btn{
 						margin-left: 10rpx;
 						border-radius: 30rpx;
-						border: 1rpx solid #C39A58;
-						color: #C39A58;
+						border: 1rpx solid #2583EB;
+						color: #2583EB;
 						font-size: 26rpx;
 						padding: 5rpx 15rpx;
 					}
@@ -405,8 +405,8 @@
 						color: red;
 					}
 					.green{
-						border: 1rpx solid #C39A58;
-						color: #C39A58;
+						border: 1rpx solid #2583EB;
+						color: #2583EB;
 					}
 				}
 				 
@@ -432,7 +432,7 @@
 		 		font-size: 28upx;
 		 		font-family: PingFang SC;
 		 		color: #FFFFFF;
-		 		background: #C39A58;
+		 		background: #2583EB;
 		 		border-radius: 45upx;
 		 	}
 			.red{

+ 4 - 4
pages_order/prescribeList.vue

@@ -4,7 +4,7 @@
 			 <u-tabs
 			  :scrollable="false"
 			  :list="tabs"  
-			  lineColor="#C39A58"
+			  lineColor="#2583EB"
 			 @change="tabChange">
 			 </u-tabs>
 		</view>
@@ -74,7 +74,7 @@
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					textNoMore:"已经到底了",
 					empty: {
-						icon:'https://cos.his.cdwjyyh.com/fs/20240423/cf4a86b913a04341bb44e34bb4d37aa2.png',
+						icon:'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/empty_icon.png',
 						tip: '暂无数据'
 					}
 				},
@@ -184,7 +184,7 @@
 							font-weight: 500;
 							line-height: 1;
 							&.success{
-								color: #2BC7B9;
+								color: #2583EB;
 							}
 							&.black{
 								color: #111111;
@@ -267,7 +267,7 @@
 						display: inline-block;
 						padding: 0 6upx;
 						height: 30upx;
-						background: linear-gradient(90deg, #C39A58 0%, #E2C99E 100%);
+						background: linear-gradient(90deg, #2583EB 0%, #2EDAD4 100%);
 						border-radius: 4upx;
 						margin-right: 10upx;
 						font-size: 22upx;

+ 4 - 4
pages_order/storeOrderDelivery.vue

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

+ 11 - 11
pages_order/storeOrderDetail.vue

@@ -8,7 +8,7 @@
 					<!-- 待付款 -->
 					<view v-if="order.status == 1" class="inner">
 						<view class="img-box">
-							<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/67eda0644e5847008096525b04cd12ca.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/67eda0644e5847008096525b04cd12ca.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">待付款</text>
@@ -18,7 +18,7 @@
 					<!-- 待发货 -->
 					<view v-if="order.status == 2" class="inner">
 						<view class="img-box">
-							<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/520e24fba47441b3b0f73b5250bb0b57.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/520e24fba47441b3b0f73b5250bb0b57.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">待发货</text>
@@ -28,7 +28,7 @@
 					<!-- 已发货、待收货 -->
 					<view v-if="order.status == 3" class="inner">
 						<view class="img-box">
-							<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/1e6ba423ff7e4537bef87a022d530015.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/1e6ba423ff7e4537bef87a022d530015.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">待收货</text>
@@ -38,7 +38,7 @@
 					<!-- 已完成 -->
 					<view v-if="order.status == 4" class="inner">
 						<view class="img-box">
-							<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/0712ba14f3a648afa69c9912fcbf9b61.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/0712ba14f3a648afa69c9912fcbf9b61.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">已完成</text>
@@ -48,7 +48,7 @@
 					<!--交易取消 -->
 					<view v-if="order.status == -3" class="inner">
 						<view class="img-box">
-							<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/02f95bd03e854a9c8076aef1e6c05e74.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/02f95bd03e854a9c8076aef1e6c05e74.png" mode=""></image>
 							</view>
 						<view class="status-box">
 							<text class="status">交易关闭</text>
@@ -57,7 +57,7 @@
 					</view>
 					<view v-if="order.status == -1" class="inner">
 						<view class="img-box">
-							<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/6020712aa10f4bb08db92957cb7eb8ed.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/6020712aa10f4bb08db92957cb7eb8ed.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">申请售后</text>
@@ -66,7 +66,7 @@
 					</view>
 					<view v-if="order.status == -2" class="inner">
 						<view class="img-box">
-							<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/6020712aa10f4bb08db92957cb7eb8ed.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/6020712aa10f4bb08db92957cb7eb8ed.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">退款成功</text>
@@ -440,8 +440,8 @@
 			top: 0;
 			left: 0;
 			z-index: 1;
-			background-color: #C39A58;
-			background: linear-gradient(#C39A58, #E2C99E);
+			background-color: #2583EB;
+			background: linear-gradient(#2583EB, #2EDAD4);
 			border-radius: 0rpx 0rpx 100rpx 100rpx;
 		}
 		.inner{
@@ -574,7 +574,7 @@
 							display: inline-block;
 							padding: 0 6upx;
 							height: 30upx;
-							background: linear-gradient(90deg, #C39A58 0%, #E2C99E 100%);
+							background: linear-gradient(90deg, #2583EB 0%, #2EDAD4 100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							font-size: 22upx;
@@ -772,7 +772,7 @@
 			color: #666666;
 		}
 		&.pay{
-			background: #C39A58;
+			background: #2583EB;
 			color: #FFFFFF;
 		}
 		.contact-btn {

+ 5 - 5
pages_order/storeOrderList.vue

@@ -4,7 +4,7 @@
 			 <u-tabs
 			  :scrollable="false"
 			  :list="tabs"  
-			  lineColor="#C39A58"
+			  lineColor="#2583EB"
 			 @change="tabChange">
 			 </u-tabs>
 		</view>
@@ -111,7 +111,7 @@
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					textNoMore:"已经到底了",
 					empty: {
-						icon:'https://cos.his.cdwjyyh.com/fs/20240423/cf4a86b913a04341bb44e34bb4d37aa2.png',
+						icon:'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/empty_icon.png',
 						tip: '暂无数据'
 					}
 				},
@@ -338,7 +338,7 @@
 						font-weight: 500;
 						line-height: 1;
 						&.success{
-							color: #C39A58;
+							color: #2583EB;
 						}
 						&.black{
 							color: #111111;
@@ -381,7 +381,7 @@
 								display: inline-block;
 								padding: 0 6upx;
 								height: 30upx;
-								background: linear-gradient(90deg, #C39A58 0%, #E2C99E 100%);
+								background: linear-gradient(90deg, #2583EB 0%, #2EDAD4 100%);
 								border-radius: 4upx;
 								margin-right: 10upx;
 								font-size: 22upx;
@@ -492,7 +492,7 @@
 								color: #666666;
 							}
 							&.pay{
-								background: #C39A58;
+								background: #2583EB;
 								color: #FFFFFF;
 							}
 							.contact-btn {

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff