From 1bf39274d6b51540953f746c507b2cc70d3e0ed9 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期四, 04 十二月 2025 14:44:36 +0800
Subject: [PATCH] feat: 通知
---
apps/underTakeMiniApp/.eslintrc-auto-import.json | 4 +
apps/bMiniApp/src/subpackages/login/loginByForm/accountLoginForm.vue | 69 +++++++++++-----------
apps/underTakeMiniApp/src/subpackages/login/loginByForm/accountLoginForm.vue | 57 +++++++++++--------
apps/bMiniApp/config/dev.js | 1
apps/underTakeMiniApp/auto-imports.d.ts | 4 +
5 files changed, 76 insertions(+), 59 deletions(-)
diff --git a/apps/bMiniApp/config/dev.js b/apps/bMiniApp/config/dev.js
index 0578270..143686c 100644
--- a/apps/bMiniApp/config/dev.js
+++ b/apps/bMiniApp/config/dev.js
@@ -4,6 +4,7 @@
env: {
NODE_ENV: '"development"',
BASE_URL: '"http://localhost:53780"',
+ // BASE_URL: '"https://testfj.81812333.com"',
BASE_URL_JX: '"https://api.jx818.com"',
APP_ENV: '"development"',
diff --git a/apps/bMiniApp/src/subpackages/login/loginByForm/accountLoginForm.vue b/apps/bMiniApp/src/subpackages/login/loginByForm/accountLoginForm.vue
index 3be7bd3..949c44f 100644
--- a/apps/bMiniApp/src/subpackages/login/loginByForm/accountLoginForm.vue
+++ b/apps/bMiniApp/src/subpackages/login/loginByForm/accountLoginForm.vue
@@ -43,22 +43,13 @@
<LargeButton class="login-btn" @click="handleLogin" :loading="form.loading">鐧诲綍</LargeButton>
</template>
- <!-- <AccessOpenTypeButton
- type="primary"
- class="authorization-page-wechat-wrapper"
- open-type="getPhoneNumber"
- :access="policyChecked"
- @noAccess="noAccess"
- @getphonenumber="handleLogin"
- >
- <div class="authorization-page-wechat">鐧诲綍</div>
- </AccessOpenTypeButton> -->
<!-- <div class="go-register-btn" @click="goRegister">绔嬪嵆娉ㄥ唽</div> -->
</div>
</template>
<script setup lang="ts">
import { Message } from '@12333/utils';
+import { AccessOpenTypeButton } from '@12333/components';
import { FormRules } from '@nutui/nutui-taro/dist/types/__VUE/form/types';
import { LargeButton } from '@/components';
import { useLoginedJump } from '@/hooks';
@@ -67,6 +58,7 @@
import Taro from '@tarojs/taro';
import * as authServices from '@12333/services/apiV2/auth';
import { subscribeMessageTemplateIdsForB } from '@12333/constants';
+import { ButtonProps, CommonEventFunction } from '@tarojs/components';
defineOptions({
name: 'AccountLoginForm',
@@ -103,20 +95,7 @@
try {
if (props.policyChecked) {
userStore.loginSuccess(wxMiniAppUserLoginRes.value);
- Message.success('鐧诲綍鎴愬姛', {
- onClosed: async () => {
- if (!Taro.requestSubscribeMessage) {
- await Message.confirm({ message: '浣犵殑寰俊鐗堟湰杩囦綆锛屼笉鏀寔璁㈤槄娑堟伅锛屾槸鍚︾户缁紵' });
- }
- await Taro.requestSubscribeMessage({
- tmplIds: subscribeMessageTemplateIdsForB,
- success: function (res) {
- console.log('res: ', res);
- },
- });
- jump();
- },
- });
+ handleLoginSuccess();
} else {
noAccess();
}
@@ -135,16 +114,7 @@
password: form.userPassword,
code: loginRes.code,
});
- if (!Taro.requestSubscribeMessage) {
- await Message.confirm({ message: '浣犵殑寰俊鐗堟湰杩囦綆锛屼笉鏀寔璁㈤槄娑堟伅锛屾槸鍚︾户缁紵' });
- }
- await Taro.requestSubscribeMessage({
- tmplIds: subscribeMessageTemplateIdsForB,
- success: function (res) {
- console.log('res: ', res);
- },
- });
- jump();
+ handleLoginSuccess();
}
} else {
noAccess();
@@ -159,6 +129,37 @@
Message.warning('璇峰厛闃呰骞跺嬀閫夊崗璁�');
}
+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);
+ }
+ Taro.requestSubscribeMessage({
+ tmplIds: subscribeMessageTemplateIdsForB,
+ success: function (res) {
+ console.log('res: ', res);
+ },
+ });
+ console.log('setting: ', setting);
+ Message.success('鐧诲綍鎴愬姛', {
+ onClosed: () => {
+ jump();
+ },
+ });
+ } catch (error) {
+ console.log('error: ', error);
+ }
+}
+
function goRegister() {
console.log('RouterPath.registerForm: ', RouterPath.registerForm);
Taro.navigateTo({
diff --git a/apps/underTakeMiniApp/.eslintrc-auto-import.json b/apps/underTakeMiniApp/.eslintrc-auto-import.json
index 28f1710..5036610 100644
--- a/apps/underTakeMiniApp/.eslintrc-auto-import.json
+++ b/apps/underTakeMiniApp/.eslintrc-auto-import.json
@@ -125,6 +125,8 @@
"DirectiveBinding": true,
"MaybeRef": true,
"MaybeRefOrGetter": true,
- "TabBarPageRouterList": true
+ "TabBarPageRouterList": true,
+ "APP_ENV": true,
+ "NODE_ENV": true
}
}
diff --git a/apps/underTakeMiniApp/auto-imports.d.ts b/apps/underTakeMiniApp/auto-imports.d.ts
index b393104..b925506 100644
--- a/apps/underTakeMiniApp/auto-imports.d.ts
+++ b/apps/underTakeMiniApp/auto-imports.d.ts
@@ -5,6 +5,7 @@
// Generated by unplugin-auto-import
export {}
declare global {
+ const APP_ENV: typeof import('./src/constants/app')['APP_ENV']
const AppLocalConfig: typeof import('./src/constants/app')['AppLocalConfig']
const BackType: typeof import('./src/constants/enum')['BackType']
const EffectScope: typeof import('vue')['EffectScope']
@@ -29,6 +30,7 @@
const EnumUserStatus: typeof import('./src/constants/apiEnum')['EnumUserStatus']
const EnumUserType: typeof import('./src/constants/apiEnum')['EnumUserType']
const HomeOrderType: typeof import('./src/hooks/task')['HomeOrderType']
+ const NODE_ENV: typeof import('./src/constants/app')['NODE_ENV']
const OssAssets: typeof import('./src/constants/img')['OssAssets']
const RouterPath: typeof import('./src/constants/router')['RouterPath']
const TabBarPageRouter: typeof import('./src/constants/tabBar')['TabBarPageRouter']
@@ -134,9 +136,11 @@
import { UnwrapRef } from 'vue'
declare module 'vue' {
interface ComponentCustomProperties {
+ readonly APP_ENV: UnwrapRef<typeof import('./src/constants/app')['APP_ENV']>
readonly AppLocalConfig: UnwrapRef<typeof import('./src/constants/app')['AppLocalConfig']>
readonly BackType: UnwrapRef<typeof import('./src/constants/enum')['BackType']>
readonly EffectScope: UnwrapRef<typeof import('vue')['EffectScope']>
+ readonly NODE_ENV: UnwrapRef<typeof import('./src/constants/app')['NODE_ENV']>
readonly OssAssets: UnwrapRef<typeof import('./src/constants/img')['OssAssets']>
readonly RouterPath: UnwrapRef<typeof import('./src/constants/router')['RouterPath']>
readonly TabBarPageRouter: UnwrapRef<typeof import('./src/constants/tabBar')['TabBarPageRouter']>
diff --git a/apps/underTakeMiniApp/src/subpackages/login/loginByForm/accountLoginForm.vue b/apps/underTakeMiniApp/src/subpackages/login/loginByForm/accountLoginForm.vue
index ab08c97..ad613bb 100644
--- a/apps/underTakeMiniApp/src/subpackages/login/loginByForm/accountLoginForm.vue
+++ b/apps/underTakeMiniApp/src/subpackages/login/loginByForm/accountLoginForm.vue
@@ -92,20 +92,7 @@
try {
if (props.policyChecked) {
userStore.loginSuccess(wxMiniAppUserLoginRes.value);
- Message.success('鐧诲綍鎴愬姛', {
- onClosed: async () => {
- if (!Taro.requestSubscribeMessage) {
- await Message.confirm({ message: '浣犵殑寰俊鐗堟湰杩囦綆锛屼笉鏀寔璁㈤槄娑堟伅锛屾槸鍚︾户缁紵' });
- }
- await Taro.requestSubscribeMessage({
- tmplIds: subscribeMessageTemplateIdsForU,
- success: function (res) {
- console.log('res: ', res);
- },
- });
- jump();
- },
- });
+ handleLoginSuccess();
} else {
noAccess();
}
@@ -124,16 +111,7 @@
password: form.userPassword,
code: loginRes.code,
});
- if (!Taro.requestSubscribeMessage) {
- await Message.confirm({ message: '浣犵殑寰俊鐗堟湰杩囦綆锛屼笉鏀寔璁㈤槄娑堟伅锛屾槸鍚︾户缁紵' });
- }
- await Taro.requestSubscribeMessage({
- tmplIds: subscribeMessageTemplateIdsForU,
- success: function (res) {
- console.log('res: ', res);
- },
- });
- jump();
+ handleLoginSuccess();
}
} else {
noAccess();
@@ -148,6 +126,37 @@
Message.warning('璇峰厛闃呰骞跺嬀閫夊崗璁�');
}
+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);
+ }
+ Taro.requestSubscribeMessage({
+ tmplIds: subscribeMessageTemplateIdsForU,
+ success: function (res) {
+ console.log('res: ', res);
+ },
+ });
+ console.log('setting: ', setting);
+ Message.success('鐧诲綍鎴愬姛', {
+ onClosed: () => {
+ jump();
+ },
+ });
+ } catch (error) {
+ console.log('error: ', error);
+ }
+}
+
function goRegister() {
console.log('RouterPath.registerForm: ', RouterPath.registerForm);
Taro.navigateTo({
--
Gitblit v1.9.1