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

pages/my/index.vue

@@ -366,7 +366,7 @@
 							<view class="info-box-header flex align-center" @click="goNav('/my/renzheng/editCompany')">
 								<view class="info-box-header-l">
 									<image :src="avatar ? avatar : '../../static/logo.png'"
-										@click.stop="return; goNav('/pages/my/userinfo')" mode=""></image>
+										@click.stop="goNav('/pages/my/userinfo')" mode=""></image>
 								</view>
 								<view class="info-box-header-r">
 									<view class="info-box-header-r-name flex align-center">

pages/my/myCompany.vue

@@ -10,38 +10,38 @@
 				<view class="nav-right"></view>
 			</view>
 		</view>
-		
+
 		<!-- 头部渐变背景区域 -->
 		<view class="header-section">
 			<!-- 插画区域 -->
 			<view class="illustration-area">
 				<image src="/static/images/gongsi.svg" class="company-illustration" mode="aspectFit" />
 			</view>
-			
+
 			<!-- 公司名称显示 -->
 			<view class="company-name-section">
-				<view class="company-brand">汉睿国际</view>
-				<view class="company-full-name">深圳市汉睿国际猎头服务有限公司</view>
+				<view class="company-brand">{{companyInfo.companyName}}</view>
+				<view class="company-full-name">{{companyInfo.companyAllName}}</view>
 			</view>
 		</view>
-		
+
 		<!-- 公司信息卡片和按钮整体 -->
 		<view class="company-content-wrapper">
 			<view class="company-info-card">
 				<view class="info-item">
 					<view class="info-label">公司规模</view>
-					<view class="info-value">0-20人</view>
+					<view class="info-value">{{companyInfo.companyPeople?(companyInfo.companyPeople+'人'):'--'}}</view>
 				</view>
 				<view class="info-item">
 					<view class="info-label">融资阶段</view>
-					<view class="info-value">暂无融资</view>
+					<view class="info-value">{{companyInfo.companyDevelop}}</view>
 				</view>
 				<view class="info-item">
 					<view class="info-label">所属行业</view>
-					<view class="info-value">跨境电商</view>
+					<view class="info-value">{{companyInfo.companyScope}}</view>
 				</view>
 			</view>
-			
+
 			<!-- 操作按钮 -->
 			<view class="action-buttons">
 				<view class="leave-btn" @click="leaveCompany">
@@ -52,18 +52,12 @@
 				</view>
 			</view>
 		</view>
-		
+
 		<!-- 离开公司确认弹窗 -->
-		<u-popup 
-			v-model="showLeaveModal" 
-			mode="center" 
-			width="630rpx"
-			border-radius="24"
-			:closeable="false"
-		>
+		<u-popup v-model="showLeaveModal" mode="center" width="630rpx" border-radius="24" :closeable="false">
 			<view class="leave-modal">
 				<view class="modal-content">
-                    <view class="modal-title">离开公司可能造成的影响:</view>
+					<view class="modal-title">离开/更换公司可能造成的影响:</view>
 					<view class="impact-list">
 						<view class="impact-item">
 							<text class="item-number">1.</text>
@@ -83,13 +77,13 @@
 						</view>
 					</view>
 				</view>
-				
+
 				<view class="modal-buttons">
 					<view class="cancel-btn" @click="closeLeaveModal">
 						<text>取消</text>
 					</view>
 					<view class="confirm-btn" @click="confirmLeaveCompany">
-						<text>仍要离开</text>
+						<text>仍要离开/更换</text>
 					</view>
 				</view>
 			</view>
@@ -98,328 +92,350 @@
 </template>
 
 <script>
