From 1db9a4130699636cabe7e0c9f7f15d004aadada0 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Fri, 21 Nov 2025 09:13:08 +0800
Subject: [PATCH] 1、超级分红 2、vip专区
---
mobile/pages/order/confirm-order.vue | 97 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 70 insertions(+), 27 deletions(-)
diff --git a/mobile/pages/order/confirm-order.vue b/mobile/pages/order/confirm-order.vue
index 0059b51..1f8b13f 100644
--- a/mobile/pages/order/confirm-order.vue
+++ b/mobile/pages/order/confirm-order.vue
@@ -19,7 +19,7 @@
<view class="info">
<view class="d-b-s">
<view class="flex-1">
- <view class="title f32 gray3">{{ item.product_name }}</view>
+ <view class="title f30 gray3 pr20">{{ item.product_name }}</view>
<view class="theme-price mt10 f18">
¥<text class="f26">{{ item.product_price }}</text>
</view>
@@ -330,12 +330,14 @@
delivery_store:{},
delivery_store_list: {},
verify_data: [] ,//虚拟商品 核销数据
+ branch_activity_id: 0,
};
},
onLoad(options) {
let self = this;
self.options = options;
self.room_id = options.room_id ? options.room_id : 0;
+ self.branch_activity_id = options.branch_activity_id ? options.branch_activity_id : 0; //分会活动的购物车提交
self.$fire.on('selectStoreId', function(e) {
self.extract_store = e;
self.choose_store_id = e.store_id;
@@ -537,20 +539,38 @@
}
//直接购买
if (self.options.order_type === 'buy') {
- self._get(
- 'order.order/buy', {
- params: JSON.stringify(
- Object.assign({}, params, {
- product_id: self.options.product_id,
- product_num: self.options.product_num,
- product_sku_id: self.options.product_sku_id,
- })
- )
- },
- function(res) {
- callback(res);
- }
- );
+ if(self.branch_activity_id > 0){
+ self._get(
+ 'branch.activityOrder/buy', {
+ params: JSON.stringify(
+ Object.assign({}, params, {
+ activity_id:self.branch_activity_id,
+ product_id: self.options.product_id,
+ product_num: self.options.product_num,
+ product_sku_id: self.options.product_sku_id,
+ })
+ )
+ },
+ function(res) {
+ callback(res);
+ }
+ );
+ } else {
+ self._get(
+ 'order.order/buy', {
+ params: JSON.stringify(
+ Object.assign({}, params, {
+ product_id: self.options.product_id,
+ product_num: self.options.product_num,
+ product_sku_id: self.options.product_sku_id,
+ })
+ )
+ },
+ function(res) {
+ callback(res);
+ }
+ );
+ }
}
//定金
else if (self.options.order_type === 'deposit') {
@@ -596,18 +616,34 @@
}
// 购物车结算
else if (self.options.order_type === 'cart') {
- self._get(
- 'order.order/cart', {
- params: JSON.stringify(
- Object.assign({}, params, {
- cart_ids: self.options.cart_ids || 0
- })
- )
- },
- function(res) {
- callback(res);
- }
- );
+ if(self.branch_activity_id > 0){
+ self._get(
+ 'branch.activityOrder/cart', {
+ params: JSON.stringify(
+ Object.assign({}, params, {
+ activity_id:self.branch_activity_id,
+ cart_ids: self.options.cart_ids || 0
+ })
+ )
+ },
+ function(res) {
+ callback(res);
+ }
+ );
+ } else {
+ self._get(
+ 'order.order/cart', {
+ params: JSON.stringify(
+ Object.assign({}, params, {
+ cart_ids: self.options.cart_ids || 0
+ })
+ )
+ },
+ function(res) {
+ callback(res);
+ }
+ );
+ }
}
// 积分兑换结算
else if (self.options.order_type == 'points') {
@@ -793,6 +829,7 @@
});
let params = {
+ activity_id: self.branch_activity_id, // 分会活动购物
pay_type: self.pay_type,
room_id: self.room_id,
coupon_id: self.coupon_id,
@@ -808,6 +845,9 @@
let url = '';
if (self.options.order_type === 'buy') {
url = 'order.order/buy';
+ if(self.branch_activity_id > 0){
+ url = 'branch.activityOrder/buy';
+ }
params = Object.assign(params, {
product_id: self.options.product_id,
product_num: self.options.product_num,
@@ -837,6 +877,9 @@
// 创建订单-购物车结算
if (self.options.order_type === 'cart') {
url = 'order.order/cart';
+ if(self.branch_activity_id > 0){
+ url = 'branch.activityOrder/cart';
+ }
params = Object.assign(params, {
cart_ids: self.options.cart_ids || 0,
// video_id: self.options.video_id || 0,
--
Gitblit v1.9.2