From 4cc738e535d1a20701d206e12cf9de8cc5a01170 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 01 六月 2024 15:24:12 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/zshare/actionList/normalbutton/index.jsx | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index d4f7524..bcf9a4f 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -2320,7 +2320,7 @@
Modal.success({
title: msg,
onOk: () => {
- this.successContinue(sign, id)
+ this.successContinue(sign, id, res)
}
})
return
@@ -2328,10 +2328,10 @@
}
- this.successContinue(sign, id)
+ this.successContinue(sign, id, res)
}
- successContinue = (sign, id) => {
+ successContinue = (sign, id, res) => {
const { btn } = this.props
const { btnconfig } = this.state
@@ -2452,6 +2452,16 @@
} else {
url = btn.verify.linkUrl
}
+
+ if (/@/.test(url)) {
+ Object.keys(res).forEach(key => {
+ url = url.replace(new RegExp('@' + key + '@', 'ig'), res[key])
+ })
+ }
+ if (!/^http/.test(url)) {
+ url = window.location.origin + url
+ }
+
window.open(url)
}
}
@@ -2586,9 +2596,9 @@
if (verify.wxNoteLink === 'url' && verify.wxNoteLinkUrl) {
_param.url = verify.wxNoteLinkUrl
- } else if (verify.wxNoteLink === 'miniProgram' && window.GLOB.WXminiAppID) {
+ } else if (verify.wxNoteLink === 'miniProgram' && (window.GLOB.WXminiAppID || verify.wxNoteMiniId)) {
_param.miniprogram = {
- appid: window.GLOB.WXminiAppID,
+ appid: verify.wxNoteMiniId || window.GLOB.WXminiAppID,
pagepath: '/pages/index/index'
}
--
Gitblit v1.8.0