Merge branch 'master' of https://git.nanodreamtech.com/Boss/yizhizan-h5

package/jobIntention/basicInfo.vue

@@ -64,7 +64,10 @@
 			</view>
 			
 			<view class="form-item">
-				<view class="form-label">邮箱</view>
+				<view class="form-label">
+					<text class="required-mark">*</text>
+					<text>邮箱</text>
+				</view>
 				<input class="form-input" type="text" placeholder="请输入邮箱号码,方便接收offer" v-model="email" />
 			</view>
 			

pages/index/game/order.vue

@@ -938,6 +938,7 @@
 				line-height: 20px;
 				letter-spacing: 0.5%;
 				text-align: right;
+				flex-shrink: 0;
 			}
 		}
 	}

pages/index/index.vue

@@ -66,13 +66,13 @@
 									</view>
 								</view>
 								<!-- 添加求职意向 -->
-								<view class="topbg-yx-box-r flex align-center" @click="addDirection">
+								<view v-if="isExpanded" class="topbg-yx-box-r flex align-center" @click="addDirection">
 									<image src="../../static/images/index/Attachment.svg" class="attachment-icon" />
 								</view>
 							</view>
 
 							<!-- 第二行：筛选 -->
-							<view class="topbg-sx-box flex justify-between align-center">
+							<view v-if="isExpanded" class="topbg-sx-box flex justify-between align-center">
 								<!-- 分类 -->
 								<view class="topbg-sx-box-l flex align-center">
 									<view class="topbg-sx-box-l-i" :class="currentSx == index ? 'active3' : ''"
@@ -117,7 +117,7 @@
 							</view>
 
 							<!-- 从事方向 -->
-							<view class="direction-tip">
+							<view v-if="isExpanded" class="direction-tip">
 								<view class="direction-tip-title">请选择您的跨境标签</view>
 								<view class="direction-tip-subtitle">您的跨境标签将用于为您推荐更匹配的职位</view>
 
@@ -137,6 +137,10 @@
 									</view>
 								</view>
 							</view>
+							<!-- 展开收起 -->
+							 <view style="text-align: right;" @click="isExpanded = !isExpanded">
+								<u-icon :name="isExpanded ? 'arrow-up' : 'arrow-down'" color="#016bf6"></u-icon>
+							</view>
 						</view>
 					</view>
 
