From e9d602d8b496368a829cee5e6eae0dec29566363 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期二, 02 十二月 2025 13:29:48 +0800
Subject: [PATCH] feat: 通知
---
apps/underTakeMiniApp/src/subpackages/login/authorization/authorization.vue | 35 ++++++++++++++---
apps/cMiniApp/src/subpackages/login/authorization/authorization.vue | 7 +--
packages/constants/enum.ts | 16 +++++++
apps/bMiniApp/src/subpackages/login/authorization/authorization.vue | 35 ++++++++++++++---
apps/bMiniApp/project.private.config.json | 4 +-
5 files changed, 78 insertions(+), 19 deletions(-)
diff --git a/apps/bMiniApp/project.private.config.json b/apps/bMiniApp/project.private.config.json
index 212944a..a630d9b 100644
--- a/apps/bMiniApp/project.private.config.json
+++ b/apps/bMiniApp/project.private.config.json
@@ -26,8 +26,8 @@
"name": "寰呴獙鏀�-楠屾敹璇︽儏",
"pathName": "subpackages/task/taskHandleCheckDetail/taskHandleCheckDetail",
"query": "id=546401cc-c148-47d0-c647-08de1e75af01&date=2025-11-28&taskInfoId=5a22c18b-0b49-4540-6658-08de1da80d7c",
- "scene": null,
- "launchMode": "default"
+ "launchMode": "default",
+ "scene": null
},
{
"name": "鎶ュ悕鍒楄〃",
diff --git a/apps/bMiniApp/src/subpackages/login/authorization/authorization.vue b/apps/bMiniApp/src/subpackages/login/authorization/authorization.vue
index 748c81e..3f1b760 100644
--- a/apps/bMiniApp/src/subpackages/login/authorization/authorization.vue
+++ b/apps/bMiniApp/src/subpackages/login/authorization/authorization.vue
@@ -60,6 +60,7 @@
import IconCaptcha from '@/assets/login/icon-btn-captcha.png';
import IconPassword from '@/assets/login/icon-btn-password.png';
import { LoginFormTabs } from '../constants';
+import { subscribeMessageTemplateIdsForB } from '@12333/constants';
import * as authServices from '@12333/services/apiV2/auth';
defineOptions({
@@ -166,12 +167,34 @@
} catch (error) {}
}
-function handleLoginSuccess() {
- Message.success('鎺堟潈鐧诲綍鎴愬姛', {
- onClosed: () => {
- jump();
- },
- });
+async function handleLoginSuccess() {
+ try {
+ if (!Taro.requestSubscribeMessage) {
+ await Message.confirm({ message: '浣犵殑寰俊鐗堟湰杩囦綆锛屼笉鏀寔璁㈤槄娑堟伅锛屾槸鍚︾户缁姤鍚�' });
+ }
+ const res = await Taro.getSetting({
+ withSubscriptions: true,
+ });
+ let setting: boolean[] = [];
+ if (res.subscriptionsSetting && res.subscriptionsSetting.itemSettings) {
+ setting = subscribeMessageTemplateIdsForB
+ .map((id) => res.subscriptionsSetting.itemSettings[id] !== 'accept')
+ .filter(Boolean);
+ }
+ if (setting.length > 0) {
+ Taro.requestSubscribeMessage({
+ tmplIds: subscribeMessageTemplateIdsForB,
+ success: function (res) {
+ console.log('res: ', res);
+ },
+ });
+ }
+ Message.success('鎺堟潈鐧诲綍鎴愬姛', {
+ onClosed: () => {
+ jump();
+ },
+ });
+ } catch (error) {}
}
function goLoginByForm(tab = LoginFormTabs.VerificationCodeLogin) {
diff --git a/apps/cMiniApp/src/subpackages/login/authorization/authorization.vue b/apps/cMiniApp/src/subpackages/login/authorization/authorization.vue
index 089f1fc..e45b6a4 100644
--- a/apps/cMiniApp/src/subpackages/login/authorization/authorization.vue
+++ b/apps/cMiniApp/src/subpackages/login/authorization/authorization.vue
@@ -63,7 +63,7 @@
import { LoginFormTabs } from '../constants';
import * as authServices from '@12333/services/apiV2/auth';
import { NODE_ENV } from '@/constants';
-import { subscribeMessageTemplateIds } from '@12333/constants';
+import { subscribeMessageTemplateIdsForC } from '@12333/constants';
console.log('NODE_ENV: ', NODE_ENV);
defineOptions({
@@ -172,7 +172,6 @@
async function handleLoginSuccess() {
try {
- console.log('Taro.requestSubscribeMessage: ', Taro.requestSubscribeMessage);
if (!Taro.requestSubscribeMessage) {
await Message.confirm({ message: '浣犵殑寰俊鐗堟湰杩囦綆锛屼笉鏀寔璁㈤槄娑堟伅锛屾槸鍚︾户缁姤鍚�' });
}
@@ -181,13 +180,13 @@
});
let setting: boolean[] = [];
if (res.subscriptionsSetting && res.subscriptionsSetting.itemSettings) {
- setting = subscribeMessageTemplateIds
+ setting = subscribeMessageTemplateIdsForC
.map((id) => res.subscriptionsSetting.itemSettings[id] !== 'accept')
.filter(Boolean);
}
if (setting.length > 0) {
Taro.requestSubscribeMessage({
- tmplIds: subscribeMessageTemplateIds,
+ tmplIds: subscribeMessageTemplateIdsForC,
success: function (res) {
console.log('res: ', res);
},
diff --git a/apps/underTakeMiniApp/src/subpackages/login/authorization/authorization.vue b/apps/underTakeMiniApp/src/subpackages/login/authorization/authorization.vue
index 748c81e..56640a5 100644
--- a/apps/underTakeMiniApp/src/subpackages/login/authorization/authorization.vue
+++ b/apps/underTakeMiniApp/src/subpackages/login/authorization/authorization.vue
@@ -61,6 +61,7 @@
import IconPassword from '@/assets/login/icon-btn-password.png';
import { LoginFormTabs } from '../constants';
import * as authServices from '@12333/services/apiV2/auth';
+import { subscribeMessageTemplateIdsForU } from '@12333/constants';
defineOptions({
name: 'authorization',
@@ -166,12 +167,34 @@
} catch (error) {}
}
-function handleLoginSuccess() {
- Message.success('鎺堟潈鐧诲綍鎴愬姛', {
- onClosed: () => {
- jump();
- },
- });
+async function handleLoginSuccess() {
+ try {
+ if (!Taro.requestSubscribeMessage) {
+ await Message.confirm({ message: '浣犵殑寰俊鐗堟湰杩囦綆锛屼笉鏀寔璁㈤槄娑堟伅锛屾槸鍚︾户缁姤鍚�' });
+ }
+ const res = await Taro.getSetting({
+ withSubscriptions: true,
+ });
+ let setting: boolean[] = [];
+ if (res.subscriptionsSetting && res.subscriptionsSetting.itemSettings) {
+ setting = subscribeMessageTemplateIdsForU
+ .map((id) => res.subscriptionsSetting.itemSettings[id] !== 'accept')
+ .filter(Boolean);
+ }
+ if (setting.length > 0) {
+ Taro.requestSubscribeMessage({
+ tmplIds: subscribeMessageTemplateIdsForU,
+ success: function (res) {
+ console.log('res: ', res);
+ },
+ });
+ }
+ Message.success('鎺堟潈鐧诲綍鎴愬姛', {
+ onClosed: () => {
+ jump();
+ },
+ });
+ } catch (error) {}
}
function goLoginByForm(tab = LoginFormTabs.VerificationCodeLogin) {
diff --git a/packages/constants/enum.ts b/packages/constants/enum.ts
index 0deae86..7258708 100644
--- a/packages/constants/enum.ts
+++ b/packages/constants/enum.ts
@@ -119,10 +119,24 @@
export const WeekCN = ['鏃�', '涓�', '浜�', '涓�', '鍥�', '浜�', '鍏�'];
-export const subscribeMessageTemplateIds = [
+export const subscribeMessageTemplateIdsForC = [
'xYWBg0FydQ64a-4cDqLCp8HV82QhRKmREa78GpLqMlQ', //绛剧害鎻愰啋
'Ce0QCQIGXjChpmq_r3hr_lifwO7MSpxDUjqNkwJCA74', //琚畨鎺掓彁閱�
'ziC07K27Km9OAywf-KYwHiWgn195j9tmuFKxbDZ79tg', //褰曠敤/褰曠敤璋㈢粷
'TwPHORIjXxeUVr8R4FzbRofmIYmU0vODetvXrPfFAbY', //楠屾敹缁撴灉
'Fm2ut8eeJxf18PrVusJEdufbCMr9wZ45LeFVK4eNhIc', //鍒拌处鎻愰啋
];
+
+export const subscribeMessageTemplateIdsForB = [
+ 'VTxlUXF40FU0G3Re6UIIK3w3wqeJxAKG1veLpaQysVQ', //楠屾敹鎻愰啋
+ 'wOMG0iMj1hheKdJhBZIuUZIRT_AJl7-auvf2C0KrACs', //寰呭鎵规彁閱�
+ 'gPaQGVWqA0UM8764uYb8LfapitRG-R2urVSa5za1hCU', //缁撶畻鎻愰啋
+ 'a97bSRg0O7xbugFNxDBShm7k55e-jMWT4PHVZnVCzQM', //鍏呭�兼彁閱�
+];
+
+export const subscribeMessageTemplateIdsForU = [
+ '2canu6qqn3_03s2IbfPEPWRqNtEKxu4lNvRUud5yRys', //钖祫缁撶畻鎻愰啋
+ 'PZO6t_6pBEPxqlGXD4x99h8sIOHFKKjaki9An6FnT1c', //缁撶畻鎻愰啋锛堝凡缁撶畻銆佺粨绠楀け璐ワ級
+ 'oY96y8VrXOW47ZBCfLTLk5gEeBamn8Ou8S9Ub4ANZAY', //鍏呭�兼彁閱�
+ 'B_y0UwuixBCkhM0ng_RYaxGgXhLh4SXxDTmkwZ5CXiY', //绛惧埌鎻愰啋
+];
--
Gitblit v1.9.1