11

components/kk-printer/index.vue

@@ -25,7 +25,7 @@
 						<view class="" v-else>
 							<view class="kk-devices-item" v-for="(item,index) in devicesList" :key="index"
 								@tap="lianejieshebei(item.deviceId)">
-								<view class="name" style="color:#000;">
+								<view class="name" style="color:#000;display: flex;flex-direction: column;">
 									<text>设备名称：</text>
 									<text>{{item.name?item.name:'未命名'}}</text>
 								</view>
@@ -103,13 +103,6 @@
 		},
 		mounted() {
 
-		},
-		watch: {
-			isShowSearch(newVal, oldVal) {
-				if(newVal == false){
-					this.$parent.$parent.isShow = true
-				}
-			}
 		},
 		onLoad() {
 
@@ -125,8 +118,6 @@
 			//点击打印按钮
 			handlePrintTap() {
 				let that = this
-				console.log(this.$parent)
-				this.$parent.$parent.clickShow();
 				uni.showLoading({
 					mask: true,
 					title: '加载中...'
@@ -383,8 +374,8 @@
 				align-items: center;
 
 				.kk-modal {
-					width: 680upx;
+					width: 420upx;
-					height: 60%;
+					height: 600upx;
 					padding: 24upx;
 					box-sizing: border-box;
 					overflow-y: auto;
@@ -429,18 +420,20 @@
 
 						.kk-btn-wrap {
 							width: 100%;
-							height: 140upx;
+							height: 90upx;
 							display: flex;
 							justify-content: space-between;
-							align-items: center;
+							align-items: center;
+							padding: 20rpx;
 
 							&>view {
 								flex: 1 1 auto;
-								height: 100upx;
+								height: 60upx;
-								line-height: 100upx;
+								line-height: 60upx;
 								border-radius: 16upx;
 								text-align: center;
-								color: #ffffff;
+								color: #ffffff;
+								    font-size: 26rpx;
 
 								&.confirm-btn {
 									background: #007AFF;
@@ -454,7 +447,7 @@
 						}
 
 						.kk-devices-wrap {
-							height: calc(100% - 460upx);
+							height: calc(100% - 80upx);
 							overflow-y: auto;
 							padding: 10upx 20upx;
 							box-sizing: border-box;