订单详情完善

pages/order/coupon.vue

@@ -64,11 +64,14 @@
 			</view>
 		</view>
 
-		<view style="height:120rpx;" v-if="Orderinfo.typeOrder == 2"></view>
+		<view style="height:120rpx;"></view>
 
 		<view class="btnBox" v-if="Orderinfo.typeOrder == 2">
 			<view class="btn" @click="cancelCoupon">确定</view>
 		</view>
+		<view class="btnBox" v-else>
+			<button style="margin-top: 20rpx;" @click="IntegralInputclose">取消</button>
+		</view>
 	</view>
 </template>
 
@@ -256,12 +259,24 @@
 		console.log(res)
 
 	}
+	// 商品取消
 	const cancelCoupon = () => {
 		uni.$emit('returnData', Selectedlist.value);
 		uni.navigateBack({
 			delta: 1
 		});
 	}
+
+	// 优惠卷取消
+	const IntegralInputclose = () => {
+		uni.$emit('returnData', {
+			typeOrder: Orderinfo.typeOrder,
+		});
+		uni.navigateBack({
+			delta: 1
+		});
+	}
+
 	onMounted(async () => {
 		// 获取当前页面栈
 		const pages = getCurrentPages();