commit -m

components/cm-module/cm-seller/home.vue

@@ -587,7 +587,8 @@
 			border-radius: 20rpx;
 			.floor-item{
 				width: 341rpx;
-				height: 568rpx;
+				// height: 568rpx;
+				height: 500rpx;
 				margin-right: 20rpx;
 				font-size: $font-size-24;
 				color: $text-color;
@@ -613,6 +614,7 @@
 					padding: 0 15rpx;
 				}
 				.floor-item-act{
+					display: none;
 					width: 100%;
 					height: 68rpx;
 					text-align: center;
@@ -635,7 +637,7 @@
 				.title-none{
 					font-size: $font-size-26;
 					color: #FF2A2A;
-					line-height: 80rpx;
+					line-height: 44rpx;
 					.btn{
 						display: inline-block;
 						float: right;

components/cm-module/listTemplate/commodityList.vue

@@ -24,7 +24,7 @@
 								<text v-if="priceLoading" class="price-larger small">正在获取价格...</text>
 								<template v-else>
 									<text class="price-larger" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
-										￥{{ (PromotionsFormat(item.promotions) ? item.normalPrice : item.price) | NumFormat}}
+										￥{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price) | NumFormat}}
 									</text>
 								</template>
 							</view>	
@@ -38,7 +38,7 @@
 								<text v-else-if="priceLoading" class="price-larger small">正在获取价格...</text>
 								<template v-else>
 									<text class="price-larger" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
-										￥{{ (PromotionsFormat(item.promotions) ? item.normalPrice : item.price) | NumFormat}}
+										￥{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price) | NumFormat}}
 									</text>
 								</template>
 							</view>

pages/goods/cart.vue

