From f4cbd28835784fd3d66728a920f2efd39e1b963a Mon Sep 17 00:00:00 2001
From: wangxia <779219182@qq.com>
Date: Wed, 20 Apr 2022 09:59:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FirstJob/joblist.vue | 28 ++++++++++++++---
 src/components/main/index.vue       | 60 ++++++++++++++++++-------------------
 src/components/main/index1.vue      |  8 ++---
 src/utils/commonUtil.js             | 23 +++++++++++++-
 src/utils/request.js                |  4 +--
 src/views/main.vue                  | 12 ++++----
 6 files changed, 89 insertions(+), 46 deletions(-)

diff --git a/src/components/FirstJob/joblist.vue b/src/components/FirstJob/joblist.vue
index ada6455..10bab0a 100644
--- a/src/components/FirstJob/joblist.vue
+++ b/src/components/FirstJob/joblist.vue
@@ -252,9 +252,18 @@
               </div>
             </div>
             <div class="subsetright">
-              <div class="topbox">
-                <div>服务费</div>
-                <div>{{ item.servetype }}</div>
+              <div class="topContainer">
+                <div class="updateTime">
+                  <span
+                    >更新时间：{{ item.updateTime || "--" }}（{{
+                      item.diffTime || "--"
+                    }}）</span
+                  >
+                </div>
+                <div class="topbox">
+                  <div>服务费</div>
+                  <div>{{ item.servetype }}</div>
+                </div>
               </div>
               <div class="bottombox1">
                 <router-link
@@ -1262,7 +1271,7 @@ export default {
       justify-content: space-between;
       // width: 944px;
       // height: 212px;
-      padding: 16px;
+      padding: 12px 20px;
       margin-bottom: 16px;
       background: #ffffff;
       border-radius: 4px;
@@ -1355,9 +1364,20 @@ export default {
         flex-direction: column;
         justify-content: space-between;
         align-items: flex-end;
+        .topContainer {
+          display: flex;
+          flex-direction: column;
+          justify-content: space-between;
+          align-items: flex-end;
+        }
+        .updateTime {
+          font-size: 14px;
+          color: #999;
+        }
         .topbox {
           width: 116px;
           height: 54px;
+          margin-top: 12px;
           overflow: hidden;
           text-align: center;
           background: rgba(255, 106, 0, 0.1);
diff --git a/src/components/main/index.vue b/src/components/main/index.vue
index a22b702..9c13ab5 100644
--- a/src/components/main/index.vue
+++ b/src/components/main/index.vue
@@ -26,22 +26,22 @@
 			</ul> -->
       <a-anchor :affix="true">
         <a-anchor-link
-          @click.prevent="false"
+          @click.native.prevent=""
           href="#toAboutBill"
           title="关于一手单"
         />
         <a-anchor-link
-          @click.prevent="false"
+          @click.native.prevent=""
           href="#cooperativeBrand"
           title="合作品牌"
         />
         <a-anchor-link
-          @click.prevent="false"
+          @click.native.prevent=""
           href="#businessLandscape"
           title="业务版图"
         />
         <a-anchor-link
-          @click.prevent="false"
+          @click.native.prevent=""
           href="#relationUs"
           title="联系我们"
         />
@@ -94,8 +94,8 @@
         <div class="title">联系我们</div>
         <div class="content">
           <div class="left">
-            <p>总部地址：郑州市管城回族区东站南街升龙广场2号楼A座1116室</p>
-            <p>接待地址：伯才人力资源服务中心（航空港区店）</p>
+            <p>总部地址：河南省郑州市郑东新区升龙广场2号楼A座</p>
+            <p>接待地址：河南省郑州市航空港区相州街29-60号</p>
             <p>联系电话：168 3666 8888</p>
           </div>
           <div class="right">
@@ -118,17 +118,17 @@
     </div>
     <footer>
       <div class="w">
-        <ul>
-          <li @click="totop"><router-link to="/list">一手职位</router-link></li>
-          <li></li>
-          <li @click="totop">
-            <router-link to="/serviceoutlets">服务网点</router-link>
-          </li>
-          <li></li>
-          <li @click="totop">
-            <router-link to="/aboutus">关于我们</router-link>
-          </li>
-        </ul>
+        <!-- <ul>
+					<li @click="totop"><router-link to="/list">一手职位</router-link></li>
+					<li></li>
+					<li @click="totop">
+						<router-link to="/serviceoutlets">服务网点</router-link>
+					</li>
+					<li></li>
+					<li @click="totop">
+						<router-link to="/aboutus">关于我们</router-link>
+					</li>
+				</ul> -->
         <div>
           Copyright © 2015 - 2022 Matripe. All Rights Reserved. <i></i>
           <a target="_blank" href="https://beian.miit.gov.cn/#/Integrated/index"
@@ -143,7 +143,6 @@
 <script>
 import Vue from "vue";
 
-import { animate } from "popmotion";
 const path = require("path");
 const files = require.context("../../../static/img", false, /.png$/);
 
@@ -209,18 +208,18 @@ export default {
         }
       });
     },
