Merge branch 'master' of http://47.98.226.240:3000/twt/wxThird

* 'master' of http://47.98.226.240:3000/twt/wxThird:
  111

pages/activity/activity.vue

@@ -219,7 +219,8 @@ display: block;
 	}
 	.state{
 		width: 102rpx;
-		height: 53rpx;
+		height: 53rpx;
+		position: relative;
 	}
 
 	.time {

pages/activity/jkDetail.vue

@@ -118,16 +118,16 @@
 					</view>
 					<!-- clWhere报名凭证1,2,3,4 1手机号2车牌号3姓名4单位 -->
 					<view class="bmLine" v-if="info.clWhere.indexOf(1)!=-1" >
-						<input  type="text" adjust-position="false" @blur="inputBindBlur" @focus="inputBindFocus" v-model="mobilePhone"  class="bmlineInput" placeholder="输入手机号" placeholder-style="color:#999999">
+						<input  type="text" :adjust-position="false" @blur="inputBindBlur" @focus="inputBindFocus" v-model="mobilePhone"  class="bmlineInput" placeholder="输入手机号" placeholder-style="color:#999999">
 					</view>
 					<view class="bmLine" v-if="info.clWhere.indexOf(2)!=-1">
-						<input type="text" adjust-position="false" @blur="inputBindBlur" @focus="inputBindFocus" v-model="plateNumber"   class="bmlineInput" placeholder="输入车牌号" placeholder-style="color:#999999">
+						<input type="text" :adjust-position="false" @blur="inputBindBlur" @focus="inputBindFocus" v-model="plateNumber"   class="bmlineInput" placeholder="输入车牌号" placeholder-style="color:#999999">
 					</view>
 					<view class="bmLine" v-if="info.clWhere.indexOf(3)!=-1">
-						<input type="text" adjust-position="false" @blur="inputBindBlur" @focus="inputBindFocus" v-model="customerName"  class="bmlineInput" placeholder="输入姓名" placeholder-style="color:#999999">
+						<input type="text" :adjust-position="false" @blur="inputBindBlur" @focus="inputBindFocus" v-model="customerName"  class="bmlineInput" placeholder="输入姓名" placeholder-style="color:#999999">
 					</view>
 					<view class="bmLine" v-if="info.clWhere.indexOf(4)!=-1">
-						<input type="text" adjust-position="false" @blur="inputBindBlur" @focus="inputBindFocus"  v-model="unit"  class="bmlineInput" placeholder="输入单位" placeholder-style="color:#999999">
+						<input type="text" :adjust-position="false" @blur="inputBindBlur" @focus="inputBindFocus"  v-model="unit"  class="bmlineInput" placeholder="输入单位" placeholder-style="color:#999999">
 					</view>
 				</view>
 				<view class="bmTtnBox">
@@ -239,10 +239,11 @@
 				comment:'',
 				userInfo:'',
 				useShopShow:false,
-				jpHeight:'279px',
+				jpHeight:0,
 				 isPlay: false,
 				 mp3Url:'',
 				 payshow:false,
+				 jpNum:1,
 			}
 		},
 		onLoad(opt) {
@@ -263,14 +264,14 @@
 		   	})
 		   }
 		  
-		   // uni.onKeyboardHeightChange((obj)=>{
-		   //     // 获取系统信息
-		   // 	let _sysInfo = uni.getSystemInfoSync();
+		   uni.onKeyboardHeightChange((obj)=>{
+		        // 获取系统信息
+		    	let _sysInfo = uni.getSystemInfoSync();
 		   // 	let _heightDiff = _sysInfo.screenHeight - _sysInfo.windowHeight
 		   // 	let _diff = obj.height - _heightDiff
 		   // 	// 键盘高度
 		   // 	this.jpHeight = (_diff > 0 ? _diff : 0) - 2 + "px";
-		   // })
+		    })
 		   
 		   this.shopckList= uni.getStorageSync("shopckList");
 		   //this.ckmusic=uni.getStorageSync("ckmusic");
@@ -297,12 +298,13 @@
 		methods: {
 			inputBindFocus(e){
 				console.log( e.detail.height);
-				//this.jpHeight=e.detail.height+ "px";
+				this.jpHeight=e.detail.height+ "px";
 				console.log(this.jpHeight)
 			},
 			inputBindBlur(){
+				
 				uni.onKeyboardHeightChange((obj)=>{
-				    // 获取系统信息
+				    console.log("inputBindBlur"+obj.height)
 					let _sysInfo = uni.getSystemInfoSync();
 					let _heightDiff = _sysInfo.screenHeight - _sysInfo.windowHeight
 					let _diff = obj.height - _heightDiff;
@@ -313,7 +315,10 @@
 					// 键盘高度
 					//this.jpHeight = (_diff > 0 ? _diff : 0) - 2 + "px";
 				})
-				//this.jpHeight=0
+				if(this.jpNum==1){
+					this.jpHeight=0
+				}
+				this.jpNum++;
 			},
 			queryGoodsLook(){
 				this.$http('openmy/queryGoodsLook', {