diff --git a/src/api/login.js b/src/api/login.js
index c8d3628..0bc4273 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -43,3 +43,10 @@ export function updatePswApi(data) {
     data: setqs(data),
   });
 }
+// 检查token信息获取最新登录信息
+export function checkTokenApi(data) {
+  return request({
+    url: "/appLoginByToken",
+    method: "get",
+  });
+}
diff --git a/src/api/userinfo.js b/src/api/userinfo.js
index 221c61a..b85cf3b 100644
--- a/src/api/userinfo.js
+++ b/src/api/userinfo.js
@@ -116,7 +116,7 @@ export function setUserPswApi (data) {
 export function setUserTelApi (data) {
   return request({
     url: "/yishoudan/user/changeTel",
-    // method: "post",
+    method: "post",
     data: setqs(data),
   });
 }
@@ -213,8 +213,21 @@ export function dataStatisticsListApiold (data) {
   });
 }
 
+// 团队列表获取
+export function getTeamListApi (data) {
+  return request({
+    url: "/yishoudan/agency/group/user/listByUser",
+    method: "get",
+  });
+}
 
 
-
+// 切换团队
+export function changeTeamApi(agencyId) {
+  return request({
+    url: `/yishoudan/agency/group/user/changeGroup/${agencyId}`,
+    method: "get",
+  });
+}
 
 
diff --git a/src/components/FirstJob/components/recommend.vue b/src/components/FirstJob/components/recommend.vue
index e118c56..4a696e0 100644
--- a/src/components/FirstJob/components/recommend.vue
+++ b/src/components/FirstJob/components/recommend.vue
@@ -168,7 +168,7 @@ export default {
     }
   }
   .jobBox {
-    padding: 16px 20px;
+    padding: 16px 20px 0 20px;
     border-radius: 0 0 6px 6px;
     overflow: hidden;
     .jobinfobox:last-of-type {
diff --git a/src/components/FirstJob/components/recordSuccess.vue b/src/components/FirstJob/components/recordSuccess.vue
index 6f8124e..2c20d89 100644
--- a/src/components/FirstJob/components/recordSuccess.vue
+++ b/src/components/FirstJob/components/recordSuccess.vue
@@ -13,8 +13,8 @@
       <!-- <a-breadcrumb-item href="" v-if="!islist"> -->
       <a-breadcrumb-item>
         <router-link :to="'/detail?id=' + firminfo.id">
-          <!-- <span @click="$router.back(-1)">企业详情</span> -->
-          <span>企业详情</span>
+          <!-- <span @click="$router.back(-1)">职位详情</span> -->
+          <span>职位详情</span>
         </router-link>
       </a-breadcrumb-item>
       <a-breadcrumb-item href="">
diff --git a/src/components/FirstJob/detail.vue b/src/components/FirstJob/detail.vue
index 72daece..ee54127 100644
--- a/src/components/FirstJob/detail.vue
+++ b/src/components/FirstJob/detail.vue
@@ -13,7 +13,7 @@
 				</a>
 			</a-breadcrumb-item>
 			<a-breadcrumb-item href>
-				<span style="color: #333">{{ from == "vocational" ? "详情" : "企业详情" }}</span>
+				<span style="color: #333">{{ from == "vocational" ? "详情" : "职位详情" }}</span>
 			</a-breadcrumb-item>
 		</a-breadcrumb>
 		<!-- 主体区域 -->
@@ -425,7 +425,7 @@
 				<div class="companyinfo" v-if="from != 'vocational'">
 					<div class="companydetail">
 						<h1 class="bottombox">
-							<i>企业详情</i>
+							<i>职位详情</i>
 						</h1>
 					</div>
 					<div class="companylocation" style="text-align: center; padding: 0 20px 20px" v-if="positionInfo.lng">
diff --git a/src/components/FirstJob/joblist.vue b/src/components/FirstJob/joblist.vue
index 87a4f26..ed48354 100644
--- a/src/components/FirstJob/joblist.vue
+++ b/src/components/FirstJob/joblist.vue
@@ -222,7 +222,7 @@
 			<div class="maincontentleft" v-if="!isVocational" style="padding-top: 50px">
 				<div class="tabBar" @click="changeTab($event)">
 					<div class="tabSubset" :class="{ active: signType == '' }" data-type="0">全部</div>
-					<div class="tabSubset" :class="{ active: signType == 1 }" v-if="loginValue.agencyName == '郑州一才工作'" data-type="1">一才</div>
+					<div class="tabSubset" :class="{ active: signType == 1 }" v-if="loginValue.agencyName == '郑州一才工作' || loginValue.agencyName == '一才工作'" data-type="1">一才</div>
 					<!-- <div class="tabSubset" :class="{ active: signType == 2 }" data-type="2">三方</div> -->
 				</div>
 				<div class="filter" v-show="signType == ''" :class="[filterStatus == 0 ? '' : 'nobd']" style>
@@ -539,11 +539,11 @@
 										</span>
 										<span v-for="(item1, index) in item.jobSpecialLabelNames" :key="index">{{ item1 }}</span>
 										<span v-if="item.jobSpecialLabelNames.length == 0">暂无特色</span>
-									</div>
-									
+									</div>				
 									<div class="jobpricehour" v-html="getSalaryClassifyValue(item.salaryClassify, item.salaryClassifyValue)"></div>
                   <div class="jobpricemonth" v-if="item.minMonthlyPay">
 										<template v-if="formvalue.signType != 1">
+
 											<span>{{ item.minMonthlyPay ? item.minMonthlyPay : "" }}</span
 											>-<span>{{ item.maxMonthlyPay ? item.maxMonthlyPay : "" }}</span
 											>元/月
@@ -1761,8 +1761,8 @@ export default {
 				this.formvalue.aliasName = "";
 				this.formvalue.keys = "";
 				this.formvalue.ageStr = "";
-
-        if (this.formvalue.signType != 0) {
+        console.log('this.formvalue',this.formvalue);
+        if (this.formvalue.signType == 1) {
 					this.getJobListYicai();
 				} else {
 					this.getJobList();
diff --git a/src/components/FirstJob/recordBill.vue b/src/components/FirstJob/recordBill.vue
index 1ad972e..5b394c4 100644
--- a/src/components/FirstJob/recordBill.vue
+++ b/src/components/FirstJob/recordBill.vue
@@ -14,8 +14,8 @@
 			</a-breadcrumb-item>
 			<a-breadcrumb-item>
 				<router-link :to="'/detail'">
-					<!-- <span @click="$router.back(-1)">企业详情</span> -->
-					<span>企业详情</span>
+					<!-- <span @click="$router.back(-1)">职位详情</span> -->
+					<span>职位详情</span>
 				</router-link>
 			</a-breadcrumb-item>
 			<a-breadcrumb-item href>
diff --git a/src/components/FirstJob/recordBillYicai.vue b/src/components/FirstJob/recordBillYicai.vue
index a2a3f46..fe45de4 100644
--- a/src/components/FirstJob/recordBillYicai.vue
+++ b/src/components/FirstJob/recordBillYicai.vue
@@ -14,8 +14,8 @@
 			</a-breadcrumb-item>
 			<a-breadcrumb-item>
 				<router-link :to="'/detailYicai'">
-					<!-- <span @click="$router.back(-1)">企业详情</span> -->
-					<span>企业详情</span>
+					<!-- <span @click="$router.back(-1)">职位详情</span> -->
+					<span>职位详情</span>
 				</router-link>
 			</a-breadcrumb-item>
 			<a-breadcrumb-item href>
diff --git a/src/components/Login/login.vue b/src/components/Login/login.vue
index cdae9e0..7bf7308 100644
--- a/src/components/Login/login.vue
+++ b/src/components/Login/login.vue
@@ -1,467 +1,497 @@
 <template>
-  <div class="center">
-    <div class="formcontainer">
-      <div class="logo">
-        <!--  <svg class="icon" aria-hidden="true">
+	<div class="center">
+		<div class="formcontainer">
+			<div class="logo">
+				<!--  <svg class="icon" aria-hidden="true">
           <use xlink:href="#icon-yishoudanlogo"></use>
         </svg>-->
-        <img src="http://matripe.oss-cn-beijing.aliyuncs.com/bcSVG/dtLogo.png" style="width: 64px; text-align: center" alt />
-      </div>
-      <ul class="loginchange centerall">
-        <li :class="{ loginactive: loginway === 1 }" @click="loginway = 1">密码登录</li>
-        <li :class="{ loginactive: loginway === 2 }" @click="loginway = 2">验证码登录</li>
-      </ul>
-      <div class="formbox">
-        <!-- <template v-show="loginway === 1"> -->
-          <a-form id="components-form-demo-normal-login" v-show="loginway === 1" :form="form" class="login-form" @submit="userhandleSubmit">
-            <a-form-item style="text-align: left">
-              <a-input v-decorator="[ 'tel', { rules: [ { required: true, message: '请输入手机号' }, 	{ pattern: /^1[3456789]\d{9}$/, message: '请输入正确手机号' }, ], validateTrigger: 'submit', 	}, 	]" :maxLength="11" placeholder="请输入手机号">
-                <i slot="prefix" class="iconfont icon-yonghuming" style="font-size: 24px" />
-              </a-input>
-            </a-form-item>
-            <a-form-item style="text-align: left">
-              <a-input v-decorator="[
-									'password',
-									{
-										rules: [
-											{
-												required: true,
-												message: '请输入密码',
-											},
-										],
-										validateTrigger: 'submit',
-									},
-								]" type="password" placeholder="请输入密码">
-                <i slot="prefix" class="iconfont icon-mima" />
-              </a-input>
-            </a-form-item>
-            <div class="autologin">
-              <span @click="isauto = !isauto" style="opacity: 0">
-                <i class="iconfont icon-xuanzhong" v-if="isauto"></i>
-                <i class="iconfont icon-weixuanzhong" v-else style="color: #999"></i>
-                <label for="register">下次自动登录</label>
-              </span>
-              <!-- <router-link to="updatepsw" class="login-form-forgot" href>忘记密码</router-link> -->
-              <div @click="showModal" class="login-form-forgot" style="cursor:pointer">忘记密码</div>
-            </div>
-            <a-form-item class="mb0">
-              <a-button type="primary" html-type="submit" class="login-form-button">登录</a-button>
-            </a-form-item>
-            <div class="mt16 f12" style="color:#576B95">
-              <router-link to="/main">返回首页</router-link>
-            </div>
-          </a-form>
-          <!-- <div class="register">
+				<img src="http://matripe.oss-cn-beijing.aliyuncs.com/bcSVG/dtLogo.png" style="width: 64px; text-align: center" alt />
+			</div>
+			<ul class="loginchange centerall">
+				<li :class="{ loginactive: loginway === 1 }" @click="loginway = 1">密码登录</li>
+				<li :class="{ loginactive: loginway === 2 }" @click="loginway = 2">验证码登录</li>
+			</ul>
+			<div class="formbox">
+				<!-- <template v-show="loginway === 1"> -->
+				<a-form id="components-form-demo-normal-login" v-show="loginway === 1" :form="form" class="login-form" @submit="userhandleSubmit">
+					<a-form-item style="text-align: left">
+						<a-input
+							v-decorator="[
+								'tel',
+								{
+									rules: [
+										{ required: true, message: '请输入手机号' },
+										{ pattern: /^1[3456789]\d{9}$/, message: '请输入正确手机号' },
+									],
+									validateTrigger: 'submit',
+								},
+							]"
+							:maxLength="11"
+							placeholder="请输入手机号"
+						>
+							<i slot="prefix" class="iconfont icon-yonghuming" style="font-size: 24px" />
+						</a-input>
+					</a-form-item>
+					<a-form-item style="text-align: left">
+						<a-input
+							v-decorator="[
+								'password',
+								{
+									rules: [
+										{
+											required: true,
+											message: '请输入密码',
+										},
+									],
+									validateTrigger: 'submit',
+								},
+							]"
+							type="password"
+							placeholder="请输入密码"
+						>
+							<i slot="prefix" class="iconfont icon-mima" />
+						</a-input>
+					</a-form-item>
+					<div class="autologin">
+						<span @click="isauto = !isauto" style="opacity: 0">
+							<i class="iconfont icon-xuanzhong" v-if="isauto"></i>
+							<i class="iconfont icon-weixuanzhong" v-else style="color: #999"></i>
+							<label for="register">下次自动登录</label>
+						</span>
+						<!-- <router-link to="updatepsw" class="login-form-forgot" href>忘记密码</router-link> -->
+						<div @click="showModal" class="login-form-forgot" style="cursor: pointer">忘记密码</div>
+					</div>
+					<a-form-item class="mb0">
+						<a-button type="primary" html-type="submit" class="login-form-button">登录</a-button>
+					</a-form-item>
+					<div class="mt16 f12" style="color: #576b95">
+						<router-link to="/main">返回首页</router-link>
+					</div>
+				</a-form>
+				<!-- <div class="register">
             <router-link to="/register">还没有账号，立即注册</router-link>
           </div>-->
-        <!-- </template>
+				<!-- </template>
         <template v-show="loginway === 2"> -->
-          <a-form id="components-form-demo-normal-login" v-show="loginway === 2" :form="form1" class="login-form" @submit="phonehandleSubmit">
-            <a-form-item style="text-align: left">
-              <a-input v-decorator="[
-									'tel',
-									{
-										rules: [
-											{ required: true, message: '请输入手机号' },
-											{
-												pattern: /^1[3456789]\d{9}$/,
-												message: '请输入正确手机号',
-											},
-										],
-										validateTrigger: 'submit',
-									},
-								]" autocomplete="off" :maxLength="11" placeholder="请输入手机号">
-                <i slot="prefix" class="icon-shouji iconfont" style="font-size: 24px" />
-              </a-input>
-            </a-form-item>
-            <a-form-item style="text-align: left">
-              <a-input v-decorator="[
-									'code',
-									{
-										rules: [
-											{
-												required: true,
-												message: '请输入验证码',
-											},
-										],
-										validateTrigger: 'submit',
-									},
-								]" type="text" placeholder="请输入验证码">
-                <i slot="prefix" class="icon-duanxinyanzheng iconfont" />
-                <span class="getrulecode" slot="suffix">
-                  <span @click="getPhoneCode" data-mark="getcode" v-if="timedata.isfinish">获取验证码</span>
-                  <timmer :timedata="timedata" v-if="!timedata.isfinish" />
-                </span>
-              </a-input>
-            </a-form-item>
-            <div class="autologin">
-              <span @click="isauto = !isauto" style="opacity: 0">
-                <i class="iconfont icon-xuanzhong" v-if="isauto"></i>
-                <i class="iconfont icon-weixuanzhong" v-else style="color: #999"></i>
-                <label for="register">下次自动登录</label>
-              </span>
-              <!-- <router-link to="/updatepsw" class="login-form-forgot" href>忘记密码</router-link> -->
-            </div>
-            <a-form-item class="mb0">
-              <a-button type="primary" html-type="submit" class="login-form-button">登录</a-button>
-            </a-form-item>
-            <div class="mt16 f12" style="color:#576B95">
-              <router-link to="/main">返回首页</router-link>
-            </div>
-          </a-form>
+				<a-form id="components-form-demo-normal-login" v-show="loginway === 2" :form="form1" class="login-form" @submit="phonehandleSubmit">
+					<a-form-item style="text-align: left">
+						<a-input
+							v-decorator="[
+								'tel',
+								{
+									rules: [
+										{ required: true, message: '请输入手机号' },
+										{
+											pattern: /^1[3456789]\d{9}$/,
+											message: '请输入正确手机号',
+										},
+									],
+									validateTrigger: 'submit',
+								},
+							]"
+							autocomplete="off"
+							:maxLength="11"
+							placeholder="请输入手机号"
+						>
+							<i slot="prefix" class="icon-shouji iconfont" style="font-size: 24px" />
+						</a-input>
+					</a-form-item>
+					<a-form-item style="text-align: left">
+						<a-input
+							v-decorator="[
+								'code',
+								{
+									rules: [
+										{
+											required: true,
+											message: '请输入验证码',
+										},
+									],
+									validateTrigger: 'submit',
+								},
+							]"
+							type="text"
+							placeholder="请输入验证码"
+						>
+							<i slot="prefix" class="icon-duanxinyanzheng iconfont" />
+							<span class="getrulecode" slot="suffix">
+								<span @click="getPhoneCode" data-mark="getcode" v-if="timedata.isfinish">获取验证码</span>
+								<timmer :timedata="timedata" v-if="!timedata.isfinish" />
+							</span>
+						</a-input>
+					</a-form-item>
+					<div class="autologin">
+						<span @click="isauto = !isauto" style="opacity: 0">
+							<i class="iconfont icon-xuanzhong" v-if="isauto"></i>
+							<i class="iconfont icon-weixuanzhong" v-else style="color: #999"></i>
+							<label for="register">下次自动登录</label>
+						</span>
+						<!-- <router-link to="/updatepsw" class="login-form-forgot" href>忘记密码</router-link> -->
+					</div>
+					<a-form-item class="mb0">
+						<a-button type="primary" html-type="submit" class="login-form-button">登录</a-button>
+					</a-form-item>
+					<div class="mt16 f12" style="color: #576b95">
+						<router-link to="/main">返回首页</router-link>
+					</div>
+				</a-form>
 
