lilei 2 vuotta sitten
vanhempi
commit
47f799fefb

+ 1 - 0
pages.json

@@ -455,6 +455,7 @@
             					"text": "\ue694 盘点历史" ,//原生标题栏增加分享按钮,点击事件可通过页面的 onNavigationBarButtonTap 函数进行监听u
             					"fontSrc": "/static/iconfont/iconfont.ttf",
             					"fontSize": "16",
+								"color": "#00aaff",
             					"width":"120px"
             				}
             			]

+ 5 - 1
pages/latePlay/chooseProduct.vue

@@ -2,7 +2,7 @@
 	<view class="moreShelfPart flex flex_column">
 		<view class="moreShelfPart-search">
 			<view class="p-title flex align_center">
-				<view class="shelfName flex align_center"><text></text>{{shelfInfo.shelfName}}</view>
+				<view class="shelfName flex"><text></text>{{shelfInfo.shelfName}}</view>
 				<view class="btns" @click="showTab = true">筛选<u-icon name="more-circle"></u-icon></view>
 			</view>
 			<view class="search flex align_center">
@@ -280,6 +280,9 @@
 			font-size: 32rpx;
 			.shelfName{
 				width: 80%;
+				height: 50rpx;
+				text-overflow: ellipsis;
+				overflow: hidden;
 				flex-grow: 1;
 				font-weight: bold;
 				text{
@@ -289,6 +292,7 @@
 					background: #0485F6;
 					margin-right: 10rpx;
 					border-radius: 10rpx;
+					margin-top: 10rpx;
 				}
 			}
 			.btns{

+ 6 - 5
pages/stockCheck/shelfList.vue

@@ -20,8 +20,9 @@
 				class="nav-right-item" 
 				v-for="(item, index) in shelfList" 
 				:key="item.id" 
+				@click="viewDetail(item)"
 				>
-					<view class="item-info" @click="viewDetail(item)">
+					<view class="item-info">
 						<view class="item-name">
 							<text>{{item.shelfName}}</text>
 						</view>
@@ -161,25 +162,25 @@
 	.moreShelfPart{
 		width: 100%;
 		height: 100vh;
+		background-color: #f8f8f8;
 		.moreShelfPart-search{
 			padding: 20rpx;
-			background-color: #FFFFFF;
 		}
 		.moreShelfPart-body{
 			flex-grow: 1;
-			background-color: #fff;
 		}
 		.nav-right{
 			padding: 0 30upx;
 			height: calc(100vh - 110rpx);
 			box-sizing: border-box;
-			 
+			overflow: auto;
 			.nav-right-item{
 				padding:20upx;
 				border: 2rpx solid #f5f5f5;
 				border-radius: 15upx;
 				margin-bottom: 20upx;
-				box-shadow: 2rpx 3rpx 5rpx #f8f8f8;
+				box-shadow: 3rpx 3rpx 8rpx #eee;
+				background-color: #ffff;
 				&:active{
 					background: #f8f8f8;
 				}

+ 12 - 7
pages/stockCheck/startCheck.vue

@@ -2,7 +2,7 @@
 	<view class="content flex flex_column">
 		<view class="searchBar">
 			<view class="p-title flex align_center">
-				<view class="shelfName flex align_center"><text></text>{{nowData.shelfName}}</view>
+				<view class="shelfName flex"><text></text>{{nowData.shelfName}}</view>
 				<view class="btns" @click="showTab = true">筛选<u-icon name="more-circle"></u-icon></view>
 			</view>
 			<view class="search flex align_center">
@@ -147,7 +147,7 @@
 											@blur="cartChangeNums"
 											:index="'cart_'+item.id" 
 											:min="0" 
-											:max="item.stockQty||999999"></u-number-box>
+											:max="999999"></u-number-box>
 										 </view>
 									</view>
 								</view>
@@ -234,7 +234,7 @@
 			}
 		},
 		onNavigationBarButtonTap(e) {
-			if(e.index == 1){
+			if(e.index == 0){
 				uni.navigateTo({
 					url: '/pages/stockCheck/checkRecord'
 				})
@@ -411,8 +411,9 @@
 					stockCheckDetailDelete({stockCheckDetailSn: data.stockCheckDetailSn}).then(res=>{
 						if(res.status == 200){
 							this.chooseList.splice(a,1)
+							this.orderTotal = this.chooseList.length 
 							// 删除最后一个后刷新列表
-							if(this.chooseList.length == 0){
+							if(this.orderTotal == 0){
 								this.showCart = false
 								this.getDetail()
 								this.getChooseList()
@@ -592,6 +593,9 @@
 			font-size: 32rpx;
 			.shelfName{
 				width: 80%;
+				height: 50rpx;
+				text-overflow: ellipsis;
+				overflow: hidden;
 				flex-grow: 1;
 				font-weight: bold;
 				text{
@@ -601,6 +605,7 @@
 					background: #0485F6;
 					margin-right: 10rpx;
 					border-radius: 10rpx;
+					margin-top: 10rpx;
 				}
 			}
 			.btns{
@@ -630,7 +635,7 @@
 		padding: 0 0.5rem;
 		flex-grow: 1;
 		.scroll-view{
-			height: calc(100vh - 180rpx);
+			height: calc(100vh - 260rpx);
 			box-sizing: border-box;
 		}
 		.partList-list-box{
@@ -705,7 +710,7 @@
 	}
 	.footer-bar{
 		background-color: #f8f8f8;
-		padding: 52upx 20upx;
+		padding: 20upx;
 		.f-left{
 			background-color: #d8d8d8;
 			padding: 15upx;
@@ -849,7 +854,7 @@
 				}
 			}
 			.item-info{
-				border-bottom:2rpx solid #f8f8f8;
+				border-bottom:2rpx solid #eee;
 				flex-grow: 1;
 				padding-left: 0.2em;
 			}