-    toTargetLocation(target) {
-      // console.log(123);
-      const now = window.scrollY;
-      // 2. 目标位置（文章信息区域的高度）
-      const dist = document.getElementById(target).getBoundingClientRect().top;
-      console.log(dist);
-      animate({
-        from: now, // 当前的位置
-        to: dist, // 目标位置
-        onUpdate: (latest) => window.scrollTo(0, latest),
-      });
-    },
+    // toTargetLocation(target) {
+    // 	// console.log(123);
+    // 	const now = window.scrollY;
+    // 	// 2. 目标位置（文章信息区域的高度）
+    // 	const dist = document.getElementById(target).getBoundingClientRect().top;
+    // 	console.log(dist);
+    // 	animate({
+    // 		from: now, // 当前的位置
+    // 		to: dist, // 目标位置
+    // 		onUpdate: (latest) => window.scrollTo(0, latest),
+    // 	});
+    // },
     totop() {
       // console.log(window);
       document.body.scrollTop = 0;
@@ -286,6 +285,7 @@ export default {
     border-radius: 8px 8px 0 0;
     overflow: hidden;
     transform: translateX(-50%);
+    transition: all 0.2s;
     z-index: 999;
     .ant-anchor {
       display: flex;
diff --git a/src/components/main/index1.vue b/src/components/main/index1.vue
index a22b702..4b2541b 100644
--- a/src/components/main/index1.vue
+++ b/src/components/main/index1.vue
@@ -26,22 +26,22 @@
 			</ul> -->
       <a-anchor :affix="true">
         <a-anchor-link
-          @click.prevent="false"
+          @click.native.prevent=""
           href="#toAboutBill"
           title="关于一手单"
         />
         <a-anchor-link
-          @click.prevent="false"
+          @click.native.prevent=""
           href="#cooperativeBrand"
           title="合作品牌"
         />
         <a-anchor-link
-          @click.prevent="false"
+          @click.native.prevent=""
           href="#businessLandscape"
           title="业务版图"
         />
         <a-anchor-link
-          @click.prevent="false"
+          @click.native.prevent=""
           href="#relationUs"
           title="联系我们"
         />
diff --git a/src/utils/commonUtil.js b/src/utils/commonUtil.js
index 584ca1a..c505844 100644
--- a/src/utils/commonUtil.js
+++ b/src/utils/commonUtil.js
@@ -1245,7 +1245,28 @@ export function disposeJobListData(jobList) {
         }
         item["age"] = ageStr;
 
-        //服务费
+        // 更新时间距离现在的差距
+        let differenceTime =
+          new Date().getTime() -
+          new Date(item.updateTime || new Date()).getTime();
+        var D = Math.floor(differenceTime / (24 * 60 * 60 * 1000));
+        var leave1 = differenceTime % (24 * 3600 * 1000);
+        var H = Math.floor(leave1 / (3600 * 1000));
+        var leave2 = leave1 % (3600 * 1000);
+        var M = Math.floor(leave2 / (60 * 1000));
+        var leave3 = leave2 % (60 * 1000);
+        var S = Math.floor(leave3 / 1000);
+        item.diffTime = null;
+        if (D > 0) {
+          item.diffTime = D + "天前";
+        } else if (H > 0) {
+          item.diffTime = H + "小时前";
+        } else if (M > 0) {
+          item.diffTime = M + "分钟前";
+        } else {
+          item.diffTime = S + "秒前";
+        }
+        // 服务费
         // console.log(item);
 
         if (item.returnFeeType) {
diff --git a/src/utils/request.js b/src/utils/request.js
index e006e3f..77c3802 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -12,8 +12,8 @@ console.log(baseURL);
 axios.defaults.withCredentials = true; //添加这行代码
 // console.log(axios);
 const service = axios.create({
-  // baseURL: "/api_prod", // url = base url + request url
-  baseURL: baseURL, //  baseURL: "/api", // url = base url + request url
+  baseURL: "/api_prod", // url = base url + request url
+  // baseURL: baseURL, //  baseURL: "/api", // url = base url + request url
   withCredentials: true, // send cookies when cross-domain requests
   timeout: 10000, // request timeout
   crossDomain: true,
diff --git a/src/views/main.vue b/src/views/main.vue
index a695be2..525789d 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -16,7 +16,7 @@
               <router-link to="/">
                 <a
                   href="javascript:;"
-                  :class="routertitleindex === 0 ? 'titleactive' : ''"
+                  :class="routertitleindex == 0 ? 'titleactive' : ''"
                   >首页</a
                 ></router-link
               >
@@ -25,7 +25,7 @@
               <router-link to="/list" @click.native="toList"
                 ><a
                   href="javascript:;"
-                  :class="routertitleindex === 1 ? 'titleactive' : ''"
+                  :class="routertitleindex == 1 ? 'titleactive' : ''"
                   >一手职位</a
                 ></router-link
               >
@@ -33,7 +33,7 @@
             <li>
               <router-link
                 to="/mybill"
-                :class="routertitleindex === 5 ? 'titleactiveafter' : ''"
+                :class="routertitleindex == 5 ? 'titleactive' : ''"
                 >我的报名
               </router-link>
             </li>
@@ -406,11 +406,12 @@ export default {
       if (this.$route.fullPath == "/main") {
         if (
           navigationBar.getBoundingClientRect().top <= 0 &&
-          aboutBill.getBoundingClientRect().top < 84
+          aboutBill.getBoundingClientRect().top < 85
         ) {
           navigationBar.style.position = "fixed";
           navigationBar.style.top = "0px";
           navigationBar.style.boxShadow = "0 0 10px 0 #eee";
+          navigationBar.style.width = "1920px";
         } else if (
           navigationBar.getBoundingClientRect().top == 0 &&
           aboutBill.getBoundingClientRect().top >= 84
@@ -420,6 +421,7 @@ export default {
           navigationBar.style.top = "unset";
           navigationBar.style.bottom = "0px";
           navigationBar.style.boxShadow = "none";
+          navigationBar.style.width = "1200px";
         }
       }
     },
@@ -456,7 +458,7 @@ export default {
           if (data.status === 200) {
             this.jobMainList = disposeJobListData(data.data.recordList);
             this.formvalue.total = data.data.recordCount;
-            // console.log(this.jobMainList);
+            console.log(this.jobMainList);
           } else {
             this.$message.info("数据获取失败");
           }