兼容关闭推送开关

2ff27a12 · 郝聪敏 · 04365521 · 2ff27a12
Commit 2ff27a12 authored May 29, 2020 by 郝聪敏
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

index.wpy src/pages/index.wpy +7 -3

No files found.
--- a/src/pages/index.wpy
+++ b/src/pages/index.wpy
@@ -474,9 +474,13 @@
        ];
        const { subscriptionsSetting } = await wepy.wx.getSetting({ withSubscriptions: true });
-        if (subscriptionsSetting && subscriptionsSetting.mainSwitch && subscriptionsSetting.itemSettings) {
+        if (subscriptionsSetting && (!subscriptionsSetting.mainSwitch || subscriptionsSetting.itemSettings)) {
-          const isAlwaysAgree = tmplIds.every(v => subscriptionsSetting.itemSettings[v] === 'accept');
+          let isAlwaysAgree = true;
-          if (!isAlwaysAgree) {
+          if (subscriptionsSetting.itemSettings) {
+            const itemKeys = Object.keys(subscriptionsSetting.itemSettings);
+            isAlwaysAgree = itemKeys.every(v => subscriptionsSetting.itemSettings[v] === 'accept');
+          }
+          if (!isAlwaysAgree || !subscriptionsSetting.mainSwitch) {
            try {
              await Dialog.alert({
                message: '点击右上角“...” - 设置 - 消息订阅，开启接收订阅消息并选择所有消息',