修改托码合并

mycomponents/container/targetContainer.vue

@@ -3,7 +3,7 @@
 	padding-bottom: 15rpx;
 	 padding-left: 10rpx;
 	 padding-right: 10rpx;
-	 font-size:32rpx;background-color: #fff;">
+	 font-size:32rpx;">
 		<text style="font-size: 35rpx;">{{title}} </text>
 		<view class="uni-flex u-col-center" @click="showLocation">
 			<text style="color:#3FBAFF;font-size: 35rpx;" v-if="containerCode==''&&isShowEdit==true">&nbsp 请扫描</text>

pages/pallet/record/bindPalletRecord.vue

@@ -16,13 +16,13 @@
 				</scroll-view>
 			</view>
 
-			<targetContainer ref="scanContainer" title="托盘" :containerCode="containerCode" @getContainer="getContainer">
-			</targetContainer>
-
 			<view class="page-footer">
 				<view class="uni-flex u-col-center space-between padding_10"
 					style="background-color:ghostwhite; width: 100%; ">
 					<view class="">
+						<targetContainer ref="scanContainer" title="托盘" :containerCode="containerCode"
+							@getContainer="getContainer">
+						</targetContainer>
 					</view>
 					<view class=" uni-flex uni-row">
 						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -41,7 +41,7 @@
 	import {
 		goHome,
 	} from '@/common/basic.js';
-	
+
 	import {
 		getDirectoryItemArray
 	} from '@/common/directory.js';
@@ -175,11 +175,11 @@
 			scanPopupGetFocus() {
 				this.$refs.scanPopup.getfocus();
 			},
-			
+
 			scanPopupLoseFocus() {
 				this.$refs.scanPopup.losefocus();
 			},
-			
+
 
 			commit() {
 				if (this.containerCode == "") {