diff --git a/App.vue b/App.vue index 24113cd..759bbe4 100644 --- a/App.vue +++ b/App.vue @@ -27,9 +27,17 @@ export default { options.referrerInfo.extraData && options.referrerInfo.extraData.targetPath ) { - uni.navigateTo({ - url: options.referrerInfo.extraData.targetPath, - }); + let src=options.referrerInfo.extraData.targetPath + + if(src.indexOf('downLoadVideo') > -1 ){ + uni.navigateTo({ + url: src+'?from=mine', + }); + }else{ + uni.navigateTo({ + url: src, + }); + } } console.log("app传递登录信息onLaunch-------------------"); @@ -43,9 +51,15 @@ export default { plus.runtime.quit(); } if(event.indexOf("goPage") > -1){ - uni.navigateTo({ - url: data, - }); + if(data.indexOf('downLoadVideo') > -1){ + uni.navigateTo({ + url: data+'?from=mine' + }); + }else{ + uni.navigateTo({ + url: data, + }); + } } }); // #endif @@ -181,8 +195,8 @@ page { /* #endif */ .uni-nav-bar-text { - font-weight: bold; - font-size: 36rpx !important; + + font-size: 40rpx !important; } .example-info { diff --git a/api/api.js b/api/api.js index 6b0956e..ea61f8c 100644 --- a/api/api.js +++ b/api/api.js @@ -654,6 +654,9 @@ const api = { useWelfareNum(data){ return request('/expertAPI/useWelfareNum', data, 'post', false); }, + deleteComment(data){ + return request('/expertAPI/deleteComment', data, 'post', false); + }, } export default api \ No newline at end of file diff --git a/components/dialog/dialog.vue b/components/dialog/dialog.vue index 51a3d7b..524d58f 100644 --- a/components/dialog/dialog.vue +++ b/components/dialog/dialog.vue @@ -130,6 +130,8 @@ } .dialog-container { + position: relative; + z-index:100; background-color: #ffffff; border-radius: 20rpx; width: 92%; diff --git a/pages.json b/pages.json index 051c42c..e6492e0 100644 --- a/pages.json +++ b/pages.json @@ -10,16 +10,16 @@ }, "pages": [ - // { - // "path": "pages/loading/loading", - // "style": { - // "navigationBarTitleText": "", - // "navigationStyle": "custom", - // "app": { - // "bounce": "none" - // } - // } - // }, + { + "path": "pages/loading/loading", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom", + "app": { + "bounce": "none" + } + } + }, { "path": "pages/index/index", "style": { @@ -314,6 +314,36 @@ } } }, + { + "path": "zhinanDownload/zhinanDownload", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "治疗指南", + "app": { + "bounce": "none" + } + } + }, + { + "path": "pptDownload/pptDownload", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "治疗指南", + "app": { + "bounce": "none" + } + } + }, + { + "path": "articleDownload/articleDownload", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "文献期刊", + "app": { + "bounce": "none" + } + } + }, { "path": "patientVideo/patientVideo", "style": { @@ -388,6 +418,56 @@ "bounce": "none" } } + }, + { + "path": "consultDetail/consultDetail", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "uni-app分页", + "app": { + "bounce": "none" + } + } + }, + { + "path": "freeDetail/freeDetail", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "uni-app分页", + "app": { + "bounce": "none" + } + } + }, + { + "path": "consult/consult", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "uni-app分页", + "app": { + "bounce": "none" + } + } + }, + { + "path": "myAnswer/myAnswer", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "我的意见", + "app": { + "bounce": "none" + } + } + }, + { + "path": "newsList/newsList", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "uni-app分页", + "app": { + "bounce": "none" + } + } }, { "path": "pwdLogin/pwdLogin", @@ -441,36 +521,8 @@ // } // }, - // { - // "path": "myAnswer/myAnswer", - // "style": { - // "navigationStyle": "custom", - // "navigationBarTitleText": "我的意见", - // "app": { - // "bounce": "none" - // } - // } - // }, - // { - // "path": "consultDetail/consultDetail", - // "style": { - // "navigationStyle": "custom", - // "navigationBarTitleText": "uni-app分页", - // "app": { - // "bounce": "none" - // } - // } - // }, - // { - // "path": "consult/consult", - // "style": { - // "navigationStyle": "custom", - // "navigationBarTitleText": "uni-app分页", - // "app": { - // "bounce": "none" - // } - // } - // }, + + // { // "path": "searchNews/searchNews", // "style": { @@ -761,16 +813,7 @@ // } // } // }, - // { - // "path": "freeDetail/freeDetail", - // "style": { - // "navigationStyle": "custom", - // "navigationBarTitleText": "uni-app分页", - // "app": { - // "bounce": "none" - // } - // } - // }, + // { // "path": "searchPatient/searchPatient", // "style": { @@ -1029,16 +1072,7 @@ // } // } // }, - // { - // "path": "newsList/newsList", - // "style": { - // "navigationStyle": "custom", - // "navigationBarTitleText": "uni-app分页", - // "app": { - // "bounce": "none" - // } - // } - // }, + // { // "path": "personInfo/personInfo", // "style": { diff --git a/pages_app/articleDownload/articleDownload.vue b/pages_app/articleDownload/articleDownload.vue new file mode 100644 index 0000000..13a0d3a --- /dev/null +++ b/pages_app/articleDownload/articleDownload.vue @@ -0,0 +1,843 @@ + + + + + + \ No newline at end of file diff --git a/pages_app/consult/consult.vue b/pages_app/consult/consult.vue index db684a5..97c53b4 100644 --- a/pages_app/consult/consult.vue +++ b/pages_app/consult/consult.vue @@ -384,7 +384,7 @@ function onReachBottom(){ height: 44px; padding: 0 16px; position: fixed; - top: 180rpx; + top: calc(var(--status-bar-height) + 44px); left: 0; right: 0; z-index: 10; @@ -397,14 +397,14 @@ function onReachBottom(){ color: #7a7a7a; padding: 10px 0; &.active { color: #8B2316; position: relative; } - &.active::after { content: ''; position: absolute; left: 25%; right: 25%; bottom: 2px; height: 3px; background-color: #8B2316; border-radius: 2px; } + &.active::after { content: ''; position: absolute; left: 25%; right: 25%; bottom: -1px; height: 3px; background-color: #8B2316; border-radius: 2px; } } } .tabs-spacer { height: 44px; } .list-scroll { flex: 1; position: fixed; - top: 268rpx; + top: calc(var(--status-bar-height) + 44px + 44px); bottom: 136rpx; padding: 8px 0px 0 0px; margin: 20rpx rpx 0; diff --git a/pages_app/consultDetail/consultDetail.vue b/pages_app/consultDetail/consultDetail.vue index 537f736..211d0c1 100644 --- a/pages_app/consultDetail/consultDetail.vue +++ b/pages_app/consultDetail/consultDetail.vue @@ -58,7 +58,17 @@ - + + + + {{ item.realname }} @@ -72,7 +82,7 @@ {{ item.note }} - + - + 暂无数据 @@ -144,7 +144,7 @@ + + + \ No newline at end of file diff --git a/pages_app/replayText/replayText.vue b/pages_app/replayText/replayText.vue index 886406a..8635c2b 100644 --- a/pages_app/replayText/replayText.vue +++ b/pages_app/replayText/replayText.vue @@ -103,7 +103,7 @@ if (loading.value && !isRefresh) return; loading.value = true; try { - const response = await api.videoByTypeNew({ + const response = await api.patientVideoByJingHuaNew({ page: currentPage.value, pageSize: pageSize.value, typeUuid:typeUuid.value, diff --git a/pages_app/video/video.vue b/pages_app/video/video.vue index e5d552c..daa9ef3 100644 --- a/pages_app/video/video.vue +++ b/pages_app/video/video.vue @@ -11,7 +11,7 @@ > -