@@ -596,6 +600,7 @@ export default {
 			companyStatus: '',
 			XCXIsSelect: '是',
 			bannerList: [], //企业端轮播图
+			isExpanded: true, // 控制展开/收起状态
 			bannerListuser: [], //用户端轮播图
 			gridlist: [], //用户端分类
 			gongao: [], //公告

pages/my/educationExperience.vue

@@ -29,24 +29,26 @@
 			
 			<!-- 岗位履历 -->
 			<view class="form-section">
-				<!-- 任职时间 -->
+				<!-- 在校时间 -->
 				<view class="form-item">
 					<view class="form-label">
 						<text class="required-mark">*</text>
 						<text class="label-text">在校时间</text>
 					</view>
-					<view class="form-input">
-						<uni-datetime-picker
-										v-model="formData.employmentTime"
-										type="daterange"
-										rangeSeparator="至"
-										:border="false"
-										startPlaceholder="选择入校时间"
-										endPlaceholder="选择离校时间"
-									/>
-						<!-- <text v-if="resume.employmentTime">{{ resume.employmentTime }}</text> -->
-						<!-- <text v-else class="placeholder">{{ hasCrossBorderExperience ? '选择任职时间&离职时间' : '选择在职时间&离职时间' }}</text> -->
-						<image src="../../static/images/index/Iconly_Light_Calendar.svg" style="width: 48rpx; height: 48rpx;" mode="aspectFit"></image>
+					<view class="form-input time-range">
+						<view class="time-input">
+							<uni-datetime-picker v-model="formData.employmentTime[0]" type="date"
+								:border="false" placeholder="开始时间" />
+							<!-- <image src="../../static/images/index/Iconly_Light_Calendar.svg"
+								style="width: 48rpx; height: 48rpx;" mode="aspectFit"></image> -->
+						</view>
+						<view class="time-separator">至</view>
+						<view class="time-input">
+							<uni-datetime-picker v-model="formData.employmentTime[1]" type="date"
+								:border="false" placeholder="结束时间" />
+							<image src="../../static/images/index/Iconly_Light_Calendar.svg"
+								style="width: 48rpx; height: 48rpx;" mode="aspectFit"></image>
+						</view>
 					</view>
 				</view>
 				
@@ -359,8 +361,7 @@ export default {
 		}
 		picker{
 			width: 100%;
-		}
-		textarea{
+		}		textarea{
 			width: 100%;
 			padding: 20rpx 0;
 			height: fit-content;
@@ -369,6 +370,47 @@ export default {
 	}
 }
 
+/* 时间选择器样式 */
+.time-range {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+
+.time-input {
+	flex: 1;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	// border-bottom: 1rpx solid #E5E5EA;
+	// padding-bottom: 10rpx;
+	text-align: center;
+}
+
+.time-input:first-child {
+	margin-right: 20rpx;
+}
+
+.time-input:last-child {
+	margin-left: 20rpx;
+}
+
+.time-separator {
+	font-size: 28rpx;
+	color: #666;
+}
+
+/* 调整日期选择器输入框样式 */
+.time-input /deep/ .uni-datetime-picker__input {
+	width: 100%;
+	font-size: 28rpx;
+	color: #333;
+}
+
+.time-input /deep/ .uni-datetime-picker__placeholder {
+	color: #999;
+	font-size: 28rpx;
+}
 .skills-input-container {
 	width: 100%;
 	min-height: 80rpx;

pages/my/index.vue

@@ -33,7 +33,7 @@
 				</view>
 				<view class="user-content">
 					<view class="info flex justify-center"
-						:style="{ paddingTop: token && XCXIsSelect != '否' ? '0' : '80rpx' }">
+						:style="{ paddingTop: token && XCXIsSelect != '否' ? '0' : '100rpx' }">
 						<view class="info-box">
 							<!-- <view
                 class="info-box-btn flex justify-end align-center"
@@ -2060,7 +2060,7 @@ page {
 		.info-box-header {
 			width: 100%;
 			margin-top: 20rpx;
-			height: 90rpx;
+			// height: 90rpx;
 
 			.info-box-header-l {
 				margin-right: 20rpx;

pages/my/jobApplicant/startPage.vue

@@ -14,7 +14,7 @@
             <image
               :src="item.cover"
               class="wumen-img"
-              mode="scaleToFill"
+              mode="aspectFill"
             />
             <view class="txt-box">
               <view class="start-logo">
@@ -161,7 +161,7 @@ export default {
       position: relative;
       margin-top: 780rpx;
       .wumen-img {
-        width: 614rpx;
+        // width: 614rpx;
         height: 780rpx;
         position: absolute;
         left: 0;

pages/my/workExperience.vue

@@ -56,12 +56,20 @@
 						<text class="required-mark">*</text>
 						<text class="label-text">{{ hasCrossBorderExperience ? '任职时间' : '在职时间' }}</text>
 					</view>
-					<view class="form-input">
-						<uni-datetime-picker v-model="resume.employmentTime" type="daterange" rangeSeparator="至"
-							:border="false" :startPlaceholder="hasCrossBorderExperience ? '选择任职时间' : '选择在职时间'"
-							endPlaceholder="选择离职时间" />
-						<image src="../../static/images/index/Iconly_Light_Calendar.svg"
-							style="width: 48rpx; height: 48rpx;" mode="aspectFit"></image>
+					<view class="form-input time-range">
+						<view class="time-input">
+							<uni-datetime-picker v-model="resume.employmentTime[0]" type="date"
+								:border="false" placeholder="开始时间" />
+							<!-- <image src="../../static/images/index/Iconly_Light_Calendar.svg"
+								style="width: 48rpx; height: 48rpx;" mode="aspectFit"></image> -->
+						</view>
+						<view class="time-separator">至</view>
+						<view class="time-input">
+							<uni-datetime-picker v-model="resume.employmentTime[1]" type="date"
+								:border="false" placeholder="结束时间" />
+							<image src="../../static/images/index/Iconly_Light_Calendar.svg"
+								style="width: 48rpx; height: 48rpx;" mode="aspectFit"></image>
+						</view>
 					</view>
 				</view>
 
@@ -760,6 +768,18 @@ export default {
 			padding: 20rpx 0;
 			height: fit-content;
 			min-height: 40rpx;
+			resize: none;
+			line-height: 1.5;
+		}
+
+		.form-textarea {
+			width: 100%;
+			min-height: 80rpx;
+			max-height: 300rpx;
+			padding: 20rpx 0;
+			line-height: 1.5;
+			resize: none;
+			background: transparent;
 		}
 	}
 }
@@ -940,4 +960,46 @@ export default {
 	height: auto;
 
 }
+
+/* 时间选择器样式 */
+.time-range {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+
+.time-input {
+	flex: 1;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	// border-bottom: 1rpx solid #E5E5EA;
+	// padding-bottom: 10rpx;
+	text-align: center;
+}
+
+.time-input:first-child {
+	margin-right: 20rpx;
+}
+
+.time-input:last-child {
+	margin-left: 20rpx;
+}
+
+.time-separator {
+	font-size: 28rpx;
+	color: #666;
+}
+
+/* 调整日期选择器输入框样式 */
+.time-input /deep/ .uni-datetime-picker__input {
+	width: 100%;
+	font-size: 28rpx;
+	color: #333;
+}
+
+.time-input /deep/ .uni-datetime-picker__placeholder {
+	color: #999;
+	font-size: 28rpx;
+}
 </style>