Merge branch 'chronic-dev' of http://gitlab.yiboshi.com/nightkis1995/frontend-h5 into chronic-dev

src/doctor/Doctor.vue

@@ -66,8 +66,8 @@ export default {
             if (!token) {
                 token = sessionStorage.getItem('token')
                 if (process.env.NODE_ENV !== 'production') {
-                    // token = '54fa5c76-c54a-4b19-b4c8-207b0e779340'
-                    token = 'c4cedb28-0a7c-498a-b736-f88a244cc157'
+                    // token = '9486b3ed-332d-4a2e-86dc-0502a3e2bd69'
+                    token = '220d2f26-2fcd-450b-af4c-85b1bf78ed5e'
                 }
             }
             if (token) {

src/doctor/patientDetail/PatientDetail.vue

@@ -226,7 +226,7 @@ export default {
                 if (this.authInfo.officeId == CdofficeId) {
                     this.showDeath = true
                 } else {
-                    this.showDeath = true
+                    this.showDeath = false
                 }
             })
         },

src/residentWX/guide/Detail.vue

@@ -74,6 +74,7 @@ import { queryGuideDetail } from '@/api/residentWX/guide.js'
 import { useStore } from '@/residentWX/store'
 import Mp3 from '../components/mediaPlay/Mp3.vue'
 import Mp4 from '../components/mediaPlay/Mp4.vue'
