From 10e0ba33179dd73d452811ef32796d206b4fc5e4 Mon Sep 17 00:00:00 2001
From: sjf1256754123 <33301030+sjf1256754123@users.noreply.github.com>
Date: Sat, 22 Feb 2020 19:36:11 +0800
Subject: [PATCH] demo

---
 pages/index/index.vue   | 12 +++++++++---
 pages/leader/leader.vue |  6 +++---
 utils/request.js        |  4 ++--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 47397dc..57edad0 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -8,9 +8,9 @@
 					<image src="../../static/3.png" class="btnStaff2" @click="fillInDay" mode=""></image>
 					<image src="../../static/6.png" class="btnStaff2" @click="temperature" mode=""></image>
 				</view> -->
+				<view class="park">{{park}}</view>
 				<image class="img" :src="imgSrc" mode="widthFix" @click="modalName = 'Image'">
 				<view class="tips">入园请出示二维码通行证</view>
-				
 				<view class="btnStaff" v-show="securityFlag">
 					<image src="../../static/2.png" class="btnStaff2" mode=""></image>
 					<image src="../../static/7.png" class="btnStaff2 margin-left-sm" @click="getScancode" style="width: 424upx;" mode=""></image>
@@ -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;
+			}
 		}
 	}
 </style>
diff --git a/pages/leader/leader.vue b/pages/leader/leader.vue
index a01dd0f..7ccc2ee 100644
--- a/pages/leader/leader.vue
+++ b/pages/leader/leader.vue
@@ -14,7 +14,7 @@
 		</view>
 			<view class="cu-form-group">
 				<view class="title"><span style="color:red;display: inline-block; vertical-align:inherit;margin-right:4upx">*</span>身份证/护照号</view>
-				<input class="text-right" type="idcard" placeholder="请输入身份证号码/护照号" :value="form.idCard" name="input" @input="updateInputVal($event,'idCard')"></input>
+				<input class="text-right" placeholder="请输入身份证号码/护照号" :value="form.idCard" name="input" @input="updateInputVal($event,'idCard')"></input>
 			</view>
 			<view class="padding">
 				<button form-type="submit" class="cu-btn block bg-blue margin-tb-sm lg">提交</button>
@@ -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 b31b74b..104b701 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',
-- 
2.22.0