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 | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/pages/cart/payment/payOrder.vue b/pages/cart/payment/payOrder.vue
index a3db881..6cdba46 100644
--- a/pages/cart/payment/payOrder.vue
+++ b/pages/cart/payment/payOrder.vue
@@ -101,9 +101,9 @@
onShow() {
getSessionId().then(res=>{
this.pageSessionNo = res.data.data
+ this.actionParam.sessionId = this.pageSessionNo
if(this.pageSessionNo){
let param = Object.assign({}, this.actionParam);
- param.sessionId = this.pageSessionNo
userAction(param)
}
})
@@ -111,6 +111,7 @@
onLoad(val) {
this.routerVal = val;
this.actionParam.pageParams = JSON.stringify(val)
+ console.log('鑾峰彇瑙ｅ瘑鐨勫弬鏁�',JSON.stringify(val),decodeURIComponent(this.routerVal.template))
//鍒濆鍖栧弬鏁�
// #ifdef APP-PLUS
this.paymentType = "APP";
@@ -185,12 +186,23 @@
parms.sn = this.sn;
parms.orderType = this.orderType;
parms.clientType = this.paymentType;
-
+ 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){
this.cashierParams = res.data.result;
-
+
+ console.log('鑾峰彇璁㈠崟淇℃伅------------------>',this.cashierParams.orderSns)
// #ifdef MP-WEIXIN
this.payList = res.data.result.support.filter((item) => {
return item != "ALIPAY";
--
Gitblit v1.8.0