@@ -440,57 +440,87 @@
 			},
 			totalPeice(){	//计算总价格,每次调用此方法，将初始值为0，遍历价格并累加
 			    this.allPrice = 0
-				let productsList =[];
-				//店铺满减
-				let prosPrice=0;
-				let totalPrice = 0;
-				let reducedPrice=0;//促销满减
-				let totalOriginalPrice=0;//促销原价
-				//凑单满减.单品满减
-				let _totalPrice = 0;
-				let _reducedPrice = 0;
-				let _totalOriginalPrice =0;
-				// 正常商品
-				let _totalNonePrice = 0;
-				/*
-				*originalPrice:商品原价
-				*price:商品现价
-				*mode:促销商品满减计算 促销方式mode为 2 的单独做计算 当mode == 2时商品promotions字段为促销活动内容,
-				*touchPrice 为需要满金额 
-				*reducedPrice 为满减金额
-				**/ 
+			    let productsList =[];
+			    //店铺满减
+			    let prosPrice=0;
+			    let totalPrice = 0;
+			    let reducedPrice=0;//促销满减
+			    let totalOriginalPrice=0;//促销原价
+			    //凑单满减.单品满减				
+			    let _totalPrice = 0;
+			    let _promsPrice = 0;
+			    let _reducedPrice = 0;
+			    let _reducedPromsPrice = 0;
+			    let _totalOriginalPrice =0;
+			    // 正常商品
+			    let _totalNonePrice = 0;
+			    let _isFlag = false;
+			    /*
+			    *originalPrice:商品原价
+			    *price:商品现价
+			    *mode:促销商品满减计算 促销方式mode为 2 的单独做计算 当mode == 2时商品promotions字段为促销活动内容,
+			    *touchPrice 为需要满金额 
+			    *reducedPrice 为满减金额
+			    **/ 
 			    this.goodsList.forEach((item,index)=>{
-					item.cartList.forEach(pros=>{	
-						if(pros.productsChecked){
-							if(item.promotions && item.promotions.mode == 2){
-								prosPrice = pros.price*pros.number
-								if(prosPrice >= item.promotions.touchPrice){//判断如果商品合计价格已满足满减活动,计算价格
-									totalPrice += prosPrice - item.promotions.reducedPrice  //统计合计价格
-									totalOriginalPrice += pros.originalPrice*pros.number //统计原商品价格
-									reducedPrice += item.promotions.reducedPrice	//统计总减金额
-								}else{
-									reducedPrice = 0  //统计合计价格
-									totalPrice += prosPrice	//未达满减的统计合计价格
-								}
-							}else if(pros.promotions && pros.promotions.mode == 2){//以下为计算除店铺满减以外的单品满减以及正常商品
-								let _price = pros.price*pros.number
-								_totalOriginalPrice += pros.originalPrice*pros.number; //统计原商品价格
-								if(_price >= pros.promotions.touchPrice){//判断如果商品合计价格已满足满减活动,计算价格
-									_price = _price - pros.promotions.reducedPrice //商品满减后价格
-									_reducedPrice += pros.promotions.reducedPrice //统计总减金额
-								}else{
-									_reducedPrice = 0  //将满减金额置为0
+			    	item.cartList.forEach(pros=>{	
+			    		if(pros.productsChecked){							
+			    			if(item.promotions && item.promotions.mode == 2){
+								this.promotionsList.forEach(proms =>{
+									if (item.promotions.id == proms.id){
+										_isShopFlag = true;
+										prosPrice = pros.price*pros.number
+									}
+								})
+								if(_isShopFlag){
+									if(prosPrice >= item.promotions.touchPrice){//判断如果商品合计价格已满足满减活动,计算价格
+										totalPrice = prosPrice -  item.promotions.reducedPrice  //统计合计价格
+										totalOriginalPrice += pros.originalPrice*pros.productCount //统计原商品价格
+										reducedPrice = item.promotions.reducedPrice	//统计总减金额
+									}else{
+										totalPrice += prosPrice	//未达满减的统计合计价格
+									}
 								}
-								_totalPrice +=  _price //统计合计价格
-							}else{
-								_totalNonePrice += pros.price*pros.number; //正常商品的价格总计
-							}
-						}	
-					})
-					this.totalOriginalPrice = totalOriginalPrice + _totalOriginalPrice;
-					this.reducedPrice = reducedPrice +_reducedPrice;
-					this.allPrice = totalPrice + _totalPrice + _totalNonePrice;
+			    			}else if(pros.promotions && pros.promotions.type == 1 && pros.promotions.mode == 2){//以下为计算除店铺满减以外的单品满减
+			    				let _price = 0;
+			    				_price = pros.price*pros.number
+			    				_totalOriginalPrice += pros.originalPrice*pros.number; //统计原商品价格
+			    				if(_price >= pros.promotions.touchPrice){//判断如果商品合计价格已满足满减活动,计算价格
+			    					_price = _price - pros.promotions.reducedPrice //商品满减后价格
+			    					_reducedPrice += pros.promotions.reducedPrice //统计总减金额
+			    				}else{
+			    					_reducedPrice = 0  //将满减金额置为0
+			    				}
+			    				_totalPrice +=  _price //统计合计价格
+			    			}else if(pros.promotions && pros.promotions.type == 2 && pros.promotions.mode == 2){//凑单满减计算合计
+			    				let _price = 0;
+			    				this.promotionsList.forEach(proms =>{
+			    					proms.productList.forEach(el =>{
+			    						if (pros.productId == el.productId){
+			    							_isFlag = true;
+			    							_price += pros.price*pros.number
+			    							_totalOriginalPrice += pros.originalPrice*pros.number; //统计原商品价格
+			    						}
+			    					})
+			    					if(_price >= pros.promotions.touchPrice){//判断如果商品合计价格已满足满减活动,计算价格
+			    						_reducedPromsPrice = pros.promotions.reducedPrice //统计总减金额
+			    					}else{
+			    						_reducedPromsPrice = 0  //将满减金额置为0
+			    					}
+			    				})	
+			    				_promsPrice += _price//统计合计价格
+			    			}else{
+			    				_totalNonePrice += pros.price*pros.number; //正常商品的价格总计
+			    			}
+			    		}	
+			    	})
 			    })
+			    if(_isFlag){
+			    	_promsPrice = _promsPrice - _reducedPromsPrice 
+			    }
+			    this.totalOriginalPrice = totalOriginalPrice + _totalOriginalPrice;
+			    this.reducedPrice = reducedPrice + _reducedPrice + _reducedPromsPrice;
+			    this.allPrice = totalPrice + _totalPrice + _promsPrice + _totalNonePrice;
 			},
 			totalCount(){//计算总数量
 			    this.allCount = 0
@@ -855,7 +885,7 @@
 		box-sizing: border-box;
 		padding: 15rpx 24rpx;
 		background-color: #F7F7F7;
-		z-index: 9999;
+		z-index: 990;
 		.foot-text{
 			font-size: $font-size-26;
 			height: 50rpx;
@@ -878,7 +908,7 @@
 			border-radius: 30rpx;
 			background:#FFFFFF;
 			border: 1px solid #C9C9C9;
-			color: #999999;
+			color: #E15616;
 			float: right;
 			text-align: center;
 			&.none{

pages/search/search.vue

@@ -30,7 +30,9 @@
 						</view>
 						<view class="list-details-price">
 							<view class="floor-item-act" v-if="item.actStatus==1">
-								<view class="floor-tags" v-if="item.promotions.type == 1 && item.promotions.mode==1">{{item.promotions.name}}<text v-if="hasLogin">:￥{{ item.price | NumFormat }}</text></view>
+								<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
+									{{item.promotions.name}}<text v-if="hasLogin && item.p_price_flag != '1'">:￥{{ item.price | NumFormat }}</text>
+								</view>
 								<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
 							</view>
 							<view class="floor-item-act" v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">
@@ -39,7 +41,9 @@
 							<view v-if="hasLogin"class="list-price">
 								<view v-if="userIdentity == 1">
 									<text v-if="priceLoading" class="price-larger small">正在获取价格...</text>
-									<text v-else class="price-larger" :class="item.promotions.type == 1 && item.promotions.mode==1 ? 'none' : ''">￥{{ item.price | NumFormat }}</text>
+									<text v-else class="price-larger" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
+										￥{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price) | NumFormat}}
+									</text>
 								</view>	
 								<view v-if="userIdentity == 4">
 									<view class="price-larger" v-if="item.p_price_flag == '1'">
@@ -50,7 +54,9 @@
 										<view class="price-larger" v-if="item.p_price_flag == '2'">
 											<text class="txt">￥价格仅会员可见</text>
 										</view>
-										<text v-else class="price-larger" :class="item.promotions.type == 1 && item.promotions.mode==1 ? 'none' : ''">￥{{ item.price | NumFormat }}</text>
+										<text v-else class="price-larger" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
+											￥{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price) | NumFormat}}
+										</text>
 									</view>
 								</view>
 								<view v-if="userIdentity == 2">
