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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+ {{ formatDate(item.releaseTime) }}
+
+
+ 查看
+
+
+
+
+
+
+
+
+
+
+
+ 暂无数据
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@
>
-
+
@@ -74,7 +74,7 @@
mode="aspectFill"
>
-
+
- {{
- typeName
+ {{
+ formatName(typeName)
}}
-
+
-
+
+
@@ -273,11 +280,12 @@
:key="item.uuid"
:class="{ active: selectYearContent.uuid == item.uuid }"
@click="selectContent(item)"
+
>
{{ formatName(item.name) }}
- 该分类暂无内容
+ 暂无内容
@@ -289,7 +297,7 @@
+
+
+
\ No newline at end of file
diff --git a/pages_app/zhinanList/zhinanList.vue b/pages_app/zhinanList/zhinanList.vue
index 3422be1..fcedae2 100644
--- a/pages_app/zhinanList/zhinanList.vue
+++ b/pages_app/zhinanList/zhinanList.vue
@@ -23,15 +23,15 @@
-
+
搜索
- {{ innerSortTitle }}
+ {{ innerSortTitle }}
-
+
@@ -61,7 +61,8 @@
-
+
+
{
@@ -174,6 +177,7 @@ const downLoadtaskList=computed(()=>{
});
const chooseInnerSort = (index) => {
sort.value = index;
+ isSetStatus.value = true;
if (index == 1) {
innerSortTitle.value = "下载量";
} else if (index == 2) {
@@ -217,20 +221,20 @@ onShow(() => {
resumeDownloadingTasks();
// 页面显示时,如果列表为空则加载数据
if (guidelinesList.value.length === 0) {
- loadGuidelinesList(true);
+ loadGuidelinesList(false);
}
});
// 跳转到搜索页
const goToSearch = () => {
- const q = keywords.value ? encodeURIComponent(keywords.value) : "";
- const t = title.value ? encodeURIComponent(title.value) : "";
- const type = typeUuid.value
- ? `&typeUuid=${encodeURIComponent(typeUuid.value)}`
- : "";
- uni.navigateTo({
- url: `/pages_app/search/search?keywords=${q}&title=${t}${type}`,
- });
+ // const q = keywords.value ? encodeURIComponent(keywords.value) : "";
+ // const t = title.value ? encodeURIComponent(title.value) : "";
+ // const type = typeUuid.value
+ // ? `&typeUuid=${encodeURIComponent(typeUuid.value)}`
+ // : "";
+ // uni.navigateTo({
+ // url: `/pages_app/search/search?keywords=${q}&title=${t}${type}`,
+ // });
// const goSearch=()=>{
// uni.sendNativeEvent('goHomeSearch', {
// msg: 'goHomeSearch'
@@ -238,6 +242,15 @@ const goToSearch = () => {
// console.log(ret);
// })
// }
+ uni.sendNativeEvent(
+ "goHomeSearch",
+ {
+ msg: "zhinan",
+ },
+ (ret) => {
+ console.log(ret);
+ }
+ );
};
// scroll-view 下拉刷新
@@ -317,7 +330,7 @@ const loadGuidelinesList = async (isRefresh = false) => {
page: currentPage.value,
pageSize: pageSize.value,
type: 1, // 诊疗指南类型
- sort: 2,
+ sort: sort.value,
typeUuid: typeUuid.value,
keywords: keywords.value,
};
@@ -326,7 +339,7 @@ const loadGuidelinesList = async (isRefresh = false) => {
console.log("指南列表响应:", res);
if (res.code === 200 && res.data) {
- const newData = res.data.list || res.data;
+ const newData = res.data.list;
if (isRefresh) {
guidelinesList.value = newData;
@@ -335,15 +348,19 @@ const loadGuidelinesList = async (isRefresh = false) => {
guidelinesList.value = [...guidelinesList.value, ...newData];
console.log("加载更多:追加数据到列表");
}
-
+ console.log(222222);
+ console.log(res.data.pageSize);
+ console.log(newData.length);
// 判断是否还有更多数据
- if (newData.length < pageSize.value) {
+ if (newData.length {
}
};
const downLoad = (item) => {
+ console.log(item);
+ console.log(2222);
if(!item.path){
uni.showToast({
title: "暂无下载链接",
@@ -436,6 +455,8 @@ const downLoad = (item) => {
url: docUrl + item.path,
title: item.title,
id: item.uuid,
+ releaseTime: item.releaseTime,
+ type: 'zhinan'
});
};
// 查看指南(支持常用文档直链:pdf/doc/docx/xls/xlsx/ppt/pptx/txt)
@@ -675,7 +696,7 @@ $white: #ffffff;
}
.popup-panel {
position: fixed;
- top:285rpx;
+ top:calc(var(--status-bar-height) + 44px + 106rpx);
left: 0;
right: 0;
background: #fff;
@@ -700,14 +721,21 @@ $white: #ffffff;
.popup-item.active .item-text {
color: #8b2316;
}
+.search-box{
+ flex:1;
+}
.current-sort {
display: flex;
+ flex:1;
align-items: center;
gap: 10rpx;
.sort-text {
- font-size: 28rpx;
- color: #333;
+ font-size: 36rpx;
+ color: #999;
+ &.active {
+ color: #8b2316;
+ }
}
.sort-icon.up {
@@ -766,7 +794,7 @@ $white: #ffffff;
gap: 5px;
.search-text {
- font-size: 14px;
+ font-size: 36rpx;
color: #999;
}
}
diff --git a/static/avastar.png b/static/avastar.png
new file mode 100644
index 0000000..5a07c63
Binary files /dev/null and b/static/avastar.png differ
diff --git a/static/icon_library_down.png b/static/icon_library_down.png
new file mode 100644
index 0000000..89d68f5
Binary files /dev/null and b/static/icon_library_down.png differ
diff --git a/static/zhinanLazy.png b/static/zhinanLazy.png
new file mode 100644
index 0000000..2e32577
Binary files /dev/null and b/static/zhinanLazy.png differ
diff --git a/store/downloadStoreFile.js b/store/downloadStoreFile.js
index 5be592f..613af23 100644
--- a/store/downloadStoreFile.js
+++ b/store/downloadStoreFile.js
@@ -14,6 +14,9 @@ class DownloadStoreFile {
url: '',
status: 'downloading', // downloading, paused, completed, failed
progress: 0,
+ title:'',
+ type:'',
+ releaseTime:'',
task: null,
filePath: '',
createTime: Date.now(),
@@ -93,6 +96,9 @@ class DownloadStoreFile {
filePath: item.filePath,
createTime: item.createTime,
localPath:item.localPath,
+ title:item.title,
+ type:item.type,
+ releaseTime:item.releaseTime,
}));
uni.setStorageSync('downloadFileTasks', tasksToSave);
}
diff --git a/tsconfig.json b/tsconfig.json
index 6922408..4de3dff 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -71,6 +71,11 @@
+
+
+
+
+
diff --git a/utils/config.js b/utils/config.js
index ab053b6..d1f90a1 100644
--- a/utils/config.js
+++ b/utils/config.js
@@ -1,7 +1,6 @@
-console.log('打印app');
-let BASE_URL='https://dev-app.igandan.com/app';
-//let BASE_URL='https://app.igandan.com/app'
+//let BASE_URL='https://dev-app.igandan.com/app';
+let BASE_URL='https://app.igandan.com/app'
// try {
// const app = getApp({allowDefault: true});
diff --git a/utils/docUrl.js b/utils/docUrl.js
index e63746c..3224076 100644
--- a/utils/docUrl.js
+++ b/utils/docUrl.js
@@ -1,6 +1,6 @@
//const app = getApp({allowDefault: true});
-let DOC_URL='https://dev-doc.igandan.com/app/';
-//let DOC_URL='https://doc.igandan.com/app/'
+//let DOC_URL='https://dev-doc.igandan.com/app/';
+let DOC_URL='https://doc.igandan.com/app/'
// if(app.globalData.apiHost.indexOf('dev')>-1){
// DOC_URL='https://dev-doc.igandan.com/app/'
// }else{
diff --git a/utils/formatNumber.js b/utils/formatNumber.js
index 34c59f3..6f7634b 100644
--- a/utils/formatNumber.js
+++ b/utils/formatNumber.js
@@ -3,7 +3,7 @@ const formatNumber = (number) => {
if(number < 10000){
return number;
}else{
- return (number / 10000).toFixed(1) + 'w';
+ return (number / 10000).toFixed(1) + '万';
}
}
export default formatNumber;
\ No newline at end of file
diff --git a/utils/otherHost.js b/utils/otherHost.js
index 9693cac..11eb0ef 100644
--- a/utils/otherHost.js
+++ b/utils/otherHost.js
@@ -1,5 +1,5 @@
-let OTHER_HOST='https://dev-wx.igandan.com'
-//let OTHER_HOST='https://wx.igandan.com'
+//let OTHER_HOST='https://dev-wx.igandan.com'
+let OTHER_HOST='https://wx.igandan.com'
//const app = getApp({allowDefault: true});
// if(app.globalData.apiHost && app.globalData.apiHost.indexOf('dev')>-1){
// OTHER_HOST='https://dev-wx.igandan.com'
diff --git a/utils/request.js b/utils/request.js
index 091092d..d9d0178 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -89,7 +89,7 @@ export const request = (url, data = {}, method = 'post', loading = false, conten
}
-
+ console.log(postData);
return new Promise(function(e, n) {
let timestamp = Date.now();
uni.request({
@@ -141,6 +141,8 @@ export const request = (url, data = {}, method = 'post', loading = false, conten
})
plus.runtime.quit();
+ }else if(res.data.code==106){
+ e(res.data)
}else{
uni.showToast({
title: res.data.message,