Merge branch 'dev' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf_3.0.0

pagesOrder/detail/detail.vue

@@ -9,6 +9,11 @@
 		:user="user"
 			:data="orderDetail.goodsList" :seatFee="orderDetail.seatFee" @tuicai="onTuiCai"></goods-list>
 		<!-- <template v-if="orderDetail.seatFee.totalNumber&&orderDetail.seatFee.totalAmount"> -->
+		
+		<!-- <view class="default-box-padding bg-fff border-r-12 u-m-t-20 u-flex u-row-between" v-if="orderDetail.info.discountAmount>0">
+			<view>服务员改价</view>
+			<view class="color-red">-￥{{orderDetail.info.discountAmount}}</view>
+		</view> -->
 		<template v-if="true">
 			<extra-vue @tuicai="onSeatFeeTuicai" @tuikuan="onSeatFeeTuiKuan" :orderInfo="orderDetail.info"
 				:data="orderDetail.seatFee"></extra-vue>
@@ -177,7 +182,7 @@
 			orderId,
 			num,
 			priceAmount,
-			price
+			price,userCouponId
 		} = goods
 		go.to('PAGES_ORDER_TUIKUAN', {
 			id,
@@ -190,7 +195,8 @@
 			number: 0,
 			productSkuName: productSkuName || '',
 			priceAmount:priceAmount?priceAmount:(num*price).toFixed(2),
-			price
+			price,
+			userCouponId:userCouponId?userCouponId:''
 		})
 
 	}