From df60073f4fb06ea2d16984635e0714bae8a1f8e9 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Mon, 22 Dec 2025 18:03:35 +0800
Subject: [PATCH] 1.在总后台首页装修增加了活动专区和智能匹配 模块 2.目前活动专区获取的是发布需求最新的数据，智能匹配是用户没登录前也是获取发布需求最新数据，登录后会根据用户发布的需求，通过分类匹配到对应的数据 3.修复缴纳保证金报错 4.修复发布需求报错
---
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