Merge branch 'dev' of http://rungit.jxdsy.cn:10000/xys/lumastoreapp into dev

pages/Printer/AddPrinter.scss

@@ -77,8 +77,8 @@ page{
 	bottom: 200upx;
 }
 .wz{
-	margin:20px 40px;
-	font-size: 15px;
+	margin:40upx 80upx;
+	font-size: 30upx;
 }
 
 .switch {

pages/Printer/AddPrinter.vue

@@ -13,7 +13,7 @@
 			<view class="inoutlist">
 				<view class="inputitem flex">
 					<view class="names">填写编码</view>
-					<input type="text" placeholder="打印机编码" v-model="parameter.print_SN" class="inputs"  >
+					<input type="text" placeholder="打印机编码" v-model="parameter.print_SN" class="inputs" maxlength="20" >
 				</view>	
 				<view class="wz">请查看打印机上对应的设备编码,并正确填写(不区分大小写)</view>
 			</view>
@@ -75,6 +75,7 @@
 						icon:"success",
 						title:res.msg
 					})
+					this.taggleTab(2);
 					//this.$api.msg(res.msg);
 				}else{
 					this.$api.msg(res.msg);