Commit dbbe6040 authored by 郝聪敏's avatar 郝聪敏

Merge branch 'feature/animation' into 'master'

兼容关闭推送开关

See merge request !31
parents bf74491c 2ff27a12
......@@ -474,9 +474,13 @@
];
const { subscriptionsSetting } = await wepy.wx.getSetting({ withSubscriptions: true });
if (subscriptionsSetting && subscriptionsSetting.mainSwitch && subscriptionsSetting.itemSettings) {
const isAlwaysAgree = tmplIds.every(v => subscriptionsSetting.itemSettings[v] === 'accept');
if (!isAlwaysAgree) {
if (subscriptionsSetting && (!subscriptionsSetting.mainSwitch || subscriptionsSetting.itemSettings)) {
let isAlwaysAgree = true;
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: '点击右上角“...” - 设置 - 消息订阅,开启接收订阅消息并选择所有消息',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment