From 426ac9171d10bc0c09caf74b3313ec692f166e2d Mon Sep 17 00:00:00 2001
From: xuli3099 <jswawa@qq.com>
Date: Thu, 4 Sep 2025 14:34:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9D=80=E5=8F=8A?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development          |  6 +++---
 .env.production           |  4 ++--
 src/App.vue               | 29 ++++++++++++++---------------
 src/pages/login/login.vue | 27 +++++++++++++++++++--------
 4 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/.env.development b/.env.development
index 96551b7..934abf9 100644
--- a/.env.development
+++ b/.env.development
@@ -1,12 +1,12 @@
 
 #调用后台地址
 # 公司
-VITE_APP_BASE_URL = 'http://118.186.13.120:31302'
+# VITE_APP_BASE_URL = 'http://118.186.13.120:31302'
 # VITE_APP_BASE_URL = "http://192.168.236.71:31302"
 # VITE_APP_BASE_URL = "http://123.57.20.168:3000"
 
 # 友晟外网
-# VITE_APP_BASE_URL = 'https://app-test.718yousheng.com'
+VITE_APP_BASE_URL = 'https://app-test.718yousheng.com/app'
 # 友晟内网
-# VITE_APP_BASE_URL = 'https://appi-test.718yousheng.com'
+# VITE_APP_BASE_URL = 'https://appi-test.718yousheng.com/app'
 
diff --git a/.env.production b/.env.production
index 399c1d5..6731db1 100644
--- a/.env.production
+++ b/.env.production
@@ -6,6 +6,6 @@
 # VITE_APP_BASE_URL = "http://123.57.20.168:3000"
 
 # 友晟外网
-VITE_APP_BASE_URL = 'https://app-test.718yousheng.com'
+VITE_APP_BASE_URL = 'https://app-test.718yousheng.com/app'
 # 友晟内网
-# VITE_APP_BASE_URL = 'https://appi-test.718yousheng.com'
+# VITE_APP_BASE_URL = 'https://appi-test.718yousheng.com/app'
\ No newline at end of file
diff --git a/src/App.vue b/src/App.vue
index 499cb5c..ee78382 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -15,24 +15,23 @@ onLaunch((opt) => {
 	console.log("APP onLaunch")
 	
     // #ifdef APP-PLUS
-    uni.getPushClientId({
-        success: (res) => {
-            let push_clientid = res.cid
-            console.log('客户端推送标识:', push_clientid);
-        },
-        fail(err) {
-            console.log(err)
-        }
-    })
-
+    // uni.getPushClientId({
+    //     success: (res) => {
+    //         let push_clientid = res.cid
+    //         console.log('客户端推送标识:', push_clientid);
+    //     },
+    //     fail(err) {
+    //         console.log(err)
+    //     }
+    // })
     uni.onPushMessage(res => {
         console.log("收到推送消息：", res) //监听推送消息
         showAlert(JSON.stringify(res))
-        uni.createPushMessage({
-            title: res.data.title,
-            content: res.data.content,
-            payload: res.data.payload
-        })
+        // uni.createPushMessage({
+        //     title: res.data.title,
+        //     content: res.data.content,
+        //     payload: res.data.payload
+        // })
     })
     // #endif
 })
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index 99d3ca4..55638f0 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -266,7 +266,7 @@ const submitForm = () => {
             //h5测试用 内网-sn123456
             //公司外网 'd5aa6eaf-fff7-4009-bf7e-60e4b3dc4f40'
             //友晟外网 'b97527c8-2ad4-493c-a01c-5f9d0aabaff2' 
-            param.uniqCode = 'd5aa6eaf-fff7-4009-bf7e-60e4b3dc4f40';
+            param.uniqCode = 'b97527c8-2ad4-493c-a01c-5f9d0aabaff2';
             let res = await login(param);
             userStore.login(res);
             uni.switchTab({ url: '/pages/home/home' })
@@ -281,13 +281,24 @@ const submitForm = () => {
                         let deviceId =  res3.data;
                         // showAlert("读取成功=>"+deviceId);
                         param.uniqCode = deviceId;
-                        console.log("param=>",param)
-                        login(param).then(res=>{
-                            userStore.login(res);
-                            uni.switchTab({ url: '/pages/home/home' })
-                            btnLoading.value = false;
-                        }).finally(()=>{
-                            btnLoading.value = false;
+
+                        uni.getPushClientId({
+                            success: (res) => {
+                                let push_clientid = res.cid
+                                console.log('客户端推送标识:', push_clientid);
+                                console.log("param=>",param)
+                                // showAlert("客户端推送标识=>"+push_clientid);
+                                login(param).then(res=>{
+                                    userStore.login(res);
+                                    uni.switchTab({ url: '/pages/home/home' })
+                                    btnLoading.value = false;
+                                }).finally(()=>{
+                                    btnLoading.value = false;
+                                })
+                            },
+                            fail(err) {
+                                console.log(err)
+                            }
                         })
                        
                     } else {