Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/aiot-app

pages/login/login.vue

@@ -153,7 +153,7 @@
 							setPassword(this.userInfo)
 						}
 
-						console.log(res)
+			
 						let data = res.data
 						uni.setStorageSync('token', data.token)
 						uni.setStorageSync("userInfo", data);

pages/pda/feeding/components/deviceBom.vue

@@ -10,10 +10,10 @@
 		</view>
 
 
-		<view class="material rx-ss"  v-for="(item,index) in list" :key='index'>
-		<view class="left rx-ss" @click="getDelete(index)" v-if='workOrderId'>
-					<uni-icons custom-prefix="iconfont" type="icon-shanchu" size="20" color="#fa3534"></uni-icons>
-				</view>
+		<view class="material rx-ss" v-for="(item,index) in list" :key='index'>
+			<view class="left rx-ss" @click="getDelete(index)" v-if='workOrderId'>
+				<uni-icons custom-prefix="iconfont" type="icon-shanchu" size="20" color="#fa3534"></uni-icons>
+			</view>
 			<view class="content_table">
 				<view class="item">
 					<view class="lable rx-cc">工位名称</view>
@@ -34,23 +34,23 @@
 					<view class="content">{{ item.name  }}</view>
 				</view>
 
-	
-				
-				<view class="item rx-sc" >
+
+
+				<view class="item rx-sc">
 					<view class="rx ww50">
 						<view class="lable  rx-cc">固资编码</view>
-						<view class="content"  >{{item.fixCode }} </view>
-					
+						<view class="content">{{item.fixCode }} </view>
+
 					</view>
-				
-				 
+
+
 					<view class="rx ww50">
 						<view class="lable ww80 rx-cc">编号</view>
 						<view class="content">{{item.codeNumber}}</view>
 					</view>
-				
+
 				</view>
-				
+
 
 
 				<view class="item" v-if="clientEnvironmentId == 3">
@@ -63,7 +63,6 @@
 
 
 
-
 			</view>
 		</view>
 
@@ -95,7 +94,7 @@
 			handleScan(id) {
 				this.$emit('scanIt', id, )
 			},
-			
+
 			getDelete(idx) {
 				this.list.splice(idx, 1)
 			},
@@ -232,9 +231,10 @@
 					border-bottom: none;
 				}
 			}
+
 			.ww50 {
 				width: 50%;
-			
+
 			}
 
 			.ww55 {