Merge branch 'master' of http://git.cc-lotus.info/smart-jobs/web-common

src/layout/master/index/login.vue

@@ -16,7 +16,7 @@
         </el-col>
 
         <el-col :span="8" class="login">
-          <el-link :underline="false" href="http://hr.smart.cc-lotus.info/www/login">
+          <el-link :underline="false" href="http://99991.smart.cc-lotus.info/www/student/login">
             <el-image style="width:75px;height:75px;" :src="xuesheng"></el-image>
             <p class="mainTwoTit">学生登录</p>
           </el-link>

src/layout/master/index/notice.vue

@@ -16,11 +16,6 @@
                 <P class="textOver"><span class="qiudatas"></span>{{ item.title }}</P>
               </el-col>
             </li>
-            <li class="newsTitle">
-              <el-col :span="24">
-                <P class="textOver"><span class="qiudatas"></span>浙江湖州城市综合推介会暨2019年重点用人单位招聘会在我校举行</P>
-              </el-col>
-            </li>
           </ul>
         </el-col>
       </el-col>

src/views/index.vue

@@ -248,7 +248,7 @@ export default {
 }
 .floating {
   position: fixed;
-  top: 30%;
+  top: 10%;
   right: 10%;
   width: 350px;
   height: 140px;
@@ -258,11 +258,11 @@ export default {
 }
 /deep/.floating .el-button {
   position: absolute;
-  top: -2px;
-  right: -2px;
+  right: 0px;
   padding: 3px 5px;
   background: #ccc;
   color: #000;
   border-radius: 0;
+  z-index: 1;
 }
 </style>