diff --git a/src/style/index.less b/src/style/index.less
index 5da9a83..5576244 100644
--- a/src/style/index.less
+++ b/src/style/index.less
@@ -1,4 +1,4 @@
-@import "http://at.alicdn.com/t/c/font_3135652_sael7iclr79.css";
+@import "http://at.alicdn.com/t/c/font_3135652_fo3hhgd9jw9.css";
 @font-face {
 	font-family: "DingTalk"; /* 这里的字体名称是自定义的 */
 	src: url("../assets/fonts/DingTalk\ Sans.ttf"); /* 服务器上ttf文件的路径，记得配置域名权限 */
diff --git a/src/views/main.vue b/src/views/main.vue
index 942b99d..84f030c 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -53,12 +53,16 @@
           </div>
           <span v-if="isLogin" class="logined fsa">
             <div class v-if="loginValue.agencyName == '郑州一才工作'">
-              <a-dropdown overlayClassName="logindropdown" placement="bottomRight">
+              <a-dropdown 
+				:trigger="['click']" overlayClassName="logindropdown" placement="bottomRight"
+				:getPopupContainer="
+				  (triggerNode) => {
+				    return triggerNode.parentNode || document.body;
+				  }
+				"
+				>
                 <div class="mr20 user-box">
                   <i class="iconfont icon-xiaoxi"></i>
-                  <!-- <svg class="svg_icon f16 user-box" aria-hidden="true">
-                    <use xlink:href="#icon-xiaoxi" />
-                  </svg>-->
                 </div>
                 <div class="loginbox" slot="overlay">
                   <router-link to="/systemMsg">
@@ -80,20 +84,19 @@
                 </div>
               </a-dropdown>
             </div>
-            <a-dropdown overlayClassName="logindropdown" placement="bottomRight">
-              <!-- <img :src="loginValue.imgSrc" alt="" v-if="loginValue.imgSrc !== ''" style="border-radius: 50%" />
-              <span v-else><i class="iconfont icon-morentouxiang" style="color:#ff4400"></i></span>-->
-              <span class="fsa">
+            <a-dropdown :trigger="['click']" overlayClassName="logindropdown" placement="bottomRight"
+				:getPopupContainer="
+				  (triggerNode) => {
+				    return triggerNode.parentNode || document.body;
+				  }
+				"
+			>
+              <span class="fsa fsa-box">
                 <span class="iconfont icon-morentouxiang mr4 f32" v-if="!userbaseInfo.imgSrc"></span>
                 <img :src="userbaseInfo.imgSrc" class="mr4" style="border-radius:50%;width:32px;height:32px;" alt v-else />
-                <div class="ml4 f16 c6 user-box">{{ userbaseInfo.userName || '-' }}</div>
+                <div class="ml4 f16 c6">{{ userbaseInfo.userName || '-' }}</div>
               </span>
               <div class="loginbox" slot="overlay">
-                <!-- <div>
-                  <img :src="loginValue.imgSrc" alt v-if="loginValue.imgSrc !== ''" style="border-radius: 50%" />
-                  <span v-else class="iconfont icon-morentouxiang avatar f32"></span>
-                  <span class="username">{{loginValue.userName || loginValue.nickName || loginValue.tel}}</span>
-                </div>-->
                 <router-link to="/accountsetting">
                   <div>
                     <span>
@@ -122,48 +125,21 @@
 				<router-link to="###" v-if="loginValue.agencyName == '郑州一才工作'">
 				  <div @click="goJiaofu">
 				    <span>
-				      <i class="iconfont icon-shangjiahoutai"></i>交付助手
+				      <i class="iconfont icon-jiaofuzhushouicon"></i>交付助手
 				    </span>
 				    <i class="iconfont icon-youjiantou"></i>
 				  </div>
 				</router-link>
-                <!-- <router-link to="/accountsetting"
-                  ><div>
-                    <span
-                      ><i class="iconfont icon-zhanghaoshezhi"></i
-                      >账号设置</span
-                    ><i class="iconfont icon-youjiantou"></i>
-                  </div>
-                </router-link>-->
                 <button @click="logout">退出登录</button>
               </div>
             </a-dropdown>
           </span>
           <span class="loginbtn" v-else>
-            <!-- <router-link to="/register">注册</router-link>/ -->
             <router-link to="/login">
               <button style="cursor: pointer">登录</button>
             </router-link>
           </span>
         </span>
-        <!-- <span class="navigationright">
-          <ul>
-            <li>
-              <router-link
-                to="/mytownsman"
-                :class="routertitleindex === 4 ? 'titleactiveafter' : ''"
-                >我的老乡
-              </router-link>
-            </li>
-            <li>
-              <router-link
-                to="/mybill"
-                :class="routertitleindex === 5 ? 'titleactiveafter' : ''"
-                >我的报名
-              </router-link>
-            </li>
-          </ul>
-        </span>-->
       </div>
     </div>
     <div class="fsa titleSlogan w" v-if="routertitleindex == 0 ">
@@ -178,36 +154,7 @@
       <div v-else>
         <router-link to="/list" style="display: inline-block; width: 100%">进入稻田</router-link>
       </div>
-      <!-- <span class="logined">
-        <a-dropdown overlayClassName="logindropdown" placement="bottomRight">
-          <span class="fsa f14 cf shadow">
-            <span class="iconfont icon-morentouxiang mr4 f32" v-if="!userbaseInfo.imgSrc"></span>
-            <img :src="userbaseInfo.imgSrc" class="mr4" style="border-radius:50%;width:32px;height:32px;" alt v-else />
-            <span class="ml4">{{ userbaseInfo.userName }}</span>
-          </span>
-          <div class="loginbox" slot="overlay">
-            <router-link to="/accountsetting">
-              <div>
-                <span>
-                  <i class="iconfont icon-gerenzhongxin"></i>个人中心
-                </span>
-                <i class="iconfont icon-youjiantou"></i>
-              </div>
-            </router-link>
-            <router-link to="/merchantBack" v-if="loginValue.agencyName == '郑州一才工作' && (loginValue.agencyRole == 2 || loginValue.agencyRole == 1 )">
-              <div>
-                <span>
-                  <i class="iconfont icon-shangjiahoutai"></i>商家后台
-                </span>
-                <i class="iconfont icon-youjiantou"></i>
-              </div>
-            </router-link>
-            <button @click="logout">退出登录</button>
-          </div>
-        </a-dropdown>
-      </span>-->
     </div>
-    <!-- 搜索栏 -->
 
     <router-view :isspecialboxshow.sync="isspecialboxshow" :formvalue="formvalue" :jobMainList="jobMainList" :isspinning="isspinning"></router-view>
     <!-- 老乡广告 -->
@@ -1143,8 +1090,35 @@ export default {
   }
 }
 
-.user-box:hover {
-  cursor: pointer;
-  color: #ff4400 !important;
+.user-box{
+	width: 44px;
+	height: 44px;
+	border-radius: 50%;
+	background-color: transparent;
+	text-align: center;
+	line-height: 44px;
+	margin-right: 12px !important;
+	cursor: pointer;
+	&:hover{
+		background-color: #e5e5e5;
+	}
+	&:active{
+		background-color: #d9d9d9;
+	}
+}
+.fsa-box{
+	padding: 6px 12px;
+	background: transparent;
+	border-radius: 4px;
+	cursor: pointer;
+	&:hover{
+		background-color: #e5e5e5;
+	}
+	&:active{
+		background-color: #d9d9d9;
+	}
+}
+/deep/ .ant-dropdown{
+	top: 68px !important;
 }
 </style>