From 51b9946758f10c36988ef917b93b67c8423875ba Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 16 五月 2023 15:07:44 +0800
Subject: [PATCH] 2023-05-16
---
public/options.json | 2 +-
src/assets/mobimg/xflow.png | 0
src/tabviews/zshare/actionList/normalbutton/index.jsx | 15 +++++++++------
src/menu/modulesource/option.jsx | 2 ++
4 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/public/options.json b/public/options.json
index 4e405d0..6942fe8 100644
--- a/public/options.json
+++ b/public/options.json
@@ -8,7 +8,7 @@
"filter": "false",
"defaultApp": "mk",
"defaultLang": "zh-CN",
- "WXAppID": "",
+ "WXAppID": "wx4d8a34c8d4494872",
"WXminiAppID": "",
"nginx": "true",
"debugger": false,
diff --git a/src/assets/mobimg/xflow.png b/src/assets/mobimg/xflow.png
new file mode 100644
index 0000000..3fa7da2
--- /dev/null
+++ b/src/assets/mobimg/xflow.png
Binary files differ
diff --git a/src/menu/modulesource/option.jsx b/src/menu/modulesource/option.jsx
index e914933..262dfbe 100644
--- a/src/menu/modulesource/option.jsx
+++ b/src/menu/modulesource/option.jsx
@@ -30,6 +30,7 @@
import mindmap from '@/assets/mobimg/mindmap.png'
import indent from '@/assets/mobimg/indent.jfif'
import kapmap from '@/assets/mobimg/kapmap.jfif'
+import xflow from '@/assets/mobimg/xflow.png'
import Voucher from '@/assets/mobimg/voucher.png'
import Account from '@/assets/mobimg/account.png'
@@ -65,6 +66,7 @@
{ type: 'menu', url: mindmap, component: 'antvG6', subtype: 'mindmap', title: '鎬濈淮瀵煎浘', width: 24 },
{ type: 'menu', url: indent, component: 'antvG6', subtype: 'indentTree', title: '缂╄繘鏂囦欢鏍�', width: 24 },
{ type: 'menu', url: kapmap, component: 'antvG6', subtype: 'kapmap', title: '鐭ヨ瘑鍥捐氨鏍�', width: 24 },
+ { type: 'menu', url: xflow, component: 'antvX6', subtype: 'xflow', title: '娴佺▼鍥�', width: 24 },
{ type: 'menu', url: chart, component: 'chart', subtype: 'custom', title: '鑷畾涔夊浘琛�', width: 24, forbid: ['billPrint'] },
{ type: 'menu', url: Editor, component: 'editor', subtype: 'brafteditor', title: '瀵屾枃鏈�', width: 24 },
{ type: 'menu', url: SandBox, component: 'code', subtype: 'sandbox', title: '鑷畾涔�', width: 24 },
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 2b021a4..6416c17 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -2125,7 +2125,7 @@
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
Api.genericInterface(param).then(res => {
- // res.data = [{openid: 'o2E7gvoSFvQRG7I8_gZxf4y3ONkQ', send_id: '2223333', first: '鎮ㄧ殑缂磋垂淇℃伅濡備笅', keyword1: '010000000001', keyword2: '2022骞�07鏈�03鏃�', keyword3: '渚涙殩缂磋垂', keyword4: '20鍏�', keyword5: '鎴愬姛', remark: '鎰熻阿鎮ㄧ殑浣跨敤锛�'}]
+ // res.send_data = [{openid: 'o2E7gvoSFvQRG7I8_gZxf4y3ONkQ', send_id: '222333344', first: '鎮ㄧ殑缂磋垂淇℃伅濡備笅', keyword1: '010000000001', keyword2: '2022骞�07鏈�03鏃�', keyword3: '渚涙殩缂磋垂', keyword4: '20鍏�', keyword5: '鎴愬姛', remark: '鎰熻阿鎮ㄧ殑浣跨敤锛�'}]
if (!res.status) {
notification.warning({
top: 92,
@@ -2133,7 +2133,12 @@
duration: 5
})
return
- } else if (!res.send_data || res.send_data.length === 0) {
+ }
+
+ let sends = res.send_data || []
+ sends = sends.filter(item => !!item.openid)
+
+ if (sends.length === 0) {
return
}
@@ -2160,10 +2165,10 @@
_param.data[item.key] = {value: '', color: item.color}
})
- let params = res.send_data.map(item => {
+ let params = sends.map(item => {
let m = fromJS(_param).toJS()
- m.touser = item.openid || ''
+ m.touser = item.openid
if (item.bid && m.miniprogram && m.miniprogram.pagepath.indexOf('MenuId') > -1) {
m.miniprogram.pagepath = m.miniprogram.pagepath + `&BID=${item.bid}`
}
@@ -2185,8 +2190,6 @@
if (!res.oa_access_token) return
params.forEach(n => {
- if (!n.touser) return
-
Api.wxNginxRequest(`cgi-bin/message/template/send?access_token=${res.oa_access_token}`, 'post', n).then(re => {
if (verify.wxNoteCallback === 'true') {
let _p = {
--
Gitblit v1.8.0