your_username 4 hete
szülő
commit
abd106d5d0

+ 14 - 10
components/btnPopous/btnPopous.vue

@@ -249,10 +249,13 @@
 			end(e) {
 				let subX = e.changedTouches[0].clientX - this.clientX
 				let subY = e.changedTouches[0].clientY - this.clientY
-				if (subY < -50) {
-					this.topY = true
-				} else if (subY > 200) {
+				// 向下拉动超过150px时直接关闭弹窗
+				if (subY > 150) {
 					this.topY = false
+					// 通知父组件关闭弹窗
+					this.$emit('closePopup')
+				} else if (subY < -50) {
+					this.topY = true
 				}
 			},
 			move(e) {
@@ -265,11 +268,12 @@
 <style lang="scss">
 	.jobAll {
 		width: 100%;
-		height: 100vh;
-		background-color: #FFFFFF;
-		border-radius: 30px 30px 0px 0px;
+		height: 90vh;
+		background-color: rgba(253, 253, 253, 1);
+		border-radius: 60rpx 60rpx 0px 0px;
 		position: fixed;
 		z-index: 99999;
+		box-shadow: 0 -4rpx 20rpx rgba(0, 0, 0, 0.1);
 
 		.jobAll-search {
 			width: 100%;
@@ -283,7 +287,7 @@
 
 		.jobAll-item {
 			width: 100%;
-			height: 80vh;
+			height: calc(90vh - 120rpx);
 			margin-top: 60rpx;
 
 			.jobAll-item-box {
@@ -337,13 +341,13 @@
 	}
 
 	.start {
-		border-radius: 30px 30px 0px 0px !important;
-		bottom: -80vh;
+		border-radius: 60rpx 60rpx 0px 0px !important;
+		bottom: -70vh;
 		transition-duration: .5s
 	}
 
 	.end {
-		border-radius: 0 !important;
+		border-radius: 60rpx 60rpx 0px 0px !important;
 		bottom: 0;
 		transition-duration: .5s
 	}

+ 537 - 64
my/enterpriseInfo/enterpriseInfo.vue

@@ -1,22 +1,92 @@
 <template>
 	<view class="content">
+		<!-- 顶部导航 -->
+		<view class="nav-bar">
+			<view class="nav-left" @click="goBack">
+				<u-icon name="arrow-leftward" color="rgba(51, 51, 51, 1)" style="font-size: 38rpx;"></u-icon>
+			</view>
+			<view class="nav-title">公司介绍</view>
+			<view class="nav-right">
+				<view class="nav-icons">
+					<view class="nav-icon" @click="setCollection">
+						<image v-if="isCollection==0" src="/static/images/index/guanzhu.svg" class="icon-img"></image>
+						<image v-else src="/static/images/index/gzActive.svg" class="icon-img"></image>
+					</view>
+					<view class="nav-icon" @click="showShare">
+						<image src="/static/images/index/fenxiang.svg" class="icon-img"></image>
+					</view>
+				</view>
+			</view>
+		</view>
+
 		<!-- 企业信息 -->
 		<view class="info flex justify-center">
 			<view class="info-box flex align-center justify-between">
-				<image :src="info.companyLogo?info.companyLogo:'../../static/logo.png'"
-					style="width: 130rpx;height: 130rpx;border-radius: 24rpx;" mode="">
-				</image>
 				<view class="info-box-r">
 					<view class="info-box-r-title" v-show="info.companyName">
 						{{info.companyName}}
 					</view>
 					<view class="info-box-r-label flex align-center flex-wrap">
+						<view class="info-box-r-label-item" v-if="info.companyPeople">
+							{{info.companyPeople}}
+						</view> 
 						<view class="info-box-r-label-item" v-show="info.companyScope">
 							{{info.companyScope}}
 						</view>
-						<view class="info-box-r-label-item" v-if="info.companyPeople">
-							{{info.companyPeople}}
+					</view>
+				</view>
+				<image :src="info.companyLogo?info.companyLogo:'../../static/logo.png'"
+					style="width: 120rpx;height: 120rpx;border-radius: 50%;" mode="">
+				</image>
+			</view>
+		</view>
+
+		<!-- 急聘标签 -->
+		
+
+		<!-- 公司地址 -->
+		<view class="address flex justify-center">
+			<view class="address-box flex justify-center">
+				<view class="address-box-c">
+					<!-- 工作时间 -->
+					<view class="working-hours flex align-center">
+						<u-icon name="clock" color="rgba(51, 51, 51, 1)" size="38" style="margin-right: 12rpx;"></u-icon>
+						<text>上午9:00-下午06:30</text>
+					</view>
+					
+					<!-- 福利标签 -->
+					<view class="benefits-section">
+						<view class="benefits-tags flex align-center flex-wrap">
+							<view class="benefit-tag">
+								<image src="/static/images/index/huizhang.svg" class="tag-icon"></image>
+								<text>五险一金</text>
+							</view>
+							<view class="benefit-tag">
+								<image src="/static/images/index/huizhang.svg" class="tag-icon"></image>
+								<text>补充医疗保险</text>
+							</view>
+							<view class="benefit-tag">
+								<image src="/static/images/index/huizhang.svg" class="tag-icon"></image>
+								<text>定期体检</text>
+							</view>
+							<view class="benefit-tag">
+								<image src="/static/images/index/huizhang.svg" class="tag-icon"></image>
+								<text>年终奖</text>
+							</view>
+						</view>
+					</view>
+					
+					<!-- 地址信息 -->
+					<view @click="openMap()" class="address-box-c-add flex justify-between align-center">
+						<view class="address-box-c-add-l flex align-center">
+							<u-icon name="map" style="margin-right: 12rpx;" color="rgba(51, 51, 51, 1)" size="24"></u-icon>
+							<text>{{info.province?info.province:''}}{{info.city?info.city:''}}{{info.district?info.district:''}}{{info.companyAddress?info.companyAddress:''}}</text>
 						</view>
+						<!-- 
+							<view class="address-box-c-add-r">
+								<u-icon name="arrow-right" color="rgba(51, 51, 51, 1)" size="24"></u-icon>
+							</view>	
+						-->
 					</view>
 				</view>
 			</view>
@@ -25,38 +95,78 @@
 		<view class="remarks flex justify-center">
 			<view class="remarks-box">
 				<view class="remarks-box-title">
-					企业介绍
+					公司介绍
 				</view>
 				<view class="remarks-box-con">
 					<u-read-more show-height="100" :shadow-style="shadowStyle" color="#FD6416" text-indent="0"
 						closeText="展开">
-						<rich-text :nodes="info.companyDetails"
+						<!-- <rich-text :nodes="info.companyDetails"
 							style="color: #ffffff;font-size: 28rpx;font-weight: 500;">
-						</rich-text>
+						</rich-text> -->
+						<view class="remarks-box-con-item">
+							汉睿国际(汉睿集团)成立于2019年11月,是一家致力于打造跨境电商一站式综合服务平台的企业。集团依托全球视野下的跨境服务资源,通过“跨境电商赋能 + 人才培养孵化 + 产业链撮合”的运营模式,推动跨境电商本土XXXXXXXXXXXXXXXXXX...
+						</view>
 					</u-read-more>
 				</view>
 			</view>
 		</view>
-		<!-- 公司地址 -->
-		<view class="address flex justify-center">
-			<view class="address-box flex justify-center">
-				<view class="address-box-c">
-					<view class="address-box-c-title">
-						公司地址
+
+		<!-- 主营业务 -->
+		<view class="business-section flex justify-center">
+			<view class="business-box">
+				<view class="business-title">主营业务</view>
+				<view class="business-tags flex flex-wrap">
+					<view class="business-tag" v-for="(business, index) in businessList" :key="index">
+						{{business}}
 					</view>
-					<view @click="openMap()" class="address-box-c-add flex justify-between align-center">
-						<view class="address-box-c-add-l flex align-center">
-							<u-icon name="map" style="margin-right: 20rpx;" color="#00B88F" size="30"></u-icon>
-							{{info.province?info.province:''}}{{info.city?info.city:''}}{{info.district?info.district:''}}
-							{{info.companyAddress?info.companyAddress:''}}
-						</view>
-						<view class="address-box-c-add-r">
-							<u-icon name="arrow-right" color="#FEFEFE" size="30"></u-icon>
+				</view>
+			</view>
+		</view>
+
+		<!-- hr介绍 -->
+		<view class="hr-section flex justify-center">
+			<view class="hr-box">
+				<view class="hr-header flex justify-between align-center">
+					<view class="hr-title">HR介绍</view>
+					<view class="view-all-jobs" @click="goToMoreJobs">
+						<text>查看所有职位</text>
+					</view>
+				</view>
+				
+				<view class="hr-list flex justify-between">
+					<view class="hr-item" v-for="(hr, index) in hrList" :key="index">
+						<view class="hr-content flex align-center">
+							<view class="hr-avatar-container">
+								<view class="hr-avatar" :style="{ backgroundColor: hr.color }">
+									<text class="avatar-text">{{hr.name.charAt(0)}}</text>
+								</view>
+								<view class="online-dot"></view>
+							</view>
+							<view class="hr-text">
+								<view class="hr-name">{{hr.name}}</view>
+								<view class="hr-position">{{hr.position}}</view>
+							</view>
 						</view>
 					</view>
 				</view>
 			</view>
 		</view>
+
+		<!-- 人才发展 -->
+		<view class="talent-section flex justify-center">
+			<view class="talent-box">
+				<view class="talent-title">人才发展</view>
+				<view class="talent-tags flex flex-wrap">
+					<view class="talent-tag" v-for="(talent, index) in talentList" :key="index">
+						{{talent}}
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 公司风采 -->
+		
+
 		<!-- 工商信息 -->
 		<view class="gsInfo flex justify-center">
 			<view class="gsInfo-box flex justify-center">
@@ -81,8 +191,8 @@
 		</view>
 
 		<!-- 全部岗位弹窗 -->
-		<btnPopous v-if="companyId" :companyId="companyId" :cittArr="cittArr" :classify="classify" :moneyArr="moneyArr"
-			:jyArr="jyArr" />
+		<btnPopous ref="jobPopup" v-if="showJobPopup && companyId" :companyId="companyId" :cittArr="cittArr" :classify="classify" :moneyArr="moneyArr"
+			:jyArr="jyArr" @closePopup="closeJobPopup" />
 	</view>
 </template>
 
@@ -102,10 +212,31 @@
 				},
 				companyId: '',
 				info: {},
+				isCollection: 0, // 收藏状态
+				showJobPopup: false, // 控制职位弹窗显示
 				cittArr: [], //企业发布岗位的城市数组
 				moneyArr: [], //薪资列表数组
 				jyArr: [], //工作经验列表数组
 				classify: [], //岗位名称数组
+				hrList: [
+					{
+						name: '孙先生',
+						position: '人事经理',
+						color: '#4A90E2'
+					},
+					{
+						name: '宋先生',
+						position: 'HRBP',
+						color: '#7ED321'
+					},
+					{
+						name: '邹先生',
+						position: 'HR助力',
+						color: '#F5A623'
+					}
+				],
+				businessList: ['居家日用', '食品饮料', '3C数码', '美妆日化'],
+				talentList: ['考核晋升', '项目奖金', '股票期权', '每年普调']
 			};
 		},
 		//分享
@@ -161,6 +292,45 @@
 			this.getClassify();
 		},
 		methods: {
+			// 返回上一页
+			goBack() {
+				uni.navigateBack();
+			},
+			// 显示分享选项
+			showShare() {
+				// 可以添加分享逻辑
+				uni.showToast({
+					title: '分享功能',
+					icon: 'none'
+				});
+			},
+			// 收藏企业
+			setCollection() {
+				this.$Request.postT("/app/myCollection/saveCollection", {
+					companyId: this.companyId,
+					type: 2 // 2表示收藏企业
+				}).then(res => {
+					if (res.code == 0) {
+						uni.showToast({
+							title: res.msg
+						})
+						this.isCollection = this.isCollection == 0 ? 1 : 0;
+					}
+				})
+			},
+			// 显示所有职位弹窗
+			goToMoreJobs() {
+				this.showJobPopup = true;
+				this.$nextTick(() => {
+					if (this.$refs.jobPopup) {
+						this.$refs.jobPopup.topY = true;
+					}
+				});
+			},
+			// 关闭职位弹窗
+			closeJobPopup() {
+				this.showJobPopup = false;
+			},
 			openMap() {
 				let that = this
 				if (that.info.companyLat && that.info.companyLng) {
@@ -262,17 +432,68 @@
 
 <style lang="scss">
 	page {
-		background-color: #4B4D5C;
+		// background-color: #4B4D5C;
 		// overflow: hidden;
 	}
 
 	.content {
-		padding-bottom: 320rpx;
+		padding-top: 88rpx!important;
+	}
+
+	.nav-bar {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		margin-bottom: 30rpx;
+		padding: 0 40rpx;
+
+		.nav-left {
+			display: flex;
+			align-items: center;
+			justify-content: flex-start;
+			width: 96rpx;
+		}
+
+		.nav-title {
+			color: rgba(34, 37, 42, 1);
+			font-family: DM Sans;
+			font-size: 16px;
+			font-weight: 400;
+			line-height: 24px;
+			letter-spacing: 0px;
+			text-align: left;
+		}
+
+		.nav-right {
+			display: flex;
+			align-items: center;
+			justify-content: flex-end;
+			width: 96rpx;
+		}
+
+		.nav-icons {
+			display: flex;
+			align-items: center;
+			gap: 24rpx;
+		}
+
+		.nav-icon {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 36rpx;
+			height: 36rpx;
+		}
+
+		.icon-img {
+			width: 42rpx;
+			height: 42rpx;
+		}
 	}
 
 	.info {
 		width: 100%;
-		height: 120rpx;
+		height: 100rpx;
 		margin-top: 50rpx;
 
 		.info-box {
@@ -281,14 +502,16 @@
 
 			.info-box-r {
 				width: calc(100% - 150rpx);
-				margin-left: 20rpx;
 			}
 
 			.info-box-r-title {
-				color: #FFFFFF;
-				font-size: 38rpx;
-				font-weight: 800;
-				margin-top: 10rpx;
+				color: rgba(58, 57, 67, 1);
+				font-family: DM Sans;
+				font-size: 42rpx;
+				font-weight: 700;
+				line-height: 30px;
+				letter-spacing: 0px;
+				text-align: left;
 			}
 
 			.info-box-r-label {
@@ -298,8 +521,13 @@
 				margin-top: 20rpx;
 
 				.info-box-r-label-item {
-					margin-right: 20rpx;
-					margin-bottom: 20rpx;
+					color: rgba(153, 153, 153, 1);
+					font-family: DM Sans;
+					font-size: 24rpx;
+					font-weight: 400;
+					line-height: 16px;
+					letter-spacing: 0%;
+					text-align: left;
 				}
 			}
 		}
@@ -307,53 +535,291 @@
 
 	.remarks {
 		width: 100%;
-		margin-top: 60rpx;
+		margin-top: 50rpx;
 
 		.remarks-box {
 			width: 686rpx;
 
 			.remarks-box-title {
-				color: #FFFFFF;
-				font-size: 32rpx;
-				font-weight: 800;
+				color: rgba(34, 37, 42, 1);
+				font-family: DM Sans;
+				font-size: 16px;
+				font-weight: 400;
+				line-height: 24px;
+				letter-spacing: 0px;
+				text-align: left;
 			}
 
 			.remarks-box-con {
 				margin-top: 30rpx;
+
+				.remarks-box-con-item {
+					color: rgba(153, 153, 153, 1);
+					font-family: DM Sans;
+					font-size: 14px;
+					font-weight: 400;
+					line-height: 18px;
+					letter-spacing: 0px;
+					text-align: left;
+				}
 			}
 		}
 	}
 
 	.address {
 		width: 100%;
-		height: 190rpx;
 		margin-top: 50rpx;
 
 		.address-box {
 			width: 686rpx;
-			height: 100%;
-			background-color: #464855;
 			border-radius: 24rpx;
 
 			.address-box-c {
-				width: 626rpx;
-				height: 100%;
+				width: 100%;
+
+				.working-hours {
+					margin-bottom: 24rpx;
+					
+					text {
+						color: rgba(51, 51, 51, 1);
+						font-size: 28rpx;
+						font-weight: 400;
+					}
+				}
+
+				.benefits-section {
+					margin-bottom: 24rpx;
+
+					.benefits-tags {
+						gap: 12rpx;
+
+						.benefit-tag {
+							background: rgba(40, 107, 229, 0.1);
+							border-radius: 12rpx;
+							padding: 12rpx;
+							display: flex;
+							align-items: center;
+							gap: 8rpx;
+
+							.tag-icon {
+								width: 48rpx;
+								height: 48rpx;
+							}
+
+							text {
+								color: rgba(34, 37, 42, 0.5);
+								font-family: DM Sans;
+								font-size: 12px;
+								font-weight: 400;
+								line-height: 22px;
+								letter-spacing: 0px;
+								text-align: left;
+							}
+						}
+					}
+				}
+
+				.address-box-c-add {
+					padding: 0;
+
+					.address-box-c-add-l {
+						color: rgba(102, 102, 102, 1);
+						font-family: DM Sans;
+						font-size: 24rpx;
+						font-weight: 400;
+						line-height: 16px;
+						letter-spacing: 0px;
+						text-align: left;
+					}
+
+					.address-box-c-add-r {
+						width: 48rpx;
+						height: 48rpx;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+					}
+				}
 			}
+		}
+	}
 
-			.address-box-c-title {
-				color: #FFFFFF;
-				font-size: 32rpx;
-				font-weight: 800;
-				margin-top: 40rpx;
+	.business-section {
+		width: 100%;
+		margin-top: 30rpx;
+
+		.business-box {
+			width: 686rpx;
+			background: #ffffff;
+			border-radius: 24rpx;
+
+			.business-title {
+				color: rgba(34, 37, 42, 1);
+				font-family: DM Sans;
+				font-size: 16px;
+				font-weight: 400;
+				line-height: 24px;
+				letter-spacing: 0px;
+				text-align: left;
+				margin-bottom: 24rpx;
 			}
 
-			.address-box-c-add {
-				width: 100%;
-				height: 40rpx;
-				margin-top: 30rpx;
+			.business-tags {
+				gap: 12rpx;
 
-				.address-box-c-add-l {
-					color: #FEFEFE;
+				.business-tag {
+					background: transparent;
+					border: 1px solid rgba(153, 196, 250, 1);
+					border-radius: 12rpx;
+					padding: 6rpx 12rpx;
+					color: rgba(40, 107, 229, 1);
+					font-family: DM Sans;
+					font-size: 20rpx;
+					font-weight: 400;
+					line-height: 16px;
+					letter-spacing: 0px;
+					text-align: center;
+				}
+			}
+		}
+	}
+
+	.talent-section {
+		width: 100%;
+		margin-top: 30rpx;
+
+		.talent-box {
+			width: 686rpx;
+			background: #ffffff;
+			border-radius: 24rpx;
+
+			.talent-title {
+				color: rgba(34, 37, 42, 1);
+				font-family: DM Sans;
+				font-size: 16px;
+				font-weight: 400;
+				line-height: 24px;
+				letter-spacing: 0px;
+				text-align: left;
+				margin-bottom: 24rpx;
+			}
+
+			.talent-tags {
+				gap: 12rpx;
+
+				.talent-tag {
+					background: rgba(153, 153, 153, 0.1);
+					border-radius: 12rpx;
+					padding: 6rpx 12rpx;
+					color: rgba(102, 102, 102, 1);
+					font-family: DM Sans;
+					font-size: 20rpx;
+					font-weight: 400;
+					line-height: 16px;
+					letter-spacing: 0px;
+					text-align: center;
+				}
+			}
+		}
+	}
+
+	.hr-section {
+		width: 100%;
+
+		.hr-box {
+			width: 686rpx;
+			background: #ffffff;
+			border-radius: 24rpx;
+
+			.hr-header {
+				padding: 50rpx 0 0 0;
+				margin-bottom: 30rpx;
+
+				.hr-title {
+					color: rgba(34, 37, 42, 1);
+					font-family: DM Sans;
+					font-size: 16px;
+					font-weight: 400;
+					line-height: 24px;
+					letter-spacing: 0px;
+					text-align: left;
+				}
+
+				.view-all-jobs {
+					text {
+						color: rgba(255, 102, 0, 1);
+						font-family: DM Sans;
+						font-size: 12px;
+						font-weight: 400;
+						line-height: 16px;
+						letter-spacing: 0px;
+						text-align: right;
+					}
+				}
+			}
+
+			.hr-list {
+				padding: 0 0 30rpx 0;
+
+				.hr-item {
+					flex: 1;
+
+					.hr-content {
+						align-items: center;
+
+						.hr-avatar-container {
+							position: relative;
+							margin-right: 16rpx;
+
+							.hr-avatar {
+								width: 80rpx;
+								height: 80rpx;
+								border-radius: 50%;
+								display: flex;
+								align-items: center;
+								justify-content: center;
+								position: relative;
+
+								.avatar-text {
+									color: #ffffff;
+									font-size: 32rpx;
+									font-weight: 600;
+								}
+							}
+
+							.online-dot {
+								position: absolute;
+								bottom: 4rpx;
+								right: 4rpx;
+								width: 20rpx;
+								height: 20rpx;
+								background-color: #7ED321;
+								border-radius: 50%;
+								border: 3rpx solid #ffffff;
+							}
+						}
+
+						.hr-text {
+							.hr-name {
+								color: rgba(34, 37, 42, 1);
+								font-family: DM Sans;
+								font-size: 28rpx;
+								font-weight: 500;
+								line-height: 20px;
+								margin-bottom: 4rpx;
+								text-align: left;
+							}
+
+							.hr-position {
+								color: rgba(153, 153, 153, 1);
+								font-family: DM Sans;
+								font-size: 24rpx;
+								font-weight: 400;
+								line-height: 16px;
+								text-align: left;
+							}
+						}
+					}
 				}
 			}
 		}
@@ -366,28 +832,35 @@
 		.gsInfo-box {
 			width: 686rpx;
 			height: 100%;
-			background-color: #464855;
 			border-radius: 24rpx;
 
 			.gsInfo-box-c {
-				width: 626rpx;
+				width: 100%;
 				height: 100%;
 				padding-top: 30rpx;
 				padding-bottom: 30rpx;
 			}
 
 			.gsInfo-box-c-title {
-				color: #FFFFFF;
-				font-size: 32rpx;
-				font-weight: 800;
-
+				color: rgba(34, 37, 42, 1);
+				font-family: DM Sans;
+				font-size: 16px;
+				font-weight: 400;
+				line-height: 24px;
+				letter-spacing: 0px;
+				text-align: left;
+				margin-bottom: 10rpx;
 			}
 
 			.gsInfo-box-c-item {
-				margin-top: 30rpx;
-				color: #FEFEFE;
-				font-size: 28rpx;
-				font-weight: 500;
+				color: rgba(153, 153, 153, 1);
+				font-family: DM Sans;
+				font-size: 12px;
+				font-weight: 400;
+				line-height: 16px;
+				letter-spacing: 0%;
+				text-align: left;
+				margin-bottom: 10rpx;
 			}
 		}
 	}

+ 1 - 1
package/jobIntention/addExpectation.vue

@@ -307,7 +307,7 @@ export default {
 	display: flex;
 	align-items: center;
 	justify-content: space-between;
-	padding: 20rpx 0;
+	margin-bottom: 30rpx;
 
 	.nav-left {
 		display: flex;

+ 24 - 20
package/screen/screen.vue

@@ -3,7 +3,7 @@
 		<!-- 列表 -->
 		<view class="list flex justify-between">
 			<!-- 左侧分类 -->
-			<view class="list-l">
+			<!-- <view class="list-l">
 				<scroll-view scroll-y="true" style="width: 100%;height: 100%;padding-bottom: 20rpx;">
 					<block v-if="type">
 						<view class="list-l-item flex align-center " v-if="index!=3" @click="change_click_index(index)"
@@ -20,7 +20,7 @@
 
 				</scroll-view>
 
-			</view>
+			</view> -->
 			<!-- 右侧列表 -->
 			<view class="list-r">
 				<scroll-view scroll-y="true" @scroll="e=>{scrolls(e)}" scroll-with-animation="true"
@@ -179,7 +179,7 @@
 			 */
 			selectHyList(index, name, info, ind) {
 				//选中
-				if (name == '薪资') { // 薪资单选
+				if (name == '薪资范围(单选)') { // 薪资单选
 					this.list[1].list.map((item, index) => {
 						item.select = false
 						info.select = true
@@ -263,7 +263,7 @@
 							value: '不限'
 						}]
 						let obj = {
-							name: '学历',
+							name: '学历要求',
 							list: [...list, ...res.data]
 						}
 						console.log(obj, '学历')
@@ -284,7 +284,7 @@
 							value: '不限'
 						}]
 						let obj = {
-							name: '薪资',
+							name: '薪资范围(单选)',
 							list: [...list, ...res.data]
 						}
 						this.getJy(obj1, obj)
@@ -304,7 +304,7 @@
 							value: '不限'
 						}]
 						let obj = {
-							name: '经验',
+							name: '经验要求',
 							list: [...list, ...res.data]
 						}
 						this.getGm(obj1, obj2, obj)
@@ -451,8 +451,10 @@
 	}
 
 	.activeRight {
-		color: #00B88F !important;
-		background-color: #DDFFF7 !important;
+		color: rgba(1, 107, 246, 1) !important;
+		background-color: rgba(153, 196, 250, 0.4) !important;
+		border-radius: 18rpx !important;
+		border: 0.5px solid rgba(1, 107, 246, 1);
 	}
 
 	.active {
@@ -483,7 +485,7 @@
 		}
 
 		.list-r {
-			width: 70%;
+			width: 100%;
 			height: 100%;
 			border-left: 1rpx solid #F2F2F7;
 			box-sizing: border-box;
@@ -504,7 +506,7 @@
 					width: 100%;
 
 					.list-r-item-childs-i {
-						width: 200rpx;
+						width: calc((100% - 120rpx) / 2);
 						margin-top: 20rpx;
 						padding-top: 16rpx;
 						padding-bottom: 16rpx;
@@ -512,7 +514,9 @@
 						padding-right: 16rpx;
 						font-size: 26rpx;
 						color: #121212;
-						background-color: #F2F2F7;
+						background: rgba(245, 248, 254, 1);
+						text-align: center;
+						border-radius: 18rpx;
 					}
 				}
 			}
@@ -524,7 +528,6 @@
 		height: 120rpx;
 		position: fixed;
 		bottom: 0;
-		border-top: 1rpx solid #F2F2F7;
 		background-color: #ffffff;
 
 		.bottom-box {
@@ -533,17 +536,18 @@
 			margin-top: 20rpx;
 
 			.bottom-box-left {
-				width: 32%;
-				height: 100%;
-				border-radius: 8rpx;
-				background-color: #F2F2F7;
+				width: 40%;
+				height: 80rpx;
+				color: #ffffff;
+				border-radius: 999rpx;
+				background: rgba(153, 196, 250, 1);
 			}
 
 			.bottom-box-right {
-				width: 65%;
-				height: 100%;
-				border-radius: 8rpx;
-				background-color: #00B88F;
+				width: 57%;
+				height: 80rpx;
+				border-radius: 999rpx;
+				background: var(--线性渐变, linear-gradient(90.00deg, rgba(13, 39, 247, 1),rgba(19, 193, 234, 1) 100%));
 				color: #ffffff;
 			}
 		}

+ 410 - 133
pages/index/game/order.vue

@@ -1,16 +1,53 @@
 <template>
-	<view>
+	<view style="padding: 88rpx 40rpx 40rpx 40rpx;">
+		<!-- 顶部导航 -->
+		<view class="nav-bar">
+			<view class="nav-left" @click="goBack">
+				<u-icon name="arrow-leftward" color="rgba(51, 51, 51, 1)" style="font-size: 38rpx;"></u-icon>
+			</view>
+
+				<view class="nav-title">职位详情</view>
+
+
+			<view class="nav-right">
+				<view class="nav-icons">
+					<view class="nav-icon" @click="setCollection">
+						<image v-if="info.isCollection==0" src="/static/images/index/guanzhu.svg" class="icon-img"></image>
+						<image v-else src="/static/images/index/gzActive.svg" style="width: 52rpx;height: 52rpx;"></image>
+					</view>
+					<view class="nav-icon" @click="showShare">
+						<image src="/static/images/index/fenxiang.svg" style="width: 60rpx;height: 60rpx;"></image>
+					</view>
+				</view>
+			</view>
+		</view>
+		
 		<!-- 岗位要求 -->
 		<view class="job flex justify-center">
 			<view class="job-info flex justify-center">
 				<view class="job-info-c">
-					<view class="job-info-c-title" v-if="info.stationName">
-						<block v-if="isSameName(info.ruleClassifyName,info.stationName)">
-							{{info.ruleClassifyName}}-
-						</block>
-						<block>
-							{{info.stationName}}
-						</block>
+					<view class="job-info-c-top flex align-center justify-between">
+						<view class="job-info-c-title" v-if="info.stationName">
+							<block v-if="isSameName(info.ruleClassifyName,info.stationName)">
+								{{info.ruleClassifyName}}-
+							</block>
+							<block>
+								{{info.stationName}}
+							</block>
+						</view>
+						<view class="job-info-c-price" v-if="info.salaryRange">
+							{{info.salaryRange}}
+						</view>
+					</view>
+					<view class="enterprise-box-c-bto flex align-center justify-between" @click.stop="gotoMap()">
+						<view class="enterprise-box-c-bto-l flex align-center gap-10rpx">
+							<u-icon name="map" color="rgba(58, 57, 67, 1)" style="margin-right: 10rpx;"
+								size="24"></u-icon>
+							{{info.province?info.province:''}}{{info.city?info.city:''}}{{info.county?info.county:''}}{{info.address?info.address:''}}
+						</view>
+						<!-- <view class="enterprise-box-c-bto-r">
+							<u-icon name="arrow-right" color="#00B88F" style="margin-right: 20rpx;" size="28"></u-icon>
+						</view> -->
 					</view>
 					<view class="job-info-c-label flex align-center flex-wrap">
 						<view class="job-info-c-label-item" v-if="info.county">
@@ -23,19 +60,44 @@
 							{{info.education}}
 						</view>
 					</view>
-					<view class="job-info-c-price" v-if="info.salaryRange">
-						{{info.salaryRange}}
+				</view>
+			</view>
+		</view>
+
+		<!-- 企业信息 -->
+		<view class="enterprise-box-c-info flex align-start justify-between">
+			<view class="enterprise-left flex align-center">
+				<view class="avatar-container">
+					<image :src="info.company?info.company.companyLogo:'../../../static/logo.png'"
+						style="width: 95rpx;height: 95rpx;border-radius: 50%;" mode=""></image>
+					<view class="online-dot"></view>
+				</view>
+				<view class="enterprise-box-c-info-n">
+					<view class="">
+						{{info.company?info.company.companyName:''}}
+					</view>
+					<view class="">
+						{{info.company?info.company.companyScope:''}}
+					</view>
+				    <view>
+						3分钟前回复
 					</view>
 				</view>
 			</view>
+			<view class="more-jobs flex align-center" @click="goToMoreJobs">
+				<text>更多职位</text>
+				<u-icon name="arrow-right" color="rgba(51, 51, 51, 1)" size="28"></u-icon>
+			</view>
 		</view>
+
 		<!-- 岗位介绍 -->
 		<view class="jobRemarks flex justify-center">
 			<!-- <skeleton type="round" bgColor="#ffffff"> -->
 			<view class="jobRemarks-box flex justify-center">
 				<view class="jobRemarks-box-c">
-					<view class="jobRemarks-box-c-title">
-						岗位介绍
+					<view class="jobRemarks-box-c-title flex align-center">
+						<image src="/static/images/index/ins.png" class="title-icon"></image>
+						<text>岗位介绍</text>
 					</view>
 					<view class="jobRemarks-box-c-label flex align-center flex-wrap" v-if="info.tag">
 						<view class="jobRemarks-box-c-label-item" v-for="(item,index) in info.tag.split(',')"
@@ -43,13 +105,37 @@
 							{{item}}
 						</view>
 					</view>
+
+					<view class="job-description">
+						<view class="description-item">1.负责Amazon英国、欧洲站、制定推广与销售计划,达成团队要求的销售业绩;</view>
+						<view class="description-item">2.做好数据的统计分析工作,收集、分析市场信息,竞争对手状况,并根据产品销售与排名变化,及时制定和调整产品的销售策略;</view>
+						<view class="description-item">3.熟悉Amazon店铺操作,负责店铺产品编辑上传,精准把握关键词选择,负责标题,详情页面的优化;</view>
+						<view class="description-item">4.熟悉Amazon平台规则,熟悉Amazon站内广告投放和促销式,站外促销,找红人营销等提高曝光率和转化率的引流方;</view>
+						<view class="description-item">5.控制产品风险,合理规划FBA库存,及时合理处理滞销FBA库存;</view>
+						<view class="description-item">6.对产品销售进行跟踪,分析,及时汇报销售中存在的问题,并给出可行性意见;</view>
+						<view class="description-item">7.及时处理客户留言及回评,解答客户相关咨询与投诉,并进行问题整理统计分析,提高店铺的好评率,确保账号安全;</view>
+						<view class="description-item">8.每月定期整理分析运营各项数据,并提出相应的合理化建议。</view>
+						
+						<view class="description-item">工作经验要求:</view>
+						<view class="description-item">1.Amazon平台欧美站点1年以上独立运营经验,英语能力良好</view>
+						<view class="description-item">2.了解亚马逊平台算法逻辑和排名规则,有清晰的运营思路,掌握亚马逊平台推广技巧</view>
+						<view class="description-item">3.能接受小精品/精铺模式,品类不限,发展空间更大</view>
+						<view class="description-item">4.熟练掌握办公软件,擅长Excel表格的数据汇总和整理</view>
+						<view class="description-item">5.有团队合作精神,良好的沟通和人际交往能力,有较好的主动性及挑战自我的信心</view>
+						<view class="description-item">6.会使用各种AI来辅助运营工作,做过英国,欧洲本土号的优先录用</view>
+					</view>
+					
+					
 					<view class="jobRemarks-box-c-con" v-if="info.positionDetails">
 						<view class="jobRemarks-box-c-con-item" v-html="info.positionDetails">
 						</view>
 					</view>
+
 					<view class="jobRemarks-box-c-line"></view>
-					<view class="jobRemarks-box-c-title" style="margin-top: 25rpx;">
-						岗位福利
+
+					<view class="jobRemarks-box-c-title flex align-center" style="margin-top: 25rpx;">
+						<image src="/static/images/index/welfare.png" class="title-icon"></image>
+						<text>岗位福利</text>
 					</view>
 					<view class="jobRemarks-box-c-label flex align-center flex-wrap" v-if="info.positionWelfare">
 						<view class="jobRemarks-box-c-label-item"
@@ -63,36 +149,40 @@
 							暂无
 						</view>
 					</view>
+
+					<view class="job-description">
+						<view class="description-item">1.完整的晋升机制,每年2次调薪机会;</view>
+						<view class="description-item">2.满一年五天带薪年假;</view>
+						<view class="description-item">3.每月员工下午茶;</view>
+						<view class="description-item">4.各类大促活动有对应的激励方案;</view>
+						<view class="description-item">5.丰厚的提成和年终奖励;</view>
+						<view class="description-item">6.开设员工俱乐部:羽毛球、篮球、舞蹈、瑜伽等等。</view>
+					</view>
 				</view>
 			</view>
 			<!-- </skeleton> -->
 		</view>
+		
 		<!-- 企业简介 -->
-		<view class="enterprise flex justify-center" v-if="info.lng" @click="goInfo(info.company.companyId)">
+		<view class="enterprise" v-if="info.lng">
+			<!-- 公司介绍卡片 -->
+			<view class="company-intro-card" @click="goInfo(info.company.companyId)">
+				<view class="company-avatar">
+					<image :src="info.company?info.company.companyLogo:'../../../static/logo.png'"
+						style="width: 95rpx;height: 95rpx;border-radius: 50%;" mode="aspectFill"></image>
+				</view>
+				<view class="company-info">
+					<view class="company-name">{{info.company?info.company.companyName:''}}</view>
+					<view class="company-details">{{info.company?info.company.companyPeople:''}} · {{info.company?info.company.companyScope:''}}</view>
+				</view>
+				<view class="company-arrow">
+					<u-icon name="arrow-right" color="rgba(51, 51, 51, 1)" size="32"></u-icon>
+				</view>
+			</view>
+			
+			<!-- 地图区域 -->
 			<view class="enterprise-box flex justify-center">
 				<view class="enterprise-box-c">
-					<view class="enterprise-box-c-info flex align-center">
-						<image :src="info.company?info.company.companyLogo:'../../../static/logo.png'"
-							style="width: 95rpx;height: 95rpx;border-radius: 50%;" mode=""></image>
-						<view class="enterprise-box-c-info-n">
-							<view class="">
-								{{info.company?info.company.companyName:''}}
-							</view>
-							<view class="">
-								{{info.company?info.company.companyScope:''}}
-							</view>
-						</view>
-					</view>
-					<view class="enterprise-box-c-bto flex align-center justify-between" @click.stop="gotoMap()">
-						<view class="enterprise-box-c-bto-l flex align-center">
-							<u-icon name="map" color="#00B88F" style="margin-left: 20rpx;margin-right: 10rpx;"
-								size="28"></u-icon>
-							{{info.province?info.province:''}}{{info.city?info.city:''}}{{info.county?info.county:''}}{{info.address?info.address:''}}
-						</view>
-						<view class="enterprise-box-c-bto-r">
-							<u-icon name="arrow-right" color="#00B88F" style="margin-right: 20rpx;" size="28"></u-icon>
-						</view>
-					</view>
 					<!-- #ifndef APP -->
 					<view class="enterprise-box-c-map">
 						<map style="width: 100%; height: 100%;" scale="14" @tap.stop="gotoMap()" :latitude="info.lat"
@@ -100,14 +190,15 @@
 						</map>
 					</view>
 					<!-- #endif -->
-
-
 				</view>
 			</view>
 		</view>
 		<!-- 底部操作 -->
 		<view class="caozuo flex justify-center align-center">
-			<view class="caozuo-box flex align-center justify-between">
+			<view class="caozuo-box-r flex justify-center align-center" @click="bindphone(2)">
+				立即沟通
+			</view>
+<!-- 			<view class="caozuo-box flex align-center justify-between">
 				<view class="caozuo-box-l flex align-center">
 					<!-- #ifdef MP-WEIXIN -->
 					<view class="caozuo-box-l-item flex align-center flex-wrap">
@@ -147,10 +238,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="caozuo-box-r flex align-center justify-center" @click="bindphone(2)">
-					立即联系
-				</view>
-			</view>
+			</view> -->
 		</view>
 
 
@@ -180,9 +268,11 @@
 		</u-popup>
 		<!-- 返回首页按钮 -->
 		<!-- #ifdef H5 -->
-		<view class="backHome" @click="goHome()">
-			<image src="../../../static/images/index/backHome.png" mode=""></image>
-		</view>
+			<!-- 
+				<view class="backHome" @click="goHome()">
+					<image src="../../../static/images/index/backHome.png" mode=""></image>
+				</view>	
+			-->
 		<!-- #endif -->
 
 	</view>
@@ -272,6 +362,14 @@
 			this.getInfo()
 		},
 		methods: {
+			// 返回上一页
+			goBack() {
+				uni.navigateBack();
+			},
+			// 显示分享选项
+			showShare() {
+				this.shows = true;
+			},
 			//判断岗位名称与职位名称是否相同(不区分大小写)
 			isSameName(className, name) {
 				let str1 = className.trim();
@@ -501,16 +599,76 @@
 					url: '/my/enterpriseInfo/enterpriseInfo?companyId=' + companyId
 				})
 			},
+			//跳转更多职位
+			goToMoreJobs() {
+				uni.navigateTo({
+					url: '/package/list/companyList?companyId=' + this.info.company.companyId
+				})
+			},
 		}
 	}
 </script>
 
 <style lang="scss">
 	page {
-		background-color: #F2F2F7;
+		// background-color: #F2F2F7;
 		padding-bottom: 200rpx;
 	}
 
+	.nav-bar {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		margin-bottom: 30rpx;
+
+		.nav-left {
+			display: flex;
+			align-items: center;
+			justify-content: flex-start;
+			width: 96rpx;
+		}
+
+		.nav-title {
+			flex: 1;
+			color: rgba(51, 51, 51, 1);
+			font-family: DM Sans;
+			font-size: 32rpx;
+			font-weight: 700;
+			line-height: 26px;
+			text-align: center;
+		}
+
+		.nav-right {
+			display: flex;
+			align-items: center;
+			justify-content: flex-end;
+			width: 96rpx;
+		}
+
+		.nav-icons {
+			display: flex;
+			align-items: center;
+			gap: 24rpx;
+		}
+
+		.nav-icon {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 36rpx;
+			height: 36rpx;
+		}
+
+		.icon-img {
+			width: 42rpx;
+			height: 42rpx;
+		}
+
+		.icon-img.active {
+			filter: hue-rotate(120deg) saturate(1.5);
+		}
+	}
+
 	button {
 		background: #ffffff;
 		border: none !important;
@@ -576,22 +734,40 @@
 		margin-top: 30rpx;
 
 		.job-info {
-			width: 686rpx;
+			// width: 686rpx;
+			width: 100%;
 			height: 100%;
 			border-radius: 24rpx;
 			background-color: #ffffff;
 
 			.job-info-c {
-				width: 626rpx;
+				// width: 626rpx;
+				width: 100%;
 				height: 100%;
 				padding-top: 30rpx;
 				padding-bottom: 30rpx;
 			}
 
+			.enterprise-box-c-bto {
+				width: 100%;
+				border-radius: 30rpx;
+				margin-top: 34rpx;
+				color: rgba(156, 164, 171, 1);
+				font-family: DM Sans;
+				font-size: 12px;
+				font-weight: 400;
+				line-height: 12px;
+				letter-spacing: 0.5%;
+			}
+
 			.job-info-c-title {
-				color: #333333;
-				font-size: 38rpx;
-				font-weight: 800;
+				color: rgba(58, 57, 67, 1);
+				font-family: DM Sans;
+				font-size: 26px;
+				font-weight: 700;
+				line-height: 30px;
+				letter-spacing: 0px;
+				text-align: left;
 			}
 
 			.job-info-c-label {
@@ -599,42 +775,137 @@
 
 				.job-info-c-label-item {
 					margin-right: 30rpx;
-					color: #999999;
-					font-size: 28rpx;
-					margin-bottom: 10rpx;
+					color: rgba(153, 153, 153, 1);
+					font-size: 24rpx;
+					padding: 4px;
+					border-radius: 6px;
+					background: rgba(198, 198, 198, 0.1);
 				}
 			}
 
 			.job-info-c-price {
-				color: #00B88F;
-				font-size: 38rpx;
-				font-weight: bold;
-				margin-top: 30rpx;
+				color: rgba(1, 107, 246, 1);
+				font-family: DM Sans;
+				font-size: 18px;
+				font-weight: 700;
+				line-height: 20px;
+				letter-spacing: 0.5%;
+				text-align: right;
 			}
 		}
 	}
 
+	.enterprise-box-c-info {
+				width: 100%;
+				height: auto;
+				padding: 16px;
+				border: 0.5px solid rgba(227, 231, 236, 1);
+				border-radius: 6px;
+				background: rgba(253, 253, 253, 1);
+				// margin-top: 40rpx;
+
+				.enterprise-left {
+					flex: 1;
+				}
+
+				.avatar-container {
+					position: relative;
+					display: inline-block;
+				}
+
+				.online-dot {
+					position: absolute;
+					bottom: 4rpx;
+					right: 4rpx;
+					width: 20rpx;
+					height: 20rpx;
+					background: #00D26A;
+					border: 2rpx solid #ffffff;
+					border-radius: 50%;
+				}
+
+				.more-jobs {
+					color: rgba(153, 153, 153, 1);
+					font-size: 22rpx;
+					font-weight: 400;
+					gap: 8rpx;
+				}
+
+				.enterprise-box-c-info-n {
+					margin-left: 18rpx;
+
+					view:nth-of-type(1) {
+						color: #333333;
+						font-size: 24rpx;
+						font-weight: 600;
+					}
+
+					view:nth-of-type(2) {
+						color: #999999;
+						font-size: 24rpx;
+						font-weight: 500;
+						margin-top: 8rpx;
+					}
+
+					view:nth-of-type(3) {
+						display: inline-block;
+						width: auto;
+						border-radius: 6px;
+						padding: 4rpx 12rpx;
+						background: rgba(236, 225, 253, 1);
+						color: rgba(107, 85, 214, 0.96);
+						font-size: 20rpx;
+						font-weight: 500;
+						margin-top: 8rpx;
+						white-space: nowrap;
+					}
+				}
+			}
+
 	.jobRemarks {
 		width: 100%;
-		margin-top: 20rpx;
 
 		.jobRemarks-box {
-			width: 686rpx;
+			width: 100%;
 			height: 100%;
 			background-color: #ffffff;
 			border-radius: 24rpx;
 
 			.jobRemarks-box-c {
-				width: 628rpx;
+				width: 100%;
 				height: 100%;
 				padding-top: 30rpx;
 				padding-bottom: 30rpx;
 			}
 
 			.jobRemarks-box-c-title {
-				color: #333333;
+				color: rgba(1, 107, 246, 1);
 				font-size: 32rpx;
-				font-weight: 800;
+				padding: 8px 12px;
+				border-radius: 36px;
+				font-weight: 500;
+				background: rgba(246, 246, 246, 1);
+
+				.title-icon {
+					width: 32rpx;
+					height: 32rpx;
+				}
+			}
+
+			.job-description {
+				margin-top: 20rpx;
+				margin-bottom: 20rpx;
+
+				.description-item {
+					color: rgba(97, 110, 124, 1);
+					font-family: DM Sans;
+					font-size: 26rpx;
+					font-weight: 400;
+					line-height: 16px;
+					letter-spacing: 0px;
+					text-align: left;
+					margin-bottom: 8rpx;
+				}
 			}
 
 			.jobRemarks-box-c-label {
@@ -642,13 +913,14 @@
 				margin-top: 25rpx;
 
 				.jobRemarks-box-c-label-item {
-					color: #666666;
-					font-size: 24rpx;
+					color: rgba(1, 107, 246, 1);
+					font-size: 20rpx;
 					padding: 10rpx 15rpx;
 					background-color: #F6F6F6;
-					border-radius: 8rpx;
+					border-radius: 10rpx;
 					margin-right: 20rpx;
 					margin-bottom: 10rpx;
+					background: rgba(252, 233, 220, 1);
 				}
 			}
 
@@ -674,55 +946,58 @@
 
 	.enterprise {
 		width: 100%;
-		// height: 256rpx;
 		margin-top: 25rpx;
 
-		.enterprise-box {
-			width: 686rpx;
+		.company-intro-card {
+			width: 100%;
 			background-color: #ffffff;
-			height: 100%;
-			padding-bottom: 25rpx;
 			border-radius: 24rpx;
+			padding: 12rpx 24rpx;
+			margin-bottom: 20rpx;
+			display: flex;
+			align-items: center;
+			border: 0.5px solid rgba(227, 231, 236, 1);
 
-			.enterprise-box-c {
-				width: 626rpx;
-				height: 100%;
+			.company-avatar {
+				flex-shrink: 0;
+				margin-right: 24rpx;
 			}
 
-			.enterprise-box-c-info {
-				width: 100%;
-				height: 95rpx;
-				margin-top: 40rpx;
-
-				.enterprise-box-c-info-n {
-					margin-left: 18rpx;
+			.company-info {
+				flex: 1;
 
-					view:nth-of-type(1) {
-						color: #333333;
-						font-size: 32rpx;
-						font-weight: 800;
-					}
+				.company-name {
+					color: rgba(51, 51, 51, 1);
+					font-size: 26rpx;
+					font-weight: 600;
+					line-height: 1.4;
+					margin-bottom: 8rpx;
+				}
 
-					view:nth-of-type(2) {
-						color: #999999;
-						font-size: 24rpx;
-						font-weight: 500;
-						margin-top: 10rpx;
-					}
+				.company-details {
+					color: rgba(153, 153, 153, 1);
+					font-size: 24rpx;
+					font-weight: 400;
+					line-height: 1.4;
 				}
 			}
 
-			.enterprise-box-c-bto {
+			.company-arrow {
+				flex-shrink: 0;
+				margin-left: 48rpx;
+			}
+		}
+
+		.enterprise-box {
+			width: 100%;
+			background-color: #ffffff;
+			height: 100%;
+			padding-bottom: 25rpx;
+			border-radius: 24rpx;
+
+			.enterprise-box-c {
 				width: 100%;
-				// height: 60rpx;
-				padding-top: 15rpx;
-				padding-bottom: 15rpx;
-				background-color: #EDFFFB;
-				border-radius: 30rpx;
-				margin-top: 20rpx;
-				color: #00B88F;
-				font-size: 24rpx;
-				font-weight: 500;
+				height: 100%;
 			}
 
 			.enterprise-box-c-map {
@@ -738,39 +1013,41 @@
 		height: 120rpx;
 		position: fixed;
 		bottom: 0;
+		left: 0;
 		background-color: #ffffff;
-
-		.caozuo-box {
-			width: 686rpx;
+		
+		.caozuo-box-r {
+			// width: 400rpx;
+			width: 90%;
 			height: 80rpx;
+			color: #ffffff;
+			border-radius: 45rpx;
+			/* #ifndef APP-PLUS */
+			background: var(--线性渐变, linear-gradient(90.00deg, rgba(13, 39, 247, 1),rgba(19, 193, 234, 1) 100%));
+			/* #endif */
+			/* #ifdef APP-PLUS */
+			background: var(--线性渐变, linear-gradient(90.00deg, rgba(13, 39, 247, 1),rgba(19, 193, 234, 1) 100%));
+			line-height: 80rpx;
+			text-align: center;
+			/* #endif */
+			font-size: 32rpx;
+			font-weight: 800;
+		}
 
-			.caozuo-box-l {
+		// .caozuo-box {
+		// 	width: 686rpx;
+		// 	height: 80rpx;
 
-				.caozuo-box-l-item {
-					width: 60rpx;
-					font-size: 24rpx;
-					color: #242424;
-					font-weight: 500;
-					margin-right: 50rpx;
-				}
-			}
+		// 	.caozuo-box-l {
 
-			.caozuo-box-r {
-				width: 400rpx;
-				height: 100%;
-				color: #ffffff;
-				border-radius: 45rpx;
-				/* #ifndef APP-PLUS */
-				background: linear-gradient(90deg, #00DCC2 0%, #00DC94 100%);
-				/* #endif */
-				/* #ifdef APP-PLUS */
-				background-color: #00DCC2;
-				line-height: 80rpx;
-				text-align: center;
-				/* #endif */
-				font-size: 32rpx;
-				font-weight: 800;
-			}
-		}
+		// 		.caozuo-box-l-item {
+		// 			width: 60rpx;
+		// 			font-size: 24rpx;
+		// 			color: #242424;
+		// 			font-weight: 500;
+		// 			margin-right: 50rpx;
+		// 		}
+		// 	}
+		// }
 	}
 </style>

+ 5 - 0
static/images/index/fenxiang.svg

@@ -0,0 +1,5 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24.000000" height="24.000000" fill="none">
+	<rect id="svg 14" width="24.000000" height="24.000000" x="0.000000" y="0.000000" />
+	<path id="矢量 18" d="M20.2953 13.6689C19.9138 13.6689 19.602 13.9794 19.6 14.3657L19.6 19.4077C19.6 19.8294 19.2581 20.1726 18.8378 20.1726L4.26032 20.1726C3.83996 20.1726 3.49812 19.8293 3.49812 19.4077L3.49812 6.84731C3.49812 6.4256 3.83998 6.08237 4.26032 6.08237L11.086 6.08237C11.4682 6.08168 11.7793 5.76917 11.7793 5.38569C11.7793 5.0015 11.4682 4.68896 11.0853 4.68896L4.1634 4.68896C3.03 4.68896 2.10742 5.61359 2.10742 6.74972L2.10742 19.5045C2.10742 20.6407 3.03 21.5653 4.1634 21.5653L18.9347 21.5653C20.0681 21.5653 20.9906 20.6407 20.9906 19.5045L20.9906 14.3615C20.9886 13.9794 20.6768 13.6689 20.2953 13.6689Z" fill="rgb(23,23,37)" fill-rule="nonzero" />
+	<path id="矢量 19" d="M21.8159 7.92631L21.8159 7.91885L17.0407 3.12932L16.8898 2.98261L16.8708 3.0024C16.765 2.94304 16.6456 2.91162 16.5221 2.91162C16.1242 2.91162 15.8008 3.23576 15.8008 3.63425C15.8008 3.75844 15.8322 3.87785 15.8916 3.98365L15.8704 4.00547L19.1949 7.33885L15.783 7.3402C10.2279 8.0328 8.86383 11.4699 8.46191 16.806C8.46191 17.2045 8.78536 17.5286 9.18315 17.5286C9.50797 17.5286 9.78363 17.3123 9.87372 17.0155L9.90648 16.8237C10.3289 11.777 11.3237 9.287 15.809 8.78615L19.1949 8.78615L16.0178 11.9721L15.8888 12.1536C15.8431 12.2498 15.8192 12.3672 15.8192 12.4737C15.8192 12.8722 16.1427 13.1963 16.5405 13.1963C16.6537 13.1963 16.7786 13.169 16.8789 13.1172L21.7956 8.22061C21.8392 8.19001 21.8927 8.11456 21.8927 8.05724C21.8926 7.99992 21.8595 7.95691 21.8159 7.92631Z" fill="rgb(23,23,37)" fill-rule="nonzero" />
+</svg>

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 0
static/images/index/guanzhu.svg


+ 4 - 0
static/images/index/gzActive.svg

@@ -0,0 +1,4 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24.000000" height="24.000000" fill="none">
+	<rect id="svg 11" width="24.000000" height="24.000000" x="0.000000" y="0.000000" />
+	<path id="矢量 17" d="M7.85178 21.4836C7.01003 22.0066 5.90928 21.7361 5.39803 20.8846C5.27685 20.6825 5.1981 20.465 5.16177 20.2321C5.12543 19.9992 5.13419 19.7681 5.18803 19.5386L6.27753 14.8924C6.29075 14.8373 6.28891 14.7827 6.272 14.7286C6.2551 14.6745 6.22553 14.6286 6.18328 14.5909L2.61703 11.4834C1.87628 10.8384 1.79078 9.71038 2.42403 8.95838C2.57621 8.77719 2.75738 8.63225 2.96755 8.52357C3.17773 8.41488 3.40072 8.35082 3.63653 8.33138L8.31678 7.95013C8.41878 7.94163 8.51003 7.87438 8.55178 7.77213L10.355 3.36188C10.7308 2.44313 11.7758 2.00438 12.6875 2.39013C12.9049 2.48252 13.0965 2.61288 13.2623 2.7812C13.4281 2.94951 13.5555 3.14307 13.6445 3.36188L15.4478 7.77188C15.4895 7.87438 15.5808 7.94188 15.6828 7.95013L20.3635 8.33163C21.345 8.41163 22.0718 9.27988 21.994 10.2656C21.9758 10.5008 21.9137 10.7239 21.8079 10.9347C21.7021 11.1456 21.5604 11.3286 21.3828 11.4839L17.8165 14.5914C17.7335 14.6636 17.696 14.7806 17.7223 14.8926L18.8118 19.5389C19.0373 20.5001 18.4518 21.4686 17.496 21.7004C17.2659 21.7562 17.0339 21.7654 16.8001 21.7278C16.5663 21.6903 16.3489 21.609 16.1478 21.4839L12.1405 18.9939C12.0975 18.9669 12.0506 18.9534 11.9998 18.9534C11.949 18.9534 11.9021 18.9669 11.859 18.9939L7.85153 21.4839L7.85178 21.4836Z" fill="rgb(1,107,246)" fill-rule="nonzero" />
+</svg>

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 14 - 0
static/images/index/huizhang.svg


BIN
static/images/index/ins.png


BIN
static/images/index/welfare.png


Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott