From 320c3171d511e3e52dd802286d8985f66e7aa8d6 Mon Sep 17 00:00:00 2001
From: jscyl13849007907 <13849007907@163.com>
Date: Mon, 20 Jan 2025 10:36:10 +0800
Subject: [PATCH] =?UTF-8?q?ui=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                         |  2 +-
 src/components/FirstJob/detail.vue  | 72 +++++++++++++++++++++++++++++++++----
 src/components/FirstJob/joblist.vue | 50 +++++++++++++-------------
 src/style/index.css                 |  2 +-
 src/style/index.less                |  2 +-
 src/views/main.vue                  |  1 +
 6 files changed, 94 insertions(+), 35 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index eec3135..dde66fd 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -8,7 +8,7 @@
 <script>
 import zhCn from "ant-design-vue/lib/locale-provider/zh_CN";
 let sp = document.createElement('script')
-sp.src = '//at.alicdn.com/t/c/font_3135652_34tw0b78y6p.js'
+sp.src = '//at.alicdn.com/t/c/font_3135652_q5zxetpyxmk.js'
 document.body.appendChild(sp)
 export default {
   provide() {
diff --git a/src/components/FirstJob/detail.vue b/src/components/FirstJob/detail.vue
index 59391a2..c8174fe 100644
--- a/src/components/FirstJob/detail.vue
+++ b/src/components/FirstJob/detail.vue
@@ -18,7 +18,31 @@
 			</a-breadcrumb-item>
 		</a-breadcrumb>
 		<!-- 主体区域 -->
-		<div class="maincontent w">
+		<div class="maincontent w"> 
+			<div class="m-money-obj g_mb_20 g_p_20 g_flex_row_between" 
+					 style="background-color: #fff;border-radius: 6px;width: 800px;margin: 0 auto 20px;"
+			>
+				<div class="g_flex_row_start">
+					<div style="font-size: 16px;font-weight: 600;margin-right: 4px;">代理佣金</div>
+					<div class="g_flex_column_center" @click="isSee = !isSee" style="cursor: pointer;">
+						<i class="iconfont icon-zhengyan11" style="font-size: 22px;color: #ff4400;line-height: 0.1;" v-if="isSee"></i>
+						<i class="iconfont icon-biyan11" style="font-size: 22px;color: #ff4400;line-height: 0.1;margin-top: -4px;" v-if="!isSee"></i>
+					</div>
+				</div>
+				<div class="g_flex_row_end" @click="viewDetail" style="cursor: pointer;">
+					<div class="g_flex_column_center g_fs_14">
+						<span v-if="isSee">
+							{{ jobDetail.servetype }}
+						</span>
+						<span v-if="!isSee">
+							***
+						</span>
+					</div>
+					<div class="g_flex_column_center">
+						<i class="iconfont icon-xiangyou1"></i>
+					</div>
+				</div>
+			</div>
 			<!-- 职教 -->
 			<div class="maincontentleft" v-if="from == 'vocational'">
 				<div class="subset">
@@ -72,12 +96,13 @@
 						</a-modal>
 					</div>
 					<div class="subsetright">
-						<div class="topbox">
+						<div class="topbox" v-if="false">
 							<div>服务费</div>
 							<div>
 								<span>{{ jobDetail.serviceCharge }}</span>
 							</div>
 						</div>
+						<div style="color: #a1a1a1;font-size: 14px;margin-left: 15px;">{{ jobDetail.up_time }}</div>
 						<div class="sub-bottombox">
 							<!-- <button type="primary" class="jobDespBtn">
 								<a :href="customServiceUrl" target="_blank"> <i class="iconfont icon-kefu_lan mr6"></i>联系客服</a>
@@ -168,12 +193,13 @@
 						</a-modal>
 					</div>
 					<div class="subsetright">
-						<div class="topbox">
+						<div class="topbox" v-if="false">
 							<div>服务费</div>
 							<div>
 								<span>{{ jobDetail.servetype }}</span>
 							</div>
 						</div>
+						<div style="color: #a1a1a1;font-size: 14px;margin-left: 15px;">{{ jobDetail.up_time }}</div>
 						<div class="sub-bottombox fss">
 							<button type="primary" class="jobDespBtn" v-if="jobClassify == 1">
 
@@ -200,7 +226,7 @@
 					<h1>
 						<div class="infotitle">
 							<span @click="tabchange = 1" :class="tabchange === 1 ? 'active' : ''">基本信息</span>
-							<span @click="tabchange = 0" :class="tabchange === 0 ? 'active' : ''">财务结算</span>
+							<span @click="tabchange = 0" :class="tabchange === 0 ? 'active' : ''" v-if="false">财务结算</span>
 							<span @click="tabchange = 2" :class="tabchange === 2 ? 'active' : ''">职位描述</span>
 						</div>
 					</h1>
@@ -526,6 +552,7 @@ export default {
 	// 组件状态值
 	data() {
 		return {
+			isSee:true,
 			agency: {},
 			onSiteUsersInfo: "",
 			customServiceUsers: [],
@@ -924,7 +951,7 @@ export default {
 							}
 						});
 					}
-
+					this.jobDetail.up_time = this.timeShowXXX2(this.jobDetail.updateTime)
 					this.storeImage = [...storeImage, ...storeVideo];
 					console.log("this.storeImage", this.storeImage);
 				} else {
@@ -937,6 +964,27 @@ export default {
 			} catch (error) {
 				console.log(error);
 			}
+		}, 
+		timeShowXXX2(val){
+			const now = Date.now();
+			const diff = now - val;
+
+			const seconds = Math.floor(diff / 1000);
+			const minutes = Math.floor(seconds / 60);
+			const hours = Math.floor(minutes / 60);
+			const days = Math.floor(hours / 24);
+
+			if (days < 2) {
+					if (hours > 0) {
+							return `${hours}小时前`;
+					} else if (minutes > 0) {
+							return `${minutes}分钟前`;
+					} else {
+							return `${seconds}秒前`;
+					}
+			} else {
+					return `${days}天前`;
+			}
 		},
 		/**
 		 * 获取登录人对应的客户经理信息
@@ -1098,6 +1146,16 @@ export default {
 			this.previewImage = file;
 			this.previewVisible = true;
 		},
+
+		viewDetail(){
+			let that = this;
+			console.log('ces',that.jobDetail.returnFeeDesp);
+			const h = this.$createElement;
+			this.$info({
+        title: that.jobDetail.returnFeeDesp || '-',
+        onOk() {},
+      });
+		}
 	},
 };
 </script>
@@ -1204,8 +1262,8 @@ export default {
 //   }
 // }
 /deep/ .maincontent {
-	display: flex;
-	justify-content: space-between;
+	// display: flex;
+	// justify-content: space-between;
 	margin-top: 12px;
 	.maincontentleft {
 		width: 800px;
diff --git a/src/components/FirstJob/joblist.vue b/src/components/FirstJob/joblist.vue
index f4bd0de..2586334 100644
--- a/src/components/FirstJob/joblist.vue
+++ b/src/components/FirstJob/joblist.vue
@@ -55,7 +55,7 @@
 									筛选 <a-icon type="down" style="font-size: 14px;" />
 								</a> 
 								<div slot="overlay" class="model-obj">
-									<div class="filter" :class="[filterStatus == 0 ? '' : 'nobd']" style>
+									<div class="filter" :class="[filterStatus == 0 ? '' : 'nobd']" style="box-shadow: 3px 3px 20px 0px rgba(77, 87, 94, 0.3);border-radius: 6px;overflow: hidden;">
 										<div class="filter-title" :style="{ top: filterStatus == 0 ? '-32px' : '-21px' }" v-if="false">
 											<span>
 												<span>
@@ -745,7 +745,7 @@
 											</a-button>
 											<a-button shape="circle" type="danger" ghost @click="toggleGhost" class="g_ml_12">
 												<template #icon> -->
-													<div class="g_w_40 g_cursor_point">
+													<div class="g_w_40 g_cursor_point" v-if="false">
 														<div class="g_text_c g_w_all" style="height: 18px;line-height: 18px;">
 															<a-icon class="g_fs_17" style="color:#666;" type="star" />
 														</div>
@@ -1322,24 +1322,24 @@ export default {
 		},
 		timeShowXXX2(val){
 			const now = Date.now();
-  const diff = now - val;
-
-  const seconds = Math.floor(diff / 1000);
-  const minutes = Math.floor(seconds / 60);
-  const hours = Math.floor(minutes / 60);
-  const days = Math.floor(hours / 24);
-
-  if (days < 2) {
-      if (hours > 0) {
-          return `${hours}小时前`;
-      } else if (minutes > 0) {
-          return `${minutes}分钟前`;
-      } else {
-          return `${seconds}秒前`;
-      }
-  } else {
-      return `${days}天前`;
-  }
+			const diff = now - val;
+
+			const seconds = Math.floor(diff / 1000);
+			const minutes = Math.floor(seconds / 60);
+			const hours = Math.floor(minutes / 60);
+			const days = Math.floor(hours / 24);
+
+			if (days < 2) {
+					if (hours > 0) {
+							return `${hours}小时前`;
+					} else if (minutes > 0) {
+							return `${minutes}分钟前`;
+					} else {
+							return `${seconds}秒前`;
+					}
+			} else {
+					return `${days}天前`;
+			}
 		},
 		async getJobListYicai(newdata) {
 			// this.isspinning = true;
@@ -1600,13 +1600,13 @@ export default {
 			this.formvalue.pageNum = 1
 			if (e.target.dataset.type != undefined) {
 				this.formvalue.pageNum = 1;
-				if (e.target.dataset.type != 0) {
+				// if (e.target.dataset.type != 0) {
+				// 	this.formvalue.signType = this.signType = e.target.dataset.type;
+				// 	this.getJobListYicai();
+				// } else {
 					this.formvalue.signType = this.signType = e.target.dataset.type;
-					this.getJobListYicai();
-				} else {
-					this.formvalue.signType = this.signType = "";
 					this.getJobList();
-				}
+				//}
 			}
 		},
 		async getJobSpecialList() {
diff --git a/src/style/index.css b/src/style/index.css
index 68fd2fb..f1d582d 100644
--- a/src/style/index.css
+++ b/src/style/index.css
@@ -1,4 +1,4 @@
-@import "//at.alicdn.com/t/c/font_3135652_nd5ivglbv4.css";
+@import "//at.alicdn.com/t/c/font_3135652_q5zxetpyxmk.css";
 @font-face {
   font-family: "DingTalk";
   /* 这里的字体名称是自定义的 */
diff --git a/src/style/index.less b/src/style/index.less
index 02e1900..20e9017 100644
--- a/src/style/index.less
+++ b/src/style/index.less
@@ -1,4 +1,4 @@
-@import "//at.alicdn.com/t/c/font_3135652_nd5ivglbv4.css";
+@import "//at.alicdn.com/t/c/font_3135652_q5zxetpyxmk.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 d4a5b45..e0a6001 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -968,6 +968,7 @@ export default {
 		top: 0;
 		width: 100vw;
 		z-index: 999999;
+		box-shadow: 3px 3px 6px 0px rgba(77, 87, 94, 0.1);
 	}
  
 	.fellowtownsman {