commit -m 采美豆

components/cm-module/orderDetails/orderInformation.vue

@@ -26,26 +26,29 @@
 					<!-- <view class="view-type">{{ orderData.status | TextFormat }}</view> -->
 				</view>
 				<view class="information-view same">
-					<view class="view-man">应付总额：<label class="red">￥{{ orderData.payableAmount =='undefined' ? '0.00' : orderData.payableAmount | NumFormat }}</label></view>
-				</view>
-				<view class="information-view">
 					<view class="view-num">余额抵扣：<label class="label">￥{{ orderData.balancePayFee =='undefined' ? '' : orderData.balancePayFee | NumFormat}}</label></view>
 				</view>
-				<view class="information-view same">
+				<view class="information-view ">
 					<view class="view-num" v-if="orderData.freePostFlag == '0'">运费：<label class="label">包邮</label></view>
 					<view class="view-num" v-if="orderData.freePostFlag == '-1'">运费：<label class="label">到付</label></view>
 					<view class="view-num" v-if="orderData.freePostFlag == '1'">运费：<label class="label">￥{{ orderData.freight | NumFormat}}</label></view>
 				</view>
-				<view class="information-view" v-show="orderData.promotionFullReduction>0">
-					<view class="view-man" >促销满减：<label class="label">￥{{ orderData.promotionFullReduction | NumFormat}}</label></view>
-				</view>
 				<view class="information-view same">
-					<view class="view-man">赠品总数：<label class="label">{{ orderData.presentCount + orderData.promotionalGiftsCount}}</label></view>
+					<view class="view-man" >采美豆抵用运费：<label class="label">￥{{ orderData.promotionFullReduction | NumFormat}}</label></view>
 				</view>
 				<view class="information-view">
 					<view class="view-num">经理折扣：<label class="label">￥{{ orderData.discountFee =='undefined' ? '' : orderData.discountFee | NumFormat}}</label></view>
 				</view>
+				<view class="information-view same" v-show="orderData.promotionFullReduction>0">
+					<view class="view-man" >促销满减：<label class="label">￥{{ orderData.promotionFullReduction | NumFormat}}</label></view>
+				</view>
+				<view class="information-view">
+					<view class="view-man">赠品总数：<label class="label">{{ orderData.presentCount + orderData.promotionalGiftsCount}}</label></view>
+				</view>
 				<view class="information-view same">
+					<view class="view-man">应付总额：<label class="red">￥{{ orderData.payableAmount =='undefined' ? '0.00' : orderData.payableAmount | NumFormat }}</label></view>
+				</view>
+				<view class="information-view">
 					<view class="view-num">已支付：<label class="red">￥{{ orderData.receiptAmount == null ? '0.00' : orderData.receiptAmount | NumFormat }}</label></view>
 					<view class="view-man"></text></view>
 				</view>

pages/user/order/order-details.vue

@@ -48,7 +48,7 @@
 		<!-- 促销活动弹窗 -->
 		<activi-popup :Promotion="handlerPros" :popupShow="popupShow"></activi-popup>
 		<!-- 采美豆提示弹窗 -->
-		<activityBean :show="isActivityBean" :beanType="beanType"  @cancel="handleBeanlClick"></activityBean>
+		<activityBean v-if="isActivityBean" :show="isActivityBean" :beansType="beansType" :beanNumber="beanNumber"  @cancel="handleBeanlClick"></activityBean>
 		
 	</view>
 </template>
@@ -120,14 +120,15 @@
 				CustomBar:this.CustomBar,// 顶部导航栏高度
 				popupShow:false,
 				handlerPros:{},
-				nvabarData: {							 //顶部自定义导航
+				nvabarData: {		//顶部自定义导航
 					showCapsule: 1, // 是否显示左上角图标   1表示显示    0表示不显示
 					title: '订单详情', // 导航栏 中间的标题
 				},
 				clauseData:{},
 				orderSubmitType:false,//自主订单
-				beanType:1,
-				isActivityBean:true,
+				beansType:1,
+				beanNumber:0,
+				isActivityBean:false,
 			}
 		},
 		onLoad(option){

pages/user/order/order-list.vue

@@ -105,7 +105,7 @@
 		<!-- 透明模态层 -->
 		<modal-layer v-if='isModalLayer'></modal-layer>
 		<!-- 采美豆提示弹窗 -->
-		<activityBean :show="isActivityBean" :beanType="beanType"  @cancel="handleBeanlClick"></activityBean>
+		<activityBean v-if="isActivityBean" :show="isActivityBean" :beansType="beansType" :beanNumber="beanNumber"  @cancel="handleBeanlClick"></activityBean>
 	</view>
 </template>
 
@@ -179,8 +179,9 @@
 				modelType:0,
 				nomoreText: '上拉显示更多',
 				isOnloadFlag:false,
-				beanType:1,
-				isActivityBean:true,
+				beansType:1,
+				beanNumber:0,
+				isActivityBean:false,
 			}
 		},
 		onLoad(e) {