From b18427122c04e2b2f9589ebe77dce882511f3b94 Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Tue, 3 Sep 2024 15:20:18 +0800
Subject: [PATCH 01/10] =?UTF-8?q?pdf+=E5=9B=BE=E7=89=87=E5=AD=A6=E4=B9=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |   7 +
 .../YNEduApp/learnProj/components/PdfView.vue |   2 +-
 pages/YNEduApp/learnProj/imageStudy.vue       | 154 ++++++++++++++++++
 pages/YNEduApp/learnProj/learnProjDetail.vue  |   2 +
 pages/YNEduApp/learnProj/pdfStudy.vue         |  70 ++++----
 pages/YNEduApp/prac/exercises.vue             |  64 ++++----
 6 files changed, 239 insertions(+), 60 deletions(-)
 create mode 100644 pages/YNEduApp/learnProj/imageStudy.vue

diff --git a/pages.json b/pages.json
index 2fd41dd..3ba06e9 100644
--- a/pages.json
+++ b/pages.json
@@ -234,6 +234,13 @@
     	{
     		"navigationBarTitleText" : "公告通知"
     	}
+    },
+    {
+    	"path" : "pages/YNEduApp/learnProj/imageStudy",
+    	"style" : 
+    	{
+    		"navigationBarTitleText" : "图片学习"
+    	}
     }
   ],
   "globalStyle": {
diff --git a/pages/YNEduApp/learnProj/components/PdfView.vue b/pages/YNEduApp/learnProj/components/PdfView.vue
index fa163ca..c5e9e50 100644
--- a/pages/YNEduApp/learnProj/components/PdfView.vue
+++ b/pages/YNEduApp/learnProj/components/PdfView.vue
@@ -80,7 +80,7 @@ export default {
     handlePostMessage(data) {
       let arr = data.detail.data.pop()
       this.totalPage = arr[0].totalPage //总页数
-      this.currentReadPage = arr[1].page + 1 //当前页数
+      this.currentReadPage = arr[1].page //当前页数
       console.log('app:', this.totalPage, this.currentReadPage)
     },
     //h5 监听
diff --git a/pages/YNEduApp/learnProj/imageStudy.vue b/pages/YNEduApp/learnProj/imageStudy.vue
new file mode 100644
index 0000000..1a6fa6a
--- /dev/null
+++ b/pages/YNEduApp/learnProj/imageStudy.vue
@@ -0,0 +1,154 @@
+<template>
+  <view class="content">
+    <u--image :showLoading="true" :src="path" width="300px" height="600px" @click="handleImage"></u--image>
+  </view>
+</template>
+
+<script>
+import config from '@/config'
+
+export default {
+  data() {
+    return {
+      isShow: true,
+      path: '',
+      params: {},
+      timer: null,
+      isEnd: false,
+      isShowImg: false
+    }
+  },
+  onLoad(opt) {
+    opt = JSON.parse(opt.params)
+    console.log('🚀 ~ onLoad ~ opt:', opt)
+    this.params = JSON.parse(JSON.stringify(opt))
+    this.params.studyDuration = Number(opt.studyDuration)
+    this.params.allStudyDuration = Number(opt.allStudyDuration)
+    this.path = config.fileUrl + opt.path
+    // this.path = opt.path
+    console.log('🚀 ~ onLoad ~ this.params:', this.path)
+    console.log('🚀 ~ onLoad ~ this.params:', Number(opt.studyDuration), Number(opt.allStudyDuration))
+
+    if (Number(opt.studyDuration) <= Number(opt.allStudyDuration)) {
+      this.isEnd = false
+      setTimeout(() => {
+        this.countDown()
+      }, 1000)
+    } else {
+      this.isEnd = true
+      // 提示-学习时长已满
+      uni.showToast({
+        title: '学习时长已满, 随时可以结束学习',
+        icon: 'none'
+      })
+    }
+  },
+  onShow() {
+    console.log('🚀 ~ onShow ~ 页面显示')
+    this.isShowImg = false
+  },
+  // 卸载 隐藏是调用 onHide
+  onHide() {
+    console.log('🚀 ~ onHide ~ 页面关闭')
+    if (this.isEnd) {
+      return
+    }
+    // 关闭页面时，修改项目进度
+    if (!this.isShowImg) {
+      clearInterval(this.timer)
+      this.updStudyDuration()
+    }
+  },
+  onUnload() {
+    console.log('🚀 ~ onUnload ~ onUnload-页面关闭:')
+    if (this.isEnd) {
+      return
+    }
+    // 关闭页面时，修改项目进度
+    if (!this.isShowImg) {
+      clearInterval(this.timer)
+      this.updStudyDuration()
+    }
+  },
+  methods: {
+    // 根据allStudyDuration 倒计时
+    countDown() {
+      let allStudyDuration = Number(this.params.allStudyDuration) - Number(this.params.studyDuration)
+      // let studyDuration = Number(this.params.studyDuration)
+      this.timer = setInterval(() => {
+        allStudyDuration--
+        // studyDuration++
+        this.params.studyDuration++
+        // this.$set(this.params, 'studyDuration', studyDuration)
+        console.log('🚀 ~ countDown ~ this.params.studyDuration:', this.params.studyDuration)
+        if (allStudyDuration <= 0) {
+          this.isEnd = true
+          clearInterval(this.timer)
+          // 提示-学习时长已满
+          uni.showToast({
+            title: '学习时长已满',
+            icon: 'none'
+          })
+          setTimeout(() => {
+            this.updStudyDuration()
+          }, 1000)
+        }
+        console.log('🚀 ~ countDown ~ 剩余时间-->:', allStudyDuration)
+        console.log('🚀 ~ countDown ~ this.params.studyDuration:', this.params.studyDuration)
+      }, 1000)
+    },
+    // 修改项目进度
+    updStudyDuration() {
+      const params = {
+        userId: this.params.userId,
+        studyId: this.params.studyId,
+        stageId: this.params.stageId,
+        stageContentId: this.params.stageContentId,
+        stageType: this.params.stageType,
+        studyCourseId: this.params.studyCourseId,
+        sourceId: this.params.sourceId,
+        studyDuration: this.params.studyDuration,
+        studyPercentage:
+          Math.ceil((Number(this.params.studyDuration) / Number(this.params.allStudyDuration)) * 100).toFixed(2) > 100
+            ? 100
+            : Math.ceil((Number(this.params.studyDuration) / Number(this.params.allStudyDuration)) * 100).toFixed(2)
+      }
+      console.log('🚀 ~ updStudyDuration ~ params:', params)
+      uni.request({
+        url: config.baseUrl + '/exam-student/student/updStudyDuration',
+        method: 'post',
+        data: params,
+        header: {
+          'Content-Type': 'application/x-www-form-urlencoded',
+          Authorization: uni.getStorageSync('access_token')
+        },
+        success: res => {
+          console.log('🚀 ~ handleEnd ~ res:', res)
+          this.isShow = false
+          uni.reLaunch({
+            url: '/pages/YNEduApp/learnProj/learnProjDetail?id=' + this.params.studyId
+          })
+        },
+        fail: err => {
+          console.log('🚀 ~ handleEnd ~ err:', err)
+        }
+      })
+    },
+    // 展示图片
+    handleImage() {
+      this.isShowImg = true
+      uni.previewImage({
+        urls: [this.path]
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.content {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+</style>
diff --git a/pages/YNEduApp/learnProj/learnProjDetail.vue b/pages/YNEduApp/learnProj/learnProjDetail.vue
index 5d43504..9a6fbef 100644
--- a/pages/YNEduApp/learnProj/learnProjDetail.vue
+++ b/pages/YNEduApp/learnProj/learnProjDetail.vue
@@ -286,6 +286,8 @@ export default {
         url = '/pages/YNEduApp/learn/learn'
       } else if (item.path.includes('.pdf')) {
         url = '/pages/YNEduApp/learnProj/pdfStudy'
+      } else {
+        url = '/pages/YNEduApp/learnProj/imageStudy'
       }
 
       uni.navigateTo({
diff --git a/pages/YNEduApp/learnProj/pdfStudy.vue b/pages/YNEduApp/learnProj/pdfStudy.vue
index 8725906..05c8045 100644
--- a/pages/YNEduApp/learnProj/pdfStudy.vue
+++ b/pages/YNEduApp/learnProj/pdfStudy.vue
@@ -1,7 +1,7 @@
 <template>
   <view>
     <div>
-      <PdfView v-if="isShow" :path="path"/>
+      <PdfView v-if="isShow" :path="path" />
     </div>
   </view>
 </template>
@@ -26,30 +26,37 @@ export default {
     this.params = JSON.parse(JSON.stringify(opt))
     this.params.studyDuration = Number(opt.studyDuration)
     this.params.allStudyDuration = Number(opt.allStudyDuration)
-    // this.path =
-    //   config.fileUrl + opt.path + `&studyDuration=${opt.studyDuration}&allStudyDuration=${opt.allStudyDuration}`
-    this.path = opt.path
+    // 如果路径中带有http或者https则直接使用路径，否则拼接路径
+    if (opt.path.indexOf('http') !== -1) {
+      this.path = opt.path
+    } else {
+      this.path = config.fileUrl + opt.path
+    }
     console.log('🚀 ~ onLoad ~ this.params:', this.path)
     console.log('🚀 ~ onLoad ~ this.params:', Number(opt.studyDuration), Number(opt.allStudyDuration))
-
-    // if (Number(opt.studyDuration) <= Number(opt.allStudyDuration)) {
-    //   setTimeout(() => {
-    //     this.countDown()
-    //   }, 1000)
-    // } else {
-    //   // 提示-学习时长已满
-    //   uni.showToast({
-    //     title: '学习时长已满, 随时可以结束学习',
-    //     icon: 'none'
-    //   })
-    // }
+    if (Number(opt.studyDuration) <= Number(opt.allStudyDuration)) {
+      setTimeout(() => {
+        this.countDown()
+      }, 1000)
+    } else {
+      // 提示-学习时长已满
+      uni.showToast({
+        title: '学习时长已满, 随时可以结束学习',
+        icon: 'none'
+      })
+    }
+  },
+  onHide() {
+    clearInterval(this.timer)
+    // 关闭页面时，修改项目进度
+    this.updStudyDuration()
   },
   // 卸载
   onUnload() {
     console.log('🚀 ~ onUnload ~ 页面关闭')
     clearInterval(this.timer)
     // 关闭页面时，修改项目进度
-    // this.updStudyDuration()
+    this.updStudyDuration()
   },
   methods: {
     // 根据allStudyDuration 倒计时
@@ -58,23 +65,23 @@ export default {
       // let studyDuration = Number(this.params.studyDuration)
       this.timer = setInterval(() => {
         allStudyDuration--
-				// studyDuration++
-				this.params.studyDuration++
-				// this.$set(this.params, 'studyDuration', studyDuration)
-				console.log('🚀 ~ countDown ~ this.params.studyDuration:', this.params.studyDuration)
+        // studyDuration++
+        this.params.studyDuration++
+        // this.$set(this.params, 'studyDuration', studyDuration)
+        console.log('🚀 ~ countDown ~ this.params.studyDuration:', this.params.studyDuration)
         if (allStudyDuration <= 0) {
           clearInterval(this.timer)
-          // 提示-学习时长已满
-          uni.showToast({
-            title: '学习时长已满',
-            icon: 'none'
-          })
           setTimeout(() => {
             this.updStudyDuration()
+            // 提示-学习时长已满
+            uni.showToast({
+              title: '学习时长已满',
+              icon: 'none'
+            })
           }, 1000)
         }
         console.log('🚀 ~ countDown ~ 剩余时间-->:', allStudyDuration)
-				console.log('🚀 ~ countDown ~ this.params.studyDuration:', this.params.studyDuration)
+        console.log('🚀 ~ countDown ~ this.params.studyDuration:', this.params.studyDuration)
       }, 1000)
     },
     // 修改项目进度
@@ -88,9 +95,10 @@ export default {
         studyCourseId: this.params.studyCourseId,
         sourceId: this.params.sourceId,
         studyDuration: this.params.studyDuration,
-        studyPercentage: Math.ceil(
-          (Number(this.params.studyDuration) / Number(this.params.allStudyDuration)) * 100
-        ).toFixed(2)
+        studyPercentage:
+          Math.ceil((Number(this.params.studyDuration) / Number(this.params.allStudyDuration)) * 100).toFixed(2) > 100
+            ? 100
+            : Math.ceil((Number(this.params.studyDuration) / Number(this.params.allStudyDuration)) * 100).toFixed(2)
       }
       console.log('🚀 ~ updStudyDuration ~ params:', params)
       uni.request({
@@ -104,7 +112,7 @@ export default {
         success: res => {
           console.log('🚀 ~ handleEnd ~ res:', res)
           this.isShow = false
-          uni.navigateTo({
+          uni.reLaunch({
             url: '/pages/YNEduApp/learnProj/learnProjDetail?id=' + this.params.studyId
           })
         },
diff --git a/pages/YNEduApp/prac/exercises.vue b/pages/YNEduApp/prac/exercises.vue
index 062c463..40422b0 100644
--- a/pages/YNEduApp/prac/exercises.vue
+++ b/pages/YNEduApp/prac/exercises.vue
@@ -230,6 +230,7 @@ export default {
       correctRate: '0',
       // 已用时间 - 计时器 - 用于显示已用时间 格式 00:00:00
       usedTime: '00:00:00',
+      serviceTime: 0,
       // 正确题数
       trueNum: 0,
       // 错误题数
@@ -412,24 +413,36 @@ export default {
     // 开始计时 - 实时更新已用时间
     startTimer() {
       this.intervalId = setInterval(() => {
-        const time = this.usedTime.split(':')
-        let hours = parseInt(time[0])
-        let minutes = parseInt(time[1])
-        let seconds = parseInt(time[2])
-        seconds++
-        if (seconds === 60) {
-          seconds = 0
-          minutes++
-          if (minutes === 60) {
-            minutes = 0
-            hours++
-          }
-        }
-        this.usedTime = `${hours < 10 ? '0' + hours : hours}:${minutes < 10 ? '0' + minutes : minutes}:${
-          seconds < 10 ? '0' + seconds : seconds
-        }`
+        this.serviceTime++
+        this.handleTime()
+        // const time = this.usedTime.split(':')
+        // let hours = parseInt(time[0])
+        // let minutes = parseInt(time[1])
+        // let seconds = parseInt(time[2])
+        // seconds++
+        // if (seconds === 60) {
+        //   seconds = 0
+        //   minutes++
+        //   if (minutes === 60) {
+        //     minutes = 0
+        //     hours++
+        //   }
+        // }
+        // this.usedTime = `${hours < 10 ? '0' + hours : hours}:${minutes < 10 ? '0' + minutes : minutes}:${
+        //   seconds < 10 ? '0' + seconds : seconds
+        // }`
       }, 1000)
     },
+    // 处理时间
+    handleTime() {
+      // this.serviceTime 是秒数
+      let hours = parseInt(this.serviceTime / 3600)
+      let minutes = parseInt((this.serviceTime % 3600) / 60)
+      let seconds = parseInt(this.serviceTime % 60)
+      this.usedTime = `${hours < 10 ? '0' + hours : hours}:${minutes < 10 ? '0' + minutes : minutes}:${
+        seconds < 10 ? '0' + seconds : seconds
+      }`
+    },
     clickImg(url) {
       console.log('🚀 ~ clickImg ~ url:', url)
       uni.previewImage({
@@ -580,6 +593,8 @@ export default {
     },
     // 提交
     async handleSubmit() {
+      // 暂停时间
+      clearInterval(this.intervalId)
       console.log('提交')
       this.answerNum = this.trueNum + this.falseNum
       let rate = ((Number(this.trueNum) / Number(this.answerNum)) * 100).toFixed(2)
@@ -609,24 +624,17 @@ export default {
     handleConfirm() {
       console.log('确认')
       this.showModal = false
+      // 继续计时
+      this.startTimer()
     },
     // 结束答题
     handleClose() {
       this.isEnd = true
       // 停止计时
-      clearInterval()
-      console.log('结束', this.usedTime)
+      clearInterval(this.intervalId)
+      console.log('结束', this.usedTime, this.serviceTime)
       // 保存练习时长
-      // savePracticeDuration({
-      //   id: this.practiceId,
-      //   practiceDuration: Math.ceil(this.usedTime.split(':')[0] * 60 + this.usedTime.split(':')[1] / 60)
-      // })
-      // 将this.usedTime 00:00:00 转换为分钟
-      let time = this.usedTime.split(':').reduce((acc, cur, index) => {
-        return acc + cur * Math.pow(60, 2 - index)
-      }, 0)
-      // 再将秒数转换为分钟, 不足一分钟算一分钟
-      time = Math.ceil(time / 60)
+      let time = Math.ceil(this.serviceTime / 60)
       console.log('🚀 ~ handleClose ~ time:', time)
       const params = {
         id: this.recordId,

From bcfa1ef05013c90e80e23ffddb443ecc8a6e35d9 Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Tue, 3 Sep 2024 16:07:30 +0800
Subject: [PATCH 02/10] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/YNEduApp/exam/examination.vue              | 6 ++++++
 pages/YNEduApp/exam/examinationList.vue          | 2 +-
 pages/YNEduApp/exam/examinationResultDetails.vue | 6 +++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pages/YNEduApp/exam/examination.vue b/pages/YNEduApp/exam/examination.vue
index c3f03c4..fa7477e 100644
--- a/pages/YNEduApp/exam/examination.vue
+++ b/pages/YNEduApp/exam/examination.vue
@@ -336,6 +336,9 @@ export default {
         questionId: item.id,
         selectAnswer
       }
+      if (item.examType == 3) {
+        params.selectAnswer = selectAnswer == 'A' ? '对' : '错'
+      }
       console.log('🚀 ~ handleSelectOption ~ params:', params)
       // insertQuestionAnswerById(params)
       uni.request({
@@ -345,6 +348,9 @@ export default {
         header: {
           'Content-Type': 'application/x-www-form-urlencoded',
           Authorization: uni.getStorageSync('access_token')
+        },
+        success: res => {
+          console.log('🚀 ~ handleSelectOption ~ res:', res)
         }
       })
     },
diff --git a/pages/YNEduApp/exam/examinationList.vue b/pages/YNEduApp/exam/examinationList.vue
index f256bec..3a6374f 100644
--- a/pages/YNEduApp/exam/examinationList.vue
+++ b/pages/YNEduApp/exam/examinationList.vue
@@ -18,7 +18,7 @@
           </div>
           <div class="item">
             得分/总分：
-            <span class="item-info">{{ item.score }}/{{ item.examGrade }}</span>
+            <span class="item-info">{{ item.examGrade }}/{{ item.score }}</span>
           </div>
           <div class="item">
             得分率：
diff --git a/pages/YNEduApp/exam/examinationResultDetails.vue b/pages/YNEduApp/exam/examinationResultDetails.vue
index 41b1a4a..1982014 100644
--- a/pages/YNEduApp/exam/examinationResultDetails.vue
+++ b/pages/YNEduApp/exam/examinationResultDetails.vue
@@ -95,9 +95,9 @@
             </div>
             <div v-else :style="{ color: item.isRight ? '#48d66b' : '#fa4f19' }" class="grade">
               <div v-if="item.selectAnswer">
-                <div v-for="(grade, gradeIndex) in item.selectAnswer.split('')" :key="gradeIndex">
+                <span v-for="(grade, gradeIndex) in item.selectAnswer.split('')" :key="gradeIndex">
                   {{ grade }}{{ gradeIndex + 1 == item.selectAnswer.split('').length ? '' : ',&nbsp;' }}
-                </div>
+                </span>
               </div>
             </div>
           </div>
@@ -115,7 +115,7 @@
         <div class="btn" v-show="currentIndex != 0">
           <u-button size="small" shape="circle" text="上一题" @click="currentIndex--" />
         </div>
-        <div class="btn" v-if="currentIndex !== questionList.length - 1">
+        <div class="btn" v-if="currentIndex !== list.length - 1">
           <u-button type="primary" size="small" shape="circle" text="下一题" @click="currentIndex++" />
         </div>
       </div>

From 76ccdca6627cd160745b7d852187514891c5572d Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Wed, 4 Sep 2024 15:18:01 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E4=BD=93=E6=A3=80=E4=B8=8E=E5=9F=B9?=
 =?UTF-8?q?=E8=AE=ADbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                             |  11 +
 package.json                                  |   1 +
 pages.json                                    |   7 +
 .../appointment/appointment.vue               | 508 +++++++++++++++++-
 pages/HealthExaminationApp/index/index.vue    |  68 ++-
 .../myAppointment/bookSuccessfully.vue        |  51 ++
 .../myAppointment/myAppointment.vue           |  15 +-
 pages/YNEduApp/exam/beforeExam.vue            |   6 +-
 pages/YNEduApp/exam/exam.vue                  |  17 +-
 pages/YNEduApp/exam/examination.vue           |  76 +--
 pages/YNEduApp/exam/examinationDetails.vue    |  33 +-
 pages/YNEduApp/index/index.vue                |   2 +-
 pages/YNEduApp/learn/learn.vue                |  33 +-
 pages/YNEduApp/learnProj/learnProjDetail.vue  |   3 +-
 pages/YNEduApp/prac/exercises.vue             |  33 ++
 pages/gzt/index.vue                           |   5 +-
 static/images-tijian/success.png              | Bin 0 -> 69338 bytes
 utils/aescbc.js                               |  35 ++
 utils/request.js                              |   8 +-
 19 files changed, 830 insertions(+), 82 deletions(-)
 create mode 100644 pages/HealthExaminationApp/myAppointment/bookSuccessfully.vue
 create mode 100644 static/images-tijian/success.png
 create mode 100644 utils/aescbc.js

diff --git a/package-lock.json b/package-lock.json
index de0bb9a..c70d2b9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,6 +9,7 @@
       "version": "3.4.5",
       "license": "MIT",
       "dependencies": {
+        "crypto-js": "^4.2.0",
         "image-tools": "^1.4.0",
         "luch-request": "^3.1.1"
       }
@@ -18,6 +19,11 @@
       "resolved": "https://registry.npmjs.org/@dcloudio/types/-/types-2.6.12.tgz",
       "integrity": "sha512-mrCMwcINy1IFjU9VUqLeWBkj404yWs5paLDttBcA+eqUjanuUQbBcTVPqlrGgkyzLXDcV2oDDZRSNxNpXi4kMQ=="
     },
+    "node_modules/crypto-js": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.2.0.tgz",
+      "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
+    },
     "node_modules/image-tools": {
       "version": "1.4.0",
       "resolved": "https://registry.npmmirror.com/image-tools/-/image-tools-1.4.0.tgz",
@@ -38,6 +44,11 @@
       "resolved": "https://registry.npmjs.org/@dcloudio/types/-/types-2.6.12.tgz",
       "integrity": "sha512-mrCMwcINy1IFjU9VUqLeWBkj404yWs5paLDttBcA+eqUjanuUQbBcTVPqlrGgkyzLXDcV2oDDZRSNxNpXi4kMQ=="
     },
+    "crypto-js": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.2.0.tgz",
+      "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
+    },
     "image-tools": {
       "version": "1.4.0",
       "resolved": "https://registry.npmmirror.com/image-tools/-/image-tools-1.4.0.tgz",
diff --git a/package.json b/package.json
index 0bbe15b..1452229 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
   },
   "homepage": "https://github.com/dcloudio/hello-uniapp#readme",
   "dependencies": {
+    "crypto-js": "^4.2.0",
     "image-tools": "^1.4.0",
     "luch-request": "^3.1.1"
   },
diff --git a/pages.json b/pages.json
index 3ba06e9..92acebe 100644
--- a/pages.json
+++ b/pages.json
@@ -241,6 +241,13 @@
     	{
     		"navigationBarTitleText" : "图片学习"
     	}
+    },
+    {
+    	"path" : "pages/HealthExaminationApp/myAppointment/bookSuccessfully",
+    	"style" : 
+    	{
+    		"navigationBarTitleText" : "体检预约"
+    	}
     }
   ],
   "globalStyle": {
diff --git a/pages/HealthExaminationApp/appointment/appointment.vue b/pages/HealthExaminationApp/appointment/appointment.vue
index 5b11614..2512f06 100644
--- a/pages/HealthExaminationApp/appointment/appointment.vue
+++ b/pages/HealthExaminationApp/appointment/appointment.vue
@@ -1,19 +1,507 @@
 <template>
-	<view>
-		体检预约
-	</view>
+  <view>
+    <div class="content">
+      <h3>选择医院</h3>
+      <div class="item" @click="show = true">
+        <div v-if="!hospital">点击选择医院</div>
+        <div v-else>{{ hospital }}</div>
+        <div><u-icon name="arrow-right"></u-icon></div>
+      </div>
+
+      <h3 style="margin-top: 20px">检查类型</h3>
+      <div class="item" @click="showPropup = true">
+        <div v-if="!checkType">点击选择检查类型</div>
+        <div v-else>{{ checkType }}</div>
+        <div><u-icon name="arrow-right"></u-icon></div>
+      </div>
+
+      <h3 style="margin-top: 20px">体检时间</h3>
+      <div class="item" @click="handleShowTime">
+        <div v-if="!healthTime">点击选择时间</div>
+        <div v-else>{{ healthTime }}</div>
+        <div><u-icon name="arrow-right"></u-icon></div>
+      </div>
+    </div>
+
+    <!-- 选择医院 -->
+    <u-picker
+      :show="show"
+      :columns="[hospitalList]"
+      keyName="hospitalName"
+      @cancel="show = false"
+      @confirm="confirmHospital"
+    ></u-picker>
+
+    <!-- 检查类型 -->
+    <u-popup :show="showPropup" :round="10" mode="bottom" closeable @close="showPropup = false">
+      <div class="propup-content">
+        <h3>请选择套餐</h3>
+        <div class="title-wrapper">
+          <div class="title title-tip" v-if="!checkType">
+            <div>请选择</div>
+            <div class="line"></div>
+          </div>
+          <div v-else>
+            <div class="title">{{ checkType }}</div>
+            <div class="line"></div>
+          </div>
+        </div>
+
+        <div>
+          <div
+            class="list-item"
+            :class="{ active: active == index }"
+            v-for="(item, index) in checkTypeList"
+            :key="index"
+            @click="handleCheckType(item, index)"
+          >
+            {{ item.text }}
+          </div>
+        </div>
+
+        <div class="cont-title" v-if="checkTypeContent">
+          <div class="cont">{{ checkTypeContent }}</div>
+          <div v-if="showIcon" class="cont-icon" @click="showIcon = false">
+            <div style="margin-right: 3px">展开</div>
+            <div>
+              <u-icon name="arrow-down" color="#1989fa" size="16" />
+            </div>
+          </div>
+          <div v-else class="cont-icon" @click="showIcon = true">
+            <div style="margin-right: 3px">收起</div>
+            <div>
+              <u-icon name="arrow-up" color="#1989fa" size="16" />
+            </div>
+          </div>
+        </div>
+        <div class="cont-line"></div>
+
+        <div v-show="!showIcon" class="contList-wrapper">
+          <div class="contList-item" v-for="(item, index) in checkTypeContentList" :key="index">
+            <div class="cont-title">{{ item.combinName }}</div>
+            <div>项目内容：{{ item.combinContent }}</div>
+            <div>
+              项目价格：
+              <span style="color: red">{{ item.combinPrice }}元</span>
+            </div>
+          </div>
+        </div>
+
+        <div class="btn" v-if="checkType">
+          <u-button type="primary" text="确认套餐" size="small" @click="showPropup = false"></u-button>
+        </div>
+      </div>
+    </u-popup>
+
+    <!-- 体检时间 -->
+    <u-calendar :show="showTime" mode="single" @confirm="confirmTime" @close="showTime = false"></u-calendar>
+
+    <div v-if="healthTime" class="reservation-number">当天剩余可预约人数：{{ reservationNumber }}人</div>
+
+    <div class="content" v-if="hospitalInfo.hospitalName">
+      <h3>医院信息</h3>
+      <div class="hospital-name">{{ hospitalInfo.hospitalName }}</div>
+      <div>地址: {{ hospitalInfo.address }}</div>
+      <div>营业时间: 周一至周五 {{ hospitalInfo.businessEnd }}-{{ hospitalInfo.businessHours }}</div>
+      <div>负责人: {{ hospitalInfo.responsible }}</div>
+      <div>联系方式: {{ hospitalInfo.telPhone }}</div>
+    </div>
+
+    <div style="margin: 30px 60px" v-if="hospital && checkType && healthTime">
+      <u-button type="primary" text="确定预约" shape="circle" size="small" @click="handleSave"></u-button>
+    </div>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				
-			};
-		}
-	}
+import config from '@/config'
+import Crypoto from '@/utils/aescbc'
+
+export default {
+  data() {
+    return {
+      token: uni.getStorageSync('tjToken'),
+      idcard: '',
+      active: null,
+      // 医院列表
+      hospitalList: [],
+      // 选择的医院
+      hospital: '',
+      // 医院信息
+      hospitalInfo: {},
+      // 体检时间
+      healthTime: '',
+      show: false,
+      showTime: false,
+      columns: [],
+      showPropup: false,
+      setMealId: '',
+      // 检查类型
+      checkType: '',
+      // 检查类型-列表
+      checkTypeList: [],
+      // 检查类型-内容
+      checkTypeContent: '',
+      checkTypeContentList: [],
+      showIcon: false,
+      reservationNumber: 0,
+      isDisabled: true
+    }
+  },
+  onLoad(opt) {
+    opt = JSON.parse(opt.params)
+    console.log('🚀 ~ onLoad ~ opt:', opt)
+    this.idcard = opt.idcard
+  },
+  mounted() {
+    this.getHospitalList()
+    this.getCheckType()
+  },
+  methods: {
+    // 获取医院列表  app/getCareerHospital
+    getHospitalList() {
+      const params = {
+        token: this.token,
+        idcard: this.idcard
+      }
+      console.log('🚀 ~ getHospitalList ~ params:', params)
+      uni.request({
+        url: config.tjBaseUrl + '/app/getCareerHospital',
+        method: 'post',
+        data: params,
+        header: {
+          'Content-Type': 'application/x-www-form-urlencoded',
+          token: this.token
+        },
+        success: res => {
+          res = res.data
+          console.log('🚀 ~ getHospitalList ~ res:', res)
+          if (res.res == 1) {
+            this.hospitalList = res.obj
+            // this.hospitalInfo = res.obj[0]
+            // this.columns 双层数组, 将医院列表push到columns中
+            this.columns.push(this.hospitalList)
+            console.log('🚀 ~ getHospitalList ~ this.hospitalList:', this.hospitalList)
+          }
+        },
+        fail: err => {
+          console.log('🚀 ~ getHospitalList ~ err:', err)
+        }
+      })
+    },
+    // 获取检查类型
+    getCheckType() {
+      const params = {
+        token: this.token,
+        idcard: this.idcard
+      }
+      console.log('🚀 ~ getCheckType ~ params:', params)
+      uni.request({
+        url: config.tjBaseUrl + '/app/getPhysicalExamination',
+        method: 'post',
+        data: params,
+        header: {
+          'Content-Type': 'application/x-www-form-urlencoded',
+          token: this.token
+        },
+        success: res => {
+          res = res.data
+          console.log('🚀 ~ getCheckType ~ res:', res)
+          if (res.res == 1) {
+            this.checkTypeList = res.obj
+          }
+        },
+        fail: err => {
+          console.log('🚀 ~ getCheckType ~ err:', err)
+        }
+      })
+    },
+    // 确认医院
+    confirmHospital(e) {
+      console.log('🚀 ~ confirmHospital ~ e:', e)
+      this.hospital = e.value[0].hospitalName
+      this.hospitalInfo = e.value[0]
+      console.log('🚀 ~ confirmHospital ~ this.hospitalInfo:', this.hospitalInfo)
+      if (this.hospitalInfo.id) this.isDisabled = false
+      this.show = false
+    },
+    // 选择检查类型
+    handleCheckType(item, index) {
+      console.log('🚀 ~ handleCheckType ~ item:', item)
+      this.active = index
+      this.checkType = item.text
+      this.getCheckTypeContent(item)
+    },
+    // 获取套餐内容
+    getCheckTypeContent(item) {
+      const params = {
+        token: this.token,
+        checkId: item.id,
+        combType: 2
+      }
+      console.log('🚀 ~ getCheckTypeContent ~ params:', params)
+      uni.request({
+        url: config.tjBaseUrl + '/app/getexamination',
+        method: 'post',
+        data: params,
+        header: {
+          'Content-Type': 'application/x-www-form-urlencoded',
+          token: this.token
+        },
+        success: res => {
+          res = res.data
+          console.log('🚀 ~ getCheckTypeContent ~ res:', res)
+          if (res.res == 1) {
+            this.setMealId = res.obj.tibean[0].id
+            this.checkTypeContent = res.obj.tibean[0].combName
+            this.checkTypeContentList = res.obj.tibeanson
+          }
+        },
+        fail: err => {
+          console.log('🚀 ~ getCheckTypeContent ~ err:', err)
+        }
+      })
+    },
+    handleShowTime() {
+      if (this.isDisabled) {
+        uni.showToast({
+          title: '请选择医院',
+          icon: 'none'
+        })
+      } else {
+        this.showTime = true
+      }
+    },
+    getCurrentDate() {
+      const date = new Date()
+      const year = date.getFullYear()
+      const month = String(date.getMonth() + 1).padStart(2, '0')
+      const day = String(date.getDate()).padStart(2, '0')
+      return `${year}-${month}-${day}`
+    },
+    // 确认时间
+    confirmTime(e) {
+      console.log('🚀 ~ confirmTime ~ e:', e)
+      const today = this.getCurrentDate()
+      if (e[0] == today) {
+        uni.showToast({
+          title: '不可以预约今天',
+          icon: 'none'
+        })
+        return
+      }
+      this.healthTime = e[0]
+      this.showTime = false
+      this.getReservationNumber()
+    },
+    // 获取当天剩余可预约人数
+    getReservationNumber() {
+      const params = {
+        token: this.token,
+        hosId: this.hospitalInfo.id,
+        phyAppontTime: this.healthTime,
+        type: '2'
+      }
+      console.log('🚀 ~ getReservationNumber ~ params:', params)
+      uni.request({
+        url: config.tjBaseUrl + '/app/getphyappointnum',
+        method: 'post',
+        data: params,
+        header: {
+          'Content-Type': 'application/x-www-form-urlencoded',
+          token: this.token
+        },
+        success: res => {
+          res = res.data
+          console.log('🚀 ~ getReservationNumber ~ res:', res)
+          if (res.res == 1) {
+            this.reservationNumber = res.obj
+          }
+        },
+        fail: err => {
+          console.log('🚀 ~ getReservationNumber ~ err:', err)
+        }
+      })
+    },
+    // 确定预约 phyappoint
+    handleSave() {
+      const cry = new Crypoto()
+      const params = {
+        hospitalId: this.hospitalInfo.id,
+        setMealId: this.setMealId,
+        // checkId: '1',
+        phyAppontTime: this.healthTime,
+        setMealType: '2',
+        combName: this.checkTypeContent,
+        token: this.token
+      }
+      console.log('🚀 ~ handleSave ~ params:', params)
+      console.log('🚀 ~ handleSave ~ params:', cry.encrypt(JSON.stringify(params)))
+
+      uni.request({
+        url: config.tjBaseUrl + '/app/phyappoint',
+        method: 'post',
+        // data: { encryptedData: params, token: this.token },
+        data: params,
+        header: {
+          'Content-Type': 'application/x-www-form-urlencoded',
+          token: this.token
+        },
+        success: res => {
+          res = res.data
+          console.log('🚀 ~ handleSave ~ res:', res)
+          if (res.res == 1) {
+            uni.showToast({
+              title: '预约成功',
+              icon: 'success'
+            })
+            uni.reLaunch({
+              // url: '/pages/HealthExaminationApp/index/index'
+            })
+          }
+        },
+        fail: err => {
+          console.log('🚀 ~ handleSave ~ err:', err)
+        }
+      })
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
+.content {
+  margin: 10px;
+  padding: 10px;
+  border-radius: 5px;
+  background: #fff;
 
+  h3 {
+    margin-bottom: 10px;
+  }
+
+  .hospital-wrapper {
+    /* display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    align-items: center; */
+    margin-bottom: 20px;
+  }
+  .item {
+    padding: 0 15px;
+    width: calc(100% -30px);
+    height: 50px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    background: #f5f5f5;
+    border-radius: 50px;
+    font-size: 14px;
+  }
+
+  .hospital-name {
+    font-weight: 600;
+    font-size: 16px;
+    color: #1989fa;
+    line-height: 35px;
+  }
+}
+.propup-content {
+  height: 500px;
+  padding: 20px;
+
+  .title-wrapper {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+  }
+
+  .title {
+    margin-top: 20px;
+    color: #333;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+  }
+  .title-tip {
+    color: #999;
+  }
+
+  .line {
+    margin: 10px 0;
+    width: 42px;
+    height: 2px;
+    background: #1989fa;
+    border-radius: 2px;
+  }
+
+  .list-item {
+    margin-right: 10px;
+    color: #333;
+
+    &.active {
+      color: #1989fa;
+    }
+  }
+
+  .cont-title {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-top: 20px;
+    color: #1989fa;
+    font-size: 16px;
+
+    .cont-icon {
+      display: flex;
+      align-items: center;
+    }
+  }
+  .cont-line {
+    margin-top: 6px;
+    width: 100%;
+    height: 1px;
+    background: #ccc;
+  }
+
+  .contList-wrapper {
+    max-height: 300px;
+    overflow: auto;
+  }
+  .contList-item {
+    margin: 10px 0;
+    color: #333;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: flex-start;
+    word-break: break-all;
+    overflow: auto;
+
+    .cont-title {
+      font-size: 16px;
+      color: #1989fa;
+      line-height: 30px;
+    }
+  }
+
+  .btn {
+    // 固定左下方
+    position: absolute;
+    bottom: 20px;
+    left: 20px;
+    /* width: 80px; */
+  }
+}
+.reservation-number {
+  height: 20px;
+  margin: 10px;
+  margin-top: 0;
+  padding: 10px;
+  color: #999;
+  background: #fff;
+  border-radius: 5px;
+  font-size: 15px;
+  /* text-align: start; */
+}
 </style>
diff --git a/pages/HealthExaminationApp/index/index.vue b/pages/HealthExaminationApp/index/index.vue
index b8bf5c4..9f5c90e 100644
--- a/pages/HealthExaminationApp/index/index.vue
+++ b/pages/HealthExaminationApp/index/index.vue
@@ -33,10 +33,14 @@
 </template>
 
 <script>
+import config from '@/config'
+
 export default {
   data() {
     return {
+      token: uni.getStorageSync('tjToken'),
       isShow: true,
+      userInfo: {},
       selectValue: 0,
       homeIcon: '/static/images-tijian/home-selected.png',
       myIcon: '/static/images-tijian/my-unselected.png',
@@ -53,6 +57,11 @@ export default {
       ]
     }
   },
+  mounted() {
+    console.log('🚀 ~ mounted ~ mounted:', this.token)
+    this.getStatus()
+    this.getAppLoginInfo()
+  },
   methods: {
     changeTab(e) {
       console.log('🚀 ~ changeTab ~ e:', e)
@@ -64,7 +73,64 @@ export default {
     // 跳转页面
     handlePage(url) {
       uni.navigateTo({
-        url: `/pages/HealthExaminationApp/${url}/${url}`
+        url: `/pages/HealthExaminationApp/${url}/${url}?params=${JSON.stringify(this.userInfo)}`
+      })
+    },
+    //
+    getStatus() {
+      const params = {
+        token: this.token,
+        telephone: uni.getStorageSync('tjPhone')
+      }
+      console.log('🚀 ~ getStatus ~ params:', params)
+      uni.request({
+        url: config.tjBaseUrl + '/app/getStatus',
+        method: 'post',
+        data: params,
+        header: {
+          'content-type': 'application/x-www-form-urlencoded',
+          token: this.token
+        },
+        success: res => {
+          console.log('🚀 ~ getStatus ~ res:', res)
+          // if (res.data.code === 200) {
+          //   if (res.data.data.status === 1) {
+          //     this.isShow = true
+          //   } else {
+          //     this.isShow = false
+          //   }
+          // }
+        },
+        fail: err => {
+          console.log('🚀 ~ getStatus ~ err:', err)
+        }
+      })
+    },
+    // 获取app登录信息
+    getAppLoginInfo() {
+      const params = {
+        token: this.token
+      }
+      console.log('🚀 ~ getapplogininfo ~ params:', params)
+      uni.request({
+        url: config.tjBaseUrl + '/app/getapplogininfo',
+        method: 'post',
+        data: params,
+        header: {
+          'content-type': 'application/x-www-form-urlencoded',
+          token: this.token
+        },
+        success: res => {
+          res = res.data
+          console.log('🚀 ~ getapplogininfo ~ res:', res)
+          if (res.res === 1) {
+            this.userInfo = res.obj[0]
+          }
+
+        },
+        fail: err => {
+          console.log('🚀 ~ getapplogininfo ~ err:', err)
+        }
       })
     }
   }
diff --git a/pages/HealthExaminationApp/myAppointment/bookSuccessfully.vue b/pages/HealthExaminationApp/myAppointment/bookSuccessfully.vue
new file mode 100644
index 0000000..0cc8d2d
--- /dev/null
+++ b/pages/HealthExaminationApp/myAppointment/bookSuccessfully.vue
@@ -0,0 +1,51 @@
+<template>
+  <view>
+    <div class="img"></div>
+    <h2 style="text-align: center">恭喜您，预约成功！</h2>
+
+    <div class="btn">
+      <u-button
+        type="primary"
+        shape="circle"
+        text="返回首页"
+        plain
+        style="margin-bottom: 10px"
+        @click="handleBack"
+      ></u-button>
+      <u-button type="primary" shape="circle" text="查看预约" @click="handleSee"></u-button>
+    </div>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {}
+  },
+  methods: {
+    handleBack() {
+      uni.reLaunch({
+        url: '/pages/HealthExaminationApp/index/index'
+      })
+    },
+    handleSee() {
+      uni.reLaunch({
+        url: '/pages/HealthExaminationApp/myAppointment/myAppointment'
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.img {
+  margin: 130px auto 0;
+  width: 344px;
+  height: 247px;
+  background: url('/static/images-tijian/success.png') no-repeat;
+  background-size: 100% 100%;
+}
+.btn {
+  margin: 20px 80px;
+}
+</style>
diff --git a/pages/HealthExaminationApp/myAppointment/myAppointment.vue b/pages/HealthExaminationApp/myAppointment/myAppointment.vue
index a75ba8d..a5a662f 100644
--- a/pages/HealthExaminationApp/myAppointment/myAppointment.vue
+++ b/pages/HealthExaminationApp/myAppointment/myAppointment.vue
@@ -1,19 +1,20 @@
 <template>
-	<view>
-		我的预约
-	</view>
+	<div>
+
+	</div>
 </template>
 
 <script>
 	export default {
 		data() {
-			return {
-				
-			};
+			return {}
+		},
+		methods: {
+			
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
 
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/YNEduApp/exam/beforeExam.vue b/pages/YNEduApp/exam/beforeExam.vue
index 811a783..917118c 100644
--- a/pages/YNEduApp/exam/beforeExam.vue
+++ b/pages/YNEduApp/exam/beforeExam.vue
@@ -62,7 +62,7 @@ export default {
       content: '是否确认进入考试？',
       examId: '',
       examNum: 0, // 考试次数
-      examCount: 1, // 1: 不限次 2: 及格终止 3: 自定义
+      examCount: '', // 1: 不限次 2: 及格终止 3: 自定义
       examCustom: 0, // 自定义次数
       score: 0,
       passScore: 0
@@ -75,6 +75,10 @@ export default {
     this.title = opt.name
     this.subtitle = opt.validityDate
     this.duration = opt.responseTime
+    this.examNum = opt.examNum
+    this.count = opt.examCount === 1 ? '不限次' : opt.examCount === 2 ? '及格终止' : opt.examCustom
+    this.examCount = opt.examCount
+    this.examCustom = opt.examCustom
     this.switchCount = opt.cutNum.includes('null') || opt.cutNum.includes('undefined') ? '不限次' : opt.cutNum
     this.studyId = opt.studyId
     this.score = opt.score
diff --git a/pages/YNEduApp/exam/exam.vue b/pages/YNEduApp/exam/exam.vue
index 1e1a987..cdf9ef9 100644
--- a/pages/YNEduApp/exam/exam.vue
+++ b/pages/YNEduApp/exam/exam.vue
@@ -95,11 +95,13 @@ export default {
         },
         success: res => {
           console.log('🚀 ~ getList ~ res:', res)
+          this.activeIndex = 0
           res = res.data
           this.list = this.allList
           this.allList = this.list = res.data
           this.waitList = res.data.filter(item => item.status === 1)
           this.alreadyList = res.data.filter(item => item.status === 2)
+          this.absentList = res.data.filter(item => item.status === 3 && item.examNum === 0)
         },
         fail: err => {
           console.log(err)
@@ -121,6 +123,19 @@ export default {
     // 开始考试
     handleExamination(item) {
       console.log('🚀 ~ handleExamination ~ item:', item)
+      // 获取当前考试限制时间 item.validityDate 2021-09-01~2021-09-30 如果今天不在这个范围内, 不能考试
+      const date = new Date()
+      const year = date.getFullYear()
+      const month = date.getMonth() + 1
+      const day = date.getDate()
+      const today = `${year}-${month < 10 ? '0' + month : month}-${day < 10 ? '0' + day : day}`
+      if (today < item.validityDate.split('~')[0] || today > item.validityDate.split('~')[1]) {
+        uni.showToast({
+          title: '当前时间不在考试时间范围内',
+          icon: 'none'
+        })
+        return
+      }
       if (item.examEquipment == 2) {
         uni.showToast({
           title: '请在电脑端进行考试',
@@ -151,7 +166,7 @@ export default {
         examNum: item.examNum, // 考试次数
         examCount: item.examCount, // 考试次数类型
         examCustom: item.examCustom, // 自定义考试次数
-        score: item.score, // 总分
+        score: item.score, // 总
         passScore: item.passScore // 及格分数
       }
       uni.navigateTo({
diff --git a/pages/YNEduApp/exam/examination.vue b/pages/YNEduApp/exam/examination.vue
index fa7477e..06280ed 100644
--- a/pages/YNEduApp/exam/examination.vue
+++ b/pages/YNEduApp/exam/examination.vue
@@ -66,15 +66,24 @@
           @click="clickImg(fileUrl + item.examTopicUrl)"
         />
         <div class="options">
-          <div
-            class="option"
-            v-for="(option, optionIndex) in item.listOption"
-            :key="optionIndex"
-            :class="{ isActive: option.isActive }"
-            @click="handleSelectOption(item, index, option, optionIndex)"
-          >
-            <div class="option-item">{{ option.optionIdent }}.</div>
-            <div class="option-content">{{ option.optionContent }}</div>
+          <div class="option-wrapper" v-for="(option, optionIndex) in item.listOption" :key="optionIndex">
+            <div
+              class="option"
+              :class="{ isActive: option.isActive }"
+              @click="handleSelectOption(item, index, option, optionIndex)"
+            >
+              <div class="option-item">{{ option.optionIdent }}.</div>
+              <div class="option-content">{{ option.optionContent }}</div>
+            </div>
+            <u--image
+              v-if="option.optionUrl"
+              :showLoading="true"
+              :src="fileUrl + option.optionUrl || ''"
+              width="60px"
+              height="60px"
+              style="margin-bottom: 10px"
+              @click="clickImg(fileUrl + option.optionUrl)"
+            />
           </div>
         </div>
       </div>
@@ -391,7 +400,7 @@ export default {
             examTime: this.examTime,
             questionCount: this.questionList.length,
             switchCount: this.switchCount,
-            examNum: this.examNum,
+            examNum: this.examNum + 1,
             examCount: this.examCount,
             examCustom: this.examCustom,
             results: res.examResult,
@@ -626,27 +635,32 @@ export default {
   }
   .options {
     margin-top: 10px;
-    .option {
-      display: flex;
-      justify-content: flex-start;
-      align-items: center;
-      margin-top: 10px;
-      background: #f4f9fe;
-      border-radius: 5px;
-      &.isActive {
-        background: #8cbff1;
-        color: #fff;
-      }
-      .option-item {
-        width: 33px;
-        height: 33px;
-        line-height: 33px;
-        text-align: center;
-        color: #333;
-      }
-      .option-content {
-        margin-left: 10px;
-        color: #333;
+    margin-bottom: 30px;
+    .option-wrapper {
+      max-height: 500px;
+      overflow: auto;
+      .option {
+        display: flex;
+        justify-content: flex-start;
+        align-items: center;
+        margin-top: 10px;
+        background: #f4f9fe;
+        border-radius: 5px;
+        &.isActive {
+          background: #8cbff1;
+          color: #fff;
+        }
+        .option-item {
+          width: 33px;
+          height: 33px;
+          line-height: 33px;
+          text-align: center;
+          color: #333;
+        }
+        .option-content {
+          margin-left: 10px;
+          color: #333;
+        }
       }
     }
   }
diff --git a/pages/YNEduApp/exam/examinationDetails.vue b/pages/YNEduApp/exam/examinationDetails.vue
index 84dba6b..120946e 100644
--- a/pages/YNEduApp/exam/examinationDetails.vue
+++ b/pages/YNEduApp/exam/examinationDetails.vue
@@ -94,7 +94,7 @@ export default {
       questionCount: 0,
       // 考试次数
       examNum: 0,
-      examCount: 1, // 考试次数 1: 不限次 2: 及格终止 3: 自定义
+      examCount: '', // 考试次数 1: 不限次 2: 及格终止 3: 自定义
       examCustom: 0, // 自定义次数
       results: 0, // 考试结果
       studyId: '',
@@ -138,7 +138,7 @@ export default {
       } else {
         from = '/pages/YNEduApp/exam/exam'
       }
-      
+
       // examCount 1: 不限次 2: 及格终止 3: 自定义
       if (this.examCount == 2 && this.results == 1) {
         uni.showToast({
@@ -146,7 +146,7 @@ export default {
           icon: 'none'
         })
         setTimeout(() => {
-          uni.navigateTo({
+          uni.reLaunch({
             url: from
           })
         }, 1000)
@@ -156,23 +156,24 @@ export default {
           icon: 'none'
         })
         setTimeout(() => {
-          uni.navigateTo({
+          uni.reLaunch({
             url: from
           })
         }, 1000)
+      } else {
+        const params = {
+          examId: this.examId,
+          examNum: this.examNum,
+          examCount: this.examCount,
+          examCustom: this.examCustom,
+          switchCount: this.switchCount,
+          studyId: this.studyId
+        }
+        console.log('🚀 ~ handleResetExamination ~ params:', params)
+        uni.navigateTo({
+          url: `/pages/YNEduApp/exam/examination?params=${JSON.stringify(params)}`
+        })
       }
-      const params = {
-        examId: this.examId,
-        examNum: this.examNum,
-        examCount: this.examCount,
-        examCustom: this.examCustom,
-        switchCount: this.switchCount,
-        studyId: this.studyId
-      }
-      console.log('🚀 ~ handleResetExamination ~ params:', params)
-      uni.navigateTo({
-        url: `/pages/YNEduApp/exam/examination?params=${JSON.stringify(params)}`
-      })
     },
     handleArrow() {
       let from = ''
diff --git a/pages/YNEduApp/index/index.vue b/pages/YNEduApp/index/index.vue
index 1cdaded..b59a2c3 100644
--- a/pages/YNEduApp/index/index.vue
+++ b/pages/YNEduApp/index/index.vue
@@ -45,7 +45,7 @@
               height="8"
               activeColor="#579AF8"
             />
-            <div>{{ item.trainPercentage }}%</div>
+            <div>{{ item.trainPercentage || 0 }}%</div>
           </div>
         </div>
         <view class="no-task" v-show="!taskList || taskList.length === 0">
diff --git a/pages/YNEduApp/learn/learn.vue b/pages/YNEduApp/learn/learn.vue
index 2826801..02fec65 100644
--- a/pages/YNEduApp/learn/learn.vue
+++ b/pages/YNEduApp/learn/learn.vue
@@ -53,7 +53,8 @@ export default {
       // 当前播放时间
       currentTime: 0,
       showModal: false, // 是否显示弹窗
-      content: '是否确认结束学习？'
+      content: '是否确认结束学习？',
+      isEnd: false
     }
   },
   onLoad(opt) {
@@ -69,11 +70,24 @@ export default {
     console.log('🚀 ~ onLoad ~ this.path:', this.path)
     this.studyDuration = this.currentTime = Number(opt.studyDuration)
     this.allStudyDuration = Number(opt.allStudyDuration)
+    this.isEnd = opt.isEnd
+    if (opt.isEnd) {
+      this.studyDuration = 0
+    }
+  },
+  onHide() {
+    console.log('🚀 ~ onHide ~ 页面隐藏')
+    if (!this.isEnd) {
+      // 关闭页面时，修改项目进度
+      this.handleEnd()
+    }
   },
   onUnload() {
     console.log('🚀 ~ onUnload ~ 页面关闭')
-    // 关闭页面时，修改项目进度
-    this.handleEnd()
+    if (!this.isEnd) {
+      // 关闭页面时，修改项目进度
+      this.handleEnd()
+    }
   },
   methods: {
     videoErrorCallback(e) {
@@ -89,6 +103,12 @@ export default {
     },
     // 结束学习
     handleEnd() {
+      if (this.isEnd) {
+        uni.reLaunch({
+          url: '/pages/YNEduApp/learnProj/learnProjDetail?id=' + this.studyId
+        })
+        return
+      }
       // 手动暂停视频
       const video = uni.createVideoContext('myVideo')
       video.pause()
@@ -96,7 +116,10 @@ export default {
       console.log('当前播放时间：', this.currentTime, this.allStudyDuration)
       this.studyDuration = this.currentTime
       // 计算学习进度
-      this.studyPercentage = Math.ceil((this.studyDuration / this.allStudyDuration) * 100).toFixed(2)
+      this.studyPercentage =
+        Math.ceil((this.studyDuration / this.allStudyDuration) * 100).toFixed(2) > 100
+          ? 100
+          : Math.ceil((this.studyDuration / this.allStudyDuration) * 100).toFixed(2)
       console.log('🚀 ~ handleEnd ~ this.studyPercentage:', this.studyPercentage)
 
       const params = {
@@ -127,7 +150,7 @@ export default {
         success: res => {
           console.log('🚀 ~ handleEnd ~ res:', res)
           this.showModal = false
-          uni.navigateTo({
+          uni.reLaunch({
             url: '/pages/YNEduApp/learnProj/learnProjDetail?id=' + this.studyId
           })
         },
diff --git a/pages/YNEduApp/learnProj/learnProjDetail.vue b/pages/YNEduApp/learnProj/learnProjDetail.vue
index 9a6fbef..d638c59 100644
--- a/pages/YNEduApp/learnProj/learnProjDetail.vue
+++ b/pages/YNEduApp/learnProj/learnProjDetail.vue
@@ -276,7 +276,8 @@ export default {
         sourceId: item.id, // 素材id
         path: item.path, // 视频路径
         studyDuration: item.studyDuration || 0, // 学习时长
-        allStudyDuration: item.allStudyDuration // 总时长
+        allStudyDuration: item.allStudyDuration, // 总时长
+        isEnd: item.studyPercentage >= 100 ? true : false
       }
       console.log('🚀 ~ toggleTheoryLearn ~ params:', params)
       console.log('🚀 ~ toggleTheoryLearn ~ item:', item.path)
diff --git a/pages/YNEduApp/prac/exercises.vue b/pages/YNEduApp/prac/exercises.vue
index 40422b0..d09304a 100644
--- a/pages/YNEduApp/prac/exercises.vue
+++ b/pages/YNEduApp/prac/exercises.vue
@@ -376,6 +376,39 @@ export default {
           console.log('🚀 ~ handleJump ~ res:', res)
           res = res.data
           this.questionList.push(res.data)
+          if (res.data.selectAnswer) {
+            if (this.questionList[0].examType === 2) {
+              this.questionList[0].select = res.data.selectAnswer.split('')
+              this.questionList[0].isSelect = true
+              // 给selectAnswer选项如果正确添加正确标记, 错误添加错误标记并给正确选项添加标记
+              this.questionList[0].listOption.forEach(item => {
+                if (res.data.selectAnswer.includes(item.optionIdent)) {
+                  item.isSelect = true
+                }
+                if (item.optionIdent === this.questionList[0].correctGrade) {
+                  item.isCorrect = true
+                }
+                if (item.isSelect && !this.questionList[0].correctGrade.includes(item.optionIdent)) {
+                  item.isError = true
+                }
+              })
+            } else {
+              this.questionList[0].select = res.data.selectAnswer
+              this.questionList[0].isSelect = true
+              // 给selectAnswer选项如果正确添加正确标记, 错误添加错误标记并给正确选项添加标记
+              this.questionList[0].listOption.forEach(item => {
+                if (res.data.selectAnswer === item.optionIdent) {
+                  item.isSelect = true
+                }
+                if (item.optionIdent === this.questionList[0].correctGrade) {
+                  item.isCorrect = true
+                }
+                if (item.isSelect && item.optionIdent !== this.questionList[0].correctGrade) {
+                  item.isError = true
+                }
+              })
+            }
+          }
         },
         fail: err => {
           console.log(err)
diff --git a/pages/gzt/index.vue b/pages/gzt/index.vue
index f97353e..6211a52 100644
--- a/pages/gzt/index.vue
+++ b/pages/gzt/index.vue
@@ -197,7 +197,7 @@
 					jwtToken: uni.getStorageSync('App-Token')
 				}
 				const tjparams = {
-					username: '13908860263',
+					username: '13708411772',
 					password: 'YNsbd@123456'
 				}
 				console.log('🚀 ~ gotoYy ~ tjparams:', tjparams)
@@ -251,7 +251,10 @@
 							console.log('🚀 ~ gotoYy ~ res:', res,)
 							console.log('🚀 ~ gotoYy ~ res:', res.data.token)
 							if (res.statusCode == 200) {
+								uni.removeStorageSync('tjToken')
+								uni.removeStorageSync('tjPhone')
 								uni.setStorageSync('tjToken', res.data.token)
+								uni.setStorageSync('tjPhone', tjparams.username)
 								setTimeout(() => {
 									uni.reLaunch({
 										url: '/pages/HealthExaminationApp/index/index'
diff --git a/static/images-tijian/success.png b/static/images-tijian/success.png
new file mode 100644
index 0000000000000000000000000000000000000000..811e3316e694225fc7cf7bc163945506d9201903
GIT binary patch
literal 69338
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

literal 0
HcmV?d00001

diff --git a/utils/aescbc.js b/utils/aescbc.js
new file mode 100644
index 0000000..d70893c
--- /dev/null
+++ b/utils/aescbc.js
@@ -0,0 +1,35 @@
+
+import CryptoJS from 'crypto-js'
+
+export default class Crypoto {
+  key = CryptoJS.enc.Utf8.parse('zhgd@bonus@zhgd@bonus@1234567890') // 这里找后端要;
+  iv = CryptoJS.enc.Utf8.parse('1234567812345678')
+
+  /* 加密 */
+  encrypt(word) {
+    let aqEnnable = true
+    if (!aqEnnable) {
+      return word
+    }
+    var srcs = CryptoJS.enc.Utf8.parse(word)
+    var encrypted = CryptoJS.AES.encrypt(srcs, this.key, {
+      iv: this.iv,
+      mode: CryptoJS.mode.CBC,
+      padding: CryptoJS.pad.Pkcs7
+    })
+    return encrypted.toString()
+  }
+
+  encrypts(word) {
+    const srcs = CryptoJS.enc.Utf8.parse(word)
+    const encrypted = CryptoJS.AES.encrypt(srcs, this.key, {
+      iv: this.iv,
+      mode: CryptoJS.mode.CBC,
+      padding: CryptoJS.pad.Pkcs7
+    })
+    const ciphertext = encrypted.ciphertext.toString(CryptoJS.enc.Base64url) // 将加密结果转换为 Base64URL 格式 确认后端要的是Base64URL 还是Base64 这两种编码格式不一样
+    return ciphertext
+  }
+
+  decrypt
+}
diff --git a/utils/request.js b/utils/request.js
index 76f9e29..a5ca193 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -16,13 +16,7 @@ const request = config => {
     config.header['Authorization'] = 'Bearer ' + getToken()
   } else {
     // 没有token - 去登录
-    // store.dispatch('LogOut').then(() => {
-    //   uni.reLaunch({ url: '/pages/login' })
-    // })
-    // const token = 'eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjozMSwidXNlcl9rZXkiOiJiZmJmOGEzZC1hYTc1LTQ4MzQtOGM3NC0yZmQzOTEwZDllYzAiLCJ1c2VybmFtZSI6IuaWueS6riJ9.kv1WmthbgTrqapbsGLvevk-nwbWbYJMniyjj8DC3BSnQjCwm8csQ5GaNpfsLFFFYIHBYa8CrN_sBxXhDKOfR_A'
-    // const userId = 31
-    // setUserId(userId)
-    // setToken(token)
+    uni.reLaunch({ url: '/pages/login' })
   }
   // get请求映射params参数
   if (config.params) {

From e7a1274dbf99eac47c567f6bc707892b2790545d Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Wed, 4 Sep 2024 18:29:27 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E4=BD=93=E6=A3=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |   7 +
 .../appointment/appointment.vue               |   6 +-
 .../jobAppointment/jobAppointment.vue         | 513 +++++++++++++++++-
 .../myAppointment/healthExamDetails.vue       | 123 +++++
 .../myAppointment/myAppointment.vue           | 192 ++++++-
 pages/gzt/index.vue                           |   2 +-
 static/images-tijian/isCanceled.png           | Bin 0 -> 6380 bytes
 static/images-tijian/isExamed.png             | Bin 0 -> 6300 bytes
 static/images-tijian/readyExam.png            | Bin 0 -> 6043 bytes
 9 files changed, 820 insertions(+), 23 deletions(-)
 create mode 100644 pages/HealthExaminationApp/myAppointment/healthExamDetails.vue
 create mode 100644 static/images-tijian/isCanceled.png
 create mode 100644 static/images-tijian/isExamed.png
 create mode 100644 static/images-tijian/readyExam.png

diff --git a/pages.json b/pages.json
index 92acebe..cfcaa42 100644
--- a/pages.json
+++ b/pages.json
@@ -248,6 +248,13 @@
     	{
     		"navigationBarTitleText" : "体检预约"
     	}
+    },
+    {
+    	"path" : "pages/HealthExaminationApp/myAppointment/healthExamDetails",
+    	"style" : 
+    	{
+    		"navigationBarTitleText" : "体检预约单"
+    	}
     }
   ],
   "globalStyle": {
diff --git a/pages/HealthExaminationApp/appointment/appointment.vue b/pages/HealthExaminationApp/appointment/appointment.vue
index 2512f06..d5772a5 100644
--- a/pages/HealthExaminationApp/appointment/appointment.vue
+++ b/pages/HealthExaminationApp/appointment/appointment.vue
@@ -158,7 +158,7 @@ export default {
     this.getCheckType()
   },
   methods: {
-    // 获取医院列表  app/getCareerHospital
+    // 获取医院列表  app/gethospital
     getHospitalList() {
       const params = {
         token: this.token,
@@ -166,7 +166,7 @@ export default {
       }
       console.log('🚀 ~ getHospitalList ~ params:', params)
       uni.request({
-        url: config.tjBaseUrl + '/app/getCareerHospital',
+        url: config.tjBaseUrl + '/app/gethospital',
         method: 'post',
         data: params,
         header: {
@@ -356,7 +356,7 @@ export default {
               icon: 'success'
             })
             uni.reLaunch({
-              // url: '/pages/HealthExaminationApp/index/index'
+              url: '/pages/HealthExaminationApp/myAppointment/bookSuccessfully'
             })
           }
         },
diff --git a/pages/HealthExaminationApp/jobAppointment/jobAppointment.vue b/pages/HealthExaminationApp/jobAppointment/jobAppointment.vue
index 8dd0490..3fe727b 100644
--- a/pages/HealthExaminationApp/jobAppointment/jobAppointment.vue
+++ b/pages/HealthExaminationApp/jobAppointment/jobAppointment.vue
@@ -1,19 +1,512 @@
 <template>
-	<view>
-		职业预约
-	</view>
+  <view>
+    <div class="content">
+      <h3>选择医院</h3>
+      <div class="item" @click="show = true">
+        <div v-if="!hospital">点击选择医院</div>
+        <div v-else>{{ hospital }}</div>
+        <div><u-icon name="arrow-right"></u-icon></div>
+      </div>
+
+      <h3 style="margin-top: 20px">职工套餐</h3>
+      <!-- <div class="item" @click="showPropup = true"> -->
+      <div class="item">
+        <div>{{ checkType }}</div>
+        <!-- <div v-if="!checkType">点击选择检查类型</div>
+        <div v-else>{{ checkType }}</div>
+        <div><u-icon name="arrow-right"></u-icon></div> -->
+      </div>
+
+      <h3 style="margin-top: 20px">体检时间</h3>
+      <div class="item" @click="handleShowTime">
+        <div v-if="!healthTime">点击选择时间</div>
+        <div v-else>{{ healthTime }}</div>
+        <div><u-icon name="arrow-right"></u-icon></div>
+      </div>
+    </div>
+
+    <!-- 选择医院 -->
+    <u-picker
+      :show="show"
+      :columns="[hospitalList]"
+      keyName="hospitalName"
+      @cancel="show = false"
+      @confirm="confirmHospital"
+    ></u-picker>
+
+    <!-- 检查类型 -->
+    <u-popup :show="showPropup" :round="10" mode="bottom" closeable @close="showPropup = false">
+      <div class="propup-content">
+        <h3>请选择套餐</h3>
+        <div class="title-wrapper">
+          <div class="title title-tip" v-if="!checkType">
+            <div>请选择</div>
+            <div class="line"></div>
+          </div>
+          <div v-else>
+            <div class="title">{{ checkType }}</div>
+            <div class="line"></div>
+          </div>
+        </div>
+
+        <div>
+          <div
+            class="list-item"
+            :class="{ active: active == index }"
+            v-for="(item, index) in checkTypeList"
+            :key="index"
+            @click="handleCheckType(item, index)"
+          >
+            <!-- {{ item.combName }} -->
+          </div>
+        </div>
+
+        <div class="cont-title" v-if="checkTypeContent">
+          <div class="cont">{{ checkTypeContent }}</div>
+          <div v-if="showIcon" class="cont-icon" @click="showIcon = false">
+            <div style="margin-right: 3px">展开</div>
+            <div>
+              <u-icon name="arrow-down" color="#1989fa" size="16" />
+            </div>
+          </div>
+          <div v-else class="cont-icon" @click="showIcon = true">
+            <div style="margin-right: 3px">收起</div>
+            <div>
+              <u-icon name="arrow-up" color="#1989fa" size="16" />
+            </div>
+          </div>
+        </div>
+        <div class="cont-line"></div>
+
+        <div v-show="!showIcon" class="contList-wrapper">
+          <div class="contList-item" v-for="(item, index) in checkTypeContentList" :key="index">
+            <div class="cont-title">{{ item.combinName }}</div>
+            <div>项目内容：{{ item.combinContent }}</div>
+            <div>
+              项目价格：
+              <span style="color: red">{{ item.combinPrice }}元</span>
+            </div>
+          </div>
+        </div>
+
+        <div class="btn" v-if="checkType">
+          <u-button type="primary" text="确认套餐" size="small" @click="showPropup = false"></u-button>
+        </div>
+      </div>
+    </u-popup>
+
+    <!-- 体检时间 -->
+    <u-calendar :show="showTime" mode="single" @confirm="confirmTime" @close="showTime = false"></u-calendar>
+
+    <div v-if="healthTime" class="reservation-number">当天剩余可预约人数：{{ reservationNumber }}人</div>
+
+    <div class="content" v-if="hospitalInfo.hospitalName">
+      <h3>医院信息</h3>
+      <div class="hospital-name">{{ hospitalInfo.hospitalName }}</div>
+      <div>地址: {{ hospitalInfo.address }}</div>
+      <div>营业时间: 周一至周五 {{ hospitalInfo.businessEnd }}-{{ hospitalInfo.businessHours }}</div>
+      <div>负责人: {{ hospitalInfo.responsible }}</div>
+      <div>联系方式: {{ hospitalInfo.telPhone }}</div>
+    </div>
+
+    <div style="margin: 30px 60px" v-if="hospital && checkType && healthTime">
+      <u-button type="primary" text="确定预约" shape="circle" size="small" @click="handleSave"></u-button>
+    </div>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				
-			};
-		}
-	}
+import config from '@/config'
+import Crypoto from '@/utils/aescbc'
+
+export default {
+  data() {
+    return {
+      token: uni.getStorageSync('tjToken'),
+      idcard: '',
+      active: null,
+      // 医院列表
+      hospitalList: [],
+      // 选择的医院
+      hospital: '',
+      // 医院信息
+      hospitalInfo: {},
+      // 体检时间
+      healthTime: '',
+      show: false,
+      showTime: false,
+      columns: [],
+      showPropup: false,
+			checkId: '',
+      setMealId: '',
+      // 检查类型
+      checkType: '',
+      // 检查类型-列表
+      checkTypeList: [],
+      // 检查类型-内容
+      checkTypeContent: '',
+      checkTypeContentList: [],
+      showIcon: false,
+      reservationNumber: 0,
+      isDisabled: true
+    }
+  },
+  onLoad(opt) {
+    opt = JSON.parse(opt.params)
+    console.log('🚀 ~ onLoad ~ opt:', opt)
+    this.idcard = opt.idcard
+  },
+  mounted() {
+    this.getHospitalList()
+    this.getCheckType()
+  },
+  methods: {
+    // 获取医院列表  app/getCareerHospital
+    getHospitalList() {
+      const params = {
+        token: this.token,
+        idcard: this.idcard
+      }
+      console.log('🚀 ~ getHospitalList ~ params:', params)
+      uni.request({
+        url: config.tjBaseUrl + '/app/getCareerHospital',
+        method: 'post',
+        data: params,
+        header: {
+          'Content-Type': 'application/x-www-form-urlencoded',
+          token: this.token
+        },
+        success: res => {
+          res = res.data
+          console.log('🚀 ~ getHospitalList ~ res:', res)
+          if (res.res == 1) {
+            this.hospitalList = res.obj
+            // this.hospitalInfo = res.obj[0]
+            // this.columns 双层数组, 将医院列表push到columns中
+            this.columns.push(this.hospitalList)
+            console.log('🚀 ~ getHospitalList ~ this.hospitalList:', this.hospitalList)
+          }
+        },
+        fail: err => {
+          console.log('🚀 ~ getHospitalList ~ err:', err)
+        }
+      })
+    },
+    // 获取检查类型
+    getCheckType() {
+      const params = {
+        token: this.token,
+        idcard: this.idcard
+      }
+      console.log('🚀 ~ getCheckType ~ params:', params)
+      uni.request({
+        url: config.tjBaseUrl + '/app/getworkexamination',
+        method: 'post',
+        data: params,
+        header: {
+          'Content-Type': 'application/x-www-form-urlencoded',
+          token: this.token
+        },
+        success: res => {
+          res = res.data
+          console.log('🚀 ~ getCheckType ~ res:', res)
+          if (res.res == 1) {
+            // this.checkTypeList = res.obj
+            this.checkType = res.obj.combName
+						this.setMealId = res.obj.id
+          }
+        },
+        fail: err => {
+          console.log('🚀 ~ getCheckType ~ err:', err)
+        }
+      })
+    },
+    // 确认医院
+    confirmHospital(e) {
+      console.log('🚀 ~ confirmHospital ~ e:', e)
+      this.hospital = e.value[0].hospitalName
+      this.hospitalInfo = e.value[0]
+      console.log('🚀 ~ confirmHospital ~ this.hospitalInfo:', this.hospitalInfo)
+      if (this.hospitalInfo.id) this.isDisabled = false
+      this.show = false
+    },
+    // 选择检查类型
+    handleCheckType(item, index) {
+      console.log('🚀 ~ handleCheckType ~ item:', item)
+      this.active = index
+      this.checkType = item.combName
+      this.getCheckTypeContent(item)
+    },
+    // 获取套餐内容
+    getCheckTypeContent(item) {
+      const params = {
+        token: this.token,
+        checkId: item.id,
+        combType: 2
+      }
+      console.log('🚀 ~ getCheckTypeContent ~ params:', params)
+      uni.request({
+        url: config.tjBaseUrl + '/app/getexamination',
+        method: 'post',
+        data: params,
+        header: {
+          'Content-Type': 'application/x-www-form-urlencoded',
+          token: this.token
+        },
+        success: res => {
+          res = res.data
+          console.log('🚀 ~ getCheckTypeContent ~ res:', res)
+          if (res.res == 1) {
+            this.setMealId = res.obj.tibean[0].id
+            this.checkTypeContent = res.obj.tibean[0].combName
+            this.checkTypeContentList = res.obj.tibeanson
+          }
+        },
+        fail: err => {
+          console.log('🚀 ~ getCheckTypeContent ~ err:', err)
+        }
+      })
+    },
+    handleShowTime() {
+      if (this.isDisabled) {
+        uni.showToast({
+          title: '请选择医院',
+          icon: 'none'
+        })
+      } else {
+        this.showTime = true
+      }
+    },
+    getCurrentDate() {
+      const date = new Date()
+      const year = date.getFullYear()
+      const month = String(date.getMonth() + 1).padStart(2, '0')
+      const day = String(date.getDate()).padStart(2, '0')
+      return `${year}-${month}-${day}`
+    },
+    // 确认时间
+    confirmTime(e) {
+      console.log('🚀 ~ confirmTime ~ e:', e)
+      const today = this.getCurrentDate()
+      if (e[0] == today) {
+        uni.showToast({
+          title: '不可以预约今天',
+          icon: 'none'
+        })
+        return
+      }
+      this.healthTime = e[0]
+      this.showTime = false
+      this.getReservationNumber()
+    },
+    // 获取当天剩余可预约人数
+    getReservationNumber() {
+      const params = {
+        token: this.token,
+        hosId: this.hospitalInfo.id,
+        phyAppontTime: this.healthTime,
+        type: '2'
+      }
+      console.log('🚀 ~ getReservationNumber ~ params:', params)
+      uni.request({
+        url: config.tjBaseUrl + '/app/getphyappointnum',
+        method: 'post',
+        data: params,
+        header: {
+          'Content-Type': 'application/x-www-form-urlencoded',
+          token: this.token
+        },
+        success: res => {
+          res = res.data
+          console.log('🚀 ~ getReservationNumber ~ res:', res)
+          if (res.res == 1) {
+            this.reservationNumber = res.obj
+          }
+        },
+        fail: err => {
+          console.log('🚀 ~ getReservationNumber ~ err:', err)
+        }
+      })
+    },
+    // 确定预约 phyappoint
+    handleSave() {
+      const cry = new Crypoto()
+      const params = {
+        hospitalId: this.hospitalInfo.id,
+        setMealId: this.setMealId,
+        checkId: '',
+        phyAppontTime: this.healthTime,
+        setMealType: '3',
+        combName: this.checkType,
+        token: this.token
+      }
+      console.log('🚀 ~ handleSave ~ params:', params)
+      console.log('🚀 ~ handleSave ~ params:', cry.encrypt(JSON.stringify(params)))
+
+      uni.request({
+        url: config.tjBaseUrl + '/app/phyappoint',
+        method: 'post',
+        // data: { encryptedData: params, token: this.token },
+        data: params,
+        header: {
+          'Content-Type': 'application/x-www-form-urlencoded',
+          token: this.token
+        },
+        success: res => {
+          res = res.data
+          console.log('🚀 ~ handleSave ~ res:', res)
+          if (res.res == 1) {
+            uni.showToast({
+              title: '预约成功',
+              icon: 'success'
+            })
+            uni.reLaunch({
+              url: '/pages/HealthExaminationApp/myAppointment/bookSuccessfully'
+            })
+          }
+        },
+        fail: err => {
+          console.log('🚀 ~ handleSave ~ err:', err)
+        }
+      })
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
+.content {
+  margin: 10px;
+  padding: 10px;
+  border-radius: 5px;
+  background: #fff;
 
+  h3 {
+    margin-bottom: 10px;
+  }
+
+  .hospital-wrapper {
+    /* display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    align-items: center; */
+    margin-bottom: 20px;
+  }
+  .item {
+    padding: 0 15px;
+    width: calc(100% -30px);
+    height: 50px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    background: #f5f5f5;
+    border-radius: 50px;
+    font-size: 14px;
+  }
+
+  .hospital-name {
+    font-weight: 600;
+    font-size: 16px;
+    color: #1989fa;
+    line-height: 35px;
+  }
+}
+.propup-content {
+  height: 500px;
+  padding: 20px;
+
+  .title-wrapper {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+  }
+
+  .title {
+    margin-top: 20px;
+    color: #333;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+  }
+  .title-tip {
+    color: #999;
+  }
+
+  .line {
+    margin: 10px 0;
+    width: 42px;
+    height: 2px;
+    background: #1989fa;
+    border-radius: 2px;
+  }
+
+  .list-item {
+    margin-right: 10px;
+    color: #333;
+
+    &.active {
+      color: #1989fa;
+    }
+  }
+
+  .cont-title {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-top: 20px;
+    color: #1989fa;
+    font-size: 16px;
+
+    .cont-icon {
+      display: flex;
+      align-items: center;
+    }
+  }
+  .cont-line {
+    margin-top: 6px;
+    width: 100%;
+    height: 1px;
+    background: #ccc;
+  }
+
+  .contList-wrapper {
+    max-height: 300px;
+    overflow: auto;
+  }
+  .contList-item {
+    margin: 10px 0;
+    color: #333;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: flex-start;
+    word-break: break-all;
+    overflow: auto;
+
+    .cont-title {
+      font-size: 16px;
+      color: #1989fa;
+      line-height: 30px;
+    }
+  }
+
+  .btn {
+    // 固定左下方
+    position: absolute;
+    bottom: 20px;
+    left: 20px;
+    /* width: 80px; */
+  }
+}
+.reservation-number {
+  height: 20px;
+  margin: 10px;
+  margin-top: 0;
+  padding: 10px;
+  color: #999;
+  background: #fff;
+  border-radius: 5px;
+  font-size: 15px;
+  /* text-align: start; */
+}
 </style>
diff --git a/pages/HealthExaminationApp/myAppointment/healthExamDetails.vue b/pages/HealthExaminationApp/myAppointment/healthExamDetails.vue
new file mode 100644
index 0000000..fb53fe7
--- /dev/null
+++ b/pages/HealthExaminationApp/myAppointment/healthExamDetails.vue
@@ -0,0 +1,123 @@
+<template>
+  <view>
+    <div class="content">
+      <h2 style="text-align: center">体检单据</h2>
+      <div class="title">套餐名称:</div>
+      <div>{{ combName }}</div>
+
+      <div class="title">体检项目:</div>
+      <div>{{ combItem }}</div>
+
+      <div class="title">体检内容:</div>
+      <div v-for="(item, index) in combContent" :key="index">
+        <div class="item-content">
+          <div style="width: 240px">{{ item.mealName }}：{{ item.mealContent }}</div>
+          <div style="color: red; margin-left: 15px">{{ item.mealPrice }} 元</div>
+        </div>
+				<u-line dashed style="margin-bottom: 10px;"></u-line>
+      </div>
+
+      <div class="title" style="color: red">体检总价：{{ totalPrice }} 元</div>
+    </div>
+  </view>
+</template>
+
+<script>
+import config from '@/config'
+
+export default {
+  data() {
+    return {
+      token: '',
+      cancelId: '',
+      // 套餐名称
+      combName: '',
+      // 体检项目
+      combItem: '项目1、项目2、项目3',
+      // 体检内容
+      combContent: [
+        {
+          mealName: '项目1',
+          mealContent:
+            '项目1内容项目1内容项目1内容项目1内容项目1内容项目1内容项目1内容项目1内容项目1内容项目1内容项目1内容项目1内容',
+          mealPrice: '100'
+        },
+        {
+          mealName: '项目2',
+          mealContent: '项目2内容',
+          mealPrice: '200'
+        },
+        {
+          mealName: '项目3',
+          mealContent: '项目3内容',
+          mealPrice: '300'
+        }
+      ],
+			// 体检总价
+			totalPrice: 0
+    }
+  },
+  onLoad(opt) {
+    opt = JSON.parse(opt.params)
+    this.combName = opt.combName
+    this.cancelId = opt.id
+    console.log('🚀 ~ onLoad ~ onLoad', opt)
+    this.token = uni.getStorageSync('tjToken')
+  },
+  mounted() {
+    // this.getDetail()
+  },
+  methods: {
+    // 获取详情
+    getDetail() {
+      const params = {
+        token: this.token,
+        cancelId: this.cancelId
+      }
+      console.log('🚀 ~ getDetail ~ params:', params)
+      uni.request({
+        url: config.tjBaseUrl + '/app/getcontentByid',
+        method: 'post',
+        data: params,
+        header: {
+          token: this.token
+        },
+        success: res => {
+          res = res.data
+          console.log('🚀 ~ getDetail ~ res:', res)
+          if (res.res == 1) {
+            this.combContent = res.obj
+            this.combItem = res.obj.map(item => item.mealName).join('、')
+						this.totalPrice = res.obj.reduce((total, item) => total + Number(item.mealPrice), 0)
+          }
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.content {
+  margin: 10px;
+  padding: 10px;
+  background: #fff;
+  border-radius: 5px;
+
+  .title {
+    font-size: 16px;
+    font-weight: bold;
+    color: #333;
+    line-height: 2.5;
+  }
+
+  .item-content {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 10px;
+    word-break: break-all;
+  }
+
+	
+}
+</style>
diff --git a/pages/HealthExaminationApp/myAppointment/myAppointment.vue b/pages/HealthExaminationApp/myAppointment/myAppointment.vue
index a5a662f..a8593fe 100644
--- a/pages/HealthExaminationApp/myAppointment/myAppointment.vue
+++ b/pages/HealthExaminationApp/myAppointment/myAppointment.vue
@@ -1,20 +1,194 @@
 <template>
-	<div>
+  <div class="content">
+    <div class="item-wrapper">
+      <div class="item" @click="show = true">
+        <div v-if="!makeStatus">请选择体检状态</div>
+        <div v-else>{{ makeStatus }}</div>
+        <div><u-icon name="arrow-right"></u-icon></div>
+      </div>
+      <div class="btn">
+        <u-button type="primary" text="查询"></u-button>
+      </div>
+    </div>
+    <u-picker :show="show" :columns="columns" @close="show = false" @confirm="handleSearch"></u-picker>
 
-	</div>
+    <div class="tip">提示：向左滑动，取消预约</div>
+
+    <u-swipe-action class="swipe-wrapper">
+      <u-swipe-action-item
+        class="swipe-item"
+        :options="options"
+        v-for="(item, index) in makeList"
+        :key="index"
+        :disabled="item.ifCancel == 1 || item.ifCancel == 4"
+				@click="handleDelete(item)"
+      >
+        <div class="swipe-action" @click="handleOption(item)">
+          <div class="item-icon">
+            <u-icon
+              v-if="item.ifCancel == 1 || item.ifCancel == 4"
+              name="/static/images-tijian/isCanceled.png"
+              size="120"
+            ></u-icon>
+            <u-icon v-else-if="item.ifCancel == 2" name="/static/images-tijian/readyExam.png" size="120"></u-icon>
+            <u-icon v-else name="/static/images-tijian/isExamed.png" size="120"></u-icon>
+          </div>
+          <div class="item-cont">
+            <div class="hospital-name">{{ item.hospitalName }}</div>
+            <div class="combName">
+              <div>{{ item.combName }}</div>
+              <div style="color: red">￥{{ item.setMealPrice || '0.0' }}</div>
+            </div>
+            <div>预约时间：{{ item.phyAppontTime }}</div>
+          </div>
+        </div>
+      </u-swipe-action-item>
+    </u-swipe-action>
+  </div>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {}
-		},
-		methods: {
+import config from '@/config'
+
+export default {
+  data() {
+    return {
+      token: '',
+      show: false,
+      columns: [['全部', '已取消', '待体检', '已体检']],
+      // 体检状态
+      makeStatus: '',
+      // 列表
+      makeList: [],
+      isDisabled: false,
+      options: [
+        {
+          text: '删除',
+          // disabled: isDisabled,
+          style: {
+            backgroundColor: '#f56c6c'
+          }
+        }
+      ]
+    }
+  },
+  created() {
+    this.token = uni.getStorageSync('tjToken')
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    handleSearch(e) {
+      console.log('🚀 ~ handleSearch ~ e:', e)
+      this.makeStatus = e.value[0]
+      this.show = false
+    },
+    // 获取列表 getpersonappointInfo
+    getList() {
+      console.log('🚀 ~ 列表 ~ this.token:', this.token)
+      uni.request({
+        url: config.tjBaseUrl + '/app/getpersonappointInfo',
+        method: 'post',
+        data: this.token,
+        header: {
+          'Content-Type': 'application/x-www-form-urlencoded',
+          token: this.token
+        },
+        success: res => {
+          res = res.data
+          console.log('🚀 ~ 列表 ~ res:', res)
+          if (res.res == 1) {
+            this.makeList = res.obj
+          }
+        },
+        fail: err => {
+          console.log('🚀 ~ 列表 ~ err:', err)
+        }
+      })
+    },
+		// 操作-删除
+		handleDelete(item) {
+			console.log('🚀 ~ handleDelete ~ item:', item)
 			
+		},
+		// 
+		handleOption(item) {
+			console.log('🚀 ~ handleOption ~ item:', item)
+			const params = {
+				id: item.id,
+				combName: item.combName,
+			}
+			console.log('🚀 ~ handleOption ~ params:', params)
+			uni.navigateTo({
+				url: '/pages/HealthExaminationApp/myAppointment/healthExamDetails?params=' + JSON.stringify(params)
+			})
 		}
-	}
+  }
+}
 </script>
 
 <style lang="scss" scoped>
+.content {
+  padding: 10px;
+}
+.item-wrapper {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 10px;
+  .item {
+    padding: 0 15px;
+    width: calc(100vw - 100px);
+    height: 50px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    background: #f5f5f5;
+    border-radius: 50px;
+    font-size: 14px;
+    margin-right: 10px;
+  }
+  .btn {
+    width: 50px;
+  }
+}
+.tip {
+  margin-left: 10px;
+  margin-bottom: 20px;
+  color: #999;
+  font-size: 15px;
+}
+.swipe-item {
+  border-radius: 5px;
+  margin: 10px 0;
 
-</style>
\ No newline at end of file
+  .swipe-action {
+    padding: 10px;
+    border-radius: 5px;
+    word-break: break-all;
+
+    .item-icon {
+      //定位 移到左上角
+      position: absolute;
+      top: -42px;
+      left: -36px;
+    }
+
+    .item-cont {
+      margin-left: 50px;
+
+      .hospital-name {
+        font-size: 15px;
+        font-weight: bold;
+        line-height: 1.5;
+      }
+
+      .combName {
+        display: flex;
+        justify-content: space-between;
+      }
+    }
+  }
+}
+</style>
diff --git a/pages/gzt/index.vue b/pages/gzt/index.vue
index 6211a52..75259dd 100644
--- a/pages/gzt/index.vue
+++ b/pages/gzt/index.vue
@@ -197,7 +197,7 @@
 					jwtToken: uni.getStorageSync('App-Token')
 				}
 				const tjparams = {
-					username: '13708411772',
+					username: '13708411772', // 15912575796
 					password: 'YNsbd@123456'
 				}
 				console.log('🚀 ~ gotoYy ~ tjparams:', tjparams)
diff --git a/static/images-tijian/isCanceled.png b/static/images-tijian/isCanceled.png
new file mode 100644
index 0000000000000000000000000000000000000000..06bc79780f27e10b913181b8154bfd22ac543dab
GIT binary patch
literal 6380
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

literal 0
HcmV?d00001

diff --git a/static/images-tijian/isExamed.png b/static/images-tijian/isExamed.png
new file mode 100644
index 0000000000000000000000000000000000000000..61d17e0a034509d18caa730c933e784bfad57d97
GIT binary patch
literal 6300
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

literal 0
HcmV?d00001

diff --git a/static/images-tijian/readyExam.png b/static/images-tijian/readyExam.png
new file mode 100644
index 0000000000000000000000000000000000000000..a30ba704d89dbceb4f63c9e285845e8304764e88
GIT binary patch
literal 6043
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

literal 0
HcmV?d00001


From 7bf27993b3c6c58ab668d1c7487a6aab99d52dce Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Wed, 4 Sep 2024 19:20:45 +0800
Subject: [PATCH 05/10] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/YNEduApp/exam/examination.vue          | 15 ++++++++++-
 pages/YNEduApp/learn/learn.vue               | 14 ++++++++++-
 pages/YNEduApp/learnProj/learnProjDetail.vue | 26 ++++++++++++++++++++
 pages/YNEduApp/prac/exercises.vue            | 17 +++++++++++--
 4 files changed, 68 insertions(+), 4 deletions(-)

diff --git a/pages/YNEduApp/exam/examination.vue b/pages/YNEduApp/exam/examination.vue
index 06280ed..c2abcbb 100644
--- a/pages/YNEduApp/exam/examination.vue
+++ b/pages/YNEduApp/exam/examination.vue
@@ -139,6 +139,7 @@ import config from '@/config'
 export default {
   data() {
     return {
+      isLoading: false,
       // 考试id
       examId: '',
       // 考试记录id
@@ -369,6 +370,15 @@ export default {
     },
     // 确认提交
     handleConfirmSubmit() {
+      console.log('🚀 ~ 提交-->', this.isLoading)
+      if (this.isLoading) {
+        uni.showToast({
+          title: '正在提交中, 请稍后',
+          icon: 'none'
+        })
+        return
+      }
+      this.isLoading = true
       // 停止计时
       this.$refs.countDown.pause()
       const params = {
@@ -390,7 +400,6 @@ export default {
         success: res => {
           console.log('🚀 ~ handleConfirmSubmit ~ res:', res)
           res = res.data
-          this.showConfirmModal = false
           const params2 = {
             examId: this.examId,
             examGrade: res.examGrade,
@@ -411,6 +420,10 @@ export default {
           uni.navigateTo({
             url: `/pages/YNEduApp/exam/examinationDetails?params=${JSON.stringify(params2)}`
           })
+          setTimeout(() => {
+            this.showConfirmModal = false
+            this.isLoading = false
+          }, 1000)
         }
       })
       if (this.studyId) {
diff --git a/pages/YNEduApp/learn/learn.vue b/pages/YNEduApp/learn/learn.vue
index 02fec65..c0eb9e8 100644
--- a/pages/YNEduApp/learn/learn.vue
+++ b/pages/YNEduApp/learn/learn.vue
@@ -40,6 +40,7 @@ export default {
   },
   data() {
     return {
+      isLoading: false,
       studyId: '', // 学习id
       stageId: '', // 阶段id
       stageContentId: '', // 阶段内容id
@@ -103,6 +104,14 @@ export default {
     },
     // 结束学习
     handleEnd() {
+      if (this.isLoading) {
+        uni.showToast({
+          title: '正在提交中, 请稍后',
+          icon: 'none'
+        })
+        return
+      }
+      this.isLoading = true
       if (this.isEnd) {
         uni.reLaunch({
           url: '/pages/YNEduApp/learnProj/learnProjDetail?id=' + this.studyId
@@ -149,10 +158,13 @@ export default {
         },
         success: res => {
           console.log('🚀 ~ handleEnd ~ res:', res)
-          this.showModal = false
           uni.reLaunch({
             url: '/pages/YNEduApp/learnProj/learnProjDetail?id=' + this.studyId
           })
+          setTimeout(() => {
+            this.isLoading = false
+            this.showModal = false
+          }, 1000)
         },
         fail: err => {
           console.log('🚀 ~ handleEnd ~ err:', err)
diff --git a/pages/YNEduApp/learnProj/learnProjDetail.vue b/pages/YNEduApp/learnProj/learnProjDetail.vue
index d638c59..32144c4 100644
--- a/pages/YNEduApp/learnProj/learnProjDetail.vue
+++ b/pages/YNEduApp/learnProj/learnProjDetail.vue
@@ -317,6 +317,18 @@ export default {
     // 跳转考试
     toggleTheoryExam(item) {
       console.log('🚀 ~ toggleTheoryExam ~ item:', item, item.examMsg.examEquipment)
+      const date = new Date()
+      const year = date.getFullYear()
+      const month = date.getMonth() + 1
+      const day = date.getDate()
+      const today = `${year}-${month < 10 ? '0' + month : month}-${day < 10 ? '0' + day : day}`
+      if (today < item.examMsg.validityDate.split('~')[0] || today > item.examMsg.validityDate.split('~')[1]) {
+        uni.showToast({
+          title: '当前时间不在考试时间范围内',
+          icon: 'none'
+        })
+        return
+      }
       if (item.examMsg.examEquipment == 2) {
         uni.showToast({
           title: '请在电脑端进行考试',
@@ -324,6 +336,20 @@ export default {
         })
         return
       }
+      // examCount 1: 不限次 2: 及格终止 3: 自定义
+      if (item.examMsg.examCount == 2 && item.examMsg.results == 1) {
+        uni.showToast({
+          title: '此考试及格终止, 考试以及格, 无需再次考试',
+          icon: 'none'
+        })
+        return
+      } else if (item.examMsg.examCount == 3 && item.examMsg.examNum >= item.examMsg.examCustom) {
+        uni.showToast({
+          title: '此考试有次数限制, 考试次数已达上限, 无法再考试了',
+          icon: 'none'
+        })
+        return
+      }
       const params = {
         id: item.examMsg.id, // 考试id
         cutNum: item.examMsg.isCut, // 切屏次数
diff --git a/pages/YNEduApp/prac/exercises.vue b/pages/YNEduApp/prac/exercises.vue
index d09304a..c7946c6 100644
--- a/pages/YNEduApp/prac/exercises.vue
+++ b/pages/YNEduApp/prac/exercises.vue
@@ -218,6 +218,7 @@ import config from '@/config'
 export default {
   data() {
     return {
+      isLoading: false,
       practiceId: '', // 练习id
       recordId: '', // 记录id
       isNew: 1, // 是否新练习
@@ -606,7 +607,8 @@ export default {
           recordId: this.recordId,
           questionId: this.questionList[0].questionId,
           selectAnswer: select.join(''),
-          isTrue: isCorrect ? 1 : 0
+          isTrue: isCorrect ? 1 : 0,
+          isMiss: this.isError ? '1' : ''
         }
         console.log('🚀 ~ handleOk ~ params-多选:', params)
         // insertPracticeAnswerById(params)
@@ -662,6 +664,14 @@ export default {
     },
     // 结束答题
     handleClose() {
+      if (this.isLoading) {
+        uni.showToast({
+          title: '正在提交中, 请稍后',
+          icon: 'none'
+        })
+        return
+      }
+      this.isLoading = true
       this.isEnd = true
       // 停止计时
       clearInterval(this.intervalId)
@@ -734,7 +744,10 @@ export default {
           url: '/pages/YNEduApp/prac/prac'
         })
       }
-      this.showModal = false
+      setTimeout(() => {
+        this.isLoading = false
+        this.showModal = false
+      }, 500)
     },
     // 打开题目选择弹框
     async openSelect() {

From c73e25f07d63165512965022b9f06b149127eeab Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Thu, 5 Sep 2024 15:05:17 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E4=BD=93=E6=A3=80-=E4=BD=93=E6=A3=80?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.js                                     |   4 +-
 pages.json                                    |  10 +-
 .../appointment/appointment.vue               |   3 +-
 pages/HealthExaminationApp/index/index.vue    |  11 +-
 .../jobAppointment/jobAppointment.vue         | 105 +-------
 .../myAppointment/healthExamDetails.vue       |  38 +--
 .../myAppointment/myAppointment.vue           | 214 +++++++++++-----
 pages/HealthExaminationApp/report/pdfView.vue | 104 ++++++++
 pages/HealthExaminationApp/report/report.vue  | 230 +++++++++++++++++-
 pages/gzt/index.vue                           |   4 +-
 10 files changed, 511 insertions(+), 212 deletions(-)
 create mode 100644 pages/HealthExaminationApp/report/pdfView.vue

diff --git a/config.js b/config.js
index 7cc9c74..fd91051 100644
--- a/config.js
+++ b/config.js
@@ -36,7 +36,9 @@ 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',
+  // tjBaseUrl: 'http://192.168.0.14:20000/AppPeaManager',
+  tjBaseUrl: 'http://192.168.2.147:20000/AppPeaManager',
+  tjFile: 'http://112.29.103.165:1616/medicalDocumentation/statics/',
   // 应用信息
   appInfo: {
     // 应用名称
diff --git a/pages.json b/pages.json
index cfcaa42..14eb1d7 100644
--- a/pages.json
+++ b/pages.json
@@ -213,13 +213,19 @@
     {
       "path": "pages/HealthExaminationApp/report/report",
       "style": {
-        "navigationBarTitleText": "提交报告"
+        "navigationBarTitleText": "体检报告"
+      }
+    },
+    {
+      "path": "pages/HealthExaminationApp/report/pdfView",
+      "style": {
+        "navigationBarTitleText": "体检报告"
       }
     },
     {
       "path": "pages/HealthExaminationApp/myAppointment/myAppointment",
       "style": {
-        "navigationBarTitleText": "我的预约"
+        "navigationStyle": "custom"
       }
     },
     {
diff --git a/pages/HealthExaminationApp/appointment/appointment.vue b/pages/HealthExaminationApp/appointment/appointment.vue
index d5772a5..225d8d4 100644
--- a/pages/HealthExaminationApp/appointment/appointment.vue
+++ b/pages/HealthExaminationApp/appointment/appointment.vue
@@ -107,7 +107,7 @@
       <div>联系方式: {{ hospitalInfo.telPhone }}</div>
     </div>
 
-    <div style="margin: 30px 60px" v-if="hospital && checkType && healthTime">
+    <div style="margin: 30px 60px" v-if="hospital && checkType && healthTime && reservationNumber != 0">
       <u-button type="primary" text="确定预约" shape="circle" size="small" @click="handleSave"></u-button>
     </div>
   </view>
@@ -351,6 +351,7 @@ export default {
           res = res.data
           console.log('🚀 ~ handleSave ~ res:', res)
           if (res.res == 1) {
+            uni.setStorageSync('appoint', true)
             uni.showToast({
               title: '预约成功',
               icon: 'success'
diff --git a/pages/HealthExaminationApp/index/index.vue b/pages/HealthExaminationApp/index/index.vue
index 9f5c90e..eb6f8fa 100644
--- a/pages/HealthExaminationApp/index/index.vue
+++ b/pages/HealthExaminationApp/index/index.vue
@@ -72,6 +72,16 @@ export default {
     },
     // 跳转页面
     handlePage(url) {
+      if (
+        (url == 'appointment' && uni.getStorageSync('appoint')) ||
+        (url == 'jobAppointment' && uni.getStorageSync('jobAppoint'))
+      ) {
+        uni.showToast({
+          title: '您已经预约过，无法再次预约！',
+          icon: 'none'
+        })
+        return
+      }
       uni.navigateTo({
         url: `/pages/HealthExaminationApp/${url}/${url}?params=${JSON.stringify(this.userInfo)}`
       })
@@ -126,7 +136,6 @@ export default {
           if (res.res === 1) {
             this.userInfo = res.obj[0]
           }
-
         },
         fail: err => {
           console.log('🚀 ~ getapplogininfo ~ err:', err)
diff --git a/pages/HealthExaminationApp/jobAppointment/jobAppointment.vue b/pages/HealthExaminationApp/jobAppointment/jobAppointment.vue
index 3fe727b..0d5a284 100644
--- a/pages/HealthExaminationApp/jobAppointment/jobAppointment.vue
+++ b/pages/HealthExaminationApp/jobAppointment/jobAppointment.vue
@@ -34,67 +34,6 @@
       @confirm="confirmHospital"
     ></u-picker>
 
-    <!-- 检查类型 -->
-    <u-popup :show="showPropup" :round="10" mode="bottom" closeable @close="showPropup = false">
-      <div class="propup-content">
-        <h3>请选择套餐</h3>
-        <div class="title-wrapper">
-          <div class="title title-tip" v-if="!checkType">
-            <div>请选择</div>
-            <div class="line"></div>
-          </div>
-          <div v-else>
-            <div class="title">{{ checkType }}</div>
-            <div class="line"></div>
-          </div>
-        </div>
-
-        <div>
-          <div
-            class="list-item"
-            :class="{ active: active == index }"
-            v-for="(item, index) in checkTypeList"
-            :key="index"
-            @click="handleCheckType(item, index)"
-          >
-            <!-- {{ item.combName }} -->
-          </div>
-        </div>
-
-        <div class="cont-title" v-if="checkTypeContent">
-          <div class="cont">{{ checkTypeContent }}</div>
-          <div v-if="showIcon" class="cont-icon" @click="showIcon = false">
-            <div style="margin-right: 3px">展开</div>
-            <div>
-              <u-icon name="arrow-down" color="#1989fa" size="16" />
-            </div>
-          </div>
-          <div v-else class="cont-icon" @click="showIcon = true">
-            <div style="margin-right: 3px">收起</div>
-            <div>
-              <u-icon name="arrow-up" color="#1989fa" size="16" />
-            </div>
-          </div>
-        </div>
-        <div class="cont-line"></div>
-
-        <div v-show="!showIcon" class="contList-wrapper">
-          <div class="contList-item" v-for="(item, index) in checkTypeContentList" :key="index">
-            <div class="cont-title">{{ item.combinName }}</div>
-            <div>项目内容：{{ item.combinContent }}</div>
-            <div>
-              项目价格：
-              <span style="color: red">{{ item.combinPrice }}元</span>
-            </div>
-          </div>
-        </div>
-
-        <div class="btn" v-if="checkType">
-          <u-button type="primary" text="确认套餐" size="small" @click="showPropup = false"></u-button>
-        </div>
-      </div>
-    </u-popup>
-
     <!-- 体检时间 -->
     <u-calendar :show="showTime" mode="single" @confirm="confirmTime" @close="showTime = false"></u-calendar>
 
@@ -109,7 +48,7 @@
       <div>联系方式: {{ hospitalInfo.telPhone }}</div>
     </div>
 
-    <div style="margin: 30px 60px" v-if="hospital && checkType && healthTime">
+    <div style="margin: 30px 60px" v-if="hospital && checkType && healthTime && reservationNumber != 0">
       <u-button type="primary" text="确定预约" shape="circle" size="small" @click="handleSave"></u-button>
     </div>
   </view>
@@ -161,7 +100,7 @@ export default {
     this.getCheckType()
   },
   methods: {
-    // 获取医院列表  app/getCareerHospital
+    // 获取医院列表
     getHospitalList() {
       const params = {
         token: this.token,
@@ -169,7 +108,7 @@ export default {
       }
       console.log('🚀 ~ getHospitalList ~ params:', params)
       uni.request({
-        url: config.tjBaseUrl + '/app/getCareerHospital',
+        url: config.tjBaseUrl + '/app/getOccupationHospital',
         method: 'post',
         data: params,
         header: {
@@ -230,43 +169,6 @@ export default {
       if (this.hospitalInfo.id) this.isDisabled = false
       this.show = false
     },
-    // 选择检查类型
-    handleCheckType(item, index) {
-      console.log('🚀 ~ handleCheckType ~ item:', item)
-      this.active = index
-      this.checkType = item.combName
-      this.getCheckTypeContent(item)
-    },
-    // 获取套餐内容
-    getCheckTypeContent(item) {
-      const params = {
-        token: this.token,
-        checkId: item.id,
-        combType: 2
-      }
-      console.log('🚀 ~ getCheckTypeContent ~ params:', params)
-      uni.request({
-        url: config.tjBaseUrl + '/app/getexamination',
-        method: 'post',
-        data: params,
-        header: {
-          'Content-Type': 'application/x-www-form-urlencoded',
-          token: this.token
-        },
-        success: res => {
-          res = res.data
-          console.log('🚀 ~ getCheckTypeContent ~ res:', res)
-          if (res.res == 1) {
-            this.setMealId = res.obj.tibean[0].id
-            this.checkTypeContent = res.obj.tibean[0].combName
-            this.checkTypeContentList = res.obj.tibeanson
-          }
-        },
-        fail: err => {
-          console.log('🚀 ~ getCheckTypeContent ~ err:', err)
-        }
-      })
-    },
     handleShowTime() {
       if (this.isDisabled) {
         uni.showToast({
@@ -356,6 +258,7 @@ export default {
           res = res.data
           console.log('🚀 ~ handleSave ~ res:', res)
           if (res.res == 1) {
+            uni.setStorageSync('jobAppoint', true)
             uni.showToast({
               title: '预约成功',
               icon: 'success'
diff --git a/pages/HealthExaminationApp/myAppointment/healthExamDetails.vue b/pages/HealthExaminationApp/myAppointment/healthExamDetails.vue
index fb53fe7..bb29a8c 100644
--- a/pages/HealthExaminationApp/myAppointment/healthExamDetails.vue
+++ b/pages/HealthExaminationApp/myAppointment/healthExamDetails.vue
@@ -14,7 +14,7 @@
           <div style="width: 240px">{{ item.mealName }}：{{ item.mealContent }}</div>
           <div style="color: red; margin-left: 15px">{{ item.mealPrice }} 元</div>
         </div>
-				<u-line dashed style="margin-bottom: 10px;"></u-line>
+        <u-line dashed style="margin-bottom: 10px"></u-line>
       </div>
 
       <div class="title" style="color: red">体检总价：{{ totalPrice }} 元</div>
@@ -33,28 +33,11 @@ export default {
       // 套餐名称
       combName: '',
       // 体检项目
-      combItem: '项目1、项目2、项目3',
+      combItem: '',
       // 体检内容
-      combContent: [
-        {
-          mealName: '项目1',
-          mealContent:
-            '项目1内容项目1内容项目1内容项目1内容项目1内容项目1内容项目1内容项目1内容项目1内容项目1内容项目1内容项目1内容',
-          mealPrice: '100'
-        },
-        {
-          mealName: '项目2',
-          mealContent: '项目2内容',
-          mealPrice: '200'
-        },
-        {
-          mealName: '项目3',
-          mealContent: '项目3内容',
-          mealPrice: '300'
-        }
-      ],
-			// 体检总价
-			totalPrice: 0
+      combContent: [],
+      // 体检总价
+      totalPrice: 0
     }
   },
   onLoad(opt) {
@@ -65,14 +48,14 @@ export default {
     this.token = uni.getStorageSync('tjToken')
   },
   mounted() {
-    // this.getDetail()
+    this.getDetail()
   },
   methods: {
     // 获取详情
     getDetail() {
       const params = {
-        token: this.token,
-        cancelId: this.cancelId
+        cancelId: String(this.cancelId),
+        token: this.token
       }
       console.log('🚀 ~ getDetail ~ params:', params)
       uni.request({
@@ -80,6 +63,7 @@ export default {
         method: 'post',
         data: params,
         header: {
+          'Content-Type': 'application/x-www-form-urlencoded',
           token: this.token
         },
         success: res => {
@@ -88,7 +72,7 @@ export default {
           if (res.res == 1) {
             this.combContent = res.obj
             this.combItem = res.obj.map(item => item.mealName).join('、')
-						this.totalPrice = res.obj.reduce((total, item) => total + Number(item.mealPrice), 0)
+            this.totalPrice = res.obj.reduce((total, item) => total + Number(item.mealPrice), 0)
           }
         }
       })
@@ -117,7 +101,5 @@ export default {
     margin-bottom: 10px;
     word-break: break-all;
   }
-
-	
 }
 </style>
diff --git a/pages/HealthExaminationApp/myAppointment/myAppointment.vue b/pages/HealthExaminationApp/myAppointment/myAppointment.vue
index a8593fe..e2c0344 100644
--- a/pages/HealthExaminationApp/myAppointment/myAppointment.vue
+++ b/pages/HealthExaminationApp/myAppointment/myAppointment.vue
@@ -1,49 +1,52 @@
 <template>
-  <div class="content">
-    <div class="item-wrapper">
-      <div class="item" @click="show = true">
-        <div v-if="!makeStatus">请选择体检状态</div>
-        <div v-else>{{ makeStatus }}</div>
-        <div><u-icon name="arrow-right"></u-icon></div>
-      </div>
-      <div class="btn">
-        <u-button type="primary" text="查询"></u-button>
-      </div>
-    </div>
-    <u-picker :show="show" :columns="columns" @close="show = false" @confirm="handleSearch"></u-picker>
-
-    <div class="tip">提示：向左滑动，取消预约</div>
-
-    <u-swipe-action class="swipe-wrapper">
-      <u-swipe-action-item
-        class="swipe-item"
-        :options="options"
-        v-for="(item, index) in makeList"
-        :key="index"
-        :disabled="item.ifCancel == 1 || item.ifCancel == 4"
-				@click="handleDelete(item)"
-      >
-        <div class="swipe-action" @click="handleOption(item)">
-          <div class="item-icon">
-            <u-icon
-              v-if="item.ifCancel == 1 || item.ifCancel == 4"
-              name="/static/images-tijian/isCanceled.png"
-              size="120"
-            ></u-icon>
-            <u-icon v-else-if="item.ifCancel == 2" name="/static/images-tijian/readyExam.png" size="120"></u-icon>
-            <u-icon v-else name="/static/images-tijian/isExamed.png" size="120"></u-icon>
-          </div>
-          <div class="item-cont">
-            <div class="hospital-name">{{ item.hospitalName }}</div>
-            <div class="combName">
-              <div>{{ item.combName }}</div>
-              <div style="color: red">￥{{ item.setMealPrice || '0.0' }}</div>
-            </div>
-            <div>预约时间：{{ item.phyAppontTime }}</div>
-          </div>
+  <div>
+    <u-navbar title="我的预约" @leftClick="leftClick" placeholder></u-navbar>
+    <div class="content">
+      <div class="item-wrapper">
+        <div class="item" @click="show = true">
+          <div v-if="!makeStatus">请选择体检状态</div>
+          <div v-else>{{ makeStatus }}</div>
+          <div><u-icon name="arrow-right"></u-icon></div>
         </div>
-      </u-swipe-action-item>
-    </u-swipe-action>
+        <div class="btn">
+          <u-button type="primary" text="查询" @click="handleQuery"></u-button>
+        </div>
+      </div>
+      <u-picker :show="show" :columns="columns" keyName="label" @close="show = false" @confirm="handleSearch"></u-picker>
+
+      <div class="tip">提示：向左滑动，取消预约</div>
+
+      <u-swipe-action class="swipe-wrapper">
+        <u-swipe-action-item
+          class="swipe-item"
+          :options="options"
+          v-for="(item, index) in makeList"
+          :key="index"
+          :disabled="item.ifCancel != 2"
+          @click="handleDelete(item)"
+        >
+          <div class="swipe-action" @click="handleOption(item)">
+            <div class="item-icon">
+              <u-icon
+                v-if="item.ifCancel == 1 || item.ifCancel == 4"
+                name="/static/images-tijian/isCanceled.png"
+                size="120"
+              ></u-icon>
+              <u-icon v-else-if="item.ifCancel == 2" name="/static/images-tijian/readyExam.png" size="120"></u-icon>
+              <u-icon v-else name="/static/images-tijian/isExamed.png" size="120"></u-icon>
+            </div>
+            <div class="item-cont">
+              <div class="hospital-name">{{ item.hospitalName }}</div>
+              <div class="combName">
+                <div>{{ item.combName }}</div>
+                <div style="color: red">￥{{ item.setMealPrice || '0.0' }}</div>
+              </div>
+              <div>预约时间：{{ item.phyAppontTime }}</div>
+            </div>
+          </div>
+        </u-swipe-action-item>
+      </u-swipe-action>
+    </div>
   </div>
 </template>
 
@@ -55,16 +58,31 @@ export default {
     return {
       token: '',
       show: false,
-      columns: [['全部', '已取消', '待体检', '已体检']],
+      columns: [
+        [
+          { label: '全部', value: 4 },
+          { label: '已取消', value: 1 },
+          { label: '待体检', value: 2 },
+          { label: '已体检', value: 3 }
+        ]
+      ],
       // 体检状态
       makeStatus: '',
+      makeStatusValue: 4,
       // 列表
       makeList: [],
+      // 全部列表
+      allList: [],
+      // 已取消列表
+      canceledList: [],
+      // 待体检列表
+      readyList: [],
+      // 已体检
+      examList: [],
       isDisabled: false,
       options: [
         {
-          text: '删除',
-          // disabled: isDisabled,
+          text: '取消',
           style: {
             backgroundColor: '#f56c6c'
           }
@@ -81,9 +99,21 @@ export default {
   methods: {
     handleSearch(e) {
       console.log('🚀 ~ handleSearch ~ e:', e)
-      this.makeStatus = e.value[0]
+      this.makeStatus = e.value[0].label
+      this.makeStatusValue = e.value[0].value
       this.show = false
     },
+    handleQuery(){
+      if (this.makeStatusValue == 4) {
+        this.makeList = this.allList
+      } else if (this.makeStatusValue == 1) {
+        this.makeList = this.canceledList
+      } else if (this.makeStatusValue == 2) {
+        this.makeList = this.readyList
+      } else if (this.makeStatusValue == 3) {
+        this.makeList = this.examList
+      }
+    },
     // 获取列表 getpersonappointInfo
     getList() {
       console.log('🚀 ~ 列表 ~ this.token:', this.token)
@@ -99,7 +129,10 @@ export default {
           res = res.data
           console.log('🚀 ~ 列表 ~ res:', res)
           if (res.res == 1) {
-            this.makeList = res.obj
+            this.makeList = this.allList = res.obj
+            this.canceledList = res.obj.filter(item => item.ifCancel == 1)
+            this.readyList = res.obj.filter(item => item.ifCancel == 2)
+            this.examList = res.obj.filter(item => item.ifCancel == 3)
           }
         },
         fail: err => {
@@ -107,23 +140,72 @@ export default {
         }
       })
     },
-		// 操作-删除
-		handleDelete(item) {
-			console.log('🚀 ~ handleDelete ~ item:', item)
-			
-		},
-		// 
-		handleOption(item) {
-			console.log('🚀 ~ handleOption ~ item:', item)
-			const params = {
-				id: item.id,
-				combName: item.combName,
-			}
-			console.log('🚀 ~ handleOption ~ params:', params)
-			uni.navigateTo({
-				url: '/pages/HealthExaminationApp/myAppointment/healthExamDetails?params=' + JSON.stringify(params)
-			})
-		}
+    // 操作-删除  cancelpoint
+    handleDelete(item) {
+      console.log('🚀 ~ handleDelete ~ item:', item)
+      const params = {
+        cancelId: item.id,
+        mealType: item.setMealType,
+        token: this.token
+      }
+      // 弹框确认
+      uni.showModal({
+        title: '提示',
+        content: '确认取消预约吗？',
+        success: res => {
+          console.log('🚀 ~ handleDelete ~ res:', res)
+          if (res.confirm) {
+            uni.request({
+              url: config.tjBaseUrl + '/app/cancelpoint',
+              method: 'post',
+              data: params,
+              header: {
+                'Content-Type': 'application/x-www-form-urlencoded',
+                token: this.token
+              },
+              success: res => {
+                res = res.data
+                console.log('🚀 ~ 取消预约 ~ res:', res)
+                if (res.res == 1) {
+                  if (item.setMealType == '2') {
+                    uni.removeStorageSync('appoint')
+                  } else if (item.setMealType == '3') {
+                    uni.removeStorageSync('jobAppoint')
+                  }
+                  // 刷新 - 重定向
+                  uni.redirectTo({
+                    url: '/pages/HealthExaminationApp/myAppointment/myAppointment'
+                  })
+                }
+              },
+              fail: err => {
+                console.log('🚀 ~ 列表 ~ err:', err)
+              }
+            })
+          }
+        },
+        fail: err => {
+          console.log('🚀 ~ handleDelete ~ err:', err)
+        }
+      })
+    },
+    //
+    handleOption(item) {
+      console.log('🚀 ~ handleOption ~ item:', item)
+      const params = {
+        id: item.id,
+        combName: item.combName
+      }
+      console.log('🚀 ~ handleOption ~ params:', params)
+      uni.navigateTo({
+        url: '/pages/HealthExaminationApp/myAppointment/healthExamDetails?params=' + JSON.stringify(params)
+      })
+    },
+    leftClick() {
+      uni.reLaunch({
+        url: '/pages/HealthExaminationApp/index/index'
+      })
+    }
   }
 }
 </script>
diff --git a/pages/HealthExaminationApp/report/pdfView.vue b/pages/HealthExaminationApp/report/pdfView.vue
new file mode 100644
index 0000000..41088f8
--- /dev/null
+++ b/pages/HealthExaminationApp/report/pdfView.vue
@@ -0,0 +1,104 @@
+<template>
+  <view class="content">
+    <web-view :src="url" @message="handlePostMessage"></web-view>
+  </view>
+</template>
+
+<script>
+/* uni页面通信文档
+ * https://ask.dcloud.net.cn/article/35083
+ * 组件使用pdf.js源码修改了部分内容
+ * 只需要完成web-view监听页数并与uni通信即可
+ * @kklxx 2022/12/09修复组件通信
+ */
+import { computed } from 'vue'
+export default {
+  // props: {
+  //   path: {
+  //     type: String,
+  //     default: ''
+  //   }
+  // },
+  data() {
+    return {
+      viewerUrl: '/hybrid/html/web/viewer.html', // 注意：静态的html文件需要放在根路径下的 hybrid/html 文件夹中
+      fileUrl: '', // 要访问的本地pdf的路径
+      url: '', // 最终显示在web-view中的路径
+      currentPage: 1, //初始页
+      totalPage: 0, //总页码
+      currentReadPage: 0 //当前页码
+    }
+  },
+
+  onLoad(opt) {
+    console.log('页面信息：', opt)
+    this.fileUrl = opt.path
+    // /* 设置标题 */
+    // uni.setNavigationBarTitle({
+    //   title: 'PDF预览'
+    // })
+    // /* 初始页面 */
+    // this.pageInt() //获取pdfs数据
+  },
+
+  mounted() {
+    console.log('mounted-pdfView', this.path)
+    /* H5页面通信方式 */
+    // #ifdef H5
+    window.addEventListener('message', this.ReceiveMessage)
+    // #endif
+    // this.fileUrl = this.path
+    /* 设置标题 */
+    uni.setNavigationBarTitle({
+      title: 'PDF预览'
+    })
+    /* 初始页面 */
+    this.pageInt() //获取pdfs数据
+  },
+
+  //页面销毁前
+  beforeDestroy() {
+    uni.removeStorage({
+      //清除pdf留下的缓存，不干扰新的pdf载入
+      key: 'pdfjs.history',
+      success() {
+        // console.log("removeStorage", res)
+      }
+    })
+  },
+
+  methods: {
+    //页面初始化
+    pageInt() {
+      this.url = `${this.viewerUrl}?file=${encodeURIComponent(this.fileUrl)}&page=` + this.currentPage
+    },
+    /*
+     *	做成监听滚动条判断更好
+     *
+     */
+    //uni 组件通信 监听
+    handlePostMessage(data) {
+      let arr = data.detail.data.pop()
+      this.totalPage = arr[0].totalPage //总页数
+      this.currentReadPage = arr[1].page //当前页数
+      console.log('app:', this.totalPage, this.currentReadPage)
+    },
+    //h5 监听
+    ReceiveMessage(event) {
+      if (event.data && event.data.data && event.data.data.arg) {
+        this.totalPage = event.data.data.arg[0].totalPage
+        this.currentReadPage = event.data.data.arg[1].page + 1
+      }
+      console.log('app:', this.totalPage, this.currentReadPage)
+    },
+
+    //页面销毁前动作
+    addBrowseRecord() {
+      // console.log("总页数：",this.totalPage);
+      // console.log("当前页数：",this.currentReadPage);
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/pages/HealthExaminationApp/report/report.vue b/pages/HealthExaminationApp/report/report.vue
index 748742a..d6cf40f 100644
--- a/pages/HealthExaminationApp/report/report.vue
+++ b/pages/HealthExaminationApp/report/report.vue
@@ -1,19 +1,229 @@
 <template>
-	<view>
-		提交报告
-	</view>
+  <view>
+    <div class="content">
+      <u-search
+        placeholder="查找报告"
+        v-model="keyword"
+        clearabled
+        :showAction="false"
+        @clickIcon="handleSearch"
+      ></u-search>
+
+      <div class="cont-wrapper">
+        <div class="cont-title">请选择体检年度</div>
+        <div class="cont-item" @click="showData = true">
+          <div>{{ year }}</div>
+          <u-icon name="arrow-right" size="13"></u-icon>
+        </div>
+        <div class="cont-item" @click="showType = true">
+          <div v-if="type">{{ type }}</div>
+          <div v-else style="color: #999">体检类型</div>
+          <u-icon name="arrow-right" size="13"></u-icon>
+        </div>
+      </div>
+
+      <div class="cont-list" v-for="(item, index) in contList" :key="index">
+        <div class="list-type">{{ item.fixedValue }}</div>
+        <div class="center-cont">
+          <div class="title">{{ item.mealName }}</div>
+          <div>{{ item.createTime }}</div>
+        </div>
+        <div class="btn">
+          <u-button type="primary" shape="circle" text="查看报告" @click="handleSeeReport(item)"></u-button>
+        </div>
+      </div>
+    </div>
+
+		<u-picker :show="showData" :columns="dataColumns" @cancel="showData = false" @confirm="handleData"></u-picker>
+		<u-picker
+			:show="showType"
+			:columns="typeColumns"
+			keyName="label"
+			@cancel="showType = false"
+			@confirm="handleType"
+		></u-picker>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				
-			};
-		}
-	}
+import config from '@/config'
+
+export default {
+  data() {
+    return {
+      isShow: true,
+      token: '',
+      keyword: '',
+      // 体检年度
+      year: new Date().getFullYear(),
+      // 体检类型
+      type: '',
+			typeValue: '',
+      showData: false,
+      showType: false,
+      dataColumns: [],
+      typeColumns: [
+        [
+          { label: '全部', value: '' },
+          { label: '普通体检', value: 0 },
+          { label: '职业体检', value: 1 }
+        ]
+      ],
+      contList: [],
+			pdfPath: ''
+    }
+  },
+  mounted() {
+    this.token = uni.getStorageSync('tjToken')
+    this.year = new Date().getFullYear()
+    console.log('🚀 ~ mounted ~ year:', this.year)
+    let arr = []
+    for (let i = 0; i < 10; i++) {
+      arr.push(this.year - i)
+    }
+    this.dataColumns = [arr]
+    console.log('🚀 ~ mounted ~ this.dataColumns:', this.dataColumns)
+    this.getList()
+  },
+  methods: {
+    // 搜索
+    handleSearch() {
+      console.log('🚀 ~ handleSearch ~ this.keyword:', this.keyword)
+			this.getList()
+    },
+    // 选择体检年度
+    handleData(e) {
+      console.log('🚀 ~ handleData ~ this.year:', e)
+      this.year = e.value[0]
+			this.getList()
+      this.showData = false
+    },
+    // 选择体检类型
+    handleType(e) {
+      console.log('🚀 ~ handleType ~ this.type:', e)
+      this.type = e.value[0].label
+			this.typeValue = e.value[0].value
+			this.getList()
+      this.showType = false
+    },
+    // 获取列表
+    getList() {
+      const params = {
+        name: this.keyword,
+        data: this.year,
+        type: this.typeValue,
+        token: this.token
+      }
+      console.log('🚀 ~ getList ~ params:', params)
+
+      uni.request({
+        url: config.tjBaseUrl + '/app/getpackageBid',
+        method: 'get',
+        data: params,
+        header: {
+          'Content-Type': 'application/x-www-form-urlencoded',
+          token: this.token
+        },
+        success: res => {
+          res = res.data
+          console.log('🚀 ~ 列表 ~ res:', res)
+          if (res.res == 1) {
+            this.contList = res.obj
+          }
+        },
+        fail: err => {
+          console.log('🚀 ~ 列表 ~ err:', err)
+        }
+      })
+    },
+    // 查看报告
+    handleSeeReport(item) {
+      console.log('🚀 ~ handleSeeReport ~ item:', item)
+      this.pdfPath = config.tjFile + item.physicalAddress
+			// 跳转
+			uni.navigateTo({
+				url: `/pages/HealthExaminationApp/report/pdfView?path=${this.pdfPath}`
+			})
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
+.content {
+  margin: 10px;
+  padding: 10px;
 
+  .cont-wrapper {
+    display: flex;
+    justify-content: space-between;
+    align-content: center;
+    padding: 10px 0;
+
+    .cont-title {
+      height: 40px;
+      line-height: 40px;
+      font-size: 15px;
+      font-weight: bold;
+      text-align: center;
+    }
+
+    .cont-item {
+      padding: 0 5px;
+      width: 28%;
+      height: 40px;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      background: #fff;
+      border-radius: 40px;
+    }
+  }
+
+  .cont-list {
+		margin: 10px 0;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    background: #fff;
+    border-radius: 5px;
+    margin-top: 10px;
+
+    .list-type {
+      padding: 10px;
+      width: 20px;
+      text-align: center;
+      font-size: 14px;
+      font-weight: bold;
+      white-space: pre-wrap;
+      word-break: break-all;
+      background: #9bc5c6;
+			color: #fff;
+			border-radius: 5px 0 0 5px;
+    }
+
+    .center-cont {
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+      font-size: 14px;
+      color: #666;
+
+			.title {
+				font-size: 15px;
+				font-weight: bold;
+				color: #333;
+				margin-bottom: 15px;
+			}
+    }
+
+    .btn {
+      margin-right: 10px;
+      width: 80px;
+      text-align: center;
+    }
+  }
+}
 </style>
diff --git a/pages/gzt/index.vue b/pages/gzt/index.vue
index 75259dd..32e0cc0 100644
--- a/pages/gzt/index.vue
+++ b/pages/gzt/index.vue
@@ -197,7 +197,7 @@
 					jwtToken: uni.getStorageSync('App-Token')
 				}
 				const tjparams = {
-					username: '13708411772', // 15912575796
+					username: '17681010134', // 15912575796
 					password: 'YNsbd@123456'
 				}
 				console.log('🚀 ~ gotoYy ~ tjparams:', tjparams)
@@ -262,7 +262,7 @@
 								}, 500)
 							} else {
 								uni.showToast({
-									title: req.message,
+									title: res.msg,
 									icon: 'none'
 								})
 							}

From a03f5c08b4cd745a4adf2a3de62898a49743c85a Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Thu, 5 Sep 2024 18:17:59 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=20bug=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/YNEduApp/exam/examination.vue     |  58 ++++++------
 pages/YNEduApp/learnProj/imageStudy.vue |   5 +-
 pages/YNEduApp/learnProj/pdfStudy.vue   |   6 +-
 pages/YNEduApp/prac/exercises.vue       | 114 +++++++++++++++++-------
 pages/YNEduApp/user/faceScan.vue        |   8 +-
 5 files changed, 118 insertions(+), 73 deletions(-)

diff --git a/pages/YNEduApp/exam/examination.vue b/pages/YNEduApp/exam/examination.vue
index c2abcbb..870abfd 100644
--- a/pages/YNEduApp/exam/examination.vue
+++ b/pages/YNEduApp/exam/examination.vue
@@ -208,10 +208,6 @@ export default {
   },
   mounted() {
     this.getList()
-    this.random1 = Math.ceil(Math.random() * 100000) + 420000 // random1 在 7-13分钟之间
-    // this.random1 = 10000
-    this.random2 = Math.ceil(Math.random() * 100000) + 900000 // random2 在 15-19分钟之间
-    console.log('🚀 ~ mounted ~ this.random1:', this.random1, this.random2)
   },
   // onUnload() {
   //   console.log('🚀 ~ onUnload ~ 页面关闭')
@@ -224,14 +220,7 @@ export default {
         const params = {
           examId: this.examId
         }
-        // const res = await getExamQuestionList(params)
-        // const data = res.data
-        // this.questionList = data.examPaperData
-        // this.recordId = data.recordId
-        // this.examTime = data.answerTime
-        // this.time = Number(data.answerTime) * 60 * 1000
-        // console.log('🚀 ~ getList ~ this.time:', this.time)
-        // console.log('🚀 ~ getList ~ res考试题:', res)
+        
         uni.request({
           url: config.baseUrl + '/exam-student/studentExam/getExamQuestionList',
           method: 'post',
@@ -250,6 +239,9 @@ export default {
             this.time = Number(data.answerTime) * 60 * 1000
             console.log('🚀 ~ getList ~ this.time:', this.time)
             console.log('🚀 ~ getList ~ this.questionList:', this.questionList)
+            this.random1 = (data.answerTime/3) * 60 + Math.ceil(Math.random() * 20) + 20
+            this.random2 = (data.answerTime/2) * 60 + Math.ceil(Math.random() * 30) + 30
+            console.log('🚀 ~ getList ~ this.random1:', this.random1, this.random2)
             if (this.questionList.length > 0) {
               this.questionList.forEach((item, index) => {
                 this.$set(item, 'isShow', index < 7)
@@ -282,12 +274,12 @@ export default {
         this.time - (time.days * 24 * 60 * 60 + time.hours * 60 * 60 + time.minutes * 60 + time.seconds) * 1000
       // console.log('🚀 ~ changeCountDown ~ this.answerTime:', this.answerTime)
       if (this.answerTime > this.random1 && this.answerTime < this.random2 && !this.hasScanned) {
-        this.openFaceScan() // Android 人脸识别
-        // this.openPhotograph() // IOS 拍照识别
+        // this.openFaceScan() // Android 人脸识别
+        this.openPhotograph() // IOS 拍照识别
         this.hasScanned = true
       } else if (this.answerTime > this.random2 && this.hasScanned) {
-        this.openFaceScan()
-        // this.openPhotograph()
+        // this.openFaceScan()
+        this.openPhotograph()
         this.hasScanned = false
       }
       if (this.answerTime == this.time) {
@@ -452,18 +444,18 @@ export default {
       // })
     },
     // 人脸识别
-    async openFaceScan() {
-      face.open(['a'], e => {
-        console.log('🚀 ~ e-人脸识别:', e)
-        face.close()
-        let params = {
-          userId: uni.getStorageSync('userId'),
-          img: e
-        }
-        params = JSON.stringify(params)
-        this.getFaceRecognition(params)
-      })
-    },
+    // async openFaceScan() {
+    //   face.open(['a'], e => {
+    //     console.log('🚀 ~ e-人脸识别:', e)
+    //     face.close()
+    //     let params = {
+    //       userId: uni.getStorageSync('userId'),
+    //       img: e
+    //     }
+    //     params = JSON.stringify(params)
+    //     this.getFaceRecognition(params)
+    //   })
+    // },
     // 拍照录入
     openPhotograph() {
       this.isHide = true
@@ -478,7 +470,7 @@ export default {
           this.imgToBase64(res.tempFilePaths[0]).then(base64 => {
             url = base64
             console.log('🚀 ~ this.imgToBase64 ~ base64:', url)
-            this.getFaceRecognition(url)
+            this.getFaceRecognition({ userId: uni.getStorageSync('userId'), img: url })
           })
         },
         fail: err => {
@@ -501,6 +493,7 @@ export default {
     },
     // 发送请求
     getFaceRecognition(params) {
+      console.log('🚀 ~ getFaceRecognition ~ params:', params)
       uni.request({
         url: config.baseUrl + '/exam-student/personalCenter/getFaceRecognition',
         method: 'POST',
@@ -510,8 +503,9 @@ export default {
         },
         data: params,
         success: res => {
+          console.log('🚀 ~ openFaceScan ~ res-人脸识别:', res)
           res = res.data
-          console.log('🚀 ~ openFaceScan ~ res-人脸识别:', res, res.code)
+          console.log('🚀 ~ openFaceScan ~ res-人脸识别:', res.code)
           if (res.code == 200) {
             this.$refs.uToast.show({
               message: '人脸识别成功',
@@ -529,6 +523,10 @@ export default {
         },
         fail(err) {
           console.log('🚀 ~ openFaceScan ~ 人脸识别失败', err)
+          this.$refs.uToast.show({
+            message: err.errMsg,
+            duration: 1000
+          })
         }
       })
     },
diff --git a/pages/YNEduApp/learnProj/imageStudy.vue b/pages/YNEduApp/learnProj/imageStudy.vue
index 1a6fa6a..cd83aeb 100644
--- a/pages/YNEduApp/learnProj/imageStudy.vue
+++ b/pages/YNEduApp/learnProj/imageStudy.vue
@@ -29,7 +29,7 @@ export default {
     console.log('🚀 ~ onLoad ~ this.params:', this.path)
     console.log('🚀 ~ onLoad ~ this.params:', Number(opt.studyDuration), Number(opt.allStudyDuration))
 
-    if (Number(opt.studyDuration) <= Number(opt.allStudyDuration)) {
+    if (Number(opt.studyDuration) < Number(opt.allStudyDuration)) {
       this.isEnd = false
       setTimeout(() => {
         this.countDown()
@@ -77,11 +77,10 @@ export default {
       // let studyDuration = Number(this.params.studyDuration)
       this.timer = setInterval(() => {
         allStudyDuration--
-        // studyDuration++
         this.params.studyDuration++
-        // this.$set(this.params, 'studyDuration', studyDuration)
         console.log('🚀 ~ countDown ~ this.params.studyDuration:', this.params.studyDuration)
         if (allStudyDuration <= 0) {
+          this.params.studyDuration = this.params.allStudyDuration
           this.isEnd = true
           clearInterval(this.timer)
           // 提示-学习时长已满
diff --git a/pages/YNEduApp/learnProj/pdfStudy.vue b/pages/YNEduApp/learnProj/pdfStudy.vue
index 05c8045..d22a8e0 100644
--- a/pages/YNEduApp/learnProj/pdfStudy.vue
+++ b/pages/YNEduApp/learnProj/pdfStudy.vue
@@ -34,7 +34,7 @@ export default {
     }
     console.log('🚀 ~ onLoad ~ this.params:', this.path)
     console.log('🚀 ~ onLoad ~ this.params:', Number(opt.studyDuration), Number(opt.allStudyDuration))
-    if (Number(opt.studyDuration) <= Number(opt.allStudyDuration)) {
+    if (Number(opt.studyDuration) < Number(opt.allStudyDuration)) {
       setTimeout(() => {
         this.countDown()
       }, 1000)
@@ -62,14 +62,12 @@ export default {
     // 根据allStudyDuration 倒计时
     countDown() {
       let allStudyDuration = Number(this.params.allStudyDuration) - Number(this.params.studyDuration)
-      // let studyDuration = Number(this.params.studyDuration)
       this.timer = setInterval(() => {
         allStudyDuration--
-        // studyDuration++
         this.params.studyDuration++
-        // this.$set(this.params, 'studyDuration', studyDuration)
         console.log('🚀 ~ countDown ~ this.params.studyDuration:', this.params.studyDuration)
         if (allStudyDuration <= 0) {
+          this.params.studyDuration = this.params.allStudyDuration
           clearInterval(this.timer)
           setTimeout(() => {
             this.updStudyDuration()
diff --git a/pages/YNEduApp/prac/exercises.vue b/pages/YNEduApp/prac/exercises.vue
index c7946c6..ecbd815 100644
--- a/pages/YNEduApp/prac/exercises.vue
+++ b/pages/YNEduApp/prac/exercises.vue
@@ -17,7 +17,7 @@
     </div>
 
     <div class="question-wrapper" v-for="(item, index) in questionList" :key="index">
-      <div v-if="item.examType !== 2">
+      <div v-if="item.examType != 2">
         <div class="title">{{ nowNum }}.{{ item.paperTopic }}{{ item.examType == 1 ? '（单选题）' : '(判断题)' }}</div>
         <u--image
           v-if="item.paperTopicUrl"
@@ -36,7 +36,21 @@
             @click="handleOption(option, index)"
             :class="{ active: option.isCorrect || option.isError }"
           >
-            <div class="label">{{ option.optionIdent }}.{{ option.optionContent }}</div>
+            <div class="label-wrapper">
+              <div class="label">
+                <div style="width: 18px">{{ option.optionIdent }}.</div>
+                <div class="label-cont">{{ option.optionContent }}</div>
+              </div>
+              <u--image
+                v-if="option.optionUrl"
+                :showLoading="true"
+                :src="fileUrl + option.optionUrl"
+                width="60px"
+                height="60px"
+                style="margin: 10px 0"
+                @click="clickImg(fileUrl + option.optionUrl)"
+              />
+            </div>
             <u-icon v-if="option.isCorrect" name="/static/images/right.png" size="25" />
             <u-icon v-if="option.isError" name="/static/images/err.png" size="25" />
           </div>
@@ -46,15 +60,15 @@
           <div>正确答案：{{ item.correctGrade }}</div>
           <div>你的答案：{{ item.select }}</div>
 
-          <div v-if="item.analysis">
+          <div>
             <div class="analysis">答案解析：</div>
             <div class="analysis-container">{{ item.answerAnaly }}</div>
           </div>
         </div>
       </div>
       <!-- 多选 -->
-      <div v-else-if="item.examType === 2">
-        <div class="title">{{ index + 1 }}. {{ item.paperTopic }}（多选题）</div>
+      <div v-else-if="item.examType == 2">
+        <div class="title">{{ nowNum }}. {{ item.paperTopic }}（多选题）</div>
         <u--image
           v-if="item.paperTopicUrl"
           :showLoading="true"
@@ -72,7 +86,7 @@
             @click="handleCheckbox(option, index, item)"
             :class="{ active: option.isCheck || option.isCorrect || option.isError }"
           >
-            <div>
+            <div class="label-wrapper">
               <div class="label">
                 <div style="width: 18px">{{ option.optionIdent }}.</div>
                 <div class="label-cont">{{ option.optionContent }}</div>
@@ -80,11 +94,11 @@
               <u--image
                 v-if="option.optionUrl"
                 :showLoading="true"
-                :src="fileUrl + option.optionUrl || ''"
+                :src="fileUrl + option.optionUrl"
                 width="60px"
                 height="60px"
-                style="margin-bottom: 10px"
-                @click="clickImg(fileUrl + option.optionUrl || '')"
+                style="margin: 10px 0"
+                @click="clickImg(fileUrl + option.optionUrl)"
               />
             </div>
             <u-icon v-if="option.isCorrect" name="/static/images/right.png" size="25" />
@@ -224,7 +238,7 @@ export default {
       isNew: 1, // 是否新练习
       isOutOfOrder: 1, // 是否乱序
       isError: false, // 是否错题消除
-      nowNum: 0, // 当前题目索引
+      nowNum: '', // 当前题目索引
       showModal: false,
       showModalSelect: false,
       // 正确率
@@ -273,19 +287,13 @@ export default {
   },
   methods: {
     // 获取题目-上方数量
-    async getPracticeItData() {
+    getPracticeItData() {
       const params = {
         practiceId: this.practiceId,
         recordId: this.recordId,
         isNew: this.isNew || '',
         isMiss: this.isError ? '1' : ''
       }
-      // const res = await getPracticeItData(params)
-      // this.trueNum = res.data.trueNum
-      // this.falseNum = res.data.falseNum
-      // this.allNum = res.data.allNum
-      // this.nowNum = res.data.nowNum
-      // console.log('🚀 ~ getPracticeItData ~ res:', res)
       uni.request({
         url: config.baseUrl + '/exam-student/studentPractice/getPracticeItData',
         method: 'post',
@@ -308,7 +316,7 @@ export default {
       })
     },
     // 获取题目
-    async getPracticeQuestion() {
+    getPracticeQuestion() {
       this.questionList = []
       const params = {
         practiceId: this.practiceId,
@@ -333,8 +341,43 @@ export default {
         success: res => {
           console.log('🚀 ~ getPracticeQuestion ~ res:', res)
           res = res.data
-          this.recordId = res.data.recordId ? res.data.recordId : this.recordId
           this.questionList.push(res.data)
+          console.log('🚀 ~ getPracticeQuestion ~ :', this.questionList[0])
+          this.recordId = res.data.recordId ? res.data.recordId : this.recordId
+          if (res.data.selectAnswer) {
+            console.log('执行了--')
+            if (this.questionList[0].examType == 2) {
+              this.questionList[0].select = res.data.selectAnswer.split('')
+              this.questionList[0].isSelect = true
+              // 给selectAnswer选项如果正确添加正确标记, 错误添加错误标记并给正确选项添加标记
+              this.questionList[0].listOption.forEach(item => {
+                if (res.data.selectAnswer.includes(item.optionIdent)) {
+                  item.isSelect = true
+                }
+                if (res.data.correctGrade.includes(item.optionIdent)) {
+                  item.isCorrect = true
+                }
+                if (item.isSelect && !this.questionList[0].correctGrade.includes(item.optionIdent)) {
+                  item.isError = true
+                }
+              })
+            } else {
+              this.questionList[0].select = res.data.selectAnswer
+              this.questionList[0].isSelect = true
+              // 给selectAnswer选项如果正确添加正确标记, 错误添加错误标记并给正确选项添加标记
+              this.questionList[0].listOption.forEach(item => {
+                if (res.data.selectAnswer === item.optionIdent) {
+                  item.isSelect = true
+                }
+                if (item.optionIdent === this.questionList[0].correctGrade) {
+                  item.isCorrect = true
+                }
+                if (item.isSelect && item.optionIdent !== this.questionList[0].correctGrade) {
+                  item.isError = true
+                }
+              })
+            }
+          }
         },
         fail: err => {
           console.log(err)
@@ -342,15 +385,16 @@ export default {
       })
     },
     // 跳题
-    async handleJump(item, index) {
+    handleJump(item, index) {
       console.log('🚀 ~ handleJump ~ item:', item, this.recordId)
       if (item === 'prev') {
-        this.nowNum -= 1
+        this.nowNum--
       } else if (item === 'next') {
-        this.nowNum += 1
+        this.nowNum++
       } else if (item === 'jump') {
         this.nowNum = index
       }
+      console.log('🚀 ~ handleJump ~ this.nowNum:', this.nowNum)
 
       this.currentIndex = index
       this.questionList = []
@@ -378,7 +422,7 @@ export default {
           res = res.data
           this.questionList.push(res.data)
           if (res.data.selectAnswer) {
-            if (this.questionList[0].examType === 2) {
+            if (this.questionList[0].examType == 2) {
               this.questionList[0].select = res.data.selectAnswer.split('')
               this.questionList[0].isSelect = true
               // 给selectAnswer选项如果正确添加正确标记, 错误添加错误标记并给正确选项添加标记
@@ -386,7 +430,7 @@ export default {
                 if (res.data.selectAnswer.includes(item.optionIdent)) {
                   item.isSelect = true
                 }
-                if (item.optionIdent === this.questionList[0].correctGrade) {
+                if (res.data.correctGrade.includes(item.optionIdent)) {
                   item.isCorrect = true
                 }
                 if (item.isSelect && !this.questionList[0].correctGrade.includes(item.optionIdent)) {
@@ -417,7 +461,7 @@ export default {
       })
     },
     // 获取题目列表-弹框
-    async getPracticeQuestionList() {
+    getPracticeQuestionList() {
       const params = {
         recordId: this.recordId,
         practiceId: this.practiceId,
@@ -627,7 +671,7 @@ export default {
       }
     },
     // 提交
-    async handleSubmit() {
+    handleSubmit() {
       // 暂停时间
       clearInterval(this.intervalId)
       console.log('提交')
@@ -750,7 +794,7 @@ export default {
       }, 500)
     },
     // 打开题目选择弹框
-    async openSelect() {
+    openSelect() {
       this.showModalSelect = true
       // const res = await this.getPracticeQuestionList()
       // console.log('🚀 ~ openSelect ~ res:', res)
@@ -882,6 +926,8 @@ export default {
   }
 
   .question-wrapper {
+    max-height: 500px;
+    overflow: auto;
     padding: 30px;
     color: #08428d;
 
@@ -901,11 +947,15 @@ export default {
       background: #ffffff;
       border-radius: 8px;
       overflow: auto;
-      .label {
-        display: flex;
-        align-items: center;
-        justify-content: flex-start;
-        text-align: left;
+      .label-wrapper {
+        max-height: 100px;
+        overflow: auto;
+        .label {
+          display: flex;
+          align-items: center;
+          justify-content: flex-start;
+          text-align: left;
+        }
       }
     }
     .active {
diff --git a/pages/YNEduApp/user/faceScan.vue b/pages/YNEduApp/user/faceScan.vue
index f7c17c8..97e1162 100644
--- a/pages/YNEduApp/user/faceScan.vue
+++ b/pages/YNEduApp/user/faceScan.vue
@@ -22,8 +22,8 @@
         </div>
       </div>
       <div class="btn">
-        <u-button type="primary" shape="circle" text="开始录入" @click="openFaceScan" style="margin-bottom: 10px" />
-        <!-- <u-button type="primary" shape="circle" text="拍照录入" @click="openPhotograph" /> -->
+        <!-- <u-button type="primary" shape="circle" text="开始录入" @click="openFaceScan" style="margin-bottom: 10px" /> -->
+        <u-button type="primary" shape="circle" text="拍照录入" @click="openPhotograph" />
       </div>
     </div>
 
@@ -36,8 +36,8 @@
       <div class="img-tip-content">收集您的信息，以实现在考试中检测是否是您本人操作，请务必录入您本人的面部信息</div>
       <div class="btn">
         <u-button type="primary" shape="circle" text="确定录入" @click="handleSubmit" />
-        <u-button type="primary" plain shape="circle" text="重新录入" @click="openFaceScan" style="margin: 10px 0" />
-        <!-- <u-button type="primary" plain shape="circle" text="重新拍照" @click="openPhotograph" /> -->
+        <!-- <u-button type="primary" plain shape="circle" text="重新录入" @click="openFaceScan" style="margin: 10px 0" /> -->
+        <u-button type="primary" plain shape="circle" text="重新拍照" style="margin: 10px 0" @click="openPhotograph" />
       </div>
     </div>
   </view>

From c4dec49f2831a6e1806d96bde0b9db08ae36a858 Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Fri, 6 Sep 2024 14:53:49 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E4=BD=93=E6=A3=80=20=E4=B8=8E=20?=
 =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E9=AA=8C=E8=AF=81token?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.js                                       |  67 ++++++---
 pages.json                                    |  14 ++
 pages/HealthExaminationApp/index/index.vue    | 134 +++++++++++++++---
 pages/HealthExaminationApp/index/message.vue  | 111 +++++++++++++++
 pages/HealthExaminationApp/index/userInfo.vue |  62 ++++++++
 pages/YNEduApp/exam/exam.vue                  |   1 +
 pages/YNEduApp/exam/examination.vue           |  22 +--
 pages/YNEduApp/exam/examinationDetails.vue    |   1 +
 pages/YNEduApp/exam/examinationList.vue       |   1 +
 .../exam/examinationResultDetails.vue         |   1 +
 pages/YNEduApp/index/index.vue                |   9 +-
 pages/YNEduApp/index/notices.vue              |   3 +-
 pages/YNEduApp/learn/learn.vue                |   1 +
 pages/YNEduApp/learnProj/imageStudy.vue       |   1 +
 pages/YNEduApp/learnProj/learnProj.vue        |   1 +
 pages/YNEduApp/learnProj/learnProjDetail.vue  |   1 +
 pages/YNEduApp/learnProj/pdfStudy.vue         |   1 +
 pages/YNEduApp/prac/exercises.vue             |  10 ++
 pages/YNEduApp/prac/prac.vue                  |   1 +
 pages/YNEduApp/prac/pracDetail.vue            |   1 +
 pages/YNEduApp/user/faceScan.vue              |   1 +
 pages/YNEduApp/user/myMsg.vue                 |   3 +
 pages/YNEduApp/user/user.vue                  |   1 +
 pages/gzt/index.vue                           |  10 +-
 pages/login.vue                               |   2 +-
 static/images-tijian/logout.png               | Bin 0 -> 1270 bytes
 static/images-tijian/message.png              | Bin 0 -> 1940 bytes
 static/images-tijian/userInfo.png             | Bin 0 -> 2745 bytes
 utils/request.js                              |   3 -
 29 files changed, 408 insertions(+), 55 deletions(-)
 create mode 100644 pages/HealthExaminationApp/index/message.vue
 create mode 100644 pages/HealthExaminationApp/index/userInfo.vue
 create mode 100644 static/images-tijian/logout.png
 create mode 100644 static/images-tijian/message.png
 create mode 100644 static/images-tijian/userInfo.png

diff --git a/main.js b/main.js
index bfd88d8..f5ef3a8 100644
--- a/main.js
+++ b/main.js
@@ -7,11 +7,11 @@ import Vue from 'vue'
 Vue.config.productionTip = false
 // Vue.prototype.$api = $api
 Vue.prototype.$store = store
-Vue.prototype.$adpid = "1111111111"
+Vue.prototype.$adpid = '1111111111'
 Vue.prototype.$backgroundAudioData = {
-	playing: false,
-	playTime: 0,
-	formatedPlayTime: '00:00:00'
+  playing: false,
+  playTime: 0,
+  formatedPlayTime: '00:00:00'
 }
 
 import uView from '@/uni_modules/uview-ui'
@@ -24,29 +24,56 @@ Vue.use(uView)
 // const vconsole = require('vconsole')
 // Vue.prototype.$vconsole = new vconsole() // 使用vconsole
 
+Vue.prototype.$verificationToken = function () {
+  console.log('验证Token-->')
+  uni.request({
+    url: 'http://192.168.0.14:19999/exam-bmw/users/current',
+    method: 'get',
+    header: {
+      Authorization: uni.getStorageSync('access_token')
+    },
+		success: (res) => {
+			console.log('🚀 ~ res:', res)
+			let data = res.data
+			console.log('🚀 ~ res.data:', data)
+			if (data === '' || data === undefined) {
+				uni.showToast({
+					title: '已在其他设备登录，请重新登录',
+					icon: 'none'
+				})
+				uni.reLaunch({
+					url: '/pages/login'
+				})
+			}
+		},
+		fail: (err) => {
+			console.log('🚀 ~ err:', err)
+		}
+  })
+}
+
 App.mpType = 'app'
 const app = new Vue({
-	store,
-	...App
+  store,
+  ...App
 })
 app.$mount()
 // #endif
 
 // #ifdef VUE3
-import {
-	createSSRApp
-} from 'vue'
+import { createSSRApp } from 'vue'
+import { data } from 'uview-ui/libs/mixin/mixin';
 export function createApp() {
-	const app = createSSRApp(App)
-	app.use(store)
-	app.config.globalProperties.$adpid = "1111111111"
-	app.config.globalProperties.$backgroundAudioData = {
-		playing: false,
-		playTime: 0,
-		formatedPlayTime: '00:00:00'
-	}
-	return {
-		app
-	}
+  const app = createSSRApp(App)
+  app.use(store)
+  app.config.globalProperties.$adpid = '1111111111'
+  app.config.globalProperties.$backgroundAudioData = {
+    playing: false,
+    playTime: 0,
+    formatedPlayTime: '00:00:00'
+  }
+  return {
+    app
+  }
 }
 // #endif
diff --git a/pages.json b/pages.json
index 14eb1d7..2be0f27 100644
--- a/pages.json
+++ b/pages.json
@@ -261,6 +261,20 @@
     	{
     		"navigationBarTitleText" : "体检预约单"
     	}
+    },
+    {
+    	"path" : "pages/HealthExaminationApp/index/userInfo",
+    	"style" : 
+    	{
+    		"navigationBarTitleText" : "个人信息"
+    	}
+    },
+    {
+    	"path" : "pages/HealthExaminationApp/index/message",
+    	"style" : 
+    	{
+    		"navigationBarTitleText" : "消息通知"
+    	}
     }
   ],
   "globalStyle": {
diff --git a/pages/HealthExaminationApp/index/index.vue b/pages/HealthExaminationApp/index/index.vue
index eb6f8fa..cc301d7 100644
--- a/pages/HealthExaminationApp/index/index.vue
+++ b/pages/HealthExaminationApp/index/index.vue
@@ -1,6 +1,5 @@
 <template>
   <view>
-    <!-- <u-navbar title="首页" placeholder @leftClick="leftClick" /> -->
     <div v-if="isShow">
       <div class="top-swiper">
         <div class="swiper">
@@ -11,17 +10,55 @@
       <div class="title">体检服务</div>
 
       <div class="opt-list">
-        <div class="opt-item" v-for="(item, index) in optList" :key="index" @click="handlePage(item.url)">
+        <div class="opt-item" v-if="personnelType != 0" @click="handlePage(optList[0].url)">
           <div class="item">
-            <u--image :showLoading="true" :src="item.src" width="70px" height="60px" />
-            <div class="name">{{ item.name }}</div>
+            <u--image :showLoading="true" :src="optList[0].src" width="70px" height="60px" />
+            <div class="name">{{ optList[0].name }}</div>
+          </div>
+        </div>
+        <div class="opt-item" v-if="status != 0" @click="handlePage(optList[1].url)">
+          <div class="item">
+            <u--image :showLoading="true" :src="optList[1].src" width="70px" height="60px" />
+            <div class="name">{{ optList[1].name }}</div>
+          </div>
+        </div>
+        <div class="opt-item" @click="handlePage(optList[2].url)">
+          <div class="item">
+            <u--image :showLoading="true" :src="optList[2].src" width="70px" height="60px" />
+            <div class="name">{{ optList[2].name }}</div>
+          </div>
+        </div>
+        <div class="opt-item" @click="handlePage(optList[3].url)">
+          <div class="item">
+            <u--image :showLoading="true" :src="optList[3].src" width="70px" height="60px" />
+            <div class="name">{{ optList[3].name }}</div>
           </div>
         </div>
       </div>
     </div>
 
     <div v-else>
-      <div class="top-swiper">个人中心</div>
+      <div class="top-swiper avatar">
+        <u--image :showLoading="true" :src="avatar" shape="circle" width="120px" height="120px" />
+        <div style="margin-top: 20px; font-size: 18px">{{ userInfo.phyName }}</div>
+      </div>
+
+      <div class="user">
+        <div class="item" @click="handleUserInfo">
+          <u-icon name="/static/images-tijian/userInfo.png" size="16"></u-icon>
+          <div>个人信息</div>
+        </div>
+        <u-line color="#F2F2F2"></u-line>
+        <div class="item" @click="handleMsg">
+          <u-icon name="/static/images-tijian/message.png" size="16"></u-icon>
+          <div>消息通知</div>
+        </div>
+        <u-line color="#F2F2F2"></u-line>
+        <div class="item" @click="handleLogout">
+          <u-icon name="/static/images-tijian/logout.png" size="16"></u-icon>
+          <div>退出登录</div>
+        </div>
+      </div>
     </div>
 
     <!-- 底部导航 -->
@@ -49,12 +86,17 @@ export default {
         '/static/images-tijian/swiper-2.png',
         '/static/images-tijian/swiper-3.png'
       ],
+      personnelType: '',
+      status: '',
       optList: [
         { name: '体检预约', src: '/static/images-tijian/preOrder.png', url: 'appointment' },
-        { name: '体检报告', src: '/static/images-tijian/report.png', url: 'report' },
+        { name: '职业预约', src: '/static/images-tijian/careerExam.png', url: 'jobAppointment' },
         { name: '我的预约', src: '/static/images-tijian/myPreOrder.png', url: 'myAppointment' },
-        { name: '职业预约', src: '/static/images-tijian/careerExam.png', url: 'jobAppointment' }
-      ]
+        { name: '体检报告', src: '/static/images-tijian/report.png', url: 'report' }
+      ],
+      // 头像
+      avatar:
+        'https://img.zcool.cn/community/0104c958b69c23a801219c77ba5da2.png?x-oss-process=image/auto-orient,1/resize,m_lfit,w_1280,limit_1/sharpen,100'
     }
   },
   mounted() {
@@ -86,7 +128,7 @@ export default {
         url: `/pages/HealthExaminationApp/${url}/${url}?params=${JSON.stringify(this.userInfo)}`
       })
     },
-    //
+    // 获取状态
     getStatus() {
       const params = {
         token: this.token,
@@ -103,13 +145,13 @@ export default {
         },
         success: res => {
           console.log('🚀 ~ getStatus ~ res:', res)
-          // if (res.data.code === 200) {
-          //   if (res.data.data.status === 1) {
-          //     this.isShow = true
-          //   } else {
-          //     this.isShow = false
-          //   }
-          // }
+          res = res.data
+          if (res.res === 1) {
+            this.personnelType = res.obj.personnelType || 0
+            this.status = res.obj.status
+            console.log('🚀 ~ getStatus ~ this.personnelType:', this.personnelType)
+            console.log('🚀 ~ getStatus ~ this.status:', this.status)
+          }
         },
         fail: err => {
           console.log('🚀 ~ getStatus ~ err:', err)
@@ -141,6 +183,42 @@ export default {
           console.log('🚀 ~ getapplogininfo ~ err:', err)
         }
       })
+    },
+    // 个人信息
+    handleUserInfo() {
+      const params = {
+        name: this.userInfo.phyName,
+        idcard: this.userInfo.idcard,
+        age: this.userInfo.age,
+        sex: this.userInfo.sex == '0' ? '男' : '女',
+        phone: this.userInfo.telepNumber,
+        departName: this.userInfo.departName
+      }
+      console.log('🚀 ~ handleUserInfo ~ params:', params)
+      uni.navigateTo({
+        url: '/pages/HealthExaminationApp/index/userInfo?params=' + JSON.stringify(params)
+      })
+    },
+    // 消息通知
+    handleMsg() {
+      uni.navigateTo({
+        url: '/pages/HealthExaminationApp/index/message'
+      })
+    },
+    // 退出登录
+    handleLogout() {
+      uni.showModal({
+        title: '提示',
+        content: '确定退出登录吗？',
+        success: res => {
+          if (res.confirm) {
+            uni.removeStorageSync('tjToken')
+            uni.reLaunch({
+              url: '/pages/login'
+            })
+          }
+        }
+      })
     }
   }
 }
@@ -157,6 +235,12 @@ export default {
     margin-top: 130px;
   }
 }
+.avatar {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+}
 
 .title {
   margin: 20px 10px;
@@ -189,4 +273,22 @@ export default {
     }
   }
 }
+
+.user {
+  margin: 10px;
+  padding: 10px;
+  background: #fff;
+  border-radius: 5px;
+
+  .item {
+    display: flex;
+    align-items: center;
+    margin: 10px 0;
+    div {
+      margin-left: 10px;
+      font-size: 16px;
+      color: #333;
+    }
+  }
+}
 </style>
diff --git a/pages/HealthExaminationApp/index/message.vue b/pages/HealthExaminationApp/index/message.vue
new file mode 100644
index 0000000..ca1be8f
--- /dev/null
+++ b/pages/HealthExaminationApp/index/message.vue
@@ -0,0 +1,111 @@
+<template>
+  <view class="content">
+    <div class="cont-list" v-for="(item, index) in msgList" :key="index">
+      <div class="list-type">{{ item.ifCareerAppointText }}</div>
+      <div class="center-cont">
+        <div class="title">
+          {{ item.mealName }}
+          <span class="title-tip">{{ item.ifCancelText }}</span>
+        </div>
+        <div v-if="item.ifCancelText == '已取消'">您好，您于{{ item.cancelTime }}取消了位于{{ item.hospitalName }}的体检，特此通知。</div>
+      </div>
+    </div>
+  </view>
+</template>
+
+<script>
+import config from '@/config'
+
+export default {
+  data() {
+    return {
+      msgList: []
+    }
+  },
+  mounted() {
+    this.getMessageList()
+  },
+  methods: {
+    // 获取消息列表
+    getMessageList() {
+      uni.request({
+        url: config.tjBaseUrl + '/app/getmessage',
+        method: 'post',
+        data: {
+          token: uni.getStorageSync('tjToken')
+        },
+        header: {
+          'content-type': 'application/x-www-form-urlencoded',
+          token: this.token
+        },
+        success: res => {
+          res = res.data
+          console.log('🚀 ~ getMessageList ~ res:', res)
+          if (res.res === 1) {
+            this.msgList = res.obj
+          }
+        },
+        fail: err => {
+          console.log('🚀 ~ getMessageList ~ err:', err)
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.content {
+  padding: 10px;
+
+  .cont-list {
+    margin: 10px 0;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    background: #fff;
+    border-radius: 5px;
+    margin-top: 10px;
+
+    .list-type {
+      padding: 10px;
+      width: 20px;
+      text-align: center;
+      font-size: 14px;
+      font-weight: bold;
+      white-space: pre-wrap;
+      word-break: break-all;
+      background: #9bc5c6;
+      color: #fff;
+      border-radius: 5px 0 0 5px;
+    }
+
+    .center-cont {
+      padding: 0 10px;
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: flex-start;
+      font-size: 14px;
+      color: #666;
+
+      .title {
+        font-size: 15px;
+        font-weight: bold;
+        color: red;
+        margin-bottom: 6px;
+
+        .title-tip {
+          padding: 3px;
+          font-size: 13px;
+          color: #fff;
+          margin-left: 10px;
+          background: #ff7026;
+          border-radius: 5px;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/pages/HealthExaminationApp/index/userInfo.vue b/pages/HealthExaminationApp/index/userInfo.vue
new file mode 100644
index 0000000..5590933
--- /dev/null
+++ b/pages/HealthExaminationApp/index/userInfo.vue
@@ -0,0 +1,62 @@
+<template>
+  <view class="content">
+    <div class="item">
+      <div>姓名</div>
+      <div>{{ userInfo.name }}</div>
+    </div>
+    <div class="item">
+      <div>身份证号</div>
+      <div>{{ userInfo.idcard }}</div>
+    </div>
+    <div class="item">
+      <div>年龄</div>
+      <div>{{ userInfo.age }}</div>
+    </div>
+    <div class="item">
+      <div>性别</div>
+      <div>{{ userInfo.sex }}</div>
+    </div>
+    <div class="item">
+      <div>联系方式</div>
+      <div>{{ userInfo.phone }}</div>
+    </div>
+    <div class="item">
+      <div>部门</div>
+      <div>{{ userInfo.departName }}</div>
+    </div>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      userInfo: {}
+    }
+  },
+  onLoad(opt) {
+    opt = JSON.parse(opt.params)
+    console.log('🚀 ~ onLoad ~ opt:', opt)
+    this.userInfo = opt
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.content {
+  margin: 10px;
+  padding: 10px;
+
+	.item {
+		padding: 10px;
+		margin-bottom: 10px;
+		font-size: 16px;
+		height: 40px;
+		background: #fff;
+		border-radius: 5px;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+}
+</style>
diff --git a/pages/YNEduApp/exam/exam.vue b/pages/YNEduApp/exam/exam.vue
index cdf9ef9..29496f6 100644
--- a/pages/YNEduApp/exam/exam.vue
+++ b/pages/YNEduApp/exam/exam.vue
@@ -85,6 +85,7 @@ export default {
       // this.allList = this.list = res.data
       // this.waitList = res.data.filter(item => item.status === 1)
       // this.alreadyList = res.data.filter(item => item.status === 2)
+      this.$verificationToken()
       uni.request({
         url: config.baseUrl + '/exam-student/personalCenter/getStudentExamList',
         method: 'post',
diff --git a/pages/YNEduApp/exam/examination.vue b/pages/YNEduApp/exam/examination.vue
index 870abfd..ff6daff 100644
--- a/pages/YNEduApp/exam/examination.vue
+++ b/pages/YNEduApp/exam/examination.vue
@@ -154,7 +154,6 @@ export default {
       examTime: 0,
       random1: 0,
       random2: 0,
-      hasScanned: false,
       // 答题时间
       answerTime: 0,
       currentIndex: 0,
@@ -220,7 +219,7 @@ export default {
         const params = {
           examId: this.examId
         }
-        
+        this.$verificationToken()
         uni.request({
           url: config.baseUrl + '/exam-student/studentExam/getExamQuestionList',
           method: 'post',
@@ -239,8 +238,8 @@ export default {
             this.time = Number(data.answerTime) * 60 * 1000
             console.log('🚀 ~ getList ~ this.time:', this.time)
             console.log('🚀 ~ getList ~ this.questionList:', this.questionList)
-            this.random1 = (data.answerTime/3) * 60 + Math.ceil(Math.random() * 20) + 20
-            this.random2 = (data.answerTime/2) * 60 + Math.ceil(Math.random() * 30) + 30
+            this.random1 = (data.answerTime / 3) * 60 + Math.ceil(Math.random() * 20) + 20
+            this.random2 = (data.answerTime / 2) * 60 + Math.ceil(Math.random() * 30) + 30
             console.log('🚀 ~ getList ~ this.random1:', this.random1, this.random2)
             if (this.questionList.length > 0) {
               this.questionList.forEach((item, index) => {
@@ -273,14 +272,17 @@ export default {
       this.answerTime =
         this.time - (time.days * 24 * 60 * 60 + time.hours * 60 * 60 + time.minutes * 60 + time.seconds) * 1000
       // console.log('🚀 ~ changeCountDown ~ this.answerTime:', this.answerTime)
-      if (this.answerTime > this.random1 && this.answerTime < this.random2 && !this.hasScanned) {
+      console.log('🚀 ~ changeCountDown ~ this.answerTime:',this.time, this.answerTime / 1000, this.random1, this.random2)
+      console.log('🚀 ~ changeCountDown ~:', this.answerTime / 1000 == this.random1)
+      console.log('🚀 ~ changeCountDown ~:', this.answerTime / 1000 == this.random2)
+      if (this.answerTime / 1000 == this.random1) {
+        console.log('🚀 ~ changeCountDown ~ 人脸识别')
         // this.openFaceScan() // Android 人脸识别
         this.openPhotograph() // IOS 拍照识别
-        this.hasScanned = true
-      } else if (this.answerTime > this.random2 && this.hasScanned) {
+      }
+      if (this.answerTime / 1000 == this.random2) {
         // this.openFaceScan()
         this.openPhotograph()
-        this.hasScanned = false
       }
       if (this.answerTime == this.time) {
         // 提示: 时间结束, 自动提交
@@ -343,6 +345,7 @@ export default {
       }
       console.log('🚀 ~ handleSelectOption ~ params:', params)
       // insertQuestionAnswerById(params)
+      this.$verificationToken()
       uni.request({
         url: config.baseUrl + '/exam-student/studentExam/insertQuestionAnswerById',
         method: 'post',
@@ -381,6 +384,7 @@ export default {
         answerTime: Math.ceil(this.answerTime / 60000)
       }
       // const res = await commitExamByRecordId(params)
+      this.$verificationToken()
       uni.request({
         url: config.baseUrl + '/exam-student/studentExam/commitExamByRecordId',
         method: 'post',
@@ -494,6 +498,7 @@ export default {
     // 发送请求
     getFaceRecognition(params) {
       console.log('🚀 ~ getFaceRecognition ~ params:', params)
+      this.$verificationToken()
       uni.request({
         url: config.baseUrl + '/exam-student/personalCenter/getFaceRecognition',
         method: 'POST',
@@ -538,6 +543,7 @@ export default {
       // this.screenCount--
     },
     updStudyDurationExamPractice(params) {
+      this.$verificationToken()
       uni.request({
         url: config.baseUrl + '/exam-student/student/updStudyDurationExamPractice',
         method: 'post',
diff --git a/pages/YNEduApp/exam/examinationDetails.vue b/pages/YNEduApp/exam/examinationDetails.vue
index 120946e..ae62313 100644
--- a/pages/YNEduApp/exam/examinationDetails.vue
+++ b/pages/YNEduApp/exam/examinationDetails.vue
@@ -194,6 +194,7 @@ export default {
       }
       // const res = await getExamRankById(params)
       // this.rankList = res.data
+      this.$verificationToken()
       uni.request({
         url: config.baseUrl + '/exam-student/studentExam/getExamRankById',
         method: 'post',
diff --git a/pages/YNEduApp/exam/examinationList.vue b/pages/YNEduApp/exam/examinationList.vue
index 3a6374f..002a4a3 100644
--- a/pages/YNEduApp/exam/examinationList.vue
+++ b/pages/YNEduApp/exam/examinationList.vue
@@ -66,6 +66,7 @@ export default {
       // const res = await getExamRecordById(params)
       // console.log('🚀 ~ getList ~ res:', res)
       // this.list = res.data
+      this.$verificationToken()
       uni.request({
         url: config.baseUrl + '/exam-student/studentExam/getExamRecordById',
         method: 'get',
diff --git a/pages/YNEduApp/exam/examinationResultDetails.vue b/pages/YNEduApp/exam/examinationResultDetails.vue
index 1982014..96e806b 100644
--- a/pages/YNEduApp/exam/examinationResultDetails.vue
+++ b/pages/YNEduApp/exam/examinationResultDetails.vue
@@ -481,6 +481,7 @@ export default {
       }
       // const res = await getExamRecordAnswer(params)
       // this.questionList = res.data.examPaperData
+      this.$verificationToken()
       uni.request({
         url: config.baseUrl + '/exam-student/studentExam/getExamRecordAnswer',
         method: 'post',
diff --git a/pages/YNEduApp/index/index.vue b/pages/YNEduApp/index/index.vue
index b59a2c3..8ff47cd 100644
--- a/pages/YNEduApp/index/index.vue
+++ b/pages/YNEduApp/index/index.vue
@@ -99,9 +99,13 @@ export default {
     console.log('🚀 ~ mounted ~ mounted-index:')
     this.getList()
     this.getMsgList()
+    setTimeout(() => {
+      this.$verificationToken()
+     
+    }, 1000)
   },
   methods: {
-    async getList() {
+    getList() {
       this.taskList = []
       let params = {
         userId: this.userId,
@@ -111,6 +115,7 @@ export default {
       // console.log('🚀 ~ getList ~ res:', res)
       // this.taskList = res.data
       console.log('🚀 ~ toggleSearch ~ params:', params)
+      this.$verificationToken()
       uni.request({
         url: config.baseUrl + '/exam-student/personalCenter/getStudentStudyWorkList',
         method: 'post',
@@ -137,6 +142,7 @@ export default {
       }
       // const res = await getStudentStudyWorkList(params)
       // this.taskList = res.data
+      this.$verificationToken()
       uni.request({
         url: config.baseUrl + '/exam-student/personalCenter/getStudentStudyWorkList',
         method: 'post',
@@ -154,6 +160,7 @@ export default {
     },
     // 获取消息列表
     getMsgList() {
+      this.$verificationToken()
       uni.request({
         url: config.bmwUrl + '/studentUsers/getNoticeList',
         method: 'post',
diff --git a/pages/YNEduApp/index/notices.vue b/pages/YNEduApp/index/notices.vue
index 662254d..8d733b8 100644
--- a/pages/YNEduApp/index/notices.vue
+++ b/pages/YNEduApp/index/notices.vue
@@ -24,7 +24,8 @@ export default {
   },
   methods: {
     // 获取消息列表
-    async getMsgList() {
+    getMsgList() {
+      this.$verificationToken()
       uni.request({
         url: config.bmwUrl + '/studentUsers/getNoticeList',
         method: 'post',
diff --git a/pages/YNEduApp/learn/learn.vue b/pages/YNEduApp/learn/learn.vue
index c0eb9e8..3ea4dff 100644
--- a/pages/YNEduApp/learn/learn.vue
+++ b/pages/YNEduApp/learn/learn.vue
@@ -148,6 +148,7 @@ export default {
       //   this.showModal = false
       //   uni.navigateBack()
       // })
+      this.$verificationToken()
       uni.request({
         url: config.baseUrl + '/exam-student/student/updStudyDuration',
         method: 'post',
diff --git a/pages/YNEduApp/learnProj/imageStudy.vue b/pages/YNEduApp/learnProj/imageStudy.vue
index cd83aeb..39f81c2 100644
--- a/pages/YNEduApp/learnProj/imageStudy.vue
+++ b/pages/YNEduApp/learnProj/imageStudy.vue
@@ -113,6 +113,7 @@ export default {
             : Math.ceil((Number(this.params.studyDuration) / Number(this.params.allStudyDuration)) * 100).toFixed(2)
       }
       console.log('🚀 ~ updStudyDuration ~ params:', params)
+      this.$verificationToken()
       uni.request({
         url: config.baseUrl + '/exam-student/student/updStudyDuration',
         method: 'post',
diff --git a/pages/YNEduApp/learnProj/learnProj.vue b/pages/YNEduApp/learnProj/learnProj.vue
index d78e696..85c479a 100644
--- a/pages/YNEduApp/learnProj/learnProj.vue
+++ b/pages/YNEduApp/learnProj/learnProj.vue
@@ -229,6 +229,7 @@ export default {
       })
     },
     getStudentStudyWorkList(params) {
+      this.$verificationToken()
       uni.request({
         url: config.baseUrl + '/exam-student/personalCenter/getStudentStudyWorkList',
         method: 'post',
diff --git a/pages/YNEduApp/learnProj/learnProjDetail.vue b/pages/YNEduApp/learnProj/learnProjDetail.vue
index 32144c4..4fcba7a 100644
--- a/pages/YNEduApp/learnProj/learnProjDetail.vue
+++ b/pages/YNEduApp/learnProj/learnProjDetail.vue
@@ -243,6 +243,7 @@ export default {
     // 获取学习项目详情
     async getStudyWorkAll() {
       let params = { userId: uni.getStorageSync('userId'), id: this.projId, type: '1' }
+      this.$verificationToken()
       uni.request({
         method: 'post',
         url: config.bmwUrl + '/studyWork/StudyWorkAll',
diff --git a/pages/YNEduApp/learnProj/pdfStudy.vue b/pages/YNEduApp/learnProj/pdfStudy.vue
index d22a8e0..3d321ff 100644
--- a/pages/YNEduApp/learnProj/pdfStudy.vue
+++ b/pages/YNEduApp/learnProj/pdfStudy.vue
@@ -99,6 +99,7 @@ export default {
             : Math.ceil((Number(this.params.studyDuration) / Number(this.params.allStudyDuration)) * 100).toFixed(2)
       }
       console.log('🚀 ~ updStudyDuration ~ params:', params)
+      this.$verificationToken()
       uni.request({
         url: config.baseUrl + '/exam-student/student/updStudyDuration',
         method: 'post',
diff --git a/pages/YNEduApp/prac/exercises.vue b/pages/YNEduApp/prac/exercises.vue
index ecbd815..3b1d273 100644
--- a/pages/YNEduApp/prac/exercises.vue
+++ b/pages/YNEduApp/prac/exercises.vue
@@ -294,6 +294,7 @@ export default {
         isNew: this.isNew || '',
         isMiss: this.isError ? '1' : ''
       }
+      this.$verificationToken()
       uni.request({
         url: config.baseUrl + '/exam-student/studentPractice/getPracticeItData',
         method: 'post',
@@ -330,6 +331,7 @@ export default {
       // this.questionList.push(res.data)
       // console.log('🚀 ~ getPracticeQuestion ~ res:', res)
       // console.log('🚀 ~ getPracticeQuestion ~ this.questionList:', this.questionList)
+      this.$verificationToken()
       uni.request({
         url: config.baseUrl + '/exam-student/studentPractice/getPracticeQuestion',
         method: 'post',
@@ -409,6 +411,7 @@ export default {
       // const res = await changeQuestion(params)
       // this.questionList.push(res.data)
       // console.log('🚀 ~ handleJump ~ res:', res)
+      this.$verificationToken()
       uni.request({
         url: config.baseUrl + '/exam-student/studentPractice/changeQuestion',
         method: 'post',
@@ -470,6 +473,7 @@ export default {
       // const res = await getPracticeQuestionList(params)
       // console.log('🚀 ~ getPracticeQuestionList ~ res:', res)
       // this.questionListSelect = res.data
+      this.$verificationToken()
       uni.request({
         url: config.baseUrl + '/exam-student/studentPractice/getPracticeQuestionList',
         method: 'post',
@@ -573,6 +577,7 @@ export default {
         console.log('🚀 ~ handleOption ~ params:', params)
         // 提交答案
         // insertPracticeAnswerById(params)
+        this.$verificationToken()
         uni.request({
           url: config.baseUrl + '/exam-student/studentPractice/insertPracticeAnswerById',
           method: 'post',
@@ -656,6 +661,7 @@ export default {
         }
         console.log('🚀 ~ handleOk ~ params-多选:', params)
         // insertPracticeAnswerById(params)
+        this.$verificationToken()
         uni.request({
           url: config.baseUrl + '/exam-student/studentPractice/insertPracticeAnswerById',
           method: 'post',
@@ -728,6 +734,7 @@ export default {
         practiceDuration: time
       }
       console.log('🚀 ~ handleClose ~ params:', params)
+      this.$verificationToken()
       uni.request({
         url: config.baseUrl + '/exam-student/studentPractice/savePracticeDuration',
         method: 'post',
@@ -745,6 +752,7 @@ export default {
         // updateRemoveRecordData({
         //   practiceId: this.practiceId
         // })
+        this.$verificationToken()
         uni.request({
           url: config.baseUrl + '/exam-student/studentPractice/updateRemoveRecordData',
           method: 'post',
@@ -766,6 +774,7 @@ export default {
           studyId: this.studyId
         }
         // updStudyDurationExamPractice(params)
+        this.$verificationToken()
         uni.request({
           url: config.baseUrl + '/exam-student/student/updStudyDurationExamPractice',
           method: 'post',
@@ -804,6 +813,7 @@ export default {
         practiceId: this.practiceId,
         isMiss: this.isError ? 1 : ''
       }
+      this.$verificationToken()
       uni.request({
         url: config.baseUrl + '/exam-student/studentPractice/getPracticeQuestionList',
         method: 'post',
diff --git a/pages/YNEduApp/prac/prac.vue b/pages/YNEduApp/prac/prac.vue
index f893e5a..5476f50 100644
--- a/pages/YNEduApp/prac/prac.vue
+++ b/pages/YNEduApp/prac/prac.vue
@@ -70,6 +70,7 @@ export default {
       // this.waitList = res.data.filter(item => item.alreadyNum === 0)
       // this.alreadyList = res.data.filter(item => item.alreadyNum > 0)
       // console.log('🚀 ~ getList ~ res:', res)
+      this.$verificationToken()
       uni.request({
         url: config.baseUrl + '/exam-student/personalCenter/getStudentPracticeList',
         method: 'post',
diff --git a/pages/YNEduApp/prac/pracDetail.vue b/pages/YNEduApp/prac/pracDetail.vue
index 8129041..ec66d50 100644
--- a/pages/YNEduApp/prac/pracDetail.vue
+++ b/pages/YNEduApp/prac/pracDetail.vue
@@ -128,6 +128,7 @@ export default {
       const params = {
         id: this.practiceId
       }
+      this.$verificationToken()
       uni.request({
         url: config.baseUrl + '/exam-student/studentPractice/getPracticeQuestionRate',
         method: 'post',
diff --git a/pages/YNEduApp/user/faceScan.vue b/pages/YNEduApp/user/faceScan.vue
index 97e1162..c72a346 100644
--- a/pages/YNEduApp/user/faceScan.vue
+++ b/pages/YNEduApp/user/faceScan.vue
@@ -106,6 +106,7 @@ export default {
             img: this.url
           }
           params = JSON.stringify(params)
+          this.$verificationToken()
           uni.request({
             url: config.baseUrl + '/exam-student/personalCenter/uploadFaceRecognition',
             method: 'POST',
diff --git a/pages/YNEduApp/user/myMsg.vue b/pages/YNEduApp/user/myMsg.vue
index e915402..34afce7 100644
--- a/pages/YNEduApp/user/myMsg.vue
+++ b/pages/YNEduApp/user/myMsg.vue
@@ -48,6 +48,7 @@ export default {
   methods: {
     // 获取消息列表
     getMsgList() {
+      this.$verificationToken()
       uni.request({
         url: config.bmwUrl + '/users/getMsgInform',
         method: 'get',
@@ -85,6 +86,7 @@ export default {
     markRead(item) {
       const ids = [item.id]
       console.log('🚀 ~ markRead ~ ids:', ids)
+      this.$verificationToken()
       uni.request({
         url: config.bmwUrl + '/users/markAsRead',
         method: 'post',
@@ -102,6 +104,7 @@ export default {
     deleteMsg(item) {
       const ids = [item.id]
       console.log('🚀 ~ deleteMsg ~ ids:', ids)
+      this.$verificationToken()
       uni.request({
         url: config.bmwUrl + '/users/batchDelete',
         method: 'post',
diff --git a/pages/YNEduApp/user/user.vue b/pages/YNEduApp/user/user.vue
index 48ef853..193b9d9 100644
--- a/pages/YNEduApp/user/user.vue
+++ b/pages/YNEduApp/user/user.vue
@@ -81,6 +81,7 @@ export default {
     // 获取自学-学时-证书
     getLearnStats() {
       console.log('🚀 ~ getLearnStats ~ this.token:',uni.getStorageSync('access_token'))
+      this.$verificationToken()
       uni.request({
         url: config.baseUrl + '/exam-student/personalCenter/getStudyAndCer',
         // url: 'http://192.168.0.137:2900' + '/exam-student/personalCenter/getStudyAndCer',
diff --git a/pages/gzt/index.vue b/pages/gzt/index.vue
index 32e0cc0..5f454ff 100644
--- a/pages/gzt/index.vue
+++ b/pages/gzt/index.vue
@@ -197,8 +197,10 @@
 					jwtToken: uni.getStorageSync('App-Token')
 				}
 				const tjparams = {
-					username: '17681010134', // 15912575796
-					password: 'YNsbd@123456'
+					// username: '17681010134', // 15912575796
+					// password: 'YNsbd@123456'
+					telephone: uni.getStorageSync('userPhone'),
+					jwtToken: uni.getStorageSync('App-Token')
 				}
 				console.log('🚀 ~ gotoYy ~ tjparams:', tjparams)
 				if (name == '考试培训移动端') {
@@ -252,9 +254,7 @@
 							console.log('🚀 ~ gotoYy ~ res:', res.data.token)
 							if (res.statusCode == 200) {
 								uni.removeStorageSync('tjToken')
-								uni.removeStorageSync('tjPhone')
 								uni.setStorageSync('tjToken', res.data.token)
-								uni.setStorageSync('tjPhone', tjparams.username)
 								setTimeout(() => {
 									uni.reLaunch({
 										url: '/pages/HealthExaminationApp/index/index'
@@ -262,7 +262,7 @@
 								}, 500)
 							} else {
 								uni.showToast({
-									title: res.msg,
+									title: res.data.message,
 									icon: 'none'
 								})
 							}
diff --git a/pages/login.vue b/pages/login.vue
index e345287..4ba60ed 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -165,7 +165,7 @@
 				// globalConfig: getApp().globalData.config,
 				selectTab: 1,
 				loginForm: {
-					phone: '18700000001', // 18955734761  18700000001
+					phone: '18700000002', // 18955734761  18700000001
 					pd: 'YNsbd@123456',//YNsbd@123456
 				},
 				loginForm0: {
diff --git a/static/images-tijian/logout.png b/static/images-tijian/logout.png
new file mode 100644
index 0000000000000000000000000000000000000000..edc9fce5cd4b6085534a6ea7b1089656122e7167
GIT binary patch
literal 1270
zcmV<S1PS|zP)<h;3K|Lk000e1NJLTq001@s001@!1^@s6j74hQ00001b5ch_0Itp)
z=>Px(ut`KgRA@u(n$K?=MHI*1n_b(~cw-Wp3pA~hI6nlZs)#!T6^TCpgoIQeNu?fI
ziBmyQ)>8)+Bo6#kB`T0&QgHwToH#&#1aU-w)E=nU;fH9F3PIvk1C(IzJlOS*Y#clG
zX1&cA@YQeLywAS*zBfBN2>;R_)^a6}=OQqaY(H)eVBvLKZ@=UE9$jFBBkA8?A)v>A
zhy@V<GG#t{Ir=!fk5&-=-9D>e$=4{t@@tDgVsB8B5`v|!7y7<E-FrQ#IVyf@!L9*`
z-s+^N0Bl*TzCtpEh#gqqc*B>M76vy4L;Q{`dI=fcY{5@UCPmBo=KGnRD=iuOG^!7V
z3JB}3iG}o?Z~OGWYs2e<F$F+~BL<JZvulz0ocMn*pAWG4a87J=eXaZI3tcPCjhkCY
zk+FTxT-y`v?l}h}9s#5oL+?7>JoN1?qyQV@=21lDO&|+^DFi~K4Ibxy;G_T>oc`sI
z8j8-7D8w8X#t4g)%BJHpJB5=1%np87H^)F#J_2EB4h%9PL_Mc#&+i0I8ZbNfQEna<
zO!>eKhd`-p%6sOd0(0Q>m4}5Ic@IRftCBfH)UzHlCmooxEKiwZfXc@ptg7Y+ye&&9
z!5V1}fYL^)wQ4CXSOd)g0_xe6*0fqm4OSlx0g+8N)135Ru4TEQIj0qnp3~zETR}&F
zmEe9G0~J1WSIg}**D+u=+z4NLkQmsRD>ZS(=%3W3a&<J<QD8PplADK_yNTQ7gl*Ma
z$AQ^!L)?4_k$nOrLY2&cpiLWRUto7}ipJR52@uxC0nko1c3#I2#(?1wAc|CnI?Iw$
zx$^eQ7ubltGEQpbEf7Vop#@{l6e3Z0BFB5)^#zvH&0|be&VUH~{Ij(OVILP#;kdzj
z-tY(Z+*&WY4PFJrf!1bjlNH&goz_7hDrwAl&9PB1V~{oh9E-ld+7zZ|Hv@cizsf?F
zL0Iwf8-QII=d#xAPuoxqXT@vzh`V$WEb;MM|5W}!D56{dAqFc@0FW`3v`ILNg=zvj
z32bm`rB8{3FM+ViP-ri~Swm=(l}vRUn6vy)y#ORi-?-5EAT*~fY2#nHGSyLFWvF=|
z(O(Lj*&?bIih3fIUSo-8^NDa&Iloy`lriY*3E&SjY@kwujq-d#F!lUqO)0a+;?<*Y
z_P%PN=%|d9m)}L8jp~O0bJ-<r++F<|^$IC7wnbB=Lb0u;Y5}DKOYnRmjOu4V)<*S1
zHfxA4C%4m-)L>gRWmiAelBT2uD{Yh1i<_z+!K|@tG%Xa;7LVbnU+;!+_={?vs@c$b
z-b~7}S4^HVk1<frIG>U1LV<A35ZY6<+axc5QWTG2zPuMu`xFolf)E*F*_dqBr<y@Z
z0cHm|aB?*s+7mjIy(jiLJnH}Ejx=D+GT`<9{~%bg_@t5U&Uk%Nve?(pSm}M|5+Y0s
zp!OU=6#&)?Wc>8v9r;@U-x$n3HE{Y#JAd@UALfmF7hmpc+x;wWo8We`xO@?S#h|c1
z%X^mtnxg8qUd95uuL!7I5#6!-7fu9!)6})r2nVND_l1E4a=X-ils7}>&p-11KZDMe
gQzCA~B)c)k-yN%;WOyyC5C8xG07*qoM6N<$f}+Yzz5oCK

literal 0
HcmV?d00001

diff --git a/static/images-tijian/message.png b/static/images-tijian/message.png
new file mode 100644
index 0000000000000000000000000000000000000000..e28af0c72019aa50c4966dd524b7fe5fbf07ec1c
GIT binary patch
literal 1940
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
a!2bfg?;F=b@05-J0000<MNUMnLSTZ<bgygx

literal 0
HcmV?d00001

diff --git a/static/images-tijian/userInfo.png b/static/images-tijian/userInfo.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c1dccda98ffd56c253233b19298636236b450ae
GIT binary patch
literal 2745
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

literal 0
HcmV?d00001

diff --git a/utils/request.js b/utils/request.js
index a5ca193..13c9f63 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -14,9 +14,6 @@ const request = config => {
   config.header = config.header || {}
   if (getToken() && !isToken) {
     config.header['Authorization'] = 'Bearer ' + getToken()
-  } else {
-    // 没有token - 去登录
-    uni.reLaunch({ url: '/pages/login' })
   }
   // get请求映射params参数
   if (config.params) {

From 6c6432e21c8096a042c89c0f5f9d9286ea23c5d1 Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Fri, 6 Sep 2024 17:35:31 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E4=BD=93=E6=A3=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../appointment/appointment.vue               | 14 +++++++-------
 pages/HealthExaminationApp/index/index.vue    |  7 ++++++-
 .../jobAppointment/jobAppointment.vue         | 10 ++++------
 .../myAppointment/myAppointment.vue           |  4 +++-
 pages/HealthExaminationApp/report/report.vue  |  6 ++++--
 pages/YNEduApp/exam/beforeExam.vue            |  2 +-
 pages/YNEduApp/exam/examination.vue           |  6 ++----
 pages/gzt/index.vue                           | 12 ++++++++----
 utils/aescbc.js                               | 19 +++++++++++++++++++
 9 files changed, 54 insertions(+), 26 deletions(-)

diff --git a/pages/HealthExaminationApp/appointment/appointment.vue b/pages/HealthExaminationApp/appointment/appointment.vue
index 225d8d4..e2d6907 100644
--- a/pages/HealthExaminationApp/appointment/appointment.vue
+++ b/pages/HealthExaminationApp/appointment/appointment.vue
@@ -160,9 +160,10 @@ export default {
   methods: {
     // 获取医院列表  app/gethospital
     getHospitalList() {
+      const cry = new Crypoto()
       const params = {
         token: this.token,
-        idcard: this.idcard
+        idcard: cry.encrypt(this.idcard)
       }
       console.log('🚀 ~ getHospitalList ~ params:', params)
       uni.request({
@@ -178,7 +179,6 @@ export default {
           console.log('🚀 ~ getHospitalList ~ res:', res)
           if (res.res == 1) {
             this.hospitalList = res.obj
-            // this.hospitalInfo = res.obj[0]
             // this.columns 双层数组, 将医院列表push到columns中
             this.columns.push(this.hospitalList)
             console.log('🚀 ~ getHospitalList ~ this.hospitalList:', this.hospitalList)
@@ -191,9 +191,10 @@ export default {
     },
     // 获取检查类型
     getCheckType() {
+      const cry = new Crypoto()
       const params = {
         token: this.token,
-        idcard: this.idcard
+        idcard: cry.encrypt(this.idcard)
       }
       console.log('🚀 ~ getCheckType ~ params:', params)
       uni.request({
@@ -329,11 +330,10 @@ export default {
       const params = {
         hospitalId: this.hospitalInfo.id,
         setMealId: this.setMealId,
-        // checkId: '1',
         phyAppontTime: this.healthTime,
         setMealType: '2',
         combName: this.checkTypeContent,
-        token: this.token
+        // token: this.token
       }
       console.log('🚀 ~ handleSave ~ params:', params)
       console.log('🚀 ~ handleSave ~ params:', cry.encrypt(JSON.stringify(params)))
@@ -341,8 +341,8 @@ export default {
       uni.request({
         url: config.tjBaseUrl + '/app/phyappoint',
         method: 'post',
-        // data: { encryptedData: params, token: this.token },
-        data: params,
+        data: { encryptedData: cry.encrypt(JSON.stringify(params)), token: this.token },
+        // data: params,
         header: {
           'Content-Type': 'application/x-www-form-urlencoded',
           token: this.token
diff --git a/pages/HealthExaminationApp/index/index.vue b/pages/HealthExaminationApp/index/index.vue
index cc301d7..a0cc650 100644
--- a/pages/HealthExaminationApp/index/index.vue
+++ b/pages/HealthExaminationApp/index/index.vue
@@ -71,6 +71,7 @@
 
 <script>
 import config from '@/config'
+import { decryptCBC } from '@/utils/aescbc'
 
 export default {
   data() {
@@ -174,9 +175,13 @@ export default {
         },
         success: res => {
           res = res.data
-          console.log('🚀 ~ getapplogininfo ~ res:', res)
+          console.log('🚀 ~ getAppLoginInfo ~ res:', res)
           if (res.res === 1) {
             this.userInfo = res.obj[0]
+            this.userInfo.phyName = decryptCBC(this.userInfo.phyName)
+            this.userInfo.idcard = decryptCBC(this.userInfo.idcard)
+            this.userInfo.telepNumber = decryptCBC(this.userInfo.telepNumber)
+            console.log('🚀 ~ getAppLoginInfo ~ this.userInfo:', this.userInfo)
           }
         },
         fail: err => {
diff --git a/pages/HealthExaminationApp/jobAppointment/jobAppointment.vue b/pages/HealthExaminationApp/jobAppointment/jobAppointment.vue
index 0d5a284..fbf2e4b 100644
--- a/pages/HealthExaminationApp/jobAppointment/jobAppointment.vue
+++ b/pages/HealthExaminationApp/jobAppointment/jobAppointment.vue
@@ -104,7 +104,6 @@ export default {
     getHospitalList() {
       const params = {
         token: this.token,
-        idcard: this.idcard
       }
       console.log('🚀 ~ getHospitalList ~ params:', params)
       uni.request({
@@ -134,8 +133,7 @@ export default {
     // 获取检查类型
     getCheckType() {
       const params = {
-        token: this.token,
-        idcard: this.idcard
+        token: this.token
       }
       console.log('🚀 ~ getCheckType ~ params:', params)
       uni.request({
@@ -240,7 +238,7 @@ export default {
         phyAppontTime: this.healthTime,
         setMealType: '3',
         combName: this.checkType,
-        token: this.token
+        // token: this.token
       }
       console.log('🚀 ~ handleSave ~ params:', params)
       console.log('🚀 ~ handleSave ~ params:', cry.encrypt(JSON.stringify(params)))
@@ -248,8 +246,8 @@ export default {
       uni.request({
         url: config.tjBaseUrl + '/app/phyappoint',
         method: 'post',
-        // data: { encryptedData: params, token: this.token },
-        data: params,
+        data: { encryptedData: cry.encrypt(JSON.stringify(params)), token: this.token },
+        // data: params,
         header: {
           'Content-Type': 'application/x-www-form-urlencoded',
           token: this.token
diff --git a/pages/HealthExaminationApp/myAppointment/myAppointment.vue b/pages/HealthExaminationApp/myAppointment/myAppointment.vue
index e2c0344..355fe41 100644
--- a/pages/HealthExaminationApp/myAppointment/myAppointment.vue
+++ b/pages/HealthExaminationApp/myAppointment/myAppointment.vue
@@ -52,6 +52,7 @@
 
 <script>
 import config from '@/config'
+import Crypoto from '@/utils/aescbc'
 
 export default {
   data() {
@@ -142,9 +143,10 @@ export default {
     },
     // 操作-删除  cancelpoint
     handleDelete(item) {
+      const cry = new Crypoto()
       console.log('🚀 ~ handleDelete ~ item:', item)
       const params = {
-        cancelId: item.id,
+        cancelId: cry.encrypt(item.id),
         mealType: item.setMealType,
         token: this.token
       }
diff --git a/pages/HealthExaminationApp/report/report.vue b/pages/HealthExaminationApp/report/report.vue
index d6cf40f..c6f9034 100644
--- a/pages/HealthExaminationApp/report/report.vue
+++ b/pages/HealthExaminationApp/report/report.vue
@@ -47,6 +47,7 @@
 
 <script>
 import config from '@/config'
+import Crypoto from '@/utils/aescbc'
 
 export default {
   data() {
@@ -108,10 +109,11 @@ export default {
     },
     // 获取列表
     getList() {
+      const cry = new Crypoto()
       const params = {
-        name: this.keyword,
+        name: cry.encrypt(this.keyword),
         data: this.year,
-        type: this.typeValue,
+        type: cry.encrypt(this.typeValue),
         token: this.token
       }
       console.log('🚀 ~ getList ~ params:', params)
diff --git a/pages/YNEduApp/exam/beforeExam.vue b/pages/YNEduApp/exam/beforeExam.vue
index 917118c..76afde3 100644
--- a/pages/YNEduApp/exam/beforeExam.vue
+++ b/pages/YNEduApp/exam/beforeExam.vue
@@ -21,7 +21,7 @@
         </div>
       </div>
 
-      <div class="explain">*进入考试后，计时结束将自动交卷，退出后将会继续计时</div>
+      <div class="explain">*进入考试后，计时结束将自动交卷，退出后将会继续计时，考试期间请勿登录其他设备，否则成绩作废</div>
 
       <!-- 底部固定按钮 -->
       <div class="bottom-btn">
diff --git a/pages/YNEduApp/exam/examination.vue b/pages/YNEduApp/exam/examination.vue
index ff6daff..fdf936b 100644
--- a/pages/YNEduApp/exam/examination.vue
+++ b/pages/YNEduApp/exam/examination.vue
@@ -279,12 +279,10 @@ export default {
         console.log('🚀 ~ changeCountDown ~ 人脸识别')
         // this.openFaceScan() // Android 人脸识别
         this.openPhotograph() // IOS 拍照识别
-      }
-      if (this.answerTime / 1000 == this.random2) {
+      } else if (this.answerTime / 1000 == this.random2) {
         // this.openFaceScan()
         this.openPhotograph()
-      }
-      if (this.answerTime == this.time) {
+      } else if (this.answerTime == this.time) {
         // 提示: 时间结束, 自动提交
         this.$refs.uToast.show({
           message: '考试时间结束, 系统将自动提交',
diff --git a/pages/gzt/index.vue b/pages/gzt/index.vue
index 5f454ff..81d38c5 100644
--- a/pages/gzt/index.vue
+++ b/pages/gzt/index.vue
@@ -96,6 +96,7 @@
 <script>
 	import TabbarConfig from '@/totalTabbar.js'
 	import config from '@/config'
+	import Crypoto from '@/utils/aescbc'
 
 	import {
 		getDayNoticeAnnoByUserId,
@@ -192,6 +193,7 @@
 				})
 			},
 			gotoYy(name) {
+				const cry = new Crypoto()
 				const params = {
 					username: uni.getStorageSync('userPhone'),
 					jwtToken: uni.getStorageSync('App-Token')
@@ -199,7 +201,7 @@
 				const tjparams = {
 					// username: '17681010134', // 15912575796
 					// password: 'YNsbd@123456'
-					telephone: uni.getStorageSync('userPhone'),
+					telephone: cry.encrypt(uni.getStorageSync('userPhone')),
 					jwtToken: uni.getStorageSync('App-Token')
 				}
 				console.log('🚀 ~ gotoYy ~ tjparams:', tjparams)
@@ -243,7 +245,7 @@
 					})
 				} else if( name == '健康体检移动端') {
 					uni.request({
-						url: config.tjBaseUrl + '/login',
+						url: config.tjBaseUrl + '/app/loginNoPassword',
 						method: 'POST',
 						data: tjparams,
 						header: {
@@ -251,10 +253,12 @@
 						},
 						success: res => {
 							console.log('🚀 ~ gotoYy ~ res:', res,)
-							console.log('🚀 ~ gotoYy ~ res:', res.data.token)
+							console.log('🚀 ~ gotoYy ~ res:', res.data.obj)
 							if (res.statusCode == 200) {
 								uni.removeStorageSync('tjToken')
-								uni.setStorageSync('tjToken', res.data.token)
+								uni.removeStorageSync('tjPhone')
+								uni.setStorageSync('tjToken', res.data.obj)
+								uni.setStorageSync('tjPhone', tjparams.telephone)
 								setTimeout(() => {
 									uni.reLaunch({
 										url: '/pages/HealthExaminationApp/index/index'
diff --git a/utils/aescbc.js b/utils/aescbc.js
index d70893c..8db60f8 100644
--- a/utils/aescbc.js
+++ b/utils/aescbc.js
@@ -33,3 +33,22 @@ export default class Crypoto {
 
   decrypt
 }
+
+const  jie_mi=true;
+
+/**
+ * 解密
+ * @param word
+ * @returns {*}
+ */
+export const decryptCBC = function(word) {
+  if(!jie_mi){
+    return  word;
+  }
+  const encrypted = CryptoJS.AES.decrypt(word, CryptoJS.enc.Utf8.parse('zhgd@bonus@zhgd@bonus@1234567890'), {
+    iv: CryptoJS.enc.Utf8.parse('1234567812345678'),
+    mode: CryptoJS.mode.CBC,
+    padding: CryptoJS.pad.Pkcs7
+  })
+  return encrypted.toString(CryptoJS.enc.Utf8)
+}

From ec772280618f6e148f20aa210c8683e6e402dfb0 Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Fri, 6 Sep 2024 18:43:47 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=20bug=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/YNEduApp/exam/examination.vue | 19 +++++++++++++------
 pages/YNEduApp/prac/exercises.vue   |  2 +-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/pages/YNEduApp/exam/examination.vue b/pages/YNEduApp/exam/examination.vue
index fdf936b..cd4d528 100644
--- a/pages/YNEduApp/exam/examination.vue
+++ b/pages/YNEduApp/exam/examination.vue
@@ -201,9 +201,11 @@ export default {
   onHide() {
     // this.screenCount++
     // console.log('🚀 ~ onHide ~ this.screenCount:', this.screenCount)
-    if (!this.isHide) {
-      this.handleConfirmSubmit()
-    }
+    setTimeout(() => {
+      if (!this.isHide) {
+        this.handleConfirmSubmit()
+      }
+    }, 500)
   },
   mounted() {
     this.getList()
@@ -268,11 +270,17 @@ export default {
     changeCountDown(time) {
       // console.log('🚀 ~ changeCountDown ~ time:', time)
       // 等时间赋值后再开始计时
-      if (this.time == 0) return
+      if (this.time == 0 && !this.isLoading) return
       this.answerTime =
         this.time - (time.days * 24 * 60 * 60 + time.hours * 60 * 60 + time.minutes * 60 + time.seconds) * 1000
       // console.log('🚀 ~ changeCountDown ~ this.answerTime:', this.answerTime)
-      console.log('🚀 ~ changeCountDown ~ this.answerTime:',this.time, this.answerTime / 1000, this.random1, this.random2)
+      console.log(
+        '🚀 ~ changeCountDown ~ this.answerTime:',
+        this.time,
+        this.answerTime / 1000,
+        this.random1,
+        this.random2
+      )
       console.log('🚀 ~ changeCountDown ~:', this.answerTime / 1000 == this.random1)
       console.log('🚀 ~ changeCountDown ~:', this.answerTime / 1000 == this.random2)
       if (this.answerTime / 1000 == this.random1) {
@@ -416,7 +424,6 @@ export default {
           })
           setTimeout(() => {
             this.showConfirmModal = false
-            this.isLoading = false
           }, 1000)
         }
       })
diff --git a/pages/YNEduApp/prac/exercises.vue b/pages/YNEduApp/prac/exercises.vue
index 3b1d273..d763f3f 100644
--- a/pages/YNEduApp/prac/exercises.vue
+++ b/pages/YNEduApp/prac/exercises.vue
@@ -203,7 +203,7 @@
             v-for="(item, index) in questionListSelect"
             :key="index"
             class="topic-wrapper"
-            :class="{ correct: item.isCorrect, error: item.isError }"
+            :class="{ correct: item.isTrue == 1, error: item.isTrue == 0 }"
             @click="handleJump('jump', item.index)"
           >
             <div v-if="currentIndex == item.index">*</div>