修改

pages.json

@@ -10,22 +10,6 @@
 				"enablePullDownRefresh": false
 			}
 		},
-	{
-		"path": "pages/medicalservice/medicalservice",
-		"style": {
-			"enablePullDownRefresh": false,
-			"navigationStyle": "custom"
-		}
-	},
-
-	{
-		"path": "pages/register/register",
-		"style": {
-			"navigationBarTitleText": "注册",
-			"enablePullDownRefresh": false
-		}
-	},
-
 		{
 			"path": "pages/homepage/homepage",
 			"style": {
@@ -33,10 +17,6 @@
 				"navigationStyle": "custom"
 			}
 		},
-
-
-
-
 		{
 			"path": "pages/myinformation/myinformation",
 			"style": {
@@ -44,8 +24,20 @@
 				"navigationStyle": "custom"
 			}
 		},
-
 		{
+			"path": "pages/register/register",
+			"style": {
+				"navigationBarTitleText": "注册",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/medicalservice/medicalservice",
+			"style": {
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		}, {
 			"path": "pages/login/login",
 			"style": {
 				"navigationBarTitleText": "登录",
@@ -82,6 +74,13 @@
 						"enablePullDownRefresh": false
 					}
 				},
+				{
+					"path": "solution/solution",
+					"style": {
+						"navigationBarTitleText": "视频通话",
+						"enablePullDownRefresh": false
+					}
+				},
 				{
 					"path": "orderlist/orderlist",
 					"style": {
@@ -223,7 +222,7 @@
 				}, {
 					"path": "shopping/shopping", //商城
 					"style": {
-					"navigationBarTitleText": "健康商城",
+						"navigationBarTitleText": "医路优品",
 						"onReachBottomDistance": 40, //距离底部多远时触发 单位为px
 						"enablePullDownRefresh": true //设置参数为true
 					}
@@ -458,13 +457,13 @@
 						"enablePullDownRefresh": false
 					}
 				},
-			// {
-			// 	"path": "Filinginformation/Filinginformation",
-			// 	"style": {
-			// 		"navigationBarTitleText": "查看建档信息",
-			// 		"enablePullDownRefresh": false
-			// 	}
-			// },
+				{
+					"path": "Filinginformation/Filinginformation",
+					"style": {
+						"navigationBarTitleText": "查看建档信息",
+						"enablePullDownRefresh": false
+					}
+				},
 				{
 					"path": "Onlinesigning/Onlinesigning",
 					"style": {
@@ -693,9 +692,25 @@
 					"navigationBarTitleText": "历史记录评估问卷",
 					"enablePullDownRefresh": false
 				}
-
 			}]
-	}],
+		},
+		{
+			"root": "pagesmeeting",
+			"pages": [{
+				"path": "room/room",
+				"style": {
+					"navigationBarTitleText": "视频通话",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "calling",
+				"style": {
+					"navigationBarTitleText": "视频通话",
+					"enablePullDownRefresh": false
+				}
+			}]
+		}
+	],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
 		"navigationBarTitleText": "",

pages/homepage/homepage.vue

@@ -106,7 +106,6 @@
 			this.userinfo = uni.getStorageSync('userinfo')
 			this.openid = uni.getStorageSync('openid');
 			this.cityCode = this.userinfo.cityCode;
-
 			if (this.address == '德州市') {
 				uni.setStorageSync("region", 1)
 			} else if (this.address == '东营市') {
@@ -115,7 +114,6 @@
 				uni.setStorageSync("region", 3)
 			}
 			this.region = uni.getStorageSync('region')
-
 			if (this.userinfo && this.region!="3") {
 				this.patientName = this.userinfo.patientName
 				checkSignApply(this.userinfo.cardNo).then(res => {

pages/message/message.vue

@@ -19,5 +19,4 @@
 		margin-top: 50%;
 
 	}
-
 </style>

pages/myinformation/myinformation.vue

@@ -529,8 +529,11 @@
 			},
 			// 专家咨询订单
 			expertOrder() {
+				// uni.navigateTo({
+				// 	url: "/pagesB/ExpertlookOrder/ExpertlookOrder"
+				// })
 				uni.navigateTo({
-					url: "/pagesB/ExpertlookOrder/ExpertlookOrder"
+					url: "/pagesmeeting/calling"
 				})
 			},
 		}

pagesB/ExpertlookOrder/ExpertlookOrder.vue

