From 507deefd69a980e4d0d0c2e8da0dacad800951f7 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 24 十月 2025 15:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action

---
 pages/cart/payment/payOrder.vue |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pages/cart/payment/payOrder.vue b/pages/cart/payment/payOrder.vue
index 74fdb69..6cdba46 100644
--- a/pages/cart/payment/payOrder.vue
+++ b/pages/cart/payment/payOrder.vue
@@ -186,13 +186,17 @@
 				parms.sn = this.sn;
 				parms.orderType = this.orderType;
 				parms.clientType = this.paymentType;
-				if(!this.routerVal.template){
-				const template = decodeURIComponent(this.routerVal.template)
+				if(this.routerVal.template){
+					console.log('鑾峰彇璇︽儏鎵ц浜�')
+				const template = JSON.parse(decodeURIComponent(this.routerVal.template))
+				console.log('鑾峰彇璇︽儏鎵ц浜嗚幏鍙栧埌鐨勫��-----------------------銆�',template)
 				parms.templateId = template.templateId;
 				parms.templateName = template.templateName;
 				parms.chooseImage = template.chooseImage;
+				parms.chooseImageId = template.chooseImageId;
 				parms.templateForm = template.templateForm;
 				}
+				console.log('--------------------->鎵ц鐨勫弬鏁颁负',parms)
 				API_Trade.getCashierData(parms).then((res) => {
 				
 					if(res.data.success){

--
Gitblit v1.8.0