居民筛查慢病须知 页面

src/resident/screening/first/agree/Agree.vue

+<template>
+    <div class="flex flex-col agree">
+        <div class="p-3 text-16 text-black text-center shrink-0 top-bar">
+            <span class="back-bt" @click="onBack">
+                <doc-icon type="doc-left" />
+            </span>
+            <span>居民筛查慢病须知</span>
+        </div>
+        <div class="grow overflow-y-auto cont">
+            <p class="indent">在您决定是否参加慢病筛查之前，请仔细阅读以下内容：</p>
+            <p class="font-semibold">一、筛查开展的背景和目的</p>
+            <p class="color-1 indent">各种慢病严重威胁我国人群健康，也是我国居民的主要死亡原因之一。
+                患者治疗费用昂贵而且效果不佳，该疾病给患者和家属带来极大的痛苦和沉重的经济负担。
+                医学研究和临床实践证实,施行有效的筛查和综合干预是降低该疾病致残率和死亡率、提高生存率和生存质量的重要手段。</p>
+            <p class="font-semibold">二、筛查过程</p>
+            <p class="color-1 indent">本地常住居民可在自愿的情况下接受筛查。将有专门的医护人员收集您的人口学信息、生活方式、家族史、既往病史、服药史，
+                并对您进行身高、体重、腰围、血压、心脏听诊等体格检查，
+                根据检查结果就您的身体情况进行评估，并根据评估结果对您提供相应指导。</p>
+            <p class="font-semibold">三、参加筛查可能的受益</p>
+            <p class="color-1 indent">如果您参加筛查，可全面了解您的患病风险。对于本次筛查出的风险人群，将会得到具有针对性的指导和干预。
+                也可接受健康科普宣传教育，提高对自身健康的重视程度。</p>
+            <p class="font-semibold">四、保密原则</p>
+            <p class="color-1 indent">我们承诺您的所有个人信息将完全保密，筛查信息只用于慢病医疗服务。
+                任何公开报告将不会披露您的个人信息和健康信息。我们将在法律允许的范围内，尽一切努力保护您的隐私。</p>
+        </div>
+        <div class="px-5 pb-4 pt-3 shrink-0">
+            <van-button type="primary" block round
+                @click="submit">同意</van-button>
+        </div>
+    </div>
+</template>
+
+<script>
+import { backHome } from '@/utils/common.js'
+
+export default {
+    methods: {
+        onBack() {
+            backHome()
+        },
+        submit() {
+            this.$router.replace({
+                path: '/resident/screening/first/form',
+                query: this.$route.query
+            })
+        }
+    }
+}
+</script>
+
+<style lang="less" scoped>
+@import '../../../utils/common.less';
+.agree {
+    height: 100vh;
+}
+.cont {
+    padding: 6px 24px;
+    .color-1 {
+        color: #595959;
+    }
+    .indent {
+        text-indent: 2em;
+        line-height: 1.5;
+    }
+}
+</style>

src/resident/screening/first/detail/Detail.vue

@@ -6,7 +6,7 @@
                     <doc-icon type="doc-left" />
                 </span>
             </span>
-            <span>慢病自我初筛详情</span>
+            <span>居民慢病筛查详情</span>
         </div>
         <div class="py-4 border-bottom">
             <div class="px-4 doc-title">居民信息</div>

src/resident/screening/first/form/IdCheck.vue

@@ -26,7 +26,9 @@
             >
             <template #right-icon>
                 <div class="flex items-center">
+                    <van-uploader :max-size="5 * 1024 * 1024" :after-read="afterRead" max-count="1">
                         <doc-icon type="doc-scan" style="font-size: .2rem;"/>
+                    </van-uploader>
                 </div>
             </template>
             </van-field>
@@ -36,7 +38,7 @@
             <div class="text-12 tip">提示：所填写的信息只用于慢病初筛，不会用于其他用途。</div>
         </div>
 
-        <div class="px-5 pb-4 grow flex flex-col justify-end">
+        <div class="px-5 pb-4 ">
             <van-button type="primary" block round
                 @click="submit">下一步</van-button>
         </div>
@@ -101,6 +103,11 @@ export default {
             }).catch(err => {
                 console.warn(err)
             })
+        },
+        // 证件上传后
+        afterRead(file) {
+            console.log(file)
+            showNotify({ type: 'primary', message: '文件上传' })
         }
     }
 }

src/resident/screening/first/form/Index.vue

@@ -9,7 +9,7 @@
                     <doc-icon type="doc-left" />
                 </span>
             </span>
-            <span>慢病自我初筛</span>
+            <span>居民慢病筛查</span>
         </div>
         <div class="grow overflow-y-auto">
             <IdCheck v-show="step === 1"/>
@@ -26,7 +26,7 @@
 
 <script>
 import { showNotify } from 'vant'
-import { isWeiXin } from '@/utils/common.js'
+import { backHome } from '@/utils/common.js'
 import IdCheck from './IdCheck.vue'
 import CheckTip from './CheckTip.vue'
 import BaseInfo from './BaseInfo.vue' 
@@ -87,12 +87,7 @@ export default {
             this.step = this.setpHistory[this.setpHistory.length - 1]
         },
         onClose() {
-            if (isWeiXin()) {
-                // 微信中关闭页面
-                WeixinJSBridge.call('closeWindow')
-            } else {
-                window.close()
-            }
+            backHome()
         }
     }
 } 

src/router/index.js

@@ -11,6 +11,11 @@ const routes = [
         name: 'resident',
         component: () => import(/* webpackChunkName: "page-resident" */ '@/resident/Resident.vue'),
         children: [
+            {
+                path: 'screening/first/agree',
+                name: 'resident-screening-first-agree',
+                component: () => import(/* webpackChunkName: "page-resident" */ '@/resident/screening/first/agree/Agree.vue')
+            },
             {
                 path: 'screening/first/form',
                 name: 'resident-screening-first-form',

src/utils/common.js

@@ -159,13 +159,6 @@ export function checkboxReject(val = [], exclude = []) {
     return arr
 }
 
-// 判断是否在微信中
-export function isWeiXin() {
-    const ua = window.navigator.userAgent.toLowerCase()
-    return /micromessenger/.test(ua)
-}
-
-
 //获取url参数
 export function getQueryVariable(variable, urlInfo) {
     let url = decodeURI(decodeURI(urlInfo || window.location.href))
@@ -200,7 +193,7 @@ export function callMobile(handlerInterface, parameters) {
                         window.webkit.messageHandlers[handlerInterface].postMessage(param);
                     }
                 }
-            } else if (isIOSWebKit() === false) {
+            } else if (isAndroid()) {
                 //安卓传输不了js json对象，只能传输string
                 if (param == '{}') {
                     window['function'][handlerInterface]();
@@ -219,16 +212,31 @@ export function isIOSWebKit() {
     const aa = window.navigator.userAgent;
     if (!!aa.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/)) {// ios端
         return true;
-    } else if (aa.indexOf('Android') !== -1 || aa.indexOf('Adr') !== -1) {// 安卓端
-        return false;
     }
 }
 
+// 判断是否安卓
+export function isAndroid() {
+    const aa = window.navigator.userAgent;
+    if (aa.indexOf('Android') !== -1 || aa.indexOf('Adr') !== -1) {
+        return true
+    }
+}
+
+// 判断是否在微信中
+export function isWeiXin() {
+    const ua = window.navigator.userAgent.toLowerCase()
+    return /micromessenger/.test(ua)
+}
+
 //关闭页面
 export function backHome() {
     if (isIOSWebKit()) { //ios
         callMobile("closeWebPage", {})
-    } if (isIOSWebKit() === false) {
+    } else if (isAndroid()) {
         callMobile("closePage", {})
     }
+    if (isWeiXin()) { // 微信中
+        WeixinJSBridge.call('closeWindow')
+    }
 }
\ No newline at end of file