@@ -406,14 +406,12 @@
 			serve(item) {
 				// this.info()
 				getRoomId(item.goodsOrderId).then(res => {
-					console.log(res, '787')
 					if (res.msg) {
 						this.roomId = res.msg
 						uni.navigateTo({
 							url: `/pagesB/solution/solution?item=${JSON.stringify(item)}&&roomId=${this.roomId}`
 						})
-					}
-					else{
+					} else {
 						this.$refs.uToast.show({
 							title: '暂无视频通话',
 							type: 'error'
@@ -423,7 +421,6 @@
 						// })
 					}
 				})
-				
 			},
 			//订单详情页面
 			goorderdetails(item) {

pagesB/solution/solution.vue

@@ -1,6 +1,8 @@
 <template>
 	<view>
-		<web-view :src="src" @message="handlePostMessage"></web-view>
+		<view class="" @tap='goroom'>
+			跳转跳转跳转跳转跳转跳转跳转跳转跳转跳转跳转跳转跳转跳转跳转跳转跳转跳转跳转跳转跳转
+		</view>
 	</view>
 </template>
 
@@ -14,28 +16,113 @@
 				src: '',
 				userSig: '',
 				item: {},
+				roomId: '',
+				authorizeMic: '',
+				authorizeCamera: '',
+				hasOpenDeviceAuthorizeModal: '',
 			};
 		},
 		methods: {
+			goroom() {
+				uni.navigateTo({
+					url: `/pagesmeeting/calling?userID=${this.item.patientId}&userName=${this.item.patientName}&userSig=${this.userSig}&roomID=${this.roomId}`
+				})
+				// this.checkDeviceAuthorize().then((result) => {
+				// 		console.log('授权成功', result)
+
+				// 	})
+				// 	.catch((error) => {
+				// 		console.log('没有授权', error)
+				// 	})
+			},
+			checkDeviceAuthorize() {
+				this.hasOpenDeviceAuthorizeModal = false
+				return new Promise((resolve, reject) => {
+					if (!wx.getSetting || !wx.getSetting()) {
+						// 微信测试版 获取授权API异常，目前只能即使没授权也可以通过
+						resolve()
+					}
+					wx.getSetting().then((result) => {
+						console.log('getSetting', result)
+						this.authorizeMic = result.authSetting['scope.record']
+						this.authorizeCamera = result.authSetting['scope.camera']
+						if (result.authSetting['scope.camera'] && result.authSetting['scope.record']) {
+							// 授权成功
+							resolve()
+						} else {
+							// 没有授权，弹出授权窗口
+							// 注意： wx.authorize 只有首次调用会弹框，之后调用只返回结果，如果没有授权需要自行弹框提示处理
+							console.log('getSetting 没有授权，弹出授权窗口', result)
+							wx.authorize({
+									scope: 'scope.record',
+								}).then((res) => {
+									console.log('authorize mic', res)
+									this.authorizeMic = true
+									if (this.authorizeCamera) {
+										resolve()
+									}
+								})
+								.catch((error) => {
+									console.log('authorize mic error', error)
+									this.authorizeMic = false
+								})
+							wx.authorize({
+									scope: 'scope.camera',
+								}).then((res) => {
+									console.log('authorize camera', res)
+									this.authorizeCamera = true
+									if (this.authorizeMic) {
+										resolve()
+									} else {
+										this.openConfirm()
+										reject(new Error('authorize fail'))
+									}
+								})
+								.catch((error) => {
+									console.log('authorize camera error', error)
+									this.authorizeCamera = false
+									this.openConfirm()
+									reject(new Error('authorize fail'))
+								})
+						}
+					})
+				})
+			},
+			openConfirm() {
+				if (this.hasOpenDeviceAuthorizeModal) {
+					return
+				}
+				this.hasOpenDeviceAuthorizeModal = true
+				return uni.showModal({
+					content: '您没有打开麦克风和摄像头的权限，是否去设置打开？',
+					confirmText: '确认',
+					cancelText: '取消',
+					success: (res) => {
+						this.hasOpenDeviceAuthorizeModal = false
+						console.log(res)
+						// 点击“确认”时打开设置页面
+						if (res.confirm) {
+							console.log('用户点击确认')
+							wx.openSetting({
+								success: (res) => {},
+							})
+						} else {
+							console.log('用户点击取消')
+						}
+					},
+				})
+			},
 			info() {
-				// console.log(this.item.patientId, '88585')
 				getUserSig(this.item.patientId).then(res => {
 					this.userSig = res.data
-					this.src =
-						`https://msg.xinyilu.cn​​​​​?userId=5&userName=王晓燕&userSig=eJyrVgrxCdYrSy1SslIy0jNQ0gHzM1NS80oy0zLBwqZQweKU7MSCgswUJStDMwMgMLM0MYHIpFYUZBalAsVNTU2NgDIQ0ZLMXJCYmaWlsZGRoYUh1JTMdKCZFgGhHiGlhkWBZR6mKanpAVW*bpVuMfpGeY5epUZVad6G5qZBjgGZzk6GvqG2SrUAMZovIA__&roomId=456789`
-		
-					console.log(this.src, '555')
 				})
 			},
 		},
 		onLoad(options) {
 			this.item = JSON.parse(options.item)
 			this.roomId = options.roomId
-			// console.log(this.roomId, '88888')
 			this.info()
-
 		}
-
 	}
 </script>