+import { showNav } from '@/utils/common'
 
 export default {
     components: {
@@ -116,7 +117,9 @@ export default {
         }
     },
     created() {
+        if (!this.showNav()) {
             document.title = '指导详情'
+        }
         if (!this.id) {
             showNotify({ type: 'warning', message: '未获取到查询信息' })
             return

src/residentWX/guide/List.vue

@@ -52,6 +52,7 @@
 <script>
 import { queryGuideList } from '@/api/residentWX/guide.js'
 import { useStore } from '@/residentWX/store'
+import { showNav } from '@/utils/common'
 
 export default {
     inject: ['showNav', 'isResidentInfo'],
@@ -82,7 +83,9 @@ export default {
         },
     },
     created() {
+        if (!this.showNav()) {
             document.title = '健康指导'
+        }
     },
     mounted() {
         const list = this.$refs.list

src/residentWX/nim/Index.vue

@@ -39,6 +39,7 @@ import { useStore } from '@/residentWX/store'
 import { getServiceDoc } from '@/api/residentWX/nim.js'
 import { showFailToast  } from 'vant'
 import { getSessionInfo } from '@/api/residentWX/nim.js'
+import { showNav } from '@/utils/common'
 
 export default {
     inject:['showNav', 'isResidentInfo'],
@@ -64,7 +65,9 @@ export default {
         }
     },
     created() {
+        if (!this.showNav()) {
             document.title = '专家在线咨询'
+        }
         if (this.isResidentInfo()) {
             this.init()
         }

src/residentWX/screening/List.vue

@@ -55,6 +55,7 @@
 <script>
 import { useStore } from '@/residentWX/store'
 import { queryScreenList } from '@/api/residentWX/screening.js'
+import { showNav } from '@/utils/common'
 
 export default {
     inject:['showNav', 'isResidentInfo'],
@@ -90,7 +91,9 @@ export default {
         },
     },
     created() {
+        if (!this.showNav()) {
             document.title = '慢病筛查记录'
+        }
         this.load()
     },
     mounted() {

src/residentWX/screening/detail/FirstDetail.vue

@@ -98,6 +98,7 @@
 import { showNotify } from 'vant'
 import { firstScreenDetail } from '@/api/residentWX/screening.js'
 import { useStore } from '@/residentWX/store'
+import { showNav } from '@/utils/common'
 
 export default {
     inject:['showNav'],
@@ -157,7 +158,9 @@ export default {
         },
     },
     created() {
+        if (!this.showNav()) {
             document.title = '筛查详情'
+        }
         if (!this.id) {
             showNotify({ type: 'warning', message: '未获取到查询信息' })
             return

src/residentWX/screening/detail/SecondDetail.vue

@@ -490,7 +490,7 @@
 import { showNotify } from 'vant'
 import { secondScreenDetail } from '@/api/residentWX/screening.js'
 import { useStore } from '@/residentWX/store'
-import { fetchDataHandle } from '@/utils/common'
+import { fetchDataHandle, showNav } from '@/utils/common'
 import ImagePreview from '@/residentWX/components/imagePreview/imagePreview'
 
 export default {
@@ -726,7 +726,9 @@ export default {
         }
     },
     created() {
+        if (!this.showNav()) {
             document.title = '筛查详情'
+        }
         if (!this.id) {
             showNotify({ type: 'warning', message: '未获取到查询信息' })
             return

src/residentWX/visit/List.vue

@@ -70,6 +70,7 @@
 import { showConfirmDialog, showToast } from 'vant'
 import { useStore } from '@/residentWX/store'
 import { queryVisitList } from '@/api/residentWX/visit'
+import { showNav } from '@/utils/common'
 
 export default {
     inject: ['showNav', 'isResidentInfo'],
@@ -114,7 +115,9 @@ export default {
         }
     },
     mounted() {
+        if (!this.showNav()) {
             document.title = '随访记录'
+        }
         const list = this.$refs.list
         list.addEventListener('scroll', () => {
             if (list.scrollTop > 0) {

src/residentWX/visit/detail/FirstFUDetail.vue

@@ -98,6 +98,7 @@
 import { showNotify } from 'vant'
 import { useStore } from '@/residentWX/store'
 import { queryMajorFUDetail } from '@/api/residentWX/visit'
+import { showNav } from '@/utils/common'
 
 export default {
     inject:['showNav'],
@@ -157,7 +158,9 @@ export default {
         },
     },
     created() {
+        if (!this.showNav()) {
             document.title = '主要慢病高危随访详情'
+        }
         if (!this.id) {
             showNotify({ type: 'warning', message: '未获取到查询信息' })
             return

src/residentWX/visit/detail/GeneralFUDetail.vue

@@ -235,6 +235,7 @@ import { queryGeneralFUDetail } from '@/api/residentWX/visit'
 import Mp3 from '@/residentWX/components/mediaPlay/Mp3.vue'
 import Mp4 from '@/residentWX/components/mediaPlay/Mp4'
 import ImagePreview from '@/residentWX/components/imagePreview/imagePreview'
+import { showNav } from '@/utils/common'
 
 export default {
     name: 'CurrencyFUDetail.vue',
@@ -346,7 +347,9 @@ export default {
         }
     },
     created() {
+        if (!this.showNav()) {
             document.title = '通用随访详情'
+        }
         this.load()
     },
     methods: {

src/residentWX/visit/detail/SecondFUDetail.vue

@@ -489,7 +489,7 @@
 <script>
 import { showNotify } from 'vant'
 import { useStore } from '@/residentWX/store'
-import { fetchDataHandle } from '@/utils/common'
+import { fetchDataHandle, showNav } from '@/utils/common'
 import ImagePreview from '@/residentWX/components/imagePreview/imagePreview'
 import { querySpecificFUDetail } from '@/api/residentWX/visit'
 
@@ -726,7 +726,9 @@ export default {
         }
     },
     created() {
+        if (!this.showNav()) {
             document.title = '专病高危随访详情'
+        }
         if (!this.id) {
             showNotify({ type: 'warning', message: '未获取到查询信息' })
             return

src/residentWX/visit/detail/SeparateFUDetail.vue

@@ -51,6 +51,7 @@ import CerebralApoplexyDetail from './components/CerebralApoplexyDetail.vue'
 import CopdDetail from './components/CopdDetail.vue'
 import ChronicKidneyDiseaseDetail from './components/ChronicKidneyDiseaseDetail.vue'
 import AbnormalBloodLipidsDetail from './components/AbnormalBloodLipidsDetail.vue'
+import { showNav } from '@/utils/common'
 export default {
     components: { HypertensionDetail, DiabetesDetail, CoronaryHeartDiseaseDetail, CerebralApoplexyDetail, CopdDetail, ChronicKidneyDiseaseDetail, AbnormalBloodLipidsDetail },
     inject:['showNav'],
@@ -68,7 +69,9 @@ export default {
         }
     },
     created() {
+        if (!this.showNav()) {
             document.title = '专病随访详情'
+        }
         this.load()
     },
     methods: {