lilei 7 months ago
parent
commit
b52b4f4a93
1 changed files with 8 additions and 13 deletions
  1. 8 13
      pagesB/procureOrder/creatOrder.vue

+ 8 - 13
pagesB/procureOrder/creatOrder.vue

@@ -35,7 +35,7 @@
 					<view class="product-price">
 					<view class="product-price">
 						<view>
 						<view>
 							<view class="product-price-item">
 							<view class="product-price-item">
-								<text>商品金额</text>
+								<text>合计</text>
 								<text class="price">¥{{Number(totalAmount).toFixed(2)}}</text>
 								<text class="price">¥{{Number(totalAmount).toFixed(2)}}</text>
 							</view>
 							</view>
 							<view class="product-price-item" v-if="totalDiscount">
 							<view class="product-price-item" v-if="totalDiscount">
@@ -46,12 +46,6 @@
 								<text>代金券</text>
 								<text>代金券</text>
 								<text class="price">¥{{Number(totalCoupon).toFixed(2)}}</text>
 								<text class="price">¥{{Number(totalCoupon).toFixed(2)}}</text>
 							</view>
 							</view>
-							<view class="product-price-item">
-								<text></text>
-								<view class="flex align_center">
-									合计:<text class="price">¥{{settleAmount.join('.')}}</text>
-								</view>
-							</view>
 						</view>
 						</view>
 					</view>
 					</view>
 				</scroll-view>
 				</scroll-view>
@@ -137,7 +131,7 @@
 			},
 			},
 			// 结算金额
 			// 结算金额
 			settleAmount(){
 			settleAmount(){
-				return Number(this.totalAmount-this.totalDiscount-this.totalCoupon).toFixed(2).toString().split('.')
+				return Number(this.totalAmount).toFixed(2).toString().split('.')
 			},
 			},
 			// 货架经销商信息
 			// 货架经销商信息
 			shelfInfo(){
 			shelfInfo(){
@@ -311,7 +305,7 @@
 				this.totalNum = 0
 				this.totalNum = 0
 				this.list.forEach(key => {
 				this.list.forEach(key => {
 					key.filter(item=>item.checked).forEach(item => {
 					key.filter(item=>item.checked).forEach(item => {
-						this.totalAmount += item.orginPrice * item.qty // 总金额
+						this.totalAmount += item.price * item.qty // 总金额
 						this.totalNum += item.qty // 总数量
 						this.totalNum += item.qty // 总数量
 						this.total += 1 // 总款数
 						this.total += 1 // 总款数
 						// 如果是返券类型
 						// 如果是返券类型
@@ -407,13 +401,14 @@
 						padding: 6px 0;
 						padding: 6px 0;
 						.price{
 						.price{
 							color: #333;
 							color: #333;
-							font-weight: bold;
+							font-size: 24rpx;
 						}
 						}
-						&:last-child{
-							border-top: 1px solid #eee;
-							padding: 10px 0 0;
+						&:first-child{
+							border-bottom: 1px solid #eee;
 							.price{
 							.price{
 								color: #d81e06;
 								color: #d81e06;
+								font-weight: bold;
+								font-size: 28rpx;
 							}
 							}
 						}
 						}
 					}
 					}