From 88550d6f43aece6e20c7a52b6e47aff638fb02f3 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期四, 04 十二月 2025 16:23:36 +0800
Subject: [PATCH] feat: 通知

---
 apps/underTakeMiniApp/src/subpackages/mine/setting/setting.vue               |    2 +-
 apps/bMiniApp/src/subpackages/login/loginByForm/accountLoginForm.vue         |    9 +++++----
 apps/underTakeMiniApp/src/subpackages/login/loginByForm/accountLoginForm.vue |   12 +++++++-----
 apps/bMiniApp/src/subpackages/mine/setting/setting.vue                       |    2 +-
 apps/underTakeMiniApp/config/dev.js                                          |    1 +
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/apps/bMiniApp/src/subpackages/login/loginByForm/accountLoginForm.vue b/apps/bMiniApp/src/subpackages/login/loginByForm/accountLoginForm.vue
index 949c44f..794166d 100644
--- a/apps/bMiniApp/src/subpackages/login/loginByForm/accountLoginForm.vue
+++ b/apps/bMiniApp/src/subpackages/login/loginByForm/accountLoginForm.vue
@@ -79,6 +79,7 @@
 const formRef = ref(null);
 const isAccount = ref(false);
 const wxMiniAppUserLoginRes = ref<API.LoginCommandCallback>();
+const loginRes = ref(null);
 
 const form = reactive({
   loading: false,
@@ -104,7 +105,6 @@
 
 async function handleLogin() {
   try {
-    let loginRes = await Taro.login();
     if (props.policyChecked) {
       const { valid } = await formRef.value.validate();
       if (valid) {
@@ -112,7 +112,7 @@
         await userStore.loginByPassword({
           userName: form.userName,
           password: form.userPassword,
-          code: loginRes.code,
+          code: loginRes.value?.code,
         });
         handleLoginSuccess();
       }
@@ -169,9 +169,8 @@
 
 onMounted(async () => {
   try {
-    let loginRes = await Taro.login();
     const params: API.WxmpLoginCommand = {
-      code: loginRes.code,
+      code: loginRes.value?.code,
       type: AppLocalConfig.userType,
       enterpriseType: AppLocalConfig.enterpriseType,
     };
@@ -185,6 +184,8 @@
     if (error?.info?.errorCode == 's401') {
       isAccount.value = false;
     }
+  } finally {
+    loginRes.value = await Taro.login();
   }
 });
 </script>
diff --git a/apps/bMiniApp/src/subpackages/mine/setting/setting.vue b/apps/bMiniApp/src/subpackages/mine/setting/setting.vue
index cc30f04..b6436cc 100644
--- a/apps/bMiniApp/src/subpackages/mine/setting/setting.vue
+++ b/apps/bMiniApp/src/subpackages/mine/setting/setting.vue
@@ -60,7 +60,7 @@
 
 async function handleUnbindWechat() {
   try {
-    if (!isBindWechat) {
+    if (!isBindWechat.value) {
       Message.error('鎮ㄨ繕娌℃湁缁戝畾寰俊');
       return;
     }
diff --git a/apps/underTakeMiniApp/config/dev.js b/apps/underTakeMiniApp/config/dev.js
index 0578270..143686c 100644
--- a/apps/underTakeMiniApp/config/dev.js
+++ b/apps/underTakeMiniApp/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/underTakeMiniApp/src/subpackages/login/loginByForm/accountLoginForm.vue b/apps/underTakeMiniApp/src/subpackages/login/loginByForm/accountLoginForm.vue
index ad613bb..31411a0 100644
--- a/apps/underTakeMiniApp/src/subpackages/login/loginByForm/accountLoginForm.vue
+++ b/apps/underTakeMiniApp/src/subpackages/login/loginByForm/accountLoginForm.vue
@@ -76,6 +76,7 @@
 const formRef = ref(null);
 const isAccount = ref(false);
 const wxMiniAppUserLoginRes = ref<API.LoginCommandCallback>();
+const loginRes = ref(null);
 
 const form = reactive({
   loading: false,
@@ -88,7 +89,7 @@
   userPassword: [{ required: true, message: '璇疯緭鍏ュ瘑鐮�' }],
 });
 
-async function handleLoginByHasAccount() {
+function handleLoginByHasAccount() {
   try {
     if (props.policyChecked) {
       userStore.loginSuccess(wxMiniAppUserLoginRes.value);
@@ -101,7 +102,6 @@
 
 async function handleLogin() {
   try {
-    let loginRes = await Taro.login();
     if (props.policyChecked) {
       const { valid } = await formRef.value.validate();
       if (valid) {
@@ -109,7 +109,7 @@
         await userStore.loginByPassword({
           userName: form.userName,
           password: form.userPassword,
-          code: loginRes.code,
+          code: loginRes.value?.code,
         });
         handleLoginSuccess();
       }
@@ -166,9 +166,9 @@
 
 onMounted(async () => {
   try {
-    let loginRes = await Taro.login();
+    loginRes.value = await Taro.login();
     const params: API.WxmpLoginCommand = {
-      code: loginRes.code,
+      code: loginRes.value?.code,
       type: AppLocalConfig.userType,
       enterpriseType: AppLocalConfig.enterpriseType,
     };
@@ -182,6 +182,8 @@
     if (error?.info?.errorCode == 's401') {
       isAccount.value = false;
     }
+  } finally {
+    loginRes.value = await Taro.login();
   }
 });
 </script>
diff --git a/apps/underTakeMiniApp/src/subpackages/mine/setting/setting.vue b/apps/underTakeMiniApp/src/subpackages/mine/setting/setting.vue
index cc30f04..b6436cc 100644
--- a/apps/underTakeMiniApp/src/subpackages/mine/setting/setting.vue
+++ b/apps/underTakeMiniApp/src/subpackages/mine/setting/setting.vue
@@ -60,7 +60,7 @@
 
 async function handleUnbindWechat() {
   try {
-    if (!isBindWechat) {
+    if (!isBindWechat.value) {
       Message.error('鎮ㄨ繕娌℃湁缁戝畾寰俊');
       return;
     }

--
Gitblit v1.9.1