From f44d19582973633d88814b6e9ff6d90f25509a60 Mon Sep 17 00:00:00 2001
From: unknown <331404948@qq.com>
Date: Wed, 5 Jun 2024 11:45:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                    | 27 ++++++++++++++++++++++++---
 pages/userCenter/login/login.vue |  6 ++----
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/manifest.json b/manifest.json
index 6521008..8f1110c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "洛阳学车",
     "appid" : "__UNI__3347C6E",
     "description" : "",
-    "versionName" : "1.2.8",
-    "versionCode" : 128,
+    "versionName" : "1.2.9",
+    "versionCode" : 129,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -163,6 +163,27 @@
                     "pid" : "16895",
                     "parameters" : {}
                 }
+            },
+            "KJ-TencentLocation" : {
+                "andorid_key" : "BPMBZ-VSKE3-MC23F-O3KZO-AZGI7-PXFJI",
+                "__plugin_info__" : {
+                    "name" : "腾讯定位、定位反作弊、伪定位、后台定位、单次或持续定位、场景定位(双端)",
+                    "description" : "支持获取oaid、腾讯定位、定位反作弊、伪定位、后台定位、单次或持续定位、场景定位、请试用合适再购买、请试用合适再购买、请试用合适再购买",
+                    "platforms" : "Android,iOS",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=12983",
+                    "android_package_name" : "com.junan.luoyangxueche",
+                    "ios_bundle_id" : "com.junan.luoyangxueche",
+                    "isCloud" : true,
+                    "bought" : 1,
+                    "pid" : "12983",
+                    "parameters" : {
+                        "andorid_key" : {
+                            "des" : "配置andoridApiKey，ios的在init方法里设置apiKey",
+                            "key" : "TencentMapSDK",
+                            "value" : ""
+                        }
+                    }
+                }
             }
         }
     },
@@ -204,7 +225,7 @@
             "disableHostCheck" : true,
             "proxy" : {
                 "/api" : {
-                    "target" : "http://192.168.1.40:8318/",
+                    "target" : "http://192.168.1.43:8318/",
                     // "target" : "http://123.6.232.1:8099/",
                     "changeOrigin" : true,
                     "secure" : true,
diff --git a/pages/userCenter/login/login.vue b/pages/userCenter/login/login.vue
index 96f5608..ebd7a9a 100644
--- a/pages/userCenter/login/login.vue
+++ b/pages/userCenter/login/login.vue
@@ -128,13 +128,11 @@
 						})
 					}else {
 						const pages = getCurrentPages();
-						console.log('有几个pages')
-						console.log(pages)
-						if(pages.length<1) { 
-							console.log('走首页')
+						if(pages.length<1||this.redirect=='/pages/mineEntry/personaInfo/personaInfo') { 
 							uni.switchTab({
 								url: '/pages/tabbar/index/index'
 							})
+							return
 						}
 						console.log('走返回')
 						uni.navigateBack()