更新

pagesCreateOrder/confirm-order/components/discount.vue

@@ -33,7 +33,7 @@
 						<view class="u-m-t-24 border discount u-relative u-flex input-box">
 							<view class="u-flex-1">
 								<input @input="discountMoneyInput" v-model="form.discountMoney" type="digit"
-									placeholder-class="placeholder-class" placeholder="减8.55元请输入8.55" />
+									placeholder-class="placeholder-class" placeholder="请输入最终优惠金额" />
 							</view>
 							<view class="color-999 u-p-l-48 u-p-r-48   u-flex u-row-center u-col-center">
 								<view>元</view>

pagesCreateOrder/confirm-order/confirm-order.vue

@@ -302,7 +302,7 @@
 	import { getNowCart } from '@/pagesCreateOrder/util.js'
 	import { getShopInfo } from '@/api/shop.js'
 	import { getShopTableDetail } from '@/api/table.js'
-	import { getProductList } from '@/api/product.js'
+	import { getProductPage } from '@/api/product.js'
 	import { createOrder,getHistoryOrder } from '@/api/order.js'
 	import { number } from 'uview-plus/libs/function/test';
 	
@@ -568,7 +568,7 @@
 	 * 获取商品列表
 	 */
 	function getGoods() {
-		return getProductList({
+		return getProductPage({
 			page: 1,
 			size: 300
 		},'product', false)
@@ -871,15 +871,16 @@
 	
 		let vipPrice = isVip.value ? 1 : 0
 		let placeNum = pageData.shopInfo.registerType == 'after'&&pageData.orderInfo ? pageData.orderInfo.placeNum + 1 : 1;
+		let originAmount = goodsPrice.value*1+youhui.value*1
 		let par = {
 			shopId: pageData.shopInfo.id, 			//店铺Id
 			userId: pageData.user.userId,			//用户Id
 			tableCode: pageData.table.tableCode,	//台桌编码
 			dineMode: pageData.eatTypes.active,		//用餐模式 堂食 dine-in 外带 take-out 外卖 take-away
 			remark: pageData.form.note,				//备注
-			seatNum: 0,	//用餐人数
+			seatNum: 0,								//用餐人数
 			packFee: $packFee.value,				//打包费
-			originAmount: goodsPrice.value,			//订单原金额（包含打包费+餐位费） 不含折扣价格
+			originAmount: originAmount,			//订单原金额（包含打包费+餐位费） 不含折扣价格
 			placeNum: placeNum,						//当前订单下单次数
 			waitCall: 0,							//是否等叫 0 否 1 等叫
 			vipPrice: vipPrice,		                //是否使用会员价