From a4b3ee325c7354579d495bc74a777e494e5ec38c Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Fri, 06 Feb 2026 18:18:44 +0800
Subject: [PATCH] 商品可以价格面议 选择走访时显示输入走访企业名 分会添加活动时要总会审核 分类添加人数限制，添加活动选择了填写人数限制的分类时活动名额下显示该分类人数限制为15 同一个企业30天内只能走访一次，在30天内走访同一个企业时提示该企业已被走访xx天后才可以从新走访
---
mobile/pages/order/confirm-order.vue | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/mobile/pages/order/confirm-order.vue b/mobile/pages/order/confirm-order.vue
index 1f8b13f..7d8ae24 100644
--- a/mobile/pages/order/confirm-order.vue
+++ b/mobile/pages/order/confirm-order.vue
@@ -50,7 +50,7 @@
</view>
</view>
- <Verifystoreinfo v-if="supplier_item.orderData.delivery==30 && supplier_item.productList[0].is_virtual == 1" ref="getShopinfoData" :extract_store="extract_store"
+ <Verifystoreinfo v-if="supplier_item.orderData.delivery==30 && (supplier_item.productList[0].is_virtual == 1||supplier_item.productList[0].is_virtual == 3)" ref="getShopinfoData" :extract_store="extract_store"
:last_extract="last_extract" :verify_data="verify_data"></Verifystoreinfo>
<view class="d-f-c">
@@ -143,6 +143,12 @@
<view class="theme-price f24">-￥{{supplier_item.orderData.points_money}}</view>
</view>
</view>
+ <view v-if="is_use_consumption==1&&!OrderData.force_points&&supplier_item.orderData.consumption_money>0">
+ <view class="d-f-c">
+ <view>{{consumption_name()}}抵扣金额</view>
+ <view class="theme-price f24">-￥{{supplier_item.orderData.consumption_money}}</view>
+ </view>
+ </view>
<view class="d-f-c">
<view class="ww100">
<view class="mb20">订单备注</view>
@@ -206,6 +212,14 @@
<view class="">
<text class="theme-price f24">-￥{{toDecimal2(OrderData.points_money)}}</text>
<switch style="transform: scale(0.7); margin-right: -10rpx;" checked=true @change="onShowPoints" />
+ </view>
+ </view>
+ <view class="item"
+ v-if="OrderData.is_allow_consumption && OrderData.force_points == false &&OrderData.consumption_money != 0">
+ <text class="key">可用{{consumption_name()}}抵扣：</text>
+ <view class="">
+ <text class="theme-price f24">-￥{{toDecimal2(OrderData.consumption_money)}}</text>
+ <switch style="transform: scale(0.7); margin-right: -10rpx;" checked=true @change="onShowConsumption" />
</view>
</view>
</view>
@@ -292,6 +306,8 @@
coupon_id: -1,
/*是否使用积分,默认使用*/
is_use_points: 1,
+ /*是否使用消费券,默认使用*/
+ is_use_consumption: 1,
remark: '',
/*支付方式*/
pay_type: 20,
@@ -430,6 +446,16 @@
}
self.getData();
},
+ /*是否使用消费券选择*/
+ onShowConsumption: function(e) {
+ let self = this;
+ if (e.target.value == true) {
+ self.is_use_consumption = 1;
+ } else {
+ self.is_use_consumption = 0;
+ }
+ self.getData();
+ },
/*选择优惠卷*/
onTogglePopupCoupon(e, id) {
let self = this;
@@ -526,6 +552,7 @@
store_id: self.store_id,
coupon_id: self.coupon_id,
is_use_points: self.is_use_points,
+ is_use_consumption: self.is_use_consumption,
// pay_source: self.getPlatform()
pay_source: 'android'
};
@@ -834,6 +861,7 @@
room_id: self.room_id,
coupon_id: self.coupon_id,
is_use_points: self.is_use_points,
+ is_use_consumption: self.is_use_consumption,
// pay_source: self.getPlatform()
};
--
Gitblit v1.9.2