From 06be1c7ccc7533612e4cc7b0e730080d0dd3d2a1 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Fri, 16 Jan 2026 11:43:36 +0800
Subject: [PATCH] 商品可以赠送优惠券 商品属性增加团购 入驻商家增加实物和团购选项 团购和实物商户分类分开 增加团购商家页面 后台添加页面增加团购组件

---
 mobile/pages/order/cashier.vue |   26 ++++++++++++++++++++++----
 1 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/mobile/pages/order/cashier.vue b/mobile/pages/order/cashier.vue
index fe6a892..7a3bbd3 100644
--- a/mobile/pages/order/cashier.vue
+++ b/mobile/pages/order/cashier.vue
@@ -185,6 +185,10 @@
 				if(self.order_type == 100){
 					url = 'plus.business.Order/pay';
 				}
+				// 供应商年卡订单
+				if(self.order_type == 110){
+					url = 'supplier.member/pay';
+				}
 				let params = {
 					order_id: self.order_id,
 					pay_source: self.getPlatform()
@@ -235,6 +239,10 @@
 				if(self.order_type == 100){
 					url = 'plus.business.Order/pay';
 				}
+				// 供应商年卡订单
+				if(self.order_type == 110){
+					url = 'supplier.member/pay';
+				}
 				let use_balance = self.balanceType == true ? 1 : 0;
 				if (self.payPrice == 0) {
 					use_balance = 1;
@@ -249,7 +257,7 @@
 				self._post(url, params,
 					function(res) {	
 						// 半屏小程序支付 by lyzflash
-						if (res.data.payment.is_embed) {
+						if (res.data.payment && res.data.payment.is_embed) {
 							// console.log(res.data.payment);
 							self.isFirst = true;
 							uni.openEmbeddedMiniProgram({
@@ -292,10 +300,15 @@
 					self.showSuccess("支付成功", function() {
 						self.gotoPage('/pages/order/myorder', 'reLaunch');
 					})
-				}
+				} else 
 				if(self.order_type == 100){
 					self.showSuccess("支付成功", function() {
-						self.gotoPage('/pages/plus/business/list', 'reLaunch');
+						self.gotoPage('/pages/plus/business/detail?business_card_id=' + result.data.business_card_id, 'reLaunch');
+					})
+				} else if(self.order_type == 110){
+					// 供应商年卡订单支付成功
+					self.showSuccess("支付成功", function() {
+						self.gotoPage('/pages/tabBar/user/index', 'reLaunch');
 					})
 				} else {
 					self.gotoPage('/pages/order/pay-success/pay-success?order_id=' + self.order_id,
@@ -319,6 +332,11 @@
 					self.gotoPage('/pages/user/my_shop/my_shop', 'redirect');
 				} else if (self.order_type == 50) {
 					self.gotoPage('/pages/order/myorder', 'redirect');
+				}else if (self.order_type == 100) {
+					self.gotoPage('/pages/plus/business/detail?business_card_id=' + result.data.business_card_id, 'redirect');
+				} else if(self.order_type == 110){
+					// 供应商年卡订单支付失败
+					self.gotoPage('/pages/user/my_shop/my_shop', 'redirect');
 				} else {
 					self.gotoPage('/pages/order/myorder', 'redirect');
 				}
@@ -368,4 +386,4 @@
 		align-items: center;
 		line-height: 116rpx;
 	}
-</style>
+</style>
\ No newline at end of file

--
Gitblit v1.9.2