diff --git a/pages.json b/pages.json index d6eceda..f9f3160 100644 --- a/pages.json +++ b/pages.json @@ -3,20 +3,20 @@ "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" }, "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages - { - "path": "pages/startup/startup", - "style": { - "navigationStyle": "custom", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/homepage/homepage", - "style": { - "enablePullDownRefresh": false, - "navigationStyle": "custom" - } - }, + { + "path": "pages/startup/startup", + "style": { + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/homepage/homepage", + "style": { + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + }, { "path": "pages/myinformation/myinformation", "style": { @@ -31,8 +31,6 @@ "enablePullDownRefresh": false } }, - - { "path": "pages/medicalservice/medicalservice", "style": { @@ -58,16 +56,12 @@ "navigationBarTitleText": "人脸采集", "enablePullDownRefresh": false } - }, - { + }, { "path": "pages/location/location", "style": { "navigationBarTitleText": "定位", - "navigationStyle": "default", "enablePullDownRefresh": false - // "navigationBarBackgroundColor": "#ffffff" } - } ], "subPackages": [{ @@ -454,13 +448,13 @@ "enablePullDownRefresh": false } }, - // { - // "path": "Filinginformation/Filinginformation", - // "style": { - // "navigationBarTitleText": "查看建档信息" - // // "enablePullDownRefresh": false - // } - // }, + { + "path": "Filinginformation/Filinginformation", + "style": { + "navigationBarTitleText": "查看建档信息", + "enablePullDownRefresh": false + } + }, { "path": "Onlinesigning/Onlinesigning", "style": { @@ -659,4 +653,4 @@ } ] } -} +} \ No newline at end of file diff --git a/pages/homepage/homepage.scss b/pages/homepage/homepage.scss index db3b119..2cc48db 100644 --- a/pages/homepage/homepage.scss +++ b/pages/homepage/homepage.scss @@ -94,8 +94,8 @@ image { vertical-align: middle; - width: 22rpx; - height: 12rpx; + width: 25rpx; + height: 30rpx; } text{ margin-left: 10rpx; diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue index fd5fdc1..f106d5a 100644 --- a/pages/homepage/homepage.vue +++ b/pages/homepage/homepage.vue @@ -2,21 +2,25 @@ - - - {{patientName}},你好 - 你好,请登录 - - + + {{address}} 请选择城市 - + @@ -81,7 +85,6 @@ detail, checkSignApply } from '@/api/pages/homepage/homepage.js' - import QQMapWX from '@/utils/qqMap/qqmap-wx-jssdk.js'; export default { data() { return { @@ -97,17 +100,16 @@ }, onShow() { this.address = uni.getStorageSync('location') - console.log(this.address,'000') + console.log(this.address, '000') if (this.address == '德州市') { uni.setStorageSync("region", 1) } else if (this.address == '东营市') { uni.setStorageSync("region", 2) - } - else if (this.address == '济南市') { - uni.setStorageSync("region", 3) + } else if (this.address == '济南市') { + uni.setStorageSync("region", 1) } this.userinfo = uni.getStorageSync('userinfo'); - if (this.userinfo) { + if (this.userinfo) { this.patientName = this.userinfo.patientName checkSignApply(this.userinfo.cardNo).then(res => { if (res.data.code != 0) { @@ -116,8 +118,8 @@ this.checkSign = false } }) - }else{ - this.patientName='' + } else { + this.patientName = '' } }, @@ -279,4 +281,4 @@ + \ No newline at end of file diff --git a/pages/location/location.vue b/pages/location/location.vue new file mode 100644 index 0000000..c51c59e --- /dev/null +++ b/pages/location/location.vue @@ -0,0 +1,249 @@ + + + + \ No newline at end of file diff --git a/pages/medicalservice/medicalservice.vue b/pages/medicalservice/medicalservice.vue index e709567..0006406 100644 --- a/pages/medicalservice/medicalservice.vue +++ b/pages/medicalservice/medicalservice.vue @@ -1,10 +1,10 @@