From 1c5cb9a307f32905485b44d7f045af103608a178 Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Wed, 11 Dec 2024 18:01:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/css/base.css          |  5 ++++-
 subPackages/daoyou/order.vue | 29 +++++++++++++++++++++++++++++
 subPackages/line/orders.vue  | 35 +++++++++++++++++++----------------
 3 files changed, 52 insertions(+), 17 deletions(-)

diff --git a/static/css/base.css b/static/css/base.css
index 9bdcd64..6ffdcee 100644
--- a/static/css/base.css
+++ b/static/css/base.css
@@ -48,10 +48,13 @@ view {
 /*单行隐藏*/
 .text-overflow {
 	overflow-x: hidden;
-	overflow-y: hidden;
+	overflow-y: inherit;
 	text-overflow: ellipsis;
 	white-space: nowrap;
 }
+.text-overflow::-webkit-scrollbar {
+	display: none;
+}
 
 /* 两行隐藏 */
 .text-overflowRows {
diff --git a/subPackages/daoyou/order.vue b/subPackages/daoyou/order.vue
index 2f06ede..d2a0ae6 100644
--- a/subPackages/daoyou/order.vue
+++ b/subPackages/daoyou/order.vue
@@ -222,7 +222,36 @@
 						method: 'POST',
 						data: JSON.stringify(data)
 					}, '/api/order/place').then(res => {
+						let order_id = res.data.order_id
+						this.$store.commit("changeTouristInfo", null);
+						this.$store.commit("choseCoupon", "");
 						
+						this.Post({
+							order_id: order_id,
+							type: "miniprogram",
+							platform: 'miniprogram'
+						}, '/api/pay/unify').then(res => {
+							if (res.data) {
+								let data = res.data
+								WeixinJSBridge.invoke('getBrandWCPayRequest', {
+									"appId": data.appId,     //公众号ID，由商户传入     
+									"timeStamp": data.timeStamp,     //时间戳，自1970年以来的秒数     
+									"nonceStr": data.timeStamp,      //随机串     
+									"package": data.package,
+									"signType": data.signType,     //微信签名方式：     
+									"paySign": data.paySign //微信签名 
+								},
+								function(res) {
+									// if (res.err_msg == "get_brand_wcpay_request:ok") {
+									// 	// 使用以上方式判断前端返回,微信团队郑重提示：
+									// 	//res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠。
+									// }
+									uni.navigateTo({
+										url: '/subPackages/order/trades'
+									})
+								});
+							}
+						})
 					})
 				}else {
 					this.isBottom = false
diff --git a/subPackages/line/orders.vue b/subPackages/line/orders.vue
index 534fb79..3e65686 100644
--- a/subPackages/line/orders.vue
+++ b/subPackages/line/orders.vue
@@ -266,25 +266,28 @@
 							
 							this.Post({
 								order_id: order_id,
-								type: "wx",
+								type: "miniprogram",
 								platform: 'miniprogram'
 							}, '/api/pay/unify').then(res => {
 								if (res.data) {
-									// uni.requestPayment({
-									// 	nonceStr: res.data.nonceStr,
-									// 	package: res.data.package,
-									// 	paySign: res.data.paySign,
-									// 	signType: res.data.signType,
-									// 	timeStamp: res.data.timeStamp,
-									// 	success: () => {
-									// 		this.getSubscribeMessage()
-									// 	},
-									// 	fail() {
-									// 		uni.navigateTo({
-									// 			url: '/subPackages/order/trades'
-									// 		})
-									// 	}
-									// })
+									let data = res.data
+									WeixinJSBridge.invoke('getBrandWCPayRequest', {
+										"appId": data.appId,     //公众号ID，由商户传入     
+										"timeStamp": data.timeStamp,     //时间戳，自1970年以来的秒数     
+										"nonceStr": data.timeStamp,      //随机串     
+										"package": data.package,
+										"signType": data.signType,     //微信签名方式：     
+										"paySign": data.paySign //微信签名 
+									},
+									function(res) {
+										// if (res.err_msg == "get_brand_wcpay_request:ok") {
+										// 	// 使用以上方式判断前端返回,微信团队郑重提示：
+										// 	//res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠。
+										// }
+										uni.navigateTo({
+											url: '/subPackages/order/trades'
+										})
+									});
 								}
 							})
 						}