Merge branch 'master' of http://101.37.147.115:3000/bocaigroup/daotian_pc

src/components/Login/updatepsw.vue

@@ -289,11 +289,11 @@ export default {
     width: 710px;
     .ant-form-item {
       display: flex;
-      align-items: center;
+      // align-items: center;
     }
     /deep/ .ant-form-explain {
-      margin-top: -2px;
+      // margin-top: -2px;
-      line-height: 20px;
+      // line-height: 20px;
       min-height: 20px !important;
     }
     /deep/.ant-form-item-control {
@@ -408,10 +408,9 @@ export default {
   }
 }
 .state-box{
-	position: fixed;
+	position: absolute;
-	left: 50%;
+	left: -338px;
-	transform: translateX(-50%);
 	width: 544px;
-	top: 430px;
+	top: 0px;
 }
 </style>

src/views/main.vue

@@ -52,7 +52,7 @@
             </ul>
           </div>
           <span v-if="isLogin" class="logined fsa">
-            <div class v-if="loginValue.agencyName == '郑州一才工作' && (loginValue.agencyRole == 2 || loginValue.agencyRole == 1 )">
+            <div class v-if="loginValue.agencyName == '郑州一才工作'">
               <a-dropdown overlayClassName="logindropdown" placement="bottomRight">
                 <div class="mr20 user-box">
                   <i class="iconfont icon-xiaoxi"></i>
@@ -70,7 +70,7 @@
                     </div>
                   </router-link>
                   <router-link to="/teamMsg">
-                    <div>
+                    <div style="border-bottom: none;">
                       <span>
                         <i class="iconfont icon-tuanduitongzhi"></i>团队通知
                       </span>