完善小程序

pages/order/components/IntegralInput.vue

@@ -2,13 +2,13 @@
 	<view class="integral-modal" v-if="visible">
 		<view class="modal-mask" @click="closeModal"></view>
 		<view class="modal-content">
-			<view class="input-wrapper">
+			<view class="input-wrapper" style="padding-bottom: 100px;">
 				<input type="number" v-model="inputValue" :min="minValue" :max="maxValue" @input="handleInput"
 					:placeholder="instructions" />
 			</view>
 			<!-- <view class="instructions">{{ instructions }}</view> -->
 			<up-button type="primary" @click="confirmIntegral" text="确定"></up-button>
-			<button style="margin-top: 20rpx;" @click="IntegralInputclose">取消</button>
+			<up-button style="margin-top: 20rpx;" @click="IntegralInputclose">取消</up-button>
 		</view>
 	</view>
 </template>
@@ -72,7 +72,6 @@
 
 	// 确认积分并返回值给父组件
 	const confirmIntegral = () => {
-		console.log(inputValue.value, 444)
 		if (inputValue.value < props.minValue || inputValue.value > props.maxValue) {
 			uni.showToast({
 				title: '输入的积分值不在有效范围内',
@@ -138,7 +137,7 @@
 		justify-content: center;
 		align-items: center;
 		background-color: #fff;
-		padding: 20px;
+		padding: 20rpx 20rpx;
 		box-sizing: border-box;
 		border-top-left-radius: 10px;
 		border-top-right-radius: 10px;

pages/order/components/orderInfoAfter.vue

@@ -94,7 +94,7 @@
 					<view class="val">
 						<view></view>
 						<view style="font-size: 28rpx;">￥</view>
-						<view>{{listinfo.packFee}}</view>
+						<view>{{listinfo.packFeess}}</view>
 					</view>
 				</view>
 
@@ -295,7 +295,17 @@
 		},
 
 		listinfo: {
-			type: Object
+			type: Object,
+			default: {
+				combinedArray: {},
+				Productroll: 0,
+				coupondiscountAmount: 0,
+				couponInfoList: '',
+				pointsDiscountAmount: 0,
+				packFeess: 0,
+				totalPrices: 0,
+				Seatcharge: 0
+			}
 
 		},
 		orderVIP: {
@@ -359,6 +369,7 @@
 				})
 				break;
 			case 'points':
+				IntegralInputclose()
 				if (calcUsablePointsData.usable == 0) {
 					uni.showToast({
 						title: calcUsablePointsData.unusableReason,
@@ -384,7 +395,7 @@
 		calcUsablePointsData.integral = integral
 		props.listinfo.pointsDiscountAmount = await APImemberPointscalcDeductionAmount({
 			points: integral,
-			userId: props.orderVIP.id,
+			shopUserId: props.orderVIP.id,
 			orderAmount: props.listinfo.totalCost
 		})
 		emits('clickPointsamount', props.listinfo.pointsDiscountAmount);