diff --git a/package.json b/package.json index 489c93a..435182f 100644 --- a/package.json +++ b/package.json @@ -1,56 +1,58 @@ { - "name": "youcan", - "version": "1.0.0", - "description": "", - "main": "main.js", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "author": "", - "license": "ISC", - "dependencies": { - "@tencentcloud/chat-uikit-uniapp": "^2.4.1", - "bignumber.js": "^9.3.1", - "dayjs": "^1.11.13", - "tim-upload-plugin": "^1.4.2", - "tim-wx-sdk": "^2.27.6", - "unplugin-vue2-script-setup": "^0.11.4" - }, - "uni-app": { - "scripts": { - "dev": { - "title": "【开发】支付宝", - "env": { - "UNI_PLATFORM": "mp-alipay", - "API_BASE_URL": "http://192.168.31.146:8080", - "CORP_ID": "4G7H8J2K9L0M1N3P5Q6R7S8T9U", - "APP_ID": "2021004129669493", - "ORDER_SOURCE": "ALIPAY_MINI", - "HOSPITAL_ID": 100002 - } - }, - "test": { - "title": "【测试】支付宝", - "env": { - "UNI_PLATFORM": "mp-alipay", - "API_BASE_URL": "https://patient.youcan365.com/hn", - "CORP_ID": "4G7H8J2K9L0M1N3P5Q6R7S8T9U", - "APP_ID": "2021004129669493", - "ORDER_SOURCE": "ALIPAY_MINI", - "HOSPITAL_ID": 100002 - } - }, - "yidong": { - "title": "【移动云】支付宝", - "env": { - "UNI_PLATFORM": "mp-alipay", - "API_BASE_URL": "https://hlw.zytzymz.com", - "CORP_ID": "4G7H8J2K9L0M1N3P5Q6R7S8T9U0V1", - "APP_ID": "2021005110656858", - "ORDER_SOURCE": "ALIPAY_MINI", - "HOSPITAL_ID": 100002 - } - } - } - } + "name": "youcan", + "version": "1.0.0", + "description": "", + "main": "main.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "", + "license": "ISC", + "dependencies": { + "@tencentcloud/chat-uikit-uniapp": "^2.4.1", + "bignumber.js": "^9.3.1", + "dayjs": "^1.11.13", + "tim-upload-plugin": "^1.4.2", + "tim-wx-sdk": "^2.27.6", + "unplugin-vue2-script-setup": "^0.11.4" + }, + "uni-app": { + "scripts": { + "dev": { + "title": "【开发】支付宝", + "env": { + "UNI_PLATFORM": "mp-alipay", + "API_BASE_URL": "http://192.168.31.146:8080", + "CORP_ID": "4G7H8J2K9L0M1N3P5Q6R7S8T9U", + "APP_ID": "2021004129669493", + "ORDER_SOURCE": "ALIPAY_MINI", + "YB_AUTH_QRCODE": "https://www.youcan365.com/hn/hnhlw?type=ybAuth&id=", + "HOSPITAL_ID": 100002 + } + }, + "test": { + "title": "【测试】支付宝", + "env": { + "UNI_PLATFORM": "mp-alipay", + "API_BASE_URL": "https://patient.youcan365.com/hn", + "CORP_ID": "4G7H8J2K9L0M1N3P5Q6R7S8T9U", + "APP_ID": "2021004129669493", + "ORDER_SOURCE": "ALIPAY_MINI", + "YB_AUTH_QRCODE": "https://www.youcan365.com/hn/hnhlw?type=ybAuth&id=", + "HOSPITAL_ID": 100002 + } + }, + "yidong": { + "title": "【移动云】支付宝", + "env": { + "UNI_PLATFORM": "mp-alipay", + "API_BASE_URL": "https://hlw.zytzymz.com", + "CORP_ID": "4G7H8J2K9L0M1N3P5Q6R7S8T9U0V1", + "APP_ID": "2021005110656858", + "ORDER_SOURCE": "ALIPAY_MINI", + "HOSPITAL_ID": 100002 + } + } + } + } } diff --git a/pages.json b/pages.json index 2f527c0..5fad137 100644 --- a/pages.json +++ b/pages.json @@ -1,6 +1,5 @@ { "pages": [ - // #ifdef MP-ALIPAY { "path": "pages/home/home", "style": { @@ -114,6 +113,18 @@ "navigationBarTitleText": "在线复诊" } }, + { + "path": "pages/consult/self-auth/auth-qrcode", + "style": { + "navigationBarTitleText": "医保授权" + } + }, + { + "path": "pages/consult/self-auth/auth-action", + "style": { + "navigationBarTitleText": "医保授权" + } + }, { "path": "pages/consult/disease-description", "style": { @@ -261,20 +272,11 @@ "style": { "navigationBarTitleText": "" } - }, - // #endif - // #ifdef H5 - { - "path": "pages/cloud-service/order", - "style": { - "navigationStyle": "custom", - "navigationBarTitleText": "配药订单" - } } - // #endif + ], "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "海宁康华医院互联网医院" } -} \ No newline at end of file +} diff --git a/pages/chat/index.vue b/pages/chat/index.vue index 18babcb..7b76117 100644 --- a/pages/chat/index.vue +++ b/pages/chat/index.vue @@ -1087,6 +1087,7 @@ async function reEditOrder() { }); const diseasePageIndex = pageRoutes.lastIndexOf('pages/consult/disease-description'); const orderDetailPageIndex = pageRoutes.lastIndexOf('pages/record/order-detail'); + prePage.value = '' if (diseasePageIndex >= 0 && diseasePageIndex > orderDetailPageIndex) { const delta = pages.length - 1 - diseasePageIndex; diff --git a/pages/consult/index.vue b/pages/consult/index.vue index 6eff824..f907270 100644 --- a/pages/consult/index.vue +++ b/pages/consult/index.vue @@ -31,12 +31,12 @@