Merge branch 'master' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp

pages/index/index.vue

@@ -476,17 +476,18 @@
 	}
 
 	.item-menu-badge {
-		width: 42rpx;
+		width: 36rpx;
-		height: 42rpx;
+		height: 36rpx;
-		top: -5px;
+		align-items: center;
-		right: -5px;
+		// top: -5px;
+		// right: -5px;
 		font-size: 0.6rem;
 		background-color: #fa3534;
 		position: absolute;
 		right: 0;
 		color: #fff;
 		text-align: center;
-		line-height: 42rpx;
+		line-height: 36rpx;
 		border-radius: 50%;
 	}
 </style>

pages/inspect/coms/inspectComDetailCard.vue

@@ -44,8 +44,8 @@
 					<uni-swipe-action ref="swipeAction">
 						<uni-swipe-action-item @click="swipeClick($event,item,index)"
 							:right-options="item.scaned?scanOptions:detailOptions">
-							<recommend :detail="item" :isShowPack="isShowPack" :isShowBatch="isShowBatch"
+							<recommend :detail="item" :isShowPack="true" :isShowBatch="isShowBatch"
-								:isShowFromLocation="isShowLocation"></recommend>
+								:isShowFromLocation="isShowLocation" style=' border-bottom: 0upx solid #fff;'></recommend>
 							<view v-if="item.failedQty>0||item.crackQty>0" :class="item.scaned?'scan_view':''"
 								style="font-size: 32rpx;padding-left: 2px;">
 								<view class="cell_box uni-flex uni-row">
@@ -69,7 +69,7 @@
 										<view class="text_lightblue">
 											合格
 										</view>
-										<view style="padding-left: 12rpx;color: #0A84FF">
+										<view style="padding-left: 12rpx;color: #34C759">
 											{{item.goodQty}}
 										</view>
 									</view>