Merge branch 'recruit-enterprise' of https://git.citupro.com/zhengnaiwen_citu/menduner-uniapp into recruit-enterprise

components/PositionList/index.vue

@@ -211,7 +211,7 @@ const handleDetail = (item) => {
 // 查看职位投递简历
 const handleToResume = (val) => {
   let url = `/pagesA/resume/index?jobId=${val.id}&jobName=${formatName(val.name)}`
-  if (val.bizId) url += `&jobFairId=${val.bizId}`
+  // if (val.bizId) url += `&jobFairId=${val.bizId}`
   uni.navigateTo({ url })
 }
 
@@ -281,7 +281,6 @@ const paySuccess = () => {
 }
 .list-shape {
 	padding: 10px 30rpx 10px;
-  background-color: #fff;
   border-radius: 12px 12px 0 0;
   .titleBox {
     display: flex;
@@ -322,6 +321,7 @@ const paySuccess = () => {
   position: relative;
   box-shadow: 1px 2px 12px rgba(0, 0, 0, 0.17);
   border-radius: 20rpx;
+  background-color: #fbfbfb;
 }
 /* 列表触底暂无更多 */
 .noMore{ text-align:center; color:grey; }

pages/index/components/talentItem.vue

@@ -98,8 +98,9 @@ const handleDetail = ({ userId }) => {
 	  margin: 30rpx;
 	  border-radius: 20rpx;
 	  padding: 30rpx;
-	  background-color: #fff;
+	  background-color: #fbfbfb;
 	  box-shadow: 1px 2px 12px rgba(0, 0, 0, 0.17);
+	  border: 1rpx solid #E1E4E9;
 	}
 .user-avatar {
 	position: relative;

pages/index/jobFair.vue

@@ -5,7 +5,7 @@
       <view class="defaultBgc" style="padding-bottom: 100px;" :style="{'height': `calc(100vh - ${(navbarHeight + 100)}px)`, 'padding-top': navbarHeight + 'px'}">
         <view v-if="items.length">
           <view class="commonBackground"></view>
-          <view v-for="val in items" :key="val.id" @tap="handleToJobFairEnterprises(val)" class="list-item defaultBgc default-border">
+          <view v-for="val in items" :key="val.id" @tap="handleToJobFairEnterprises(val)" class="list-item default-border">
             <image v-if="val?.previewImg" class="ss-m-t-10" :src="val.previewImg" mode="widthFix" style="width: 100%; height: auto; border-radius: 6px;"></image>
             <view class="ss-m-t-20">活动时间：{{ timesTampChange(val.startTime, 'Y-M-D') }}至{{ timesTampChange(val.endTime, 'Y-M-D') }}</view>
             <button class="ss-m-t-20 ss-m-b-10" style="background-color: #00B760; color: #fff;" type="primary">立即加入</button>
@@ -122,6 +122,7 @@ const paySuccess = () => {
   border-radius: 20rpx;
   padding: 30rpx;
   position: relative;
+  background-color: #fbfbfb;
   box-shadow: 1px 2px 12px rgba(0, 0, 0, 0.17);
   view {
     font-size: 28rpx;

pagesA/interview/components/item.vue

@@ -196,7 +196,7 @@ const actionItems = (item) => {
 	box-shadow: 1px 2px 12px rgba(0, 0, 0, 0.17);
 	margin: 0 30rpx 20rpx 30rpx;
 	padding: 30rpx;
-	background-color: #fff;
+	background-color: #fbfbfb;
 	font-size: 28rpx;
 	&:first-child {
 		margin-top: 20rpx;

pagesA/resume/item.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view v-for="(val, index) in items" :key="index" :is-shadow="true" @tap.stop="handleDetail(val)" class="mList default-border">
+		<view v-for="(val, index) in items" :key="index" @tap.stop="handleDetail(val)" class="mList default-border">
 			<!-- 基本信息 -->
 			<view class="d-flex align-center">
 				<view class="user-avatar">
@@ -298,7 +298,7 @@ const actionItems = (item) => {
 	box-shadow: 1px 2px 12px rgba(0, 0, 0, 0.17);
 	margin: 0 30rpx 20rpx 30rpx;
 	padding: 30rpx;
-	background-color: #fff;
+	background-color: #fbfbfb;
 	font-size: 28rpx;
 	&:first-child {
 		margin-top: 20rpx;

pagesB/jobFair/jobItem.vue

@@ -8,7 +8,7 @@
           </view>
           <view class="ss-m-l-20 label-text">{{ item?.hrName }}</view>
         </view>
-        <view class="list-shape">
+        <view class="list-shape" :style="{'border-radius': item?.hrName ? '0 0 12px 12px' : '12px'}">
           <view @tap.stop="handleToDetail(item)">
 						<view class="titleBox">
 							<view style="display: flex;align-items: center;">
@@ -172,7 +172,6 @@ const handleRemoveConfirm = async () => {
 }
 .list-shape {
   background-color: #fff;
-  border-radius: 0 0 12px 12px;
 	padding: 30rpx;
   .titleBox {
     display: flex;
@@ -193,5 +192,7 @@ const handleRemoveConfirm = async () => {
   margin-bottom: 20rpx;
 	position: relative;
   box-shadow: 1px 2px 12px rgba(0, 0, 0, 0.17);
+	background-color: #fbfbfb;
+	border-radius: 12px;
 }
 </style>