From f8e353cc631dc881579cd0bbe78910fdf4ceba61 Mon Sep 17 00:00:00 2001
From: mo-bai <1873032855@qq.com>
Date: Mon, 21 Feb 2022 18:25:39 +0800
Subject: [PATCH] push

---
 App.vue     | 20 +++++++++++---------
 utils/is.js |  4 ++++
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/App.vue b/App.vue
index e84b6ee..2eec292 100644
--- a/App.vue
+++ b/App.vue
@@ -1,6 +1,6 @@
 <script>
 import { go2 } from '@/utils/hook.js'
-import { isObject } from '@/utils/is.js'
+import { isString } from '@/utils/is.js'
 import store from '@/store/index.js'
 import handlePushMsg from '@/utils/handlePushMsg.js'
 export default {
@@ -28,23 +28,25 @@ export default {
       plus.push.addEventListener(
         'receive',
         function (msg) {
-          if (!isObject(msg.payload)) {
+          if (isString(msg.payload)) {
             msg.payload = JSON.parse(msg.payload)
           }
           if (client === 'ios') {
             if (msg.aps == null && msg.type == 'receive') {
-              let content = msg.payload.content
-              let title = msg.payload.title
+              let content = msg.content
+              let title = msg.title
               let payload = JSON.stringify(msg.payload)
               plus.push.createMessage(content, payload, {
-                title: title
+                title: title,
               })
             }
           }
           if (client === 'android') {
-            let title = msg.payload.title
-            let content = msg.payload.content
-            plus.push.createMessage(content, msg.payload, { title: title })
+            let title = msg.title
+            let content = msg.content
+            plus.push.createMessage(content, JSON.stringify(msg.payload), {
+              title: title,
+            })
           }
         },
         false
@@ -56,7 +58,7 @@ export default {
     // 先默认进入应用就清除所有消息
     plus.runtime.setBadgeNumber(0)
   },
-  onHide: function () {}
+  onHide: function () {},
 }
 </script>
 
diff --git a/utils/is.js b/utils/is.js
index ac04e98..0c64019 100644
--- a/utils/is.js
+++ b/utils/is.js
@@ -19,3 +19,7 @@ export function isArray(val) {
 export function isDate(val) {
   return is(val, 'Date')
 }
+
+export function isString(val) {
+  return is(val, 'String')
+}
\ No newline at end of file