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()