lilei 10 ماه پیش
والد
کامیت
e53587145f
2فایلهای تغییر یافته به همراه23 افزوده شده و 10 حذف شده
  1. 5 4
      pagesB/procureOrder.vue
  2. 18 6
      pagesB/promoDetail.vue

+ 5 - 4
pagesB/procureOrder.vue

@@ -25,7 +25,7 @@
 				<view v-for="item in partList" :key="item.id" class="flex align-center item-list">
 					<view style="height: 150rpx;">
 						<u-image :src="item.product.images" border-radius="16" width="200" height="150" bg-color="#EBEBEB" ></u-image>
-						<view class="back-price" v-if="item.giveAmount&&state=='FINISH'">返<text>{{item.giveAmount}}</text></view>
+						<view class="back-price" v-if="item.giveAmount">返<text>{{item.giveAmount}}</text></view>
 					</view>
 					<view>
 						<view class="item-name">
@@ -238,11 +238,11 @@
 					}
 					.back-price{
 						zoom: calc(0.8);
-						padding: 6rpx 55rpx;
+						padding: 6rpx 65rpx;
 						background: rgba(255 ,87 ,34 , 1);
 						position: absolute;
-						top: 10rpx;
-						right: -40rpx;
+						top: 20rpx;
+						right: -55rpx;
 						color: #fff;
 						z-index: 2;
 						font-size: 20rpx;
@@ -252,6 +252,7 @@
 						align-items: center;
 						text{
 							font-size: 28rpx;
+							margin: 0 5rpx;
 						}
 					}
 					&:last-child{

+ 18 - 6
pagesB/promoDetail.vue

@@ -79,7 +79,9 @@
 						<u-button @click="claerChoose" size="mini" type="error" plain style="margin: 0 20upx;">清空列表</u-button>
 						<text class="choose-inf">左滑删除产品</text>
 					</view>
-					<u-icon name="close" size="30" @click="showChoosePopu=false"></u-icon>
+					<view class="choose-close" @click="showChoosePopu=false">
+						<u-icon name="close" size="30"></u-icon>
+					</view>
 				</view>
 				<view class="choose-product-list" v-if="showSwipeAction">
 					<u-swipe-action 
@@ -292,8 +294,9 @@
 				this.showChoosePopu=false
 				if(this.submitOk){
 					uni.hideLoading()
+					const item = this.$store.state.vuex_tempData
 					uni.navigateTo({
-						url: '/pagesB/procureOrder'
+						url: "/pagesB/procureOrder?purchaseSn="+item.purchaseSn+"&state="+item.billStatus
 					})
 				}
 			},
@@ -524,6 +527,7 @@
 						detailList: detailList
 					}).then(res => {
 						if(res.status == 200){
+							res.data.detailList = []
 							this.$store.state.vuex_tempData = res.data
 							this.clearChooseData()
 							this.submitOk = true
@@ -706,12 +710,16 @@
 			display: flex;
 			align-items:center;
 			justify-content: space-between;
-			padding: 25rpx;
+			padding: 0 25rpx;
 			position: fixed;
 			background: #fff;
 			width: 100%;
 			z-index: 3;
 			border-bottom: 1px solid #eee;
+			border-radius: 40rpx 40rpx 0 0;
+			> view{
+				padding: 25rpx 0;
+			}
 			.p-nums{
 				color: #2196F3;
 				margin: 0 6rpx;
@@ -720,6 +728,9 @@
 				color: #999;
 				font-size: 24rpx;
 			}
+			.choose-close{
+				padding: 25rpx 20rpx;
+			}
 		}
 		.choose-product-pages{
 			padding: 10rpx;
@@ -797,11 +808,11 @@
 			}
 		}
 		.back-price{
-			padding: 6rpx 55rpx;
+			padding: 6rpx 65rpx;
 			background: rgba(255 ,87 ,34 , 1);
 			position: absolute;
-			top: 10rpx;
-			right: -40rpx;
+			top: 18rpx;
+			right: -45rpx;
 			color: #fff;
 			z-index: 2;
 			font-size: 20rpx;
@@ -811,6 +822,7 @@
 			align-items: center;
 			text{
 				font-size: 28rpx;
+				margin: 0 5rpx;
 			}
 		}
 	}