Merge branch 'master' of http://47.92.161.104:10080/zkx/jp-xqjy into master

main.js

@@ -37,7 +37,18 @@ Vue.mixin({
         }
 		
     } ,methods:{
-	
+		showName(name){
+			if(name){
+				var info=mixin.getPersonInfo();
+				if(info){
+					return name;
+				}else{
+					return name.substring(0,1)+"**"
+				}
+			}else{
+				return ""
+			}
+		},
 		gotoUrl(url){
 			uni.navigateTo({
 				url:"/"+url

pages/index/index.vue

@@ -34,7 +34,7 @@
 				</view>
 				<view class="homeUser-text">
 					<view class="homeUser-name">
-						<span>{{item.realName}}</span>
+						<span>{{showName(item.realName)}}</span>
 						<u-icon custom-prefix="custom-icon" :name="(item.gender?'women-line':'men-line')" :color="item.gender?'#FF695B':'#1677FF'"></u-icon>
 					</view>
 					<view class="homeUser-info">

pagesA/pages/login/change.vue

@@ -183,6 +183,7 @@
 		min-height: 100vh;
 		padding: 50px;
 		margin-top: -44PX;
+		 background-attachment: fixed;
 	}
 
 	.jpLogin-title {

pagesA/pages/login/register.vue

@@ -296,6 +296,7 @@
 		background-size: 100%;
 		min-height: 100vh;
 		padding: 50px;
+		 background-attachment: fixed;
 	}
 
 	.jpLogin-title {

pagesB/pages/login/step1.vue

@@ -410,6 +410,7 @@
 		min-height: 100vh;
 		padding: 50px;
 		margin-top: -44px;
+		 background-attachment: fixed;
 	}
 	.step-btn{
 		text-align: center;
@@ -446,7 +447,10 @@
 		padding: 0 20px 0 30px;
 		margin-bottom: 20px;
 		.u-form-item{
-			flex: 1;
+				   flex: 1;
+		}
+		u-form-item{
+				width: 100%;
 		}
 		.jpLogin-icon{
 			font-size: 20px;

pagesB/pages/login/step2.vue

@@ -9,21 +9,21 @@
 			</view>
 			<view class="jpLogin-main">
 				<u-form :model="form" ref="uForm">
-					<view class="jpLogin-input">
-						<u-form-item :required="true">
+					<view class="jpLogin-input jpLogin-inputLabel">
+						<u-form-item :required="true" label-position="top" :labelStyle="labelstyle" label="我的出生地">
 							<u-input v-model="form.address" type="select" placeholder="我的出生地" @click="birthdayAddressChange" />
 							<u-select v-model="show_birthday_address" mode="mutil-column-auto" :default-value='defaultData.address' :list="defaultColumns" @confirm="onBirthdayCityConfirm"></u-select>							
 						</u-form-item> 							
 					</view> 
-					<view class="jpLogin-input">
-						<u-form-item :required="true">
+					<view class="jpLogin-input jpLogin-inputLabel">
+						<u-form-item :required="true"  label-position="top" :labelStyle="labelstyle" label="户口所在地" >
 							<u-input v-model="form.registered_residence" type="select" placeholder="我的的户口所在地" @click="registeredResidenceAddressChange"  />
 							<u-select v-model="show_registered_residence" mode="mutil-column-auto" :default-value='defaultData.registered_residence' :list="defaultColumns" @confirm="onResidenceRegisteredCityConfirm"></u-select>
 						</u-form-item>
 <!--						<u-select v-model="show_registered_residence" mode="single-column" :list="area_ranges_by_names" @confirm="registeredResidenceConfirm"></u-select>						-->
 					</view>
-					<view class="jpLogin-input">
-						<u-form-item :required="true">
+					<view class="jpLogin-input jpLogin-inputLabel">
+						<u-form-item :required="true"  label-position="top" :labelStyle="labelstyle" label="工作所在地">
 							<u-input v-model="form.work_address" type="select" placeholder="我的工作所在地" @click="workAddressChange" /></u-form-item>
 							<u-select v-model="show_work_address" mode="mutil-column-auto" :default-value='defaultData.work_address' :list="defaultColumns" @confirm="onWorkCityConfirm"></u-select>
 <!--						<u-select v-model="show_work_address" mode="single-column" :list="area_ranges_by_names" @confirm="workAddressConfirm"></u-select>-->
@@ -104,7 +104,11 @@
 	export default {
 		 
 		data() {
-			return {
+			return {
+				labelstyle:{
+					"color": "#777",
+					"line-height":"20px"
+				},
 				defaultColumns: [],			
 				 defaultData:{
 				 	address:[16,6,0],
@@ -953,6 +957,7 @@
 		min-height: 100vh;
 		padding: 50px;
 		margin-top: -44px;
+		 background-attachment: fixed;
 	}
 	.step-btn{
 		text-align: center;
@@ -978,7 +983,13 @@
 	.jpLogin-main {
 		margin-top: 40px;
 	}
-
+	.jpLogin-inputLabel{
+		u-form-item{
+				
+				transform: translateY(-30px);
+				
+		}
+	}
 	.jpLogin-input {
 		height: 48px;
 		background-color: #fff;
@@ -990,7 +1001,12 @@
 		margin-bottom: 20px;
 		position: relative;
 		.u-form-item{
-			flex: 1;
+				   flex: 1;
+		}
+		u-form-item{
+				width: 100%;
+			
+				
 		}
 		.jpLogin-icon{
 			font-size: 20px;

pagesB/pages/login/step3.vue

@@ -497,6 +497,7 @@
 		min-height: 100vh;
 		padding: 50px;
 		margin-top: -44px;
+		 background-attachment: fixed;
 	}
 
 	.step-btn {
@@ -537,10 +538,12 @@
 		padding: 0 20px;
 		margin-bottom: 20px;
 		position: relative;
-
-		.u-form-item {
-			flex: 1;
-		}
+	.u-form-item{
+			   flex: 1;
+	}
+	u-form-item{
+			width: 100%;
+	}
 
 		.jpLogin-icon {
 			font-size: 20px;

pagesB/pages/login/step4.vue

@@ -224,6 +224,7 @@
 		min-height: 100vh;
 		padding: 50px;
 		margin-top: -44px;
+		 background-attachment: fixed;
 	}
 	.step-btn {
 		text-align: center;