1

package1/buyFood/buyFood.vue

@@ -2,7 +2,7 @@
 	<!-- 代买饭页 -->
 	<page-meta :page-style="addressBookVisible ? 'overflow: hidden;' : 'overflow: visible;'"></page-meta>
 	<view class="page1" :class="{'store-group-checkout': isStoreGroupOrder, 'page1--locked': addressBookVisible}">
-		<view class="checkout-fixed-header" :class="{'checkout-fixed-header--store': isStoreGroupOrder, 'checkout-fixed-header--paying': payPopupVisible}">
+		<view class="checkout-fixed-header" :class="{'checkout-fixed-header--store': isStoreGroupOrder, 'checkout-fixed-header--paying': payPopupVisible || commissionPopupVisible}">
 			<view class="title">
 				<view class="title-sreach">
 					<view class="back-btn" @tap="back" :style="{'top': menuButtonInfo.top +'px'}">
@@ -28,7 +28,7 @@
 					<view class="store-float-tag tag-b">同校热拼</view> -->
 				</view>
 			</view>
-			<view class="pay-popup-header-mask" v-if="payPopupVisible"></view>
+			<view class="pay-popup-header-mask" v-if="payPopupVisible || commissionPopupVisible" @tap.stop></view>
 			<view class="tab-wrap" v-if="!isStoreGroupOrder">
 				<view class="tab1" v-if="isPaotui">
 					<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/6b3a4d4c61ee42feb29e69d6fcfd2c1e.png" alt=""
@@ -611,6 +611,7 @@
 				isNavigatingToWorkerList: false,
 				isSeckillOrder: false,
 				payPopupVisible: false,
+				commissionPopupVisible: false,
 				baseDeliveryFee: 0
 			}
 		},
@@ -875,6 +876,7 @@
 			openCommissionPopup() {
 				this.commissionInputValue = '';
 				this.commissionInputFocus = false;
+				this.commissionPopupVisible = true;
 				this.$refs.commissionPopup.open('center');
 				this.$nextTick(() => {
 					setTimeout(() => {
@@ -884,10 +886,12 @@
 			},
 			closeCommissionPopup() {
 				this.commissionInputFocus = false;
+				this.commissionPopupVisible = false;
 				uni.hideKeyboard();
 				this.$refs.commissionPopup.close();
 			},
 			onCommissionPopupChange(e) {
+				this.commissionPopupVisible = e.show;
 				if (!e.show) {
 					this.commissionInputFocus = false;
 					uni.hideKeyboard();
@@ -1628,7 +1632,7 @@
 		height: 100%;
 		background: rgba(0, 0, 0, 0.45);
 		z-index: 20;
-		pointer-events: none;
+		pointer-events: auto;
 	}
 
 	.checkout-fixed-header--store {

package1/order/orderDetail.vue

@@ -510,6 +510,15 @@
 								快递/跑腿
 							</view>
 						</view>
+						<view style="height: 80rpx;line-height: 80rpx;display: flex;"
+							v-if="orderDetail.deliveryType == 2 && orderDetail.otherOrder == null && orderDetail.isPack != null">
+							<view style="flex: 1;color: #777;font-weight: 700;">
+								用餐方式
+							</view>
+							<view style="color: #000;font-weight: 700;">
+								{{orderDetail.isPack == 1 ? '打包' : '堂食'}}
+							</view>
+						</view>
 						<view style="height: 80rpx;line-height: 80rpx;display: flex;"
 							v-if="orderDetail.numberCode != null">
 							<view style="flex: 1;color: #777;font-weight: 700;">

package1/order/returnOrder.vue

@@ -57,7 +57,7 @@
 					</view>
 					<view>
 						<view style="height: 80rpx;line-height: 80rpx;display: flex;"
-							v-if="orderDetail.packageFee != null && orderDetail.packageFee > 0">
+							v-if="shouldIncludePackageFee() && orderDetail.packageFee != null && orderDetail.packageFee > 0">
 							<view style="flex: 1;color: #777;font-weight: 700;">
 								打包费
 							</view>
@@ -465,6 +465,9 @@
 				let num = Number(value)
 				return isNaN(num) ? 0 : num
 			},
+			shouldIncludePackageFee() {
+				return this.orderDetail.deliveryType == 1 || this.orderDetail.isPack == 1
+			},
 			getCouponAmount() {
 				if (this.toAmount(this.orderDetail.userCouponNum) > 0) {
 					return this.toAmount(this.orderDetail.userCouponNum)
@@ -586,7 +589,7 @@
 				this.returnData.shopId = this.orderDetail.shopId
 				this.returnData.totalAmount = this.orderDetail.totalAmount
 				this.returnData.goodsAmount = this.orderDetail.goodsAmount
-				this.returnData.packageFee = this.orderDetail.packageFee
+				this.returnData.packageFee = this.shouldIncludePackageFee() ? this.orderDetail.packageFee : 0
 				if (this.orderDetail.deliveryInfo) {
 					this.returnData.workerId = this.orderDetail.deliveryInfo.workerId
 					this.returnData.deliveryFee = this.orderDetail.deliveryFee
@@ -658,7 +661,7 @@
 					if ((this.orderDetail.goodsList[index].returnCount + 1) <= this.orderDetail.goodsList[index]
 						.quantity) {
 						this.orderDetail.goodsList[index].returnCount += 1
-						if (this.orderDetail.deliveryType == 1 || this.orderDetail.isPack == 1) {
+						if (this.shouldIncludePackageFee()) {
 							if(this.orderDetail.packageFee > 0){
 								this.returnData.refundAmount += Number((this.toAmount(this.orderDetail.goodsList[index].price) + this
 									.toAmount(this.orderDetail.goodsList[index].packageFee)).toFixed(2))
@@ -674,7 +677,7 @@
 					}
 				} else {
 					if (this.orderDetail.goodsList[index].returnCount > 0) {
-						if (this.orderDetail.deliveryType == 1 || this.orderDetail.isPack == 1) {
+						if (this.shouldIncludePackageFee()) {
 							if(this.orderDetail.packageFee > 0){
 								this.returnData.refundAmount -= Number((this.toAmount(this.orderDetail.goodsList[index].price) + this
 									.toAmount(this.orderDetail.goodsList[index].packageFee)).toFixed(2))