diff --git a/api/index.js b/api/index.js
index a6d2ec0..06610f1 100644
--- a/api/index.js
+++ b/api/index.js
@@ -12,9 +12,10 @@ const API = {
saveVision:data => net.POST("/vision",data),// 保存视力测试结果
getLbtList:data => net.GET("/banner/list",data),// 获取轮播图
hospital:data => net.PUT("/user/hospital",data),// 修改医院信息
+ getHospitalInfo:id => net.GET("/hospital/"+id),// 根据ID获取医院信息
getTodoist:data => net.GET("/user/todo",data),// 获取待办事项
- getVisionList:data => net.GET("/vision",data),// 获取测试记录
- todoFinished:data => net.PUT("/vision",data),// 修改待办列表状态
+ getVisionList:data => net.GET("/vision/list",data),// 获取测试记录
+ todoFinished:data => net.PUT("/user/todo",data),// 修改待办列表状态
// 百科
getArticleList:data => net.GET("/article/list",data),// 百科列表
getArticleDetail:data => net.GET("/article/"+data.id),// 文章详情
diff --git a/config/index.js b/config/index.js
index 8cbd931..1b9dce7 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,6 +1,6 @@
// isdev 为 true 表示开发环境 false 表示发布环境
const isdev = true;
-const baseUrl = isdev ? 'http://4a1840b2.r12.cpolar.top' : 'http://eb467b6.r19.cpolar.top';// 办公室接口 & 测试环境
+const baseUrl = isdev ? 'http://4ca5004.r15.cpolar.top' : 'http://eb467b6.r19.cpolar.top';// 办公室接口 & 测试环境
// const baseUrl = isdev ? 'http://192.168.1.133:8899' : 'https://api.gwkjxb.com';// 办公室接口 & 正式环境
// const baseUrl = 'https://api.gwkjxb.com';// 正式环境(由于本地测试后台没有启动,暂时通用正式服)
diff --git a/pages.json b/pages.json
index 1c558a3..0840bd2 100644
--- a/pages.json
+++ b/pages.json
@@ -81,6 +81,13 @@
"navigationBarTitleText": "测试记录",
"enablePullDownRefresh": true
}
+ },
+ {
+ "path": "pages/index/note_list",
+ "style": {
+ "navigationBarTitleText": "注意事项",
+ "enablePullDownRefresh": true
+ }
}
],
"globalStyle": {
diff --git a/pages/index/done.vue b/pages/index/done.vue
index 1a9617d..e52d933 100644
--- a/pages/index/done.vue
+++ b/pages/index/done.vue
@@ -13,13 +13,10 @@
const store = useStore()
// 生命周期
onLoad((e) => {
- // console.log(e)
c_index.value = parseInt(e.state_index)
list_box.value[c_index.value].queryParams.isFinish = c_index.value?0:1
- // console.log(store.systemInfo)
if(store.systemInfo) {
swiper_h.value = store.systemInfo.windowHeight
- // console.log(swiper_h.value)
}
getList()
})
@@ -116,7 +113,6 @@
}
function tabChange(currentIndex) {
c_index.value = currentIndex
- console.log('tabChange is done!!!!!!!')
// if(list_box.value[c_index.value].list.length === 0) {
// queryStateInitFunc()
// getList()
@@ -125,7 +121,6 @@
}
function scroll_func(e) {
c_index.value = e.detail.current
- console.log('scroll_func is done!!!!!!!')
if(list_box.value[c_index.value].list.length === 0) {
queryStateInitFunc()
getList()
@@ -144,9 +139,7 @@
title:'温馨提示',
content:"确定要完成该事务吗?",
success:async function(res) {
- // console.log(res)
if(res.confirm) {
- // console.log(handle_info.value)
const res_ = await api.todoFinished({
id:handle_info.value.ID,
isFinish:1
@@ -157,7 +150,6 @@
duration:2000,
mask:true,
success() {
- console.log(res_)
if(res_.code === 0) {
list_box.value[c_index.value].list.splice(handle_info_index.value,1)
list_box.value[0].list = []
@@ -203,9 +195,8 @@
{{util.timestampToDate(handle_info?.CreatedAt)}}
- 完成
+ 完成该事务
-
@@ -242,6 +233,9 @@
.pb-title{
text-align: center;
margin-bottom: 40rpx;
+ padding-top: 20rpx;
+ font-size: 32rpx;
+ font-weight: 900;
}
background-color: white;
padding: 20rpx;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6867caf..b5fca0b 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -110,6 +110,7 @@
userId:user_info.userId,
hospitalId:choosed_h.value?.ID
}
+ // console.log(h_query);return
const res = await api.hospital(h_query)
if(res.code == 0) {
uni.showToast({
@@ -157,6 +158,11 @@
url:"/pages/index/visionList"
})
}
+ function toNote(index) {
+ uni.navigateTo({
+ url:"/pages/index/note_list?index="+index
+ })
+ }
@@ -199,15 +205,15 @@
注意事项
-
+
术前注意事项
-
+
术中注意事项
-
+
术后注意事项
diff --git a/pages/index/note_list.vue b/pages/index/note_list.vue
new file mode 100644
index 0000000..9732221
--- /dev/null
+++ b/pages/index/note_list.vue
@@ -0,0 +1,281 @@
+
+
+
+
+
+
+
+
+
+ {{item.content}}
+
+
+ {{util.timestampToDate(item.CreatedAt)}}
+
+
+
+
+
+
+
+ 注意事项
+
+
+
+
+ {{handle_info?.content}}
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/user/feedback.vue b/pages/user/feedback.vue
index 355a558..12a2fd0 100644
--- a/pages/user/feedback.vue
+++ b/pages/user/feedback.vue
@@ -8,7 +8,7 @@
-
+
提交
diff --git a/pages/user/userInfo.vue b/pages/user/userInfo.vue
index caa7e22..10330e0 100644
--- a/pages/user/userInfo.vue
+++ b/pages/user/userInfo.vue
@@ -1,7 +1,7 @@
@@ -34,7 +96,7 @@
-
+
@@ -45,29 +107,51 @@
-
+
手术时间
- 2023-10-1
+ {{h_info?.surgery_time}}
-
+
手术医院
- 金山医院
+ {{h_info?.name}}
+
+
+
+ {{input_title}}
+
+
+
+
+
+
+
+
+
+ 提交
+
+
+
+
+
+ {{h_info?.surgery_time}}
+
\ No newline at end of file
diff --git a/pages/wikipedia/detail.vue b/pages/wikipedia/detail.vue
index 3f72111..7f28a10 100644
--- a/pages/wikipedia/detail.vue
+++ b/pages/wikipedia/detail.vue
@@ -6,6 +6,7 @@
// import mySwiper from "@/components/mySwiper.vue"
import {ref,onMounted,nextTick} from "vue"
import {useStore} from '@/store/index.js'
+ import emptyCard from "@/components/emptyCard.vue"
import api from "@/api/index.js"
import util from "@/utils"
onLoad((e) => {
@@ -60,6 +61,7 @@
+