@@ -58,7 +64,9 @@
 										<text class="txt">￥未公开价格</text>
 									</view>
 									<text v-else-if="priceLoading" class="price-larger small">正在获取价格...</text>
-									<text v-else class="price-larger" :class="item.promotions.type == 1 && item.promotions.mode==1 ? 'none' : ''">￥{{ item.price | NumFormat }}</text>
+									<text v-else class="price-larger" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
+										￥{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price) | NumFormat}}
+									</text>
 								</view>
 							</view>	
 							<view  v-else class="list-login-now">
@@ -257,6 +265,16 @@
 				});
 				return NewArray
 			},
+			PromotionsFormat(promo){//促销活动类型数据处理
+				if(promo!=null){
+					if(promo.type == 1 && promo.mode == 1){
+						return true
+					}else{
+						return false
+					}
+				}
+				return false
+			},
 			onShowClose () {//输入框输入时触发
 				this.inputEmpty(this.searchInputVal)
 			},

pages/tabBar/cart/cart.vue

@@ -6,7 +6,7 @@
 				<view class="foot-text">共<text>{{kindCount}}</text>件商品</view>
 				<view class="delBtn" @tap.stop="showDelManager">删除</view>
 			</view>
-			<view v-if="!isEmpty" class="container-cart">
+			<view v-if="!isEmpty" class="container-cart"> 
 				<view class="cart-content" :style="{paddingBottom :isIphoneX ? '130rpx' : '100rpx'}">
 					<view class="goods-list">
 						<view v-for="(item, index) in goodsList" :key="index" class="goods-item clearfix">
@@ -436,12 +436,15 @@
 				let totalPrice = 0;
 				let reducedPrice=0;//促销满减
 				let totalOriginalPrice=0;//促销原价
-				//凑单满减.单品满减
+				//凑单满减.单品满减				
 				let _totalPrice = 0;
+				let _promsPrice = 0;
 				let _reducedPrice = 0;
+				let _reducedPromsPrice = 0;
 				let _totalOriginalPrice =0;
 				// 正常商品
 				let _totalNonePrice = 0;
+				let _isFlag = false;
 				/*
 				*originalPrice:商品原价
 				*price:商品现价
@@ -451,33 +454,63 @@
 				**/ 
 			    this.goodsList.forEach((item,index)=>{
 					item.cartList.forEach(pros=>{	
-						if(pros.productsChecked){
+						if(pros.productsChecked){							
 							if(item.promotions && item.promotions.mode == 2){
-								prosPrice = pros.price*pros.number
-								if(prosPrice >= item.promotions.touchPrice){//判断如果商品合计价格已满足满减活动,计算价格
-									totalPrice += prosPrice - item.promotions.reducedPrice  //统计合计价格
-									totalOriginalPrice += pros.originalPrice*pros.number //统计原商品价格
-									reducedPrice += item.promotions.reducedPrice	//统计总减金额
-								}else{
-									totalPrice += prosPrice	//未达满减的统计合计价格
+								this.promotionsList.forEach(proms =>{
+									if (item.promotions.id == proms.id){
+										_isShopFlag = true;
+										prosPrice = pros.price*pros.number
+									}
+								})
+								if(_isShopFlag){
+									if(prosPrice >= item.promotions.touchPrice){//判断如果商品合计价格已满足满减活动,计算价格
+										totalPrice = prosPrice -  item.promotions.reducedPrice  //统计合计价格
+										totalOriginalPrice += pros.originalPrice*pros.productCount //统计原商品价格
+										reducedPrice = item.promotions.reducedPrice	//统计总减金额
+									}else{
+										totalPrice += prosPrice	//未达满减的统计合计价格
+									}
 								}
-							}else if(pros.promotions && pros.promotions.mode == 2){//以下为计算除店铺满减以外的单品满减以及正常商品
-								let _price = pros.price*pros.number
+							}else if(pros.promotions && pros.promotions.type == 1 && pros.promotions.mode == 2){//以下为计算除店铺满减以外的单品满减
+								let _price = 0;
+								_price = pros.price*pros.number
 								_totalOriginalPrice += pros.originalPrice*pros.number; //统计原商品价格
 								if(_price >= pros.promotions.touchPrice){//判断如果商品合计价格已满足满减活动,计算价格
 									_price = _price - pros.promotions.reducedPrice //商品满减后价格
 									_reducedPrice += pros.promotions.reducedPrice //统计总减金额
+								}else{
+									_reducedPrice = 0  //将满减金额置为0
 								}
 								_totalPrice +=  _price //统计合计价格
+							}else if(pros.promotions && pros.promotions.type == 2 && pros.promotions.mode == 2){//凑单满减计算合计
+								let _price = 0;
+								this.promotionsList.forEach(proms =>{
+									proms.productList.forEach(el =>{
+										if (pros.productId == el.productId){
+											_isFlag = true;
+											_price += pros.price*pros.number
+											_totalOriginalPrice += pros.originalPrice*pros.number; //统计原商品价格
+										}
+									})
+									if(_price >= pros.promotions.touchPrice){//判断如果商品合计价格已满足满减活动,计算价格
+										_reducedPromsPrice = pros.promotions.reducedPrice //统计总减金额
+									}else{
+										_reducedPromsPrice = 0  //将满减金额置为0
+									}
+								})	
+								_promsPrice += _price//统计合计价格
 							}else{
 								_totalNonePrice += pros.price*pros.number; //正常商品的价格总计
 							}
 						}	
 					})
-					this.totalOriginalPrice = totalOriginalPrice + _totalOriginalPrice;
-					this.reducedPrice = reducedPrice +_reducedPrice;
-					this.allPrice = totalPrice + _totalPrice + _totalNonePrice;
 			    })
+				if(_isFlag){
+					_promsPrice = _promsPrice - _reducedPromsPrice 
+				}
+				this.totalOriginalPrice = totalOriginalPrice + _totalOriginalPrice;
+				this.reducedPrice = reducedPrice + _reducedPrice + _reducedPromsPrice;
+				this.allPrice = totalPrice + _totalPrice + _promsPrice + _totalNonePrice;
 			},
 			totalCount(){//计算总数量
 			    this.allCount = 0
@@ -842,7 +875,7 @@
 		box-sizing: border-box;
 		padding: 15rpx 24rpx;
 		background-color: #F7F7F7;
-		z-index: 9999;
+		z-index: 990;
 		.foot-text{
 			font-size: $font-size-26;
 			height: 50rpx;
@@ -865,7 +898,7 @@
 			border-radius: 30rpx;
 			background:#FFFFFF;
 			border: 1px solid #C9C9C9;
-			color: #999999;
+			color: #E15616;
 			float: right;
 			text-align: center;
 			&.none{

pages/tabBar/home/home.vue

@@ -83,7 +83,6 @@
 										</view>
 										<view class="title-none" v-show="item.price1TextFlag == '2'">
 											<text class="p big">￥价格仅会员可见</text>
-											<text class="p btn" @click.stop="this.$api.navigateTo(`/pages/login/apply?clubStatus=${clubStatus}`)">去升级</text>
 										</view>
 										<view class="price tui-skeleton-rect" v-show="item.price1TextFlag == '0'" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
 											<text class="p sm">￥</text>
@@ -644,7 +643,8 @@
 			border-radius: 20rpx;
 			.floor-item{
 				width: 341rpx;
-				height: 568rpx;
+				// height: 568rpx;
+				height: 500rpx;
 				margin-right: 20rpx;
 				font-size: $font-size-24;
 				color: $text-color;
@@ -670,6 +670,7 @@
 					padding: 0 15rpx;
 				}
 				.floor-item-act{
+					display: none;
 					width: 100%;
 					height: 68rpx;
 					text-align: center;
@@ -692,7 +693,7 @@
 				.title-none{
 					font-size: $font-size-26;
 					color: #FF2A2A;
-					line-height: 80rpx;
+					line-height: 44rpx;
 					.btn{
 						display: inline-block;
 						float: right;

seller/pages/cart/cart.vue

@@ -148,6 +148,7 @@
 				isStock:'',
 				popupShow:false,
 				handlerPros:{},//监听单挑促销商品
+				promotionsList:[],//促销活动列表
 				goodsList:[],	//购物车的商品
 				delGoodsList:'',//要删除的商品
 				setGoodData:'', //确认订单的商品
@@ -223,6 +224,7 @@
 				 this.SellerService.GetSellerShoppingInfo(params).then(response =>{
 					this.skeletonShow = false
 					this.$store.commit('updateAllNum',response.data.cartQuantity)
+					this.promotionsList = response.data.promotionsList;
 					const resultsData = response.data.pageDate;	
 					if(resultsData.results&&resultsData.results.length > 0){
 						this.isEmpty =false
@@ -270,6 +272,7 @@
 				let params = {clubId:this.clubId,serviceProviderId:this.serviceProviderId,pageNum:this.pageNum,pageSize:this.pageSize}
 				this.SellerService.GetSellerShoppingInfo(params).then(response =>{
 					let resultsData = response.data.pageDate
+					this.promotionsList = response.data.promotionsList;
 					this.hasNextPage = resultsData.hasNextPage;
 					this.goodsList = this.goodsList.concat(resultsData.results)
 					this.goodsList.forEach((item,index) => {
@@ -383,7 +386,7 @@
 					if(item.promotions && item.promotions.mode == 2){
 						productsList.forEach(pros=>{
 							prosPrice += pros.retailPrice*pros.productCount
-							totalOriginalPrice+= pros.retailPrice*pros.productCount;
+							totalOriginalPrice += pros.retailPrice*pros.productCount;
 							if(prosPrice >= item.promotions.touchPrice){
 								item.totalPrice = prosPrice - item.promotions.reducedPrice  
 								item.reducedPrice = item.promotions.reducedPrice
@@ -418,19 +421,23 @@
 				})
 			},
 			totalPeice(){	//计算总价格,每次调用此方法，将初始值为0，遍历价格并累加
-			    this.allPrice = 0
+				this.allPrice = 0
 				let productsList =[];
 				//店铺满减
 				let prosPrice=0;
 				let totalPrice = 0;
 				let reducedPrice=0;//促销满减
 				let totalOriginalPrice=0;//促销原价
-				//凑单满减.单品满减
+				//凑单满减.单品满减				
 				let _totalPrice = 0;
+				let _promsPrice = 0;
 				let _reducedPrice = 0;
+				let _reducedPromsPrice = 0;
 				let _totalOriginalPrice =0;
 				// 正常商品
 				let _totalNonePrice = 0;
+				let _isFlag = false;
+				let _isShopFlag = false;
 				/*
 				*originalPrice:商品原价
 				*price:商品现价
@@ -438,21 +445,28 @@
 				*touchPrice 为需要满金额 
 				*reducedPrice 为满减金额
 				**/ 
-			    this.goodsList.forEach((item,index)=>{
+				this.goodsList.forEach((item,index)=>{
 					item.productsList.forEach(pros=>{	
-						if(pros.productsChecked){
+						if(pros.productsChecked){							
 							if(item.promotions && item.promotions.mode == 2){
-								prosPrice = pros.retailPrice*pros.productCount
-								totalOriginalPrice += pros.price1*pros.productCount //统计原商品价格
-								if(prosPrice >= item.promotions.touchPrice){//判断如果商品合计价格已满足满减活动,计算价格
-									totalPrice += prosPrice - item.promotions.reducedPrice  //统计合计价格
-									reducedPrice += item.promotions.reducedPrice	//统计总减金额
-								}else{
-									reducedPrice = 0  //将满减金额置为0
-									totalPrice += prosPrice	//未达满减的统计合计价格
+								this.promotionsList.forEach(proms =>{
+									if (item.promotions.id == proms.id){
+										_isShopFlag = true;
+										prosPrice += pros.retailPrice*pros.productCount
+									}
+								})
+								if(_isShopFlag){
+									if(prosPrice >= item.promotions.touchPrice){//判断如果商品合计价格已满足满减活动,计算价格
+										totalPrice = prosPrice -  item.promotions.reducedPrice  //统计合计价格
+										totalOriginalPrice += pros.price1*pros.productCount //统计原商品价格
+										reducedPrice = item.promotions.reducedPrice	//统计总减金额
+									}else{
+										totalPrice += prosPrice	//未达满减的统计合计价格
+									}
 								}
-							}else if(pros.promotions && pros.promotions.mode == 2){//以下为计算除店铺满减以外的单品满减以及正常商品
-								let _price = pros.retailPrice*pros.productCount
+							}else if(pros.promotions && pros.promotions.type == 1 && pros.promotions.mode == 2){//以下为计算除店铺满减以外的单品满减
+								let _price = 0;
+								_price = pros.retailPrice*pros.productCount
 								_totalOriginalPrice += pros.price1*pros.productCount; //统计原商品价格
 								if(_price >= pros.promotions.touchPrice){//判断如果商品合计价格已满足满减活动,计算价格
 									_price = _price - pros.promotions.reducedPrice //商品满减后价格
@@ -461,15 +475,35 @@
 									_reducedPrice = 0  //将满减金额置为0
 								}
 								_totalPrice +=  _price //统计合计价格
+							}else if(pros.promotions && pros.promotions.type == 2 && pros.promotions.mode == 2){//凑单满减计算合计
+								let _price = 0;
+								this.promotionsList.forEach(proms =>{
+									proms.products.forEach(el =>{
+										if (pros.productID == el.productID){
+											_isFlag = true;
+											_price += pros.retailPrice*pros.productCount
+											_totalOriginalPrice += pros.price1*pros.productCount; //统计原商品价格
+										}
+									})
+									if(_price >= pros.promotions.touchPrice){//判断如果商品合计价格已满足满减活动,计算价格
+										_reducedPromsPrice = pros.promotions.reducedPrice //统计总减金额
+									}else{
+										_reducedPromsPrice = 0  //将满减金额置为0
+									}
+								})	
+								_promsPrice += _price//统计合计价格
 							}else{
 								_totalNonePrice += pros.retailPrice*pros.productCount; //正常商品的价格总计
 							}
 						}	
 					})
-					this.totalOriginalPrice = totalOriginalPrice + _totalOriginalPrice;
-					this.reducedPrice = reducedPrice +_reducedPrice;
-					this.allPrice = totalPrice + _totalPrice + _totalNonePrice;
-			    })
+				})
+				if(_isFlag){
+					_promsPrice = _promsPrice - _reducedPromsPrice 
+				}
+				this.totalOriginalPrice = totalOriginalPrice + _totalOriginalPrice;
+				this.reducedPrice = reducedPrice + _reducedPrice + _reducedPromsPrice;
+				this.allPrice = totalPrice + _totalPrice + _promsPrice + _totalNonePrice;
 			},
 			totalCount(){//计算总数量
 			    this.allCount = 0
@@ -727,7 +761,7 @@
 		box-sizing: border-box;
 		padding: 15rpx 24rpx;
 		background-color: #F7F7F7;
-		z-index: 9999;
+		z-index: 990;
 		.foot-text{
 			font-size: $font-size-26;
 			height: 50rpx;
@@ -750,7 +784,7 @@
 			border-radius: 30rpx;
 			background:#FFFFFF;
 			border: 1px solid #C9C9C9;
-			color: #999999;
+			color: #E15616;
 			float: right;
 			text-align: center;
 			&.none{

seller/pages/cart/immediately.vue

@@ -32,7 +32,7 @@
 						<view class="layer-nunbox-b">
 							<view class="text">单价：
 								<text class="p sm">￥</text>
-								<text class="p bg">{{buyRetailPrice.toFixed(2)}}</text>
+								<text class="p bg">{{ buyRetailPrice | NumFormat }}</text>
 							</view>
 						</view>
 					</view>
@@ -54,7 +54,7 @@
 					</view>
 					<view class="number-right">
 						<view class="text">
-							总额：<text class="number-right-text">￥{{productTotalAmount.toFixed(2)}}</text>
+							总额：<text class="number-right-text">￥{{ productTotalAmount | NumFormat }}</text>
 						</view>
 					</view>
 				</view>
@@ -77,7 +77,7 @@
 					</view>
 					<view class="jieti_right" >
 						<view>价格</view>
-						<view class="" v-for="(item,index) in ladderPriceList" :key="index">￥ {{item.buyPrice.toFixed(2)}}</view>
+						<view class="" v-for="(item,index) in ladderPriceList" :key="index">￥ {{item.buyPrice | NumFormat}}</view>
 					</view>
 				</view>
 				<view class="addbtn" @tap="hideSpecjieti">知道了</view>
@@ -125,6 +125,11 @@
 		onLoad() {
 
 		},
+		filters:{
+			NumFormat(value) {//处理金额
+				return Number(value).toFixed(2);
+			},
+		},	
 		methods:{
 			getClubProductNum(){
 				this.SellerService.GetSellerProductNum({clubId:this.clubID,serviceProviderId:this.serviceProviderId}).then(response =>{
@@ -155,7 +160,7 @@
 				}else{
 					this.number = data.minBuyNumber
 					this.minBuyNumber = data.minBuyNumber
-					this.buyRetailPrice = Number(data.price);
+					this.buyRetailPrice = data.price;
 					this.buyRetailPriceStep = data.step
 					this.specClass = 'show';
 					if(this.handleData.ladderPriceFlag == '1'){
@@ -237,7 +242,7 @@
 						}
 					})
 				}else{
-					this.buyRetailPrice = this.handleData.retailPrice;
+					this.buyRetailPrice = this.handleData.price;
 				}
 			},
 			getzuheCart(){//组合商品加入购物车

seller/pages/order/create-order.vue

@@ -338,7 +338,7 @@
 						},2000)
 					}
 				}).catch(error =>{
-					this.$util.msg(response.msg,2000);
+					this.$util.msg(error.msg,2000);
 				})
 			},
 			handFreightAlertShow(){//显示邮费弹窗