-export default {
-	data() {
-		return {
-			companyInfo: {
-				name: '汉睿国际',
-				fullName: '深圳市汉睿国际猎头服务有限公司',
-				size: '0-20人',
-				finance: '暂无融资',
-				industry: '跨境电商'
-			},
-			showLeaveModal: false // 控制弹窗显示
-		};
-	},
-	methods: {
-		// 返回上一页
-		goBack() {
-			uni.navigateBack();
-		},
-		
-		// 离开公司
-		leaveCompany() {
-			this.showLeaveModal = true;
+	export default {
+		data() {
+			return {
+				companyInfo: {},
+				showLeaveModal: false, // 控制弹窗显示
+				leaveType: 1
+			};
 		},
-		
-		// 关闭离开公司弹窗
-		closeLeaveModal() {
-			this.showLeaveModal = false;
+		onLoad() {
+			this.getCompanyStatus()
 		},
-		
-		// 确认离开公司
-		confirmLeaveCompany() {
-			this.showLeaveModal = false;
-			uni.showLoading({
-				title: '处理中...'
-			});
-			
-			setTimeout(() => {
-				uni.hideLoading();
-				uni.showToast({
-					title: '已离开公司',
-					icon: 'success'
+		methods: {
+			// 返回上一页
+			goBack() {
+				uni.navigateBack();
+			},
+			getCompanyStatus() {
+				this.$Request.get("/app/company/selectCompanyByUserId").then((res) => {
+					if (res.code == 0 && res.data) {
+						this.companyInfo = res.data
+					} else {
+						this.companyInfo = {};
+					}
 				});
-				
-				setTimeout(() => {
-					uni.navigateBack();
-				}, 1500);
-			}, 1500);
-		},
-		
-		// 更换公司
-		changeCompany() {
-			uni.navigateTo({
-				url: '/pages/my/changeCompanies'
-			});
+			},
+			// 离开公司
+			leaveCompany() {
+				this.showLeaveModal = true;
+				this.leaveCompany = 1
+			},
+
+			// 关闭离开公司弹窗
+			closeLeaveModal() {
+				this.showLeaveModal = false;
+			},
+
+			// 确认离开公司
+			confirmLeaveCompany() {
+				this.showLeaveModal = false;
+				uni.showLoading({
+					title: '处理中...'
+				});
+				that.$Request.get("/app/company/deleteCompany").then(res => {
+					uni.hideLoading();
+					if (res.code === 0) {
+						if (this.leaveType === 1) {
+							uni.showToast({
+								title: '已离开公司',
+								icon: 'success'
+							});
+						} else {
+							uni.navigateTo({
+								url: 'pages/my/businessLicense'
+							});
+						}
+					}
+				})
+				// setTimeout(() => {
+				// 	uni.hideLoading();
+				// 	uni.showToast({
+				// 		title: '已离开公司',
+				// 		icon: 'success'
+				// 	});
+
+				// 	setTimeout(() => {
+				// 		uni.navigateBack();
+				// 	}, 1500);
+				// }, 1500);
+			},
+
+			// 更换公司
+			changeCompany() {
+				this.leaveCompany = 2
+				this.showLeaveModal = true;
+			}
 		}
 	}
-}
 </script>
 
 <style lang="scss" scoped>
-.my-company-page {
-	min-height: 100vh;
-	background: var(--线性渐变, linear-gradient(90.00deg, rgba(13, 39, 247, 1),rgba(19, 193, 234, 1) 100%));
-	background-size: 100% 35%;
-	background-position: center top;
-	background-repeat: no-repeat;
-	position: relative;
-	padding-bottom: 40rpx;
-}
-
-/* 导航栏 */
-.custom-navbar {
-	position: fixed;
-	top: 0;
-	left: 0;
-	right: 0;
-	background: transparent;
-	z-index: 9999;
-	
-	.navbar-content {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		height: 88rpx;
-		padding: 0 40rpx;
-		padding-top: 80rpx;
-		
-		.nav-left {
+	.my-company-page {
+		min-height: 100vh;
+		background: var(--线性渐变, linear-gradient(90.00deg, rgba(13, 39, 247, 1), rgba(19, 193, 234, 1) 100%));
+		background-size: 100% 35%;
+		background-position: center top;
+		background-repeat: no-repeat;
+		position: relative;
+		padding-bottom: 40rpx;
+	}
+
+	/* 导航栏 */
+	.custom-navbar {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		background: transparent;
+		z-index: 9999;
+
+		.navbar-content {
 			display: flex;
 			align-items: center;
-			gap: 8rpx;
-			
-			.nav-breadcrumb {
+			justify-content: space-between;
+			height: 88rpx;
+			padding: 0 40rpx;
+			padding-top: 80rpx;
+
+			.nav-left {
+				display: flex;
+				align-items: center;
+				gap: 8rpx;
+
+				.nav-breadcrumb {
+					color: rgba(255, 255, 255, 1);
+					font-family: DM Sans;
+					font-size: 28rpx;
+					font-weight: 400;
+					line-height: 40rpx;
+				}
+			}
+
+			.nav-title {
 				color: rgba(255, 255, 255, 1);
 				font-family: DM Sans;
-				font-size: 28rpx;
-				font-weight: 400;
-				line-height: 40rpx;
+				font-size: 32rpx;
+				font-weight: 700;
+				line-height: 52rpx;
+				letter-spacing: 0.5%;
+				text-align: center;
+			}
+
+			.nav-right {
+				width: 60rpx;
 			}
 		}
-		
-		.nav-title {
-            color: rgba(255, 255, 255, 1);
-            font-family: DM Sans;
-            font-size: 32rpx;
-            font-weight: 700;
-            line-height: 52rpx;
-            letter-spacing: 0.5%;
+	}
+
+	/* 头部区域 */
+	.header-section {
+		padding: 160rpx 40rpx 66rpx 40rpx;
+		text-align: center;
+	}
+
+	.illustration-area {
+		margin-bottom: 30rpx;
+
+		.company-illustration {
+			width: 280rpx;
+			height: 180rpx;
+			max-width: 100%;
+		}
+	}
+
+	.company-name-section {
+		.company-brand {
+			color: rgba(255, 255, 255, 1);
+			font-family: DM Sans;
+			font-size: 28rpx;
+			font-weight: 500;
+			line-height: 44rpx;
+			letter-spacing: 0%;
 			text-align: center;
+			margin-bottom: 8rpx;
 		}
-		
-		.nav-right {
-			width: 60rpx;
+
+		.company-full-name {
+			color: rgba(255, 255, 255, 1);
+			font-family: DM Sans;
+			font-size: 28rpx;
+			font-weight: 500;
+			line-height: 44rpx;
+			letter-spacing: 0%;
+			text-align: center;
 		}
 	}
-}
-
-/* 头部区域 */
-.header-section {
-	padding: 160rpx 40rpx  66rpx 40rpx;
-	text-align: center;
-}
-
-.illustration-area {
-	margin-bottom: 30rpx;
-	
-	.company-illustration {
-		width: 280rpx;
-		height: 180rpx;
-		max-width: 100%;
+
+	/* 公司内容整体包装 */
+	.company-content-wrapper {
+		width: 100%;
+		height: 100%;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10px 10px 0px 0px;
+		padding: 54rpx 76rpx;
+
+		display: flex;
+		flex-direction: column;
+		gap: 30rpx;
 	}
-}
-
-.company-name-section {
-	.company-brand {
-        color: rgba(255, 255, 255, 1);
-        font-family: DM Sans;
-        font-size: 28rpx;
-        font-weight: 500;
-        line-height: 44rpx;
-        letter-spacing: 0%;
-        text-align: center;
-		margin-bottom: 8rpx;
+
+	/* 公司信息卡片 */
+	.company-info-card {
+		background: rgba(255, 255, 255, 1);
+		border-radius: 24rpx;
+		overflow: hidden;
 	}
-	
-	.company-full-name {
-        color: rgba(255, 255, 255, 1);
-        font-family: DM Sans;
-        font-size: 28rpx;
-        font-weight: 500;
-        line-height: 44rpx;
-        letter-spacing: 0%;
-        text-align: center;
+
+	.info-item {
+		display: flex;
+		align-items: center;
+		padding: 12rpx 24rpx;
+		gap: 32rpx;
+
+		.info-label,
+		.info-value {
+			color: rgba(153, 153, 153, 1);
+			font-family: DM Sans;
+			font-size: 26rpx;
+			font-weight: 400;
+			line-height: 32rpx;
+			letter-spacing: 0%;
+			text-align: left;
+		}
+	}
+
+	.leave-btn {
+		flex: 1;
+		height: 88rpx;
+		background: transparent;
+		border: 2rpx solid rgba(255, 122, 69, 1);
+		border-radius: 44rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin-bottom: 38rpx;
+
+		text {
+			color: rgba(255, 102, 0, 1);
+			font-family: DM Sans;
+			font-size: 32rpx;
+			font-weight: 400;
+			line-height: 48rpx;
+			letter-spacing: 0%;
+			text-align: center;
+		}
+
+		&:active {
+			background: rgba(255, 122, 69, 0.1);
+		}
+	}
+
+	.change-btn {
+		flex: 1;
+		height: 88rpx;
+		background: linear-gradient(90deg, rgba(255, 122, 69, 1) 0%, rgba(255, 122, 69, 1) 100%);
+		border-radius: 44rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+
+		text {
+			color: rgba(255, 255, 255, 1);
+			font-family: DM Sans;
+			font-size: 32rpx;
+			font-weight: 400;
+			line-height: 48rpx;
+			letter-spacing: 0%;
+			text-align: center;
+		}
+
+		&:active {
+			opacity: 0.8;
+		}
+	}
+
+	/* 离开公司弹窗样式 */
+	.modal-title {
+		color: rgba(88, 88, 88, 1);
+		font-family: DM Sans;
+		font-size: 28rpxpx;
+		font-weight: 700;
+		line-height: 36rpx;
+		letter-spacing: 0%;
+		text-align: left;
+		margin-bottom: 30rpx;
 	}
-}
-
-/* 公司内容整体包装 */
-.company-content-wrapper {
-    width: 100%;
-    height: 100%;
-    background: rgba(255, 255, 255, 1);
-    border-radius: 10px 10px 0px 0px;
-    padding: 54rpx 76rpx;
-    
-	display: flex;
-	flex-direction: column;
-	gap: 30rpx;
-}
-
-/* 公司信息卡片 */
-.company-info-card {
-	background: rgba(255, 255, 255, 1);
-	border-radius: 24rpx;
-	overflow: hidden;
-}
-
-.info-item {
-	display: flex;
-	align-items: center;
-	padding: 12rpx 24rpx;
-    gap: 32rpx;
-	
-	.info-label , .info-value {
-        color: rgba(153, 153, 153, 1);
-        font-family: DM Sans;
-        font-size: 26rpx;
-        font-weight: 400;
-        line-height: 32rpx;
-        letter-spacing: 0%;
-        text-align: left;
+
+	.modal-content {
+		padding: 40rpx;
+	}
+
+	.impact-list {
+		display: flex;
+		flex-direction: column;
+		gap: 12rpx;
 	}
-}
-
-.leave-btn {
-	flex: 1;
-	height: 88rpx;
-	background: transparent;
-	border: 2rpx solid rgba(255, 122, 69, 1);
-	border-radius: 44rpx;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-    margin-bottom: 38rpx;
-	
-	text {
-        color: rgba(255, 102, 0, 1);
-        font-family: DM Sans;
-        font-size: 32rpx;
-        font-weight: 400;
-        line-height: 48rpx;
-        letter-spacing: 0%;
-        text-align: center;
+
+	.impact-item {
+		display: flex;
+		gap: 8rpx;
 	}
-	
-	&:active {
-		background: rgba(255, 122, 69, 0.1);
+
+	.item-number,
+	.item-text {
+		color: rgba(158, 158, 158, 1);
+		font-family: DM Sans;
+		font-size: 26rpx;
+		font-weight: 400;
+		line-height: 26rpx;
+		letter-spacing: 0%;
+		text-align: left;
 	}
-}
-
-.change-btn {
-	flex: 1;
-	height: 88rpx;
-	background: linear-gradient(90deg, rgba(255, 122, 69, 1) 0%, rgba(255, 122, 69, 1) 100%);
-	border-radius: 44rpx;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	
-	text {
-        color: rgba(255, 255, 255, 1);
-        font-family: DM Sans;
-        font-size: 32rpx;
-        font-weight: 400;
-        line-height: 48rpx;
-        letter-spacing: 0%;
-        text-align: center;
+
+	.modal-buttons {
+		display: flex;
 	}
-	
-	&:active {
-		opacity: 0.8;
+
+	.cancel-btn {
+		flex: 1;
+		height: 100rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		border-right: 0.5px solid rgba(153, 153, 153, 0.2);
+		border-top: 0.5px solid rgba(153, 153, 153, 0.2);
+	}
+
+	.cancel-btn text {
+		color: rgba(153, 153, 153, 0.5);
+		font-family: DM Sans;
+		font-size: 28rpx;
+		font-weight: 500;
+		line-height: 36rpx;
+		letter-spacing: 0%;
+		text-align: center;
+		text-transform: uppercase;
+	}
+
+	.confirm-btn {
+		flex: 1;
+		height: 100rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		border-top: 0.5px solid rgba(153, 153, 153, 0.2);
+	}
+
+	.confirm-btn text {
+		color: rgba(1, 107, 246, 1);
+		font-family: DM Sans;
+		font-size: 28rpx;
+		font-weight: 500;
+		line-height: 36rpx;
+		letter-spacing: 0%;
+		text-align: center;
+		text-transform: uppercase;
 	}
-}
-
-/* 离开公司弹窗样式 */
-.modal-title {
-    color: rgba(88, 88, 88, 1);
-    font-family: DM Sans;
-    font-size: 28rpxpx;
-    font-weight: 700;
-    line-height: 36rpx;
-    letter-spacing: 0%;
-    text-align: left;
-    margin-bottom: 30rpx;
-}
-
-.modal-content {
-	padding: 40rpx;
-}
-
-.impact-list {
-	display: flex;
-	flex-direction: column;
-	gap: 12rpx;
-}
-
-.impact-item {
-	display: flex;
-	gap: 8rpx;
-}
-
-.item-number , .item-text {
-    color: rgba(158, 158, 158, 1);
-    font-family: DM Sans;
-    font-size: 26rpx;
-    font-weight: 400;
-    line-height: 26rpx;
-    letter-spacing: 0%;
-    text-align: left;
-}
-
-.modal-buttons {
-	display: flex;
-}
-
-.cancel-btn {
-	flex: 1;
-	height: 100rpx;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-    border-right: 0.5px solid rgba(153, 153, 153, 0.2);
-    border-top: 0.5px solid rgba(153, 153, 153, 0.2);
-}
-
-.cancel-btn text {
-    color: rgba(153, 153, 153, 0.5);
-    font-family: DM Sans;
-    font-size: 28rpx;
-    font-weight: 500;
-    line-height: 36rpx;
-    letter-spacing: 0%;
-    text-align: center;
-    text-transform: uppercase;
-}
-
-.confirm-btn {
-	flex: 1;
-	height: 100rpx;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-    border-top: 0.5px solid rgba(153, 153, 153, 0.2);
-}
-
-.confirm-btn text {
-    color: rgba(1, 107, 246, 1);
-    font-family: DM Sans;
-    font-size: 28rpx;
-    font-weight: 500;
-    line-height: 36rpx;
-    letter-spacing: 0%;
-    text-align: center;
-    text-transform: uppercase;
-}
-</style>
+</style>

pages/my/userinfo.vue

@@ -96,7 +96,7 @@
 				<view class="usermain-item-title">接收简历邮箱</view>
 				<view>
 					<view class="cu-form-group">
-						<input v-model="email" placeholder="建议录入企业邮箱" />
+						<input v-model="hrEmail" placeholder="建议录入企业邮箱" />
 					</view>
 				</view>
 			</view>
@@ -108,7 +108,7 @@
 					<view class="form-input-selector" @click="selectCompany">
 						<text v-if="selectedCompany">{{ selectedCompany }}</text>
 						<text v-else class="placeholder">请选择公司</text>
-						<u-icon name="arrow-down" color="#999" size="36"></u-icon>
+						<u-icon name="arrow-right" color="#999" size="36"></u-icon>
 					</view>
 				</view>
 			</view>
@@ -117,10 +117,12 @@
 			<view class="usermain-item item-padding">
 				<view class="usermain-item-title">我的职务</view>
 				<view>
-					<view class="form-input-selector" @click="selectPosition">
-						<text v-if="selectedPosition">{{ selectedPosition }}</text>
+					<view class="form-input-selector">
+						<!-- 	<text v-if="selectedPosition">{{ selectedPosition }}</text>
 						<text v-else class="placeholder">请选择职务</text>
-						<u-icon name="arrow-down" color="#999" size="36"></u-icon>
+						<u-icon name="arrow-down" color="#999" size="36"></u-icon> -->
+						<input type="text" v-model="hrPosition" placeholder="请输入职务" @input="filterSymbols"
+							style="width: 100%;" :key='inputKey' />
 					</view>
 				</view>
 			</view>
@@ -167,7 +169,11 @@
 				zhiFuBao: '',
 				zhiFuBaoName: '',
 				sex: 1,
-				age: 0
+				age: 0,
+				hrInfo: {},
+				hrPosition: '',
+				hrEmail: '',
+				inputKey: ''
 			};
 		},
 		computed: {
@@ -184,9 +190,27 @@
 			this.statusBarHeight = systemInfo.statusBarHeight || 0;
 
 			this.getUserInfo()
+			this.getUserHr()
+			this.inputKey = new Date().getTime()
 			// this.avatar = uni.getStorageSync('avatar')
 		},
 		methods: {
+			filterSymbols(e) {
+				// 使用正则表达式过滤掉所有符号（只保留中文、英文、数字）
+				let value = e.detail.value
+				// 允许：中文、英文、数字
+				let filteredValue = value.replace(/[^\u4e00-\u9fa5a-zA-Z0-9]/g, '')
+				console.log(this.hrPosition);
+				// 如果值被修改了
+				this.hrPosition = filteredValue
+				if (value !== filteredValue) {
+					this.inputKey = new Date().getTime()
+					uni.showToast({
+						title: '禁止输入符号',
+						icon: "none"
+					})
+				}
+			},
 			// 返回上一页
 			goBack() {
 				uni.navigateBack();
@@ -267,7 +291,7 @@
 								'选择/拍摄照片需要相机/相册权限，用于上传用户头像',
 								that
 							);
-							
+
 							// 2. 如果未授权或者用户拒绝，显示提示
 							if (!hasPermission) {
 								return;
@@ -325,6 +349,15 @@
 				}
 				return info;
 			},
+			getUserHr() {
+				this.$Request.get("/app/HrFirst/getUserHr").then(res => {
+					if (res.code === 0) {
+						this.hrInfo = res.data.HrEntity
+						this.hrPosition = res.data.HrEntity.hrPosition
+						this.hrEmail = res.data.HrEntity.hrEmail
+					}
+				})
+			},
 			getUserInfo() {
 				let userId = uni.getStorageSync('userId')
 				this.$Request.get("/app/user/selectUserById").then(res => {
@@ -346,12 +379,12 @@
 						} else {
 							this.userName = res.data.userName;
 						}
+						this.selectedCompany = this.$queue.getData('companyName')
 					}
 					uni.hideLoading();
 				});
-
-
 			},
+
 			// 保存
 			messagebtn() {
 				if (!this.userName) {
@@ -382,14 +415,34 @@
 									weChatNum: that.weChatNum
 								}).then(res => {
 									if (res.code === 0) {
-										uni.showToast({
-											title: '保存成功',
-											icon: "none"
+										that.$Request.postJson("/app/HrFirst/addHr", {
+											hrPosition: this.hrPosition,
+											hrEmail: this.hrEmail,
+										}).then(res => {
+											if (res.code === 0) {
+												uni.showToast({
+													title: '保存成功',
+													icon: "none"
+												})
+												that.getUserInfo()
+												setTimeout(function() {
+													uni.navigateBack()
+												}, 1000)
+											} else {
+												uni.showToast({
+													title: res.msg,
+													icon: "none"
+												})
+											}
 										})
-										that.getUserInfo()
-										setTimeout(function() {
-											uni.navigateBack()
-										}, 1000)
+										// uni.showToast({
+										// 	title: '保存成功',
+										// 	icon: "none"
+										// })
+										// that.getUserInfo()
+										// setTimeout(function() {
+										// 	uni.navigateBack()
+										// }, 1000)
 									} else {
 										uni.showToast({
 											title: res.msg,