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

---
 src/tabviews/zshare/actionList/normalbutton/index.jsx |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

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