-          <!-- <div class="register">
+				<!-- <div class="register">
             <router-link to="/register">还没有账号，立即注册</router-link>
           </div>-->
-        <!-- </template> -->
-        <a-modal title="找回密码" :width="760" footer :visible="loginShow" class="modal" @ok="handleOk" @cancel="handleCancel" :maskClosable="false" okText="提交" cancelText="取消" :destroyOnClose="true">
-          <loginpsw :loginShow.sync='loginShow'></loginpsw>
-        </a-modal>
-      </div>
-    </div>
-  </div>
+				<!-- </template> -->
+				<a-modal title="找回密码" :width="760" footer :visible="loginShow" class="modal" @ok="handleOk" @cancel="handleCancel" :maskClosable="false" okText="提交" cancelText="取消" :destroyOnClose="true">
+					<loginpsw :loginShow.sync="loginShow"></loginpsw>
+				</a-modal>
+			</div>
+		</div>
+	</div>
 </template>
 
 <script>
-import { loginApi, getPhoneCodeApi } from '../../api/login'
-import timmer from './components/countback.vue'
-import loginpsw from './updatepsw.vue'
-import Cookies from 'js-cookie'
+import { loginApi, getPhoneCodeApi } from "../../api/login";
+import timmer from "./components/countback.vue";
+import loginpsw from "./updatepsw.vue";
+import Cookies from "js-cookie";
 
 export default {
-  inject: ['reload'],
-  // 组件名称
-  name: '',
-  // 局部注册的组件
-  components: {
-    timmer,
-    loginpsw,
-  },
-  // 组件参数 接收来自父组件的数据
-  props: {},
-  // 组件状态值
-  data() {
-    return {
-      loginway: 1,
-      ischecked: false,
-      isauto: false, // 是否自动登录
-      form: this.$form.createForm(this),
-      form1: this.$form.createForm(this),
-      timedata: {
-        isfinish: true,
-        deadline: 60,
-        timmer: null,
-      },
-      loginShow: false,
-    }
-  },
-  // 计算属性
-  computed: {},
-  // 侦听器
-  watch: {
-    loginway(val) {
-      console.log(val)
-      setTimeout(() => {
-      console.log(this.form.getFieldsValue().tel);
-        if (val == 2 && this.form.getFieldsValue().tel != undefined) {
-      console.log(this.form.getFieldsValue().tel);
-          this.form1.setFieldsValue({
-            tel: this.form.getFieldsValue().tel,
-          })
-        } else if (val == 1 && this.form1.getFieldsValue().tel) {
-          this.form.setFieldsValue({
-            tel: this.form1.getFieldsValue().tel,
-          })
-        }
-      }, 10)
-    },
-  },
-  // 生命周期钩子   注：没用到的钩子请自行删除
-  /**
-   * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
-   */
-  created() {},
-  /**
-   * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
-   * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
-   */
-  mounted() {},
-  // 组件方法
-  methods: {
-    userhandleSubmit(e) {
-      // 用户名登录提交
-      e.preventDefault()
-      let params
-      this.form.validateFields(async (err, values) => {
-        console.log(values)
-        if (!err) {
-          params = { ...values, loginType: 0 }
+	inject: ["reload"],
+	// 组件名称
+	name: "",
+	// 局部注册的组件
+	components: {
+		timmer,
+		loginpsw,
+	},
+	// 组件参数 接收来自父组件的数据
+	props: {},
+	// 组件状态值
+	data() {
+		return {
+			loginway: 1,
+			ischecked: false,
+			isauto: false, // 是否自动登录
+			form: this.$form.createForm(this),
+			form1: this.$form.createForm(this),
+			timedata: {
+				isfinish: true,
+				deadline: 60,
+				timmer: null,
+			},
+			loginShow: false,
+		};
+	},
+	// 计算属性
+	computed: {},
+	// 侦听器
+	watch: {
+		loginway(val) {
+			console.log(val);
+			setTimeout(() => {
+				console.log(this.form.getFieldsValue().tel);
+				if (val == 2 && this.form.getFieldsValue().tel != undefined) {
+					console.log(this.form.getFieldsValue().tel);
+					this.form1.setFieldsValue({
+						tel: this.form.getFieldsValue().tel,
+					});
+				} else if (val == 1 && this.form1.getFieldsValue().tel) {
+					this.form.setFieldsValue({
+						tel: this.form1.getFieldsValue().tel,
+					});
+				}
+			}, 10);
+		},
+	},
+	// 生命周期钩子   注：没用到的钩子请自行删除
+	/**
+	 * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
+	 */
+	created() {},
+	/**
+	 * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
+	 * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
+	 */
+	mounted() {},
+	// 组件方法
+	methods: {
+		userhandleSubmit(e) {
+			// 用户名登录提交
+			e.preventDefault();
+			let params;
+			this.form.validateFields(async (err, values) => {
+				console.log(values);
+				if (!err) {
+					params = { ...values, loginType: 0 };
 
-          console.log(params)
-          try {
-            const { data } = await loginApi(params)
+					console.log(params);
+					try {
+						const { data } = await loginApi(params);
 
-            console.log(data)
-            if (data.status !== 200) {
-              this.$message.warning(data.msg)
-              return
-            }
-            localStorage.setItem('LOGIN_DATA', JSON.stringify(data.data))
-            this.$router.push('/list')
-            // console.log(Cookies.get("LOGIN_DATA"));
-            this.reload()
-            // this.$router.push("/list");
-          } catch (err) {
-            console.log(err)
-          }
-        } else {
-          console.log(err)
-        }
-      })
-    },
-    phonehandleSubmit(e) {
-      e.preventDefault()
-      let params
-      this.form1.validateFields(async (err, values) => {
-        console.log(err)
-        if (!err) {
-          params = { ...values, loginType: 1 }
-          try {
-            const { data } = await loginApi(params)
-            console.log(data)
-            if (data.status !== 200) {
-              this.$message.warning(data.msg)
-              return
-            }
-            localStorage.setItem('LOGIN_DATA', JSON.stringify(data.data))
-            this.$router.push('/list')
-            this.reload()
-          } catch (err) {
-            console.log(err)
-          }
-        } else {
-          console.log(err)
-        }
-      })
-    },
-    async getPhoneCode() {
-      const that = this
+						console.log(data);
+						if (data.status !== 200) {
+							this.$message.warning(data.msg);
+							return;
+						}
+						localStorage.setItem("DAOTIAN_agencyid", data.data.user.agencyId);
+						localStorage.setItem("LOGIN_DATA", JSON.stringify(data.data));
+						localStorage.setItem("LOGIN_DATA_token", data.data.token);
 
-      this.form1.validateFields(['tel'], async (err, values) => {
-        console.log(values)
+						this.$router.push("/list");
+						// console.log(Cookies.get("LOGIN_DATA"));
+						this.reload();
+						// this.$router.push("/list");
+					} catch (err) {
+						console.log(err);
+					}
+				} else {
+					console.log(err);
+				}
+			});
+		},
+		phonehandleSubmit(e) {
+			e.preventDefault();
+			let params;
+			this.form1.validateFields(async (err, values) => {
+				console.log(err);
+				if (!err) {
+					params = { ...values, loginType: 1 };
+					try {
+						const { data } = await loginApi(params);
+						console.log(data);
+						if (data.status !== 200) {
+							this.$message.warning(data.msg);
+							return;
+						}
+						localStorage.setItem("DAOTIAN_agencyid", data.data.user.agencyId);
+						localStorage.setItem("LOGIN_DATA", JSON.stringify(data.data));
+						localStorage.setItem("LOGIN_DATA_token", data.data.token);
+						this.$router.push("/list");
+						this.reload();
+					} catch (err) {
+						console.log(err);
+					}
+				} else {
+					console.log(err);
+				}
+			});
+		},
+		async getPhoneCode() {
+			const that = this;
 
-        if (!err) {
-          that.timedata.isfinish = false
+			this.form1.validateFields(["tel"], async (err, values) => {
+				console.log(values);
 
-          try {
-            const { data } = await getPhoneCodeApi({ tel: values.tel })
-            console.log(data)
-            if (data.status !== 200) {
-              this.$message.warning(data.msg)
-            }
-          } catch (error) {
-            console.log(error)
-          }
-        } else {
-          console.log(err)
-        }
-      })
-    },
-    showModal() {
-      console.log('modal')
-      this.loginShow = true
-    },
-    /**
-     * 关闭忘记密码弹窗
-     *
-     *
-     */
-    handleCancel() {
-      this.loginShow = false
-      console.log(123
-      );
-    },
-    /**
-     * 提交更改密码信息
-     *
-     *
-     */
-    handleOk() {},
-    checked() {
-      console.log(this.ischecked)
-    },
-  },
-}
+				if (!err) {
+					that.timedata.isfinish = false;
+
+					try {
+						const { data } = await getPhoneCodeApi({ tel: values.tel });
+						console.log(data);
+						if (data.status !== 200) {
+							this.$message.warning(data.msg);
+						}
+					} catch (error) {
+						console.log(error);
+					}
+				} else {
+					console.log(err);
+				}
+			});
+		},
+		showModal() {
+			console.log("modal");
+			this.loginShow = true;
+		},
+		/**
+		 * 关闭忘记密码弹窗
+		 *
+		 *
+		 */
+		handleCancel() {
+			this.loginShow = false;
+			console.log(123);
+		},
+		/**
+		 * 提交更改密码信息
+		 *
+		 *
+		 */
+		handleOk() {},
+		checked() {
+			console.log(this.ischecked);
+		},
+	},
+};
 </script>
 
 <style scoped lang="less">
 .center {
-  width: 240px;
-  margin: 0 auto;
-  overflow: hidden;
-  /deep/ .login-form {
-    background-color: #fff !important;
-  }
-  .centerall {
-    margin: 0 auto;
-  }
-  .logo {
-    margin: 40px auto 0px;
-    text-align: center;
-    // img {
-    //   width: 100%;
-    //   height: 100%;
-    // }
-    svg {
-      width: 150px;
-      // height: 46px;
-      text-align: center;
-      font-size: 52px;
-      line-height: 52px;
-      // color: initial;
-    }
-  }
-  .loginchange {
-    display: flex;
-    width: 230px;
-    justify-content: space-around;
-    margin-top: 10px;
-    font-weight: bold;
-    .loginactive {
-      color: #4d575e;
-      border-bottom: 1px solid #4d575e;
-    }
-    li {
-      padding: 0 0 4px 0;
-      margin-bottom: 24px;
-      margin-top: 20px;
-      font-size: 14px;
-      text-align: left;
-      color: #cccccc;
-      line-height: 22px;
-      cursor: pointer;
-    }
-  }
-  .formbox {
-    // /deep/ .ant-form-item {
-    // margin-bottom: 0px !important;
-    // padding-bottom: 20px !important;
-    // }
-    /deep/.ant-form-item {
-      // margin-top: -10px;
-      /deep/ .ant-form-explain {
-        // 提示信息的样式
-        margin-top: -2px;
-        line-height: 20px;
-        min-height: 20px !important;
-      }
-      i {
-        font-size: 26px;
-        // margin: 0 8px 0 4px;
-        color: #4d575e;
-      }
+	width: 240px;
+	margin: 0 auto;
+	overflow: hidden;
+	/deep/ .login-form {
+		background-color: #fff !important;
+	}
+	.centerall {
+		margin: 0 auto;
+	}
+	.logo {
+		margin: 40px auto 0px;
+		text-align: center;
+		// img {
+		//   width: 100%;
+		//   height: 100%;
+		// }
+		svg {
+			width: 150px;
+			// height: 46px;
+			text-align: center;
+			font-size: 52px;
+			line-height: 52px;
+			// color: initial;
+		}
+	}
+	.loginchange {
+		display: flex;
+		width: 230px;
+		justify-content: space-around;
+		margin-top: 10px;
+		font-weight: bold;
+		.loginactive {
+			color: #4d575e;
+			border-bottom: 1px solid #4d575e;
+		}
+		li {
+			padding: 0 0 4px 0;
+			margin-bottom: 24px;
+			margin-top: 20px;
+			font-size: 14px;
+			text-align: left;
+			color: #999;
+			line-height: 22px;
+			cursor: pointer;
+		}
+	}
+	.formbox {
+		// /deep/ .ant-form-item {
+		// margin-bottom: 0px !important;
+		// padding-bottom: 20px !important;
+		// }
+		/deep/.ant-form-item {
+			// margin-top: -10px;
+			/deep/ .ant-form-explain {
+				// 提示信息的样式
+				margin-top: -2px;
+				line-height: 20px;
+				min-height: 20px !important;
+			}
+			i {
+				font-size: 26px;
+				// margin: 0 8px 0 4px;
+				color: #4d575e;
+			}
 
-      .ant-input {
-        height: 36px;
-        text-indent: 15px;
-        // background-color: #f6f6f6;
-        // border: none;
-        padding: 0 0 0 23px !important;
-        border: 1px solid #dddddd;
-        &:hover {
-          border-color: #ff4400;
-        }
-        &:focus {
-          box-shadow: none;
-        }
-        &::placeholder {
-          opacity: 0.4;
-          color: #4d575e;
-          font-size: 14px;
-          text-indent: 15px;
-        }
-      }
-    }
-    .login-form-button {
-      width: 100%;
-      height: 36px;
-      margin-top: 20px;
-      border-radius: 27px;
-      background-color: #ff4400;
-      font-size: 16px;
-      border: none;
-      color: white;
-      box-shadow: none;
-      &::after {
-        display: none;
-      }
-      &:hover {
-        background-color: #ff4400cc;
-      }
-      &:active {
-        background-color: #ff4400;
-      }
-    }
-    .register {
-      display: flex;
-      justify-content: center;
-      font-size: 12px;
-      span {
-        color: #4d575e;
-        i {
-          vertical-align: middle;
-          margin-right: 10px;
-        }
-      }
-      a {
-        color: #353649;
-      }
-    }
-    .autologin {
-      display: flex;
-      justify-content: space-between;
-      font-size: 12px;
-      margin-top: -16px;
-      > span {
-        cursor: pointer;
-        line-height: 18px;
-        margin-top: 2px;
-        i {
-          color: #ff4400;
-          font-size: 14px;
-          vertical-align: middle;
-          margin-right: 5px;
-        }
-        input {
-          margin-top: -3px;
-          vertical-align: bottom;
-        }
-        label {
-          transition: all 0.2s;
-          font-size: 12px;
-          &:hover {
-            color: #ff4400;
-          }
-        }
-      }
-      a {
-        color: #4d575e;
-      }
-    }
-    .getrulecode {
-      // padding: 0 0 0 10px;
-      font-size: 12px;
-      width: 67px;
-      text-align: center;
-      border-left: 1px #cccccc solid;
-      line-height: 12px;
-      color: #4d575e;
+			.ant-input {
+				height: 36px;
+				text-indent: 15px;
+				// background-color: #f6f6f6;
+				// border: none;
+				padding: 0 0 0 23px !important;
+				border: 1px solid #dddddd;
+				&:hover {
+					border-color: #ff4400;
+				}
+				&:focus {
+					box-shadow: none;
+				}
+				&::placeholder {
+					opacity: 0.4;
+					color: #4d575e;
+					font-size: 14px;
+					text-indent: 15px;
+				}
+			}
+		}
+		.login-form-button {
+			width: 100%;
+			height: 36px;
+			margin-top: 20px;
+			border-radius: 27px;
+			background-color: #ff4400;
+			font-size: 16px;
+			border: none;
+			color: white;
+			box-shadow: none;
+			&::after {
+				display: none;
+			}
+			&:hover {
+				background-color: #ff4400cc;
+			}
+			&:active {
+				background-color: #ff4400;
+			}
+		}
+		.register {
+			display: flex;
+			justify-content: center;
+			font-size: 12px;
+			span {
+				color: #4d575e;
+				i {
+					vertical-align: middle;
+					margin-right: 10px;
+				}
+			}
+			a {
+				color: #353649;
+			}
+		}
+		.autologin {
+			display: flex;
+			justify-content: space-between;
+			font-size: 12px;
+			margin-top: -16px;
+			> span {
+				cursor: pointer;
+				line-height: 18px;
+				margin-top: 2px;
+				i {
+					color: #ff4400;
+					font-size: 14px;
+					vertical-align: middle;
+					margin-right: 5px;
+				}
+				input {
+					margin-top: -3px;
+					vertical-align: bottom;
+				}
+				label {
+					transition: all 0.2s;
+					font-size: 12px;
+					&:hover {
+						color: #ff4400;
+					}
+				}
+			}
+			a {
+				color: #4d575e;
+			}
+		}
+		.getrulecode {
+			// padding: 0 0 0 10px;
+			font-size: 12px;
+			width: 67px;
+			text-align: center;
+			border-left: 1px #cccccc solid;
+			line-height: 12px;
+			color: #4d575e;
 
-      span[data-mark='getcode'] {
-        padding: 0 0 0 5px;
-        cursor: pointer;
-      }
-    }
-  }
+			span[data-mark="getcode"] {
+				padding: 0 0 0 5px;
+				cursor: pointer;
+			}
+		}
+	}
 }
 </style>
diff --git a/src/main-dev.js b/src/main-dev.js
index e50de89..5bd1562 100644
--- a/src/main-dev.js
+++ b/src/main-dev.js
@@ -46,9 +46,9 @@ Vue.prototype.$moment = moment; //挂载到当前vue实例对象
 
 Vue.config.productionTip = false;
 Vue.use(antd);
-new Vue({
+let newVue = new Vue({
   router,
   store,
   render: (h) => h(App),
 }).$mount("#app");
-export default Vue;
+export default newVue;
diff --git a/src/main-prod.js b/src/main-prod.js
index cadc2e9..73391b0 100644
--- a/src/main-prod.js
+++ b/src/main-prod.js
@@ -48,9 +48,11 @@ Vue.prototype.$moment = moment; //挂载到当前vue实例对象
 
 Vue.config.productionTip = false;
 Vue.use(antd);
-new Vue({
+let newVue = new Vue({
   router,
   store,
   render: (h) => h(App),
 }).$mount("#app");
-export default Vue;
+export default newVue;
+
+// export default Vue;
diff --git a/src/style/index.less b/src/style/index.less
index c5d00ac..4f0f683 100644
--- a/src/style/index.less
+++ b/src/style/index.less
@@ -1,4 +1,4 @@
-@import "http://at.alicdn.com/t/c/font_3135652_nopyx9nvfil.css";
+@import "http://at.alicdn.com/t/c/font_3135652_nd5ivglbv4.css";
 @font-face {
 	font-family: "DingTalk"; /* 这里的字体名称是自定义的 */
 	src: url("../assets/fonts/DingTalk\ Sans.ttf"); /* 服务器上ttf文件的路径，记得配置域名权限 */
@@ -454,6 +454,9 @@ i {
 .c3 {
 	color: #333;
 }
+.cf40 {
+	color: #f40;
+}
 .c6 {
 	color: #666;
 }
@@ -476,6 +479,11 @@ i {
 	align-items: center;
 	justify-content: start;
 }
+.fse {
+	display: flex;
+	align-items: center;
+	justify-content: end;
+}
 .fsc {
 	display: flex;
 	align-items: center;
@@ -757,19 +765,19 @@ i {
 	// left: 0;
 	// left: calc((100vw - 1200px) / 2 + 1013px) !important;
 	.loginbox:not(.backTable) {
-		width: 180px;
+		// width: 180px;
 		// height: 114px;
 		overflow: hidden;
 		background-color: #fff;
 		border-radius: 4px;
 		text-align: center;
 		box-shadow: 0px 0px 10px rgba(128, 128, 128, 0.4);
-		padding: 0 16px 10px 16px;
+		padding: 4px;
 		> div {
-			padding: 16px;
+			// padding: 16px;
 			text-align: center;
 			font-size: 16px;
-			font-weight: bold;
+			// font-weight: bold;
 			border-bottom: 1px solid #eee;
 		}
 		> a {
@@ -780,10 +788,10 @@ i {
 				line-height: 24px;
 				// font-weight: bold;
 				justify-content: space-between;
-				border-bottom: 1px solid #eee;
-				&:hover {
-					color: #ff4400;
-				}
+				// border-bottom: 1px solid #eee;
+				// &:hover {
+				// 	color: #ff4400;
+				// }
 				span {
 					line-height: 24px;
 
diff --git a/src/utils/request.js b/src/utils/request.js
index 61d96fa..c5ddd8b 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -1,9 +1,12 @@
 import axios from "axios";
 import router from "@/router";
+import vue from '../main-dev.js'
 import Cookies from "js-cookie";
 import qs from "qs";
-
+console.log('use message in request', this);
+console.log('use message in request', vue);
 // import Vue from "vue";
+// console.log('use message in request2', Vue);
 // const baseURL = "http://1shoudan.com"; // 正式环境线上 废弃
 // const baseURL = "//idaotian.com"; // 正式环境线上
 const baseURL = "//test.renminshitang.com.cn/daotian/api_dev"; // 测试环境本地
@@ -36,10 +39,16 @@ service.interceptors.request.use(
     // }
 
     if (localStorage.getItem("LOGIN_DATA")) {
-      req.headers.Authorization = "Bearer " + JSON.parse(localStorage.getItem("LOGIN_DATA")).token;
-      req.headers.appId = "daotianpc";
-      req.headers["g-open-env"]= 'WEB-PAGE',
+      console.log('req', req);
+      console.log('req url', req.url);
 
+      req.headers.Authorization = "Bearer " + localStorage.getItem("LOGIN_DATA_token");
+      req.headers.agencyId = JSON.parse(localStorage.getItem("DAOTIAN_agencyid"))
+      req.headers.appId = "daotianpc";
+      req.headers["g-open-env"] = 'WEB-PAGE'
+      if (req.url == '/assistant/custom/job/v2/list') {
+        req.headers.appId = ''
+      }
       console.log('getToken++++++++++++++++++++++++++++++++++++++++++++++++++++');
     }
     // application/json
@@ -54,23 +63,59 @@ service.interceptors.request.use(
 );
 service.interceptors.response.use(
   (response) => {
-    // console.log(response);
+    console.log('response', response);
     let { msg, status } = response.data;
     // status = 9999
     // return response;
     // console.log(status);
-    if (status == 9999) {
+    // response.data.status = 9999
+    if (response.data.status == 9999) {
       localStorage.removeItem("LOGIN_DATA");
+      localStorage.removeItem("LOGIN_DATA_token");
+      localStorage.removeItem("DAOTIAN_agencyid");
       router.push("/login");
       // 跳转到登录页面
       // this.$message.warning(msg);
       return Promise.reject(new Error("token过期"));
     }
-    if (response.status === 200) {
+    if (response.data.status === 200) {
       return response;
+    } else if (response.data.status === 2001) {// 职位名称
+      // message.error('职位名称：请不要填写【' + response.data.msg + '】相关违禁内容');
+      // this.$message.error(response.data.msg);
+      return response;
+
+      // return Promise.reject({
+      //   code: 2001,
+      //   msg: response.data.msg
+      // });
+    } else if (response.data.status === 2002) {// 职位名称
+      // message.error('职位名称：请不要填写【' + response.data.msg + '】相关违禁内容');
+      console.log('response.data.status === 2002', response.data.status);
+      vue.$message.error(response.data.msg)
+      // this.$message.error(response.data.msg);
+      setTimeout(() => {
+        localStorage.removeItem("LOGIN_DATA");
+        localStorage.removeItem("LOGIN_DATA_token");
+        localStorage.removeItem("DAOTIAN_agencyid");
+        // router.push({
+        //   path: "/login",
+        // });
+        router.push("/login");
+      }, 2000);
+
+      return Promise.reject(new Error("token过期"));
+
+      // return Promise.reject({
+      //   code: 2002,
+      //   msg: response.data.msg
+      // });
     } else {
-      // Message.error(message)
-      return Promise.reject(new Error(msg));
+      // Message.error(response.data.msg)
+      // vue.$message.error(response.data.msg)
+      return response;
+
+      // return Promise.reject(new Error(msg));
     }
   },
   (error) => {
diff --git a/src/views/main.vue b/src/views/main.vue
index 4757bc0..d8a04ae 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -55,10 +55,10 @@
 								</a-dropdown>
 							</li>
 							<li v-else>
-								<router-link to="/mybill" :class="routertitleindex == 5? 'titleactive' : ''">
+								<router-link to="/mybill" :class="routertitleindex == 5 ? 'titleactive' : ''">
 									<!-- <div> -->
-										<span>职位报名</span>
-										<!-- <i class="iconfont icon-youjiantou"></i> -->
+									<span>职位报名</span>
+									<!-- <i class="iconfont icon-youjiantou"></i> -->
 									<!-- </div> -->
 								</router-link>
 							</li>
@@ -120,10 +120,39 @@
 								</div>
 							</a-dropdown>
 						</div>
+						<!-- v-if="false" -->
+						<!-- <div class="g_mr_16 more-team">
+							<a-dropdown :trigger="['click']" class="" placement="bottomRight" :getPopupContainer="(node) => node.parentNode">
+								<div class="fsa more-team-button" style="padding: 0px 12px">
+									<div class="fss">
+										<div>
+											<div class="logo">{{ userbaseInfo.agencyName && userbaseInfo.agencyName.charAt(0) }}</div>
+										</div>
+										<div class="hover-f40" style="max-width: 98px">{{ userbaseInfo.agencyName }}</div>
+									</div>
+									<i class="iconfont icon-paixu f12" style="color: #ccc; margin-left: 4px"></i>
+								</div>
+
+								<div class="" slot="overlay" style="box-shadow: 0px 2px 4px 0px rgba(229, 229, 229, 0.5), 0px 4px 12px 0px rgba(0, 0, 0, 0.15)">
+									<div class="more-team-drop">
+										<div class="fsa p12 pr8 hover-blue" style="border-radius: 4px; cursor: pointer" @click="changeTeam(item)" v-for="(item, index) in teamList">
+											<div class="fss">
+												<div>
+													<img v-if="item.logo" :src="item.logo" alt="" />
+													<div v-else class="logo">{{ item.agencyName && item.agencyName.charAt(0) }}</div>
+												</div>
+												<div class="" style="width: 98px">{{ item.agencyName }}</div>
+											</div>
+											<div class="ml12 f12 cf4" v-if="item.checked">当前</div>
+										</div>
+									</div>
+								</div>
+							</a-dropdown>
+						</div> -->
 						<a-dropdown
 							:trigger="['click']"
-							overlayClassName="logindropdown"
 							placement="bottomRight"
+							overlayClassName="logindropdown"
 							:getPopupContainer="
 								(triggerNode) => {
 									return triggerNode.parentNode || document.body;
@@ -135,11 +164,11 @@
 								<img :src="userbaseInfo.imgSrc" class="mr4" style="border-radius: 50%; width: 28px; height: 28px" alt v-else />
 								<div class="ml4 f14 c6">{{ userbaseInfo.userName || userbaseInfo.nickName || "-" }}</div>
 							</span>
-							<div class="loginbox" slot="overlay">
+							<div class="loginbox" slot="overlay" style="width: 224px">
 								<router-link to="/accountsetting">
-									<div>
+									<div class="hover-blue br4" style="padding: 12px 12px">
 										<span> <i class="iconfont icon-gerenzhongxin"></i>个人中心 </span>
-										<i class="iconfont icon-youjiantou"></i>
+										<i class="iconfont icon-youjiantou c9"></i>
 									</div>
 								</router-link>
 								<!-- <router-link to="/merchantBack" v-if="loginValue.agencyName == '郑州一才工作' ">
@@ -151,12 +180,39 @@
                   </div>
                 </router-link>-->
 								<!-- 2023-11-29 注释该条件 && (loginValue.agencyRole == 2 || loginValue.agencyRole == 1 ) -->
-								<router-link to="###" v-if="loginValue.agencyName == '郑州一才工作' || loginValue.id == '116253'">
-									<div @click="goAdmin">
-										<span> <i class="iconfont icon-shangjiahoutai"></i>商家后台 </span>
-										<i class="iconfont icon-youjiantou"></i>
+								<!-- v-if="loginValue.agencyName == '郑州一才工作' || loginValue.id == '116253'" -->
+
+								<div @click.stop="goAdmin" class="hover-blue br4 fsa" style="padding: 12px 12px; line-height: 25px; border-bottom: 0" v-if="loginValue.agencyName == '郑州一才工作' || loginValue.id == '116253'">
+									<span class="f14"> <i class="iconfont icon-shangjiahoutai mr6"></i>商家后台 </span>
+									<i class="iconfont icon-youjiantou c9"></i>
+								</div>
+
+								<a-dropdown :trigger="['click']" class="more-team" :getPopupContainer="(node) => node.parentNode" overlayClassName="setPosition">
+									<span class="fsa more-team-button hover-blue br4" style="padding: 6px 12px" @click.stop>
+										<div class="fss">
+											<div>
+												<i class="icon-qiehuantuandui iconfont g_mr_5" style="font-size: 16px"></i>
+												切换团队
+											</div>
+										</div>
+										<div class="fse">
+											<div class="cf40 esl" style="max-width: 98px">{{ userbaseInfo.agencyName }}</div>
+											<i class="iconfont icon-youjiantou c9"></i>
+										</div>
+									</span>
+									<div class="more-team-drop" slot="overlay">
+										<div class="fsa p12 hover-blue" style="border-radius: 4px; cursor: pointer" @click="changeTeam(item)" v-for="(item, index) in teamList">
+											<div class="fss">
+												<div>
+													<img v-if="item.logo" class="mr8" :src="item.logo" style="width: 16px; height: 16px" alt="" />
+													<div v-else class="logo mr8">{{ item.agencyName && item.agencyName.charAt(0) }}</div>
+												</div>
+												<div class="tl" style="width: 98px">{{ item.agencyName }}</div>
+											</div>
+											<div class="ml12 f12 cf4" v-if="item.checked">当前</div>
+										</div>
 									</div>
-								</router-link>
+								</a-dropdown>
 								<!-- <router-link to="###" v-if="loginValue.agencyName == '郑州一才工作'">
                   <div @click="goJiaofu">
                     <span>
@@ -165,7 +221,7 @@
                     <i class="iconfont icon-youjiantou"></i>
                   </div>
                 </router-link> -->
-								<button @click="logout">退出登录</button>
+								<button @click="logout" class="mb6">退出登录</button>
 							</div>
 						</a-dropdown>
 					</span>
@@ -284,7 +340,8 @@ import {
 	// getCityApi,
 } from "../api/job";
 
-import { logoutApi } from "../api/login";
+import { logoutApi, checkTokenApi } from "../api/login";
+import { getTeamListApi, changeTeamApi } from "../api/userinfo";
 
 export default {
 	inject: ["reload"],
@@ -329,6 +386,7 @@ export default {
 			userbaseInfo: JSON.parse(localStorage.getItem("LOGIN_DATA")),
 			loginPage: false,
 			routertitleindex: 0,
+			teamList: [],
 		};
 	},
 	// 计算属性
@@ -445,6 +503,7 @@ export default {
 		// this.getJobListYicai();
 		this.isLaoxiangshow();
 		this.showfooter();
+		this.getTeamList();
 	},
 	/**
 	 * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
@@ -532,7 +591,58 @@ export default {
 				this.laoxiangshow = true;
 			}
 		},
+		/**
+		 * 获取团队列表
+		 */
+		getTeamList() {
+			let that = this;
+			getTeamListApi().then((res) => {
+				console.log(res);
+
+				that.teamList = res.data.data;
+				console.log("that.teamList", that.teamList);
+
+				that.teamList.forEach((item, index) => {
+					if (item.id == that.loginValue.user.agencyId) {
+						item.checked = true;
+					}
+				});
+			});
+		},
+		changeTeam(_item) {
+			let that = this;
+			if (_item.id == that.loginValue.user.agencyId) {
+				return false;
+			}
+			console.log(_item);
+			changeTeamApi(_item.id).then((res1) => {
+				console.log("res1", res1);
+				if (res1.data.status == 2001) {
+					// localStorage.setItem("DAOTIAN_userinfo_agencyid", _item.id);
+					that.$message.error(res1.data.msg);
+					that.getTeamList();
+				} else {
+					localStorage.setItem("DAOTIAN_agencyid", _item.id);
+					checkTokenApi().then((res) => {
+						console.log(res.data);
+						localStorage.setItem("LOGIN_DATA", JSON.stringify(res.data.data));
+						let routeUrl = that.$router.resolve({
+							path: "/list",
+						});
+						window.open(routeUrl.href, "_blank");
+						setTimeout(() => {
+							window.close();
+						}, 10);
+						// return
+						// localStorage.setItem("DAOTIAN_token", res.data.token);
+						// that.reload();
 
+						// location.reload();
+						// router.push("/merchantManagement/homePage");
+					});
+				}
+			});
+		},
 		async logout() {
 			// logoutApi().then((result) => {
 			//   console.log(result);
@@ -543,6 +653,7 @@ export default {
 				if (data.status === 200) {
 					localStorage.removeItem("LOGIN_DATA");
 					localStorage.removeItem("DAOTIAN_token");
+					localStorage.removeItem("LOGIN_DATA_token");
 					localStorage.removeItem("daotian_to_admin_token");
 					this.reload();
 					this.$router.push("/main");
@@ -595,33 +706,36 @@ export default {
 
 		goAdmin() {
 			let obj = JSON.parse(localStorage.getItem("LOGIN_DATA"));
-			console.log(JSON.stringify(obj.user));
+			let token = localStorage.getItem("LOGIN_DATA_token");
+			console.log(obj);
+			console.log(token);
 			if (window.location.hostname == "localhost") {
 				// 测试环境，通过URL获取token
-				window.open("http://localhost:3000/#/login?token=" + obj.token + "&username=" + (obj.user.userName ? obj.user.userName : obj.user.nickName) + "&avatar=" + obj.imgSrc + "&roleid=" + obj.user.agencyRoleId + "&agencyid=" + obj.user.agencyId + "&userInfo=" + JSON.stringify(obj));
+				window.open("http://localhost:3000/#/login?token=" + token + "&username=" + (obj.user.userName ? obj.user.userName : obj.user.nickName) + "&avatar=" + obj.imgSrc + "&roleid=" + obj.user.agencyRoleId + "&agencyid=" + obj.user.agencyId + "&userInfo=" + JSON.stringify(obj));
 			} else {
 				// 正式环境，通过缓存获取
 				localStorage.setItem("daotian_to_admin", JSON.stringify(obj));
-				localStorage.setItem("daotian_to_admin_token", obj.token);
+				localStorage.setItem("daotian_to_admin_token", token);
 				localStorage.setItem("daotian_to_admin_avatar", obj.imgSrc);
 				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);
 				if (window.location.origin.indexOf("www") > -1) {
-					window.open("http://www.ibocai.cn/#/login?token=" + obj.token + "&username=" + (obj.user.userName ? obj.user.userName : obj.user.nickName) + "&avatar=" + obj.imgSrc + "&roleid=" + obj.user.agencyRoleId + "&agencyid=" + obj.user.agencyId + "&userInfo=" + JSON.stringify(obj));
+					window.open("http://www.ibocai.cn/#/login?token=" + token + "&username=" + (obj.user.userName ? obj.user.userName : obj.user.nickName) + "&avatar=" + obj.imgSrc + "&roleid=" + obj.user.agencyRoleId + "&agencyid=" + obj.user.agencyId + "&userInfo=" + JSON.stringify(obj));
 				} else {
-					window.open("http://ibocai.cn/#/login?token=" + obj.token + "&username=" + (obj.user.userName ? obj.user.userName : obj.user.nickName) + "&avatar=" + obj.imgSrc + "&roleid=" + obj.user.agencyRoleId + "&agencyid=" + obj.user.agencyId + "&userInfo=" + JSON.stringify(obj));
+					window.open("http://ibocai.cn/#/login?token=" + token + "&username=" + (obj.user.userName ? obj.user.userName : obj.user.nickName) + "&avatar=" + obj.imgSrc + "&roleid=" + obj.user.agencyRoleId + "&agencyid=" + obj.user.agencyId + "&userInfo=" + JSON.stringify(obj));
 				}
 			}
 		},
 		goJiaofu() {
 			let obj = JSON.parse(localStorage.getItem("LOGIN_DATA"));
+			let token = JSON.parse(localStorage.getItem("LOGIN_DATA_token"));
 			if (window.location.hostname == "localhost") {
 				// 测试环境，通过URL获取token
-				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 + "&userInfo=" + JSON.stringify(obj));
+				window.open("http://localhost:3000/#/other/delivery?token=" + token + "&username=" + (obj.user.userName ? obj.user.userName : obj.user.nickName) + "&avatar=" + obj.imgSrc + "&roleid=" + obj.user.agencyRoleId + "&agencyid=" + obj.user.agencyId + "&userInfo=" + JSON.stringify(obj));
 			} else {
 				// 正式环境，通过缓存获取
-				localStorage.setItem("daotian_to_admin_token", obj.token);
+				localStorage.setItem("daotian_to_admin_token", token);
 				localStorage.setItem("daotian_to_admin", JSON.stringify(obj));
 				localStorage.setItem("daotian_to_admin_avatar", obj.imgSrc);
 				localStorage.setItem("daotian_to_admin_username", obj.user.userName ? obj.user.userName : obj.user.nickName);
@@ -1106,4 +1220,49 @@ export default {
 /deep/ .ant-dropdown {
 	top: 68px !important;
 }
+.hover-blue {
+	cursor: pointer;
+	&:hover {
+		background-color: #f5f5f5;
+	}
+}
+
+.more-team {
+	.more-team-button {
+		height: 32px;
+		margin-right: 16px;
+		border-radius: 4px;
+		cursor: pointer;
+		border: 1px solid #ddd;
+		&:hover {
+			.hover-f40 {
+				color: #ff4400;
+			}
+		}
+	}
+
+	.more-team-drop {
+		padding: 6px;
+		background: #fff;
+		border-radius: 4px;
+	}
+}
+/deep/.setPosition {
+	padding: 4px;
+	left: -218px !important;
+	border-radius: 4px;
+	background-color: #fff;
+	box-shadow: 0px 2px 4px 0px rgba(229, 229, 229, 0.5), 0px 4px 12px 0px rgba(0, 0, 0, 0.15);
+}
+.logo {
+	width: 16px;
+	height: 16px;
+	text-align: center;
+	line-height: 16px;
+	color: #fff;
+	font-size: 10px;
+	background: #ff6a00;
+	border-radius: 2px;
+	margin-right: 8px;
+}
 </style>