From 87e363ca9c542debee7eee322932b0ef50e069b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Wed, 8 Nov 2023 15:33:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 187 +- pages/login/login.vue | 17 +- pages/myinformation/myinformation.vue | 5 +- pagesB/solution/solution.vue | 19 +- pagesmeeting/calling.vue | 14 +- pagesmeeting/debug/GenerateTestUserSig.js | 59 - .../debug/lib-generate-test-usersig-es.min.js | 6217 ----------------- pagesmeeting/room/room.vue | 72 +- 8 files changed, 170 insertions(+), 6420 deletions(-) delete mode 100644 pagesmeeting/debug/GenerateTestUserSig.js delete mode 100644 pagesmeeting/debug/lib-generate-test-usersig-es.min.js diff --git a/manifest.json b/manifest.json index eecaccc..dbb145e 100644 --- a/manifest.json +++ b/manifest.json @@ -1,95 +1,96 @@ { - "name" : "xinelu-applet-ui", - "appid" : "__UNI__EA0DD4F", - "description" : "", - "versionName" : "1.0.0", - "versionCode" : "100", - "transformPx" : false, - /* 5+App特有相关 */ - "app-plus" : { - "usingComponents" : true, - "nvueStyleCompiler" : "uni-app", - "compilerVersion" : 3, - "splashscreen" : { - "alwaysShowBeforeRender" : true, - "waiting" : true, - "autoclose" : true, - "delay" : 0 - }, - /* 模块配置 */ - "modules" : {}, - /* 应用发布信息 */ - "distribute" : { - /* android打包配置 */ - "android" : { - "permissions" : [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - /* ios打包配置 */ - "ios" : {}, - /* SDK配置 */ - "sdkConfigs" : {} - } - }, - /* 快应用特有相关 */ - "quickapp" : {}, - /* 小程序特有相关 */ - "mp-weixin" : { - "appid" : "wxccb16a452ab5e4b4", - "setting" : { - "urlCheck" : false, - "postcss" : true, - "minified" : true, - "es6" : true - }, - "usingComponents" : true, - // app.json - "permission" : { - "scope.userLocation" : { - "desc" : "你的位置信息将用于护理机构列表的位置查询" - } - }, - "requiredPrivateInfos" : [ "chooseLocation", "getLocation" ], - // "plugins": { - // "chooseLocation": { - // "version": "1.0.9", - // "provider": "wx76a9a06e5b4e693e" - // } - // }, - "uniStatistics" : { - "enable" : true - }, - "lazyCodeLoading" : "requiredComponents", - "unipush" : { - "enable" : false - } - }, - "mp-alipay" : { - "usingComponents" : true - }, - "mp-baidu" : { - "usingComponents" : true - }, - "mp-toutiao" : { - "usingComponents" : true - }, - "uniStatistics" : { - "enable" : false - }, - "vueVersion" : "2" + "name": "xinelu-applet-ui", + "appid": "__UNI__EA0DD4F", + "description": "", + "versionName": "1.0.0", + "versionCode": "100", + "transformPx": false, + /* 5+App特有相关 */ + "app-plus": { + "usingComponents": true, + "nvueStyleCompiler": "uni-app", + "compilerVersion": 3, + "splashscreen": { + "alwaysShowBeforeRender": true, + "waiting": true, + "autoclose": true, + "delay": 0 + }, + /* 模块配置 */ + "modules": {}, + /* 应用发布信息 */ + "distribute": { + /* android打包配置 */ + "android": { + "permissions": [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ] + }, + /* ios打包配置 */ + "ios": {}, + /* SDK配置 */ + "sdkConfigs": {} + } + }, + /* 快应用特有相关 */ + "quickapp": {}, + /* 小程序特有相关 */ + "mp-weixin": { + "appid": "wxccb16a452ab5e4b4", + "__usePrivacyCheck__": true, + "setting": { + "urlCheck": false, + "postcss": true, + "minified": true, + "es6": true + }, + "usingComponents": true, + // app.json + "permission": { + "scope.userLocation": { + "desc": "你的位置信息将用于护理机构列表的位置查询" + } + }, + "requiredPrivateInfos": ["chooseLocation", "getLocation"], + // "plugins": { + // "chooseLocation": { + // "version": "1.0.9", + // "provider": "wx76a9a06e5b4e693e" + // } + // }, + "uniStatistics": { + "enable": true + }, + "lazyCodeLoading": "requiredComponents", + "unipush": { + "enable": false + } + }, + "mp-alipay": { + "usingComponents": true + }, + "mp-baidu": { + "usingComponents": true + }, + "mp-toutiao": { + "usingComponents": true + }, + "uniStatistics": { + "enable": false + }, + "vueVersion": "2" } diff --git a/pages/login/login.vue b/pages/login/login.vue index fb6884c..f357aad 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -40,6 +40,13 @@ } this.phonecode = undefined this.logincode = undefined + let that = this + wx.login({ + provider: 'weixin', + success: function(loginRes) { + that.logincode = loginRes.code + } + }); // this.scenenurseStationId = uni.getStorageSync('scenenurseStationId'); }, methods: { @@ -90,13 +97,7 @@ let that = this; if (val.detail.code) { that.phonecode = val.detail.code - wx.login({ - provider: 'weixin', - success: function(loginRes) { - that.logincode = loginRes.code - that.login(); - } - }); + that.login(); } }, login() { @@ -179,4 +180,4 @@ \ No newline at end of file + diff --git a/pages/myinformation/myinformation.vue b/pages/myinformation/myinformation.vue index fad4da7..fe3fecf 100644 --- a/pages/myinformation/myinformation.vue +++ b/pages/myinformation/myinformation.vue @@ -529,11 +529,8 @@ }, // 专家咨询订单 expertOrder() { - // uni.navigateTo({ - // url: "/pagesB/ExpertlookOrder/ExpertlookOrder" - // }) uni.navigateTo({ - url: "/pagesmeeting/calling" + url: "/pagesB/ExpertlookOrder/ExpertlookOrder" }) }, } diff --git a/pagesB/solution/solution.vue b/pagesB/solution/solution.vue index b508f3e..9235dd8 100644 --- a/pagesB/solution/solution.vue +++ b/pagesB/solution/solution.vue @@ -24,16 +24,15 @@ }, 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) - // }) + this.checkDeviceAuthorize().then((result) => { + console.log('授权成功', result) + uni.navigateTo({ + url: `/pagesmeeting/room/room?sdkAppID=1600006944&localVideo=true&localAudio=true&userID=${this.item.patientId}&userName=${this.item.receiver}&userSig=${this.userSig}&roomID=${this.roomId}` + }) + }) + .catch((error) => { + console.log('没有授权', error) + }) }, checkDeviceAuthorize() { this.hasOpenDeviceAuthorizeModal = false diff --git a/pagesmeeting/calling.vue b/pagesmeeting/calling.vue index 104575f..777e779 100644 --- a/pagesmeeting/calling.vue +++ b/pagesmeeting/calling.vue @@ -28,9 +28,9 @@