diff --git a/manifest.json b/manifest.json index eecaccc..7704103 100644 --- a/manifest.json +++ b/manifest.json @@ -58,6 +58,9 @@ "es6" : true }, "usingComponents" : true, + "optimization" : { + "subPackages" : true + }, // app.json "permission" : { "scope.userLocation" : { diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue index e4c4413..9c1a165 100644 --- a/pages/homepage/homepage.vue +++ b/pages/homepage/homepage.vue @@ -59,8 +59,6 @@ 照护记录 - - @@ -240,9 +238,13 @@ if (!this.userinfo) { this.gologin(); } else { - uni.navigateTo({ - url: "/pagesC/Healthrecords/Healthrecords" - }) + if (this.region == 3) { + this.family() + } else { + uni.navigateTo({ + url: "/pagesC/Healthrecords/Healthrecords" + }) + } } }, // 筛查记录 diff --git a/pages/login/login.vue b/pages/login/login.vue index 47359bd..7bab419 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -52,7 +52,7 @@ import { mapMutations } from "vuex"; - import contenttext from '@/pagesC/logintext/text.vue'; + import contenttext from '../../components/text.vue'; export default { components: { contenttext, diff --git a/pages/register/register.vue b/pages/register/register.vue index 91a920d..295ad84 100644 --- a/pages/register/register.vue +++ b/pages/register/register.vue @@ -3,7 +3,7 @@ - 人脸采集 + @@ -98,7 +98,7 @@ - 我已阅读并同意《用户协议》 + 我已阅读并同意《用户协议与隐私政策》 @@ -117,7 +117,7 @@ 取消 - 确定并同意 + 已阅读并同意 @@ -145,7 +145,7 @@ getNurseType, information } from '@/api/pagesB/information/index.js' - import contenttext from '@/pagesC/logintext/text.vue'; + import contenttext from '../../components/text.vue'; import { getSubordinateRegions, } from '@/api/pagesB/modifyAddress/modifyAddress.js'; @@ -485,9 +485,9 @@ }, // 人脸采集 Face() { - uni.navigateTo({ - url: '/pagesB/facecollection/facecollection' - }) + // uni.navigateTo({ + // url: '/pagesB/facecollection/facecollection' + // }) }, //性别 sexchange(e) { diff --git a/pagesB/facecollection/facecollection.vue b/pagesB/facecollection/facecollection.vue index 3491fb3..f0e327b 100644 --- a/pagesB/facecollection/facecollection.vue +++ b/pagesB/facecollection/facecollection.vue @@ -1,22 +1,22 @@