From bb1901d330a2d8b756762dab92f0974e627d1088 Mon Sep 17 00:00:00 2001
From: cyl <cyl20231031>
Date: Fri, 15 Dec 2023 11:46:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/main.vue | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/views/main.vue b/src/views/main.vue
index 7b5dba4..a877c5e 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -628,14 +628,17 @@ export default {
         localStorage.setItem('daotian_to_admin_username', obj.user.userName ? obj.user.userName : obj.user.nickName)
         localStorage.setItem('daotian_to_admin_roleid', obj.user.agencyRoleId)
         localStorage.setItem('daotian_to_admin_agencyid', obj.user.agencyId)
-        window.open('http://www.idaotian.com/dist2.0.0/#/merchantManagement/homePage')
+		if(window.location.origin.indexOf('www') > -1){
+			window.open('http://www.idaotian.com/dist2.0.0/#/merchantManagement/homePage','_target')
+		}else{
+			window.open('http://idaotian.com/dist2.0.0/#/merchantManagement/homePage','_target')
+		}
       }
     },
     goJiaofu() {
       let obj = JSON.parse(localStorage.getItem('LOGIN_DATA'))
       if (window.location.hostname == 'localhost') {
         // 测试环境，通过URL获取token
-        // window.location.href = 'http://localhost:3000/#/other/delivery?token=' + obj.token + '&username=' + (obj.user.userName ? obj.user.userName : obj.user.nickName) + '&avatar=' + obj.imgSrc + '&roleid=' + obj.user.agencyRoleId;
         window.open('http://localhost:3000/#/other/delivery?token=' + obj.token + '&username=' + (obj.user.userName ? obj.user.userName : obj.user.nickName) + '&avatar=' + obj.imgSrc + '&roleid=' + obj.user.agencyRoleId + '&agencyid=' + obj.user.agencyId)
       } else {
         // 正式环境，通过缓存获取
@@ -644,7 +647,11 @@ export default {
         localStorage.setItem('daotian_to_admin_username', obj.user.userName ? obj.user.userName : obj.user.nickName)
         localStorage.setItem('daotian_to_admin_roleid', obj.user.agencyRoleId)
         localStorage.setItem('daotian_to_admin_agencyid', obj.user.agencyId)
-        window.open('http://www.idaotian.com/dist2.0.0/#/other/delivery')
+		if(window.location.origin.indexOf('www') > -1){
+			window.open('http://www.idaotian.com/dist2.0.0/#/other/delivery','_target')
+		}else{
+			window.open('http://idaotian.com/dist2.0.0/#/other/delivery','_target')
+		}
       }
     },
   },