同步

src/components/FirstJob/joblist.vue

@@ -530,10 +530,15 @@
           <p class="date" :style="{ 'font-size': '16px', color: '#ff4400' }">{{ dateinfo.date }}</p>
         </div>
         <div class="hotphone">
-          <h1 class="bottombox">
+          <h1 class="bottombox" style=''>
             <i >服务热线</i>
           </h1>
+          <!-- <div class="fcsc"> -->
+            
+          <!-- <p class="mt20">梁双双</p> -->
           <p>0371-6611 3723</p>
+          <!-- <p>183-0069-3820</p> -->
+          <!-- </div> -->
         </div>
         <!-- <div class="relationme">
           <p class="bottombox"><i>稻田合作</i></p>
@@ -2920,7 +2925,7 @@ export default {
   .maincontentright {
     width: 240px;
     position: relative;
-    top: -50px;
+    top: -42px;
     > div {
       margin-bottom: 16px;
       border: 1px solid #ededed;
@@ -2938,9 +2943,9 @@ export default {
         margin-top: 0;
         margin-bottom: 0;
         // padding-top: 10px;
-        height: 50px;
+        height: 44px;
         padding: 0;
-        line-height: 50px;
+        line-height: 44px;
         font-size: 16px;
         font-weight: 600;
         border-bottom: none;
@@ -2970,7 +2975,7 @@ export default {
       p {
         position: absolute;
         width: 100%;
-        font-size: 24px;
+        font-size: 20px;
         color: #ff4400;
         font-weight: 600;
         top: 65%;

src/style/index.less

@@ -475,7 +475,12 @@ i {
 	align-items: center;
 	justify-content: center;
 }
-
+.fcsc{
+  display: flex;
+  flex-direction: column;
+	align-items: center;
+	justify-content: center;
+}
 .middle {
 	position: relative;
 	left: 50%;
@@ -879,7 +884,7 @@ p.bottombox {
 		width: 240px;
 		height: 1px;
 		bottom: 0;
-		left: -20px;
+		left: 0;
 		background-color: #eeefef;
 	}
 	// i {

src/views/main.vue

@@ -53,7 +53,7 @@
           </div>
           <span v-if="isLogin" class="logined fsa">
             <div class v-if="loginValue.agencyName == '郑州一才工作'">
-              <a-dropdown :trigger="['click']" overlayClassName="logindropdown" placement="bottomRight" :getPopupContainer="
+              <a-dropdown :trigger="['click']" v-if="false" overlayClassName="logindropdown" placement="bottomRight" :getPopupContainer="
               (triggerNode) => {
                 return triggerNode.parentNode || document.body;
               }
@@ -88,8 +88,8 @@
 				">
               <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 />
+                <img :src="userbaseInfo.imgSrc" class="mr4" style="border-radius:50%;width:28px;height:28px;" alt v-else />
-                <div class="ml4 f16 c6">{{ userbaseInfo.userName || '-' }}</div>
+                <div class="ml4 f14 c6">{{ userbaseInfo.userName || '-' }}</div>
               </span>
               <div class="loginbox" slot="overlay">
                 <router-link to="/accountsetting">
@@ -621,7 +621,7 @@ export default {
       console.log(JSON.stringify(obj.user))
       if (window.location.hostname == 'localhost') {
         // 测试环境，通过URL获取token
-        window.open('http://localhost:3000/#/merchantManagement/homePage?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.user))
+        window.open('http://localhost:3000/#/merchantManagement/homePage?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))
       } else {
         // 正式环境，通过缓存获取
         localStorage.setItem('daotian_to_admin_token', obj.token)
@@ -640,7 +640,7 @@ export default {
       let obj = JSON.parse(localStorage.getItem('LOGIN_DATA'))
       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.user))
+        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))
       } else {
         // 正式环境，通过缓存获取
         localStorage.setItem('daotian_to_admin_token', obj.token)
@@ -721,7 +721,7 @@ export default {
       // line-height: 36px;
 
       .titleTag {
-        font-size: 16px;
+        font-size: 14px;
         display: flex;
         margin-left: 150px;
         li {
@@ -1113,7 +1113,7 @@ export default {
   }
 }
 .fsa-box {
-  padding: 6px 12px;
+  padding: 1px 12px;
   background: transparent;
   border-radius: 4px;
   cursor: pointer;