diff --git a/pages/index/index.vue b/pages/index/index.vue index 47397dc0edc1198011b373f28cc25347ec96a133..57edad0e4b446102aac5ff28097b1e0b49d4ca64 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -8,9 +8,9 @@ --> + {{park}} 入园请出示二维码通行证 - @@ -49,6 +49,7 @@ name: "home", data() { return { + park:'', hiddenRegisterFlag:true, imgSrc:'', modalName:'', @@ -168,6 +169,7 @@ const d = res.data if (d.code == 1) { let userInfo = d.object + this.park = userInfo.userOrg?userInfo.userOrg.park:'' if(userInfo.roleId == '1003'){ this.securityFlag=true } @@ -205,7 +207,7 @@ background-size: cover; background-image: url('http://139.9.163.126/gastric/static/background.jpg'); .btnList{ - padding-top: 325upx; + padding-top: 225upx; text-align: center; .btnSecurity{ background-color: #92d0f1; @@ -233,13 +235,17 @@ width: 350upx; height: 350upx; } - .tips{ + .tips,.park{ margin-top:25upx; margin-bottom:45upx; font-weight: bold; font-size: 32upx; color:#FFFFFF; } + .park{ + margin-top:0; + margin-bottom:45upx; + } } } diff --git a/pages/leader/leader.vue b/pages/leader/leader.vue index a01dd0fe68b8ea16eaf9468b9aa577580392d8b2..7ccc2ee8731cde50259158bfeaf8766050cb88d4 100644 --- a/pages/leader/leader.vue +++ b/pages/leader/leader.vue @@ -14,7 +14,7 @@ *身份证/护照号 - + @@ -48,7 +48,7 @@ icon: 'success', title: '注册成功!' }) - uni.navigateTo({ + uni.reLaunch({ url: '/pages/index/index', }); }else{ @@ -56,7 +56,7 @@ icon: 'none', title: d.message }) - uni.navigateTo({ + uni.reLaunch({ url: '/pages/index/index', }); } diff --git a/utils/request.js b/utils/request.js index b31b74b82e29d7ce6d4e30f3651ba07a20095b19..104b701a050429a6e0a21dbd9bfd86e0e94d4cfe 100644 --- a/utils/request.js +++ b/utils/request.js @@ -10,8 +10,8 @@ import store from '../store' export default class Request { config = { - baseUrl: 'https://health.sh-sict.com/ncov-api', - // baseUrl: 'https://health.sh-sict.com/ncov-test-api', + // baseUrl: 'https://health.sh-sict.com/ncov-api', + baseUrl: 'https://health.sh-sict.com/ncov-test-api', // baseUrl: 'http://139.9.163.126/ncov-api', header: { 'content-type': 'application/json;charset=UTF-8',