Merge remote-tracking branch 'origin/master'

@@ -2,18 +2,18 @@ import util from '../../utils/util';
 import App from '../../utils/api';
 import App from '../../utils/api';
 Page({
 Page({
 	data:{
 	data:{
-		remark:''
+		remark:'',
+		buttonbottom:60
 	},
 	},
 	onLoad(opt){
 	onLoad(opt){
 		this.setData({
 		this.setData({
-			remark:opt.remark
+			remark:opt.remark,
 		})
 		})
 		this.remark=opt.remark;
 		this.remark=opt.remark;
 		this.getlabellist();
 		this.getlabellist();
 	},
 	},
 	inputremark(e){
 	inputremark(e){
 		this.remark=util.trim(e.detail.value)
 		this.remark=util.trim(e.detail.value)
-		console.log(e)
 	},
 	},
 	selectlabel(e){
 	selectlabel(e){
 		let name=e.currentTarget.dataset.name;
 		let name=e.currentTarget.dataset.name;
@@ -37,9 +37,10 @@ Page({
 		console.log(this.remark,this.remark.length)
 		console.log(this.remark,this.remark.length)
 	},
 	},
 	inputblur(e){
 	inputblur(e){
-		console.log(e)
+		console.log(e,'blur')
 		this.setData({
 		this.setData({
-			remark:this.remark
+			remark:this.remark,
+			buttonbottom:60
 		})
 		})
 	},
 	},
 	getlabellist(){
 	getlabellist(){
@@ -52,9 +53,14 @@ Page({
 			}
 			}
 		})
 		})
 	},
 	},
+	focusinput(e){
+		this.setData({
+			inputfocus:true,
+			buttonbottom:560
+		})
+	},
 	save(){
 	save(){
 		wx.setStorageSync('remark',this.remark);
 		wx.setStorageSync('remark',this.remark);
 		wx.navigateBack();
 		wx.navigateBack();
 	},
 	},
-	
 })
 })

 <layout>
 <layout>
 	<nav>备注</nav>
 	<nav>备注</nav>
-	<view class="contain">
+	<view class="contain" style="height: minheight+'px';overflow-y: scroll;">
 		<view class="bg-gray textarea-cover">
 		<view class="bg-gray textarea-cover">
-			<textarea placeholder="请输入您的特殊要求，我们会尽量安排" placeholder-class="gray-font font28r" class="black-font font28r" value="{{remark}}" maxlength="25" auto-focus bindinput="inputremark" bindblur="inputblur"></textarea>
+			<textarea placeholder="请输入您的特殊要求，我们会尽量安排" placeholder-class="gray-font font28r" class="black-font font28r" value="{{remark}}" maxlength="25" show-confirm-bar="{{false}}" auto-focus bindinput="inputremark" bindblur="inputblur" adjust-position cursor-spacing="130" bindfocus="focusinput"></textarea>
 			<view class="gray-font font24r flex-rr" style="padding-top: 20rpx;">最多输入25个字</view>
 			<view class="gray-font font24r flex-rr" style="padding-top: 20rpx;">最多输入25个字</view>
 		</view>
 		</view>
 		<view class="label">
 		<view class="label">
@@ -14,5 +14,5 @@
 			</view>
 			</view>
 		</view>
 		</view>
 	</view>
 	</view>
-	<view class="save-button white-font flex-cc font32r" bindtap="save">保存</view>
+	<view class="save-button white-font flex-cc font32r" bindtap="save" style="bottom:{{buttonbottom}}rpx;">保存</view>
 </layout>
 </layout>

@@ -39,4 +39,5 @@ input{
 	left:0;
 	left:0;
 	right:0;
 	right:0;
 	bottom:60rpx;
 	bottom:60rpx;
+	transition: bottom .05s ease;
 }
 }

@@ -5,14 +5,13 @@
 		"es6": true,
 		"es6": true,
 		"enhance": true,
 		"enhance": true,
 		"postcss": true,
 		"postcss": true,
-		"preloadBackgroundData": false,
 		"minified": true,
 		"minified": true,
 		"newFeature": true,
 		"newFeature": true,
 		"coverView": true,
 		"coverView": true,
 		"nodeModules": true,
 		"nodeModules": true,
 		"autoAudits": false,
 		"autoAudits": false,
 		"showShadowRootInWxmlPanel": true,
 		"showShadowRootInWxmlPanel": true,
-		"scopeDataCheck": false,
+		"scopeDataCheck": true,
 		"uglifyFileName": false,
 		"uglifyFileName": false,
 		"checkInvalidKey": true,
 		"checkInvalidKey": true,
 		"checkSiteMap": true,
 		"checkSiteMap": true,
@@ -21,7 +20,8 @@
 			"ignore": [],
 			"ignore": [],
 			"disablePlugins": [],
 			"disablePlugins": [],
 			"outputPath": ""
 			"outputPath": ""
-		}
+		},
+		"preloadBackgroundData": false
 	},
 	},
 	"compileType": "miniprogram",
 	"compileType": "miniprogram",
 	"libVersion": "2.8.2",
 	"libVersion": "2.8.2",