diff --git a/config.js b/config.js
index f9b2129..7cc9c74 100644
--- a/config.js
+++ b/config.js
@@ -35,6 +35,8 @@ module.exports = {
// 上传文件地址
uploadUrl: 'http://192.168.0.14:19999/exam-file/file/uploadBase64',
bmwUrl: 'http://192.168.0.14:19999/exam-bmw',
+ // 体检-基础路径
+ tjBaseUrl: 'http://192.168.0.14:20000/AppPeaManager',
// 应用信息
appInfo: {
// 应用名称
diff --git a/pages.json b/pages.json
index addfdf7..27d7821 100644
--- a/pages.json
+++ b/pages.json
@@ -5,7 +5,7 @@
"pages": [
// pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
// {
- // "path": "pages/YNEduApp/index/index",
+ // "path": "pages/YNEduApp/index/index",
// "style": {
// "navigationStyle" : "custom"
// }
@@ -199,11 +199,34 @@
}
},
{
- "path" : "pages/HealthExaminationApp/index/index",
- "style" :
- {
- "navigationStyle": "custom"
- }
+ "path": "pages/HealthExaminationApp/index/index",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/HealthExaminationApp/appointment/appointment",
+ "style": {
+ "navigationBarTitleText": "体检预约"
+ }
+ },
+ {
+ "path": "pages/HealthExaminationApp/report/report",
+ "style": {
+ "navigationBarTitleText": "提交报告"
+ }
+ },
+ {
+ "path": "pages/HealthExaminationApp/myAppointment/myAppointment",
+ "style": {
+ "navigationBarTitleText": "我的预约"
+ }
+ },
+ {
+ "path": "pages/HealthExaminationApp/jobAppointment/jobAppointment",
+ "style": {
+ "navigationBarTitleText": "职业预约"
+ }
}
],
"globalStyle": {
diff --git a/pages/HealthExaminationApp/appointment/appointment.vue b/pages/HealthExaminationApp/appointment/appointment.vue
new file mode 100644
index 0000000..5b11614
--- /dev/null
+++ b/pages/HealthExaminationApp/appointment/appointment.vue
@@ -0,0 +1,19 @@
+
+
+ 体检预约
+
+
+
+
+
+
diff --git a/pages/HealthExaminationApp/index/index.vue b/pages/HealthExaminationApp/index/index.vue
new file mode 100644
index 0000000..b8bf5c4
--- /dev/null
+++ b/pages/HealthExaminationApp/index/index.vue
@@ -0,0 +1,117 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/HealthExaminationApp/jobAppointment/jobAppointment.vue b/pages/HealthExaminationApp/jobAppointment/jobAppointment.vue
new file mode 100644
index 0000000..8dd0490
--- /dev/null
+++ b/pages/HealthExaminationApp/jobAppointment/jobAppointment.vue
@@ -0,0 +1,19 @@
+
+
+ 职业预约
+
+
+
+
+
+
diff --git a/pages/HealthExaminationApp/myAppointment/myAppointment.vue b/pages/HealthExaminationApp/myAppointment/myAppointment.vue
new file mode 100644
index 0000000..a75ba8d
--- /dev/null
+++ b/pages/HealthExaminationApp/myAppointment/myAppointment.vue
@@ -0,0 +1,19 @@
+
+
+ 我的预约
+
+
+
+
+
+
diff --git a/pages/HealthExaminationApp/report/report.vue b/pages/HealthExaminationApp/report/report.vue
new file mode 100644
index 0000000..748742a
--- /dev/null
+++ b/pages/HealthExaminationApp/report/report.vue
@@ -0,0 +1,19 @@
+
+
+ 提交报告
+
+
+
+
+
+
diff --git a/pages/YNEduApp/prac/prac.vue b/pages/YNEduApp/prac/prac.vue
index 6d18f8b..f893e5a 100644
--- a/pages/YNEduApp/prac/prac.vue
+++ b/pages/YNEduApp/prac/prac.vue
@@ -15,7 +15,7 @@
{{ item.alreadyNum > 0 ? '已练习' : '未练习' }}
- 练习时长 {{ item.practiceDuration }}
+ 练习时长 {{ item.practiceDuration || 0 }}分钟
共{{ item.totalNum || 0 }}题, 已练习{{ item.alreadyNum || 0 }}题
diff --git a/pages/gzt/index.vue b/pages/gzt/index.vue
index a8743f3..844c802 100644
--- a/pages/gzt/index.vue
+++ b/pages/gzt/index.vue
@@ -196,6 +196,11 @@
username: uni.getStorageSync('userPhone'),
jwtToken: uni.getStorageSync('App-Token')
}
+ const tjparams = {
+ username: '14755181965',
+ password: 'YNsbd@123456'
+ }
+ console.log('🚀 ~ gotoYy ~ tjparams:', tjparams)
if (name == '考试培训移动端') {
uni.request({
url: config.login + '/login',
@@ -235,38 +240,38 @@
}
})
} else if( name == '健康体检移动端') {
- // uni.request({
- // url: config.login + '/login',
- // method: 'POST',
- // data: JSON.stringify(params),
- // header: {
- // 'Content-Type': 'application/json'
- // },
- // success: res => {
- // console.log(res)
- // let req = res.data
- // console.log('🚀 ~ getUserInfo ~ req:', req)
- // if (req.code == 200) {
- // setTimeout(() => {
- // uni.reLaunch({
- // url: '/pages/HealthExaminationApp/index/index'
- // })
- // }, 500)
- // } else {
- // uni.showToast({
- // title: req.msg,
- // icon: 'none'
- // })
- // }
- // },
- // fail: err => {
- // console.log('🚀 ~ gotoYy ~ err:', err)
- // uni.showToast({
- // title: err.msg,
- // icon: 'none'
- // })
- // }
- // })
+ uni.request({
+ url: config.tjBaseUrl + '/login',
+ method: 'POST',
+ data: tjparams,
+ header: {
+ 'Content-Type': 'application/x-www-form-urlencoded'
+ },
+ success: res => {
+ console.log(res)
+ let req = res.data
+ console.log('🚀 ~ getUserInfo ~ req:', req)
+ if (req.code == 200) {
+ // setTimeout(() => {
+ // uni.reLaunch({
+ // url: '/pages/HealthExaminationApp/index/index'
+ // })
+ // }, 500)
+ } else {
+ uni.showToast({
+ title: req.message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: err => {
+ console.log('🚀 ~ gotoYy ~ err:', err)
+ uni.showToast({
+ title: err.message,
+ icon: 'none'
+ })
+ }
+ })
setTimeout(() => {
uni.reLaunch({
url: '/pages/HealthExaminationApp/index/index'
diff --git a/static/images-tijian/careerExam.png b/static/images-tijian/careerExam.png
new file mode 100644
index 0000000..defd62c
Binary files /dev/null and b/static/images-tijian/careerExam.png differ
diff --git a/static/images-tijian/home-bg.png b/static/images-tijian/home-bg.png
new file mode 100644
index 0000000..eab798f
Binary files /dev/null and b/static/images-tijian/home-bg.png differ
diff --git a/static/images-tijian/home-selected.png b/static/images-tijian/home-selected.png
new file mode 100644
index 0000000..dcdf027
Binary files /dev/null and b/static/images-tijian/home-selected.png differ
diff --git a/static/images-tijian/home-unselected.png b/static/images-tijian/home-unselected.png
new file mode 100644
index 0000000..3bb10b3
Binary files /dev/null and b/static/images-tijian/home-unselected.png differ
diff --git a/static/images-tijian/my-selected.png b/static/images-tijian/my-selected.png
new file mode 100644
index 0000000..aa25ded
Binary files /dev/null and b/static/images-tijian/my-selected.png differ
diff --git a/static/images-tijian/my-unselected.png b/static/images-tijian/my-unselected.png
new file mode 100644
index 0000000..080713d
Binary files /dev/null and b/static/images-tijian/my-unselected.png differ
diff --git a/static/images-tijian/myPreOrder.png b/static/images-tijian/myPreOrder.png
new file mode 100644
index 0000000..3a82a57
Binary files /dev/null and b/static/images-tijian/myPreOrder.png differ
diff --git a/static/images-tijian/preOrder.png b/static/images-tijian/preOrder.png
new file mode 100644
index 0000000..2af63c1
Binary files /dev/null and b/static/images-tijian/preOrder.png differ
diff --git a/static/images-tijian/report.png b/static/images-tijian/report.png
new file mode 100644
index 0000000..2f2e772
Binary files /dev/null and b/static/images-tijian/report.png differ
diff --git a/static/images-tijian/swiper-1.png b/static/images-tijian/swiper-1.png
new file mode 100644
index 0000000..6e6171f
Binary files /dev/null and b/static/images-tijian/swiper-1.png differ
diff --git a/static/images-tijian/swiper-2.png b/static/images-tijian/swiper-2.png
new file mode 100644
index 0000000..532346a
Binary files /dev/null and b/static/images-tijian/swiper-2.png differ
diff --git a/static/images-tijian/swiper-3.png b/static/images-tijian/swiper-3.png
new file mode 100644
index 0000000..d40e20f
Binary files /dev/null and b/static/images-tijian/swiper-3.png differ