wkw il y a 7 mois
Parent
commit
97398bdd27

+ 2 - 2
package/jobIntention/addExpectation.vue

@@ -89,7 +89,7 @@
 
 			<!-- 从事方向 -->
 			<view class="form-item">
-				<text class="form-label">从事方向</text>
+				<text class="form-label">跨境标签</text>
 				<view class="form-input" @click="selectIndustry">
 					<text class="input-text">{{ industry || '请选择' }}</text>
 					<u-icon name="arrow-right" color="#999" size="24"></u-icon>
@@ -321,7 +321,7 @@ export default {
 		    return;
 		  }
 		  if (!this.industry) {
-		    uni.showToast({ title: "请选择从事方向", icon: "none" });
+		    uni.showToast({ title: "请选择跨境标签", icon: "none" });
 		    return;
 		  }
 		  if(this.isWork)

+ 2 - 2
package/jobIntention/companyImg.vue

@@ -44,7 +44,6 @@ export default {
 		this.companyId = options.companyId;
 		console.log('接收的公司ID:', this.companyId);
 	}
-  	
   },
   	onReady() {
 		// 得到整个组件对象,内部图片列表变量为"lists"
@@ -70,7 +69,8 @@ export default {
 						title: "提交成功",
 						icon: "success"
 					});
-				    uni.navigateTo({ url: '/package/jobIntention/underReview' })
+				    // uni.navigateTo({ url: '/package/jobIntention/underReview' })
+					uni.navigateTo({ url: "/package/jobIntention/completeMsg" });
 		
 		
 				} else {

+ 27 - 26
package/jobIntention/completeMsg.vue

@@ -38,10 +38,10 @@
 						<view class="form-border-title">{{ item.ruleClassifyName }}</view>
 						<view class="form-border-money">{{ item.salaryRange }}</view>
 					</view>
-					<view class="form-border-desc">{{ item.companyName }}{{ item.companyPeople }}人</view>
+					<view class="form-border-desc">{{ item.company.companyName || item.company.companyAllName}} {{ item.company.companyPeople }}人</view>
 					<view class="form-border-img-name">
 						<view class="people-img">
-							<image v-if="item.hr != null && item.hr.hrImg" :src="item.hr.hrImg" class="avatar-image"
+							<image v-if="avatar" :src="avatar" class="avatar-image"
 								mode="aspectFill"></image>
 							<image v-else src="@/static/images/jobApplicant/touxiang.svg" mode="scaleToFill"
 								class="user-img" />
@@ -78,7 +78,7 @@ export default {
 	},
 	onShow() {
 		this.getmypost()
-		this.HrFirst()
+		// this.HrFirst()
 	},
 	methods: {
 		goUploadImg() {
@@ -232,9 +232,10 @@ export default {
 							title: "提交成功,请开始招聘吧。",
 							icon: "success"
 						});
-						uni.switchTab({
-							url: '/pages/index/index'
-						});
+						// uni.switchTab({
+						// 	url: '/pages/index/index'
+						// });
+						uni.navigateTo({ url: '/package/jobIntention/underReview' })
 					} else {
 						uni.showToast({
 							title: res.msg || "提交失败",
@@ -338,27 +339,27 @@ export default {
 				});
 		},
 		//Hr 名片
-		HrFirst() {
-			this.$Request.get("/app/HrFirst", "")
-				.then((res) => {
-					if (res.code != 0) {
-						uni.showToast({
-							title: res.msg || "查询失败",
-							icon: "none"
-						});
-						return;
-					}
+		// HrFirst() {
+		// 	this.$Request.get("/app/HrFirst", "")
+		// 		.then((res) => {
+		// 			if (res.code != 0) {
+		// 				uni.showToast({
+		// 					title: res.msg || "查询失败",
+		// 					icon: "none"
+		// 				});
+		// 				return;
+		// 			}
 
-					console.log("Hr 名片", res)
-				})
-				.catch((err) => {
-					console.error("查询失败:", err);
-					uni.showToast({
-						title: "查询失败",
-						icon: "none"
-					});
-				});
-		},
+		// 			console.log("Hr 名片", res)
+		// 		})
+		// 		.catch((err) => {
+		// 			console.error("查询失败:", err);
+		// 			uni.showToast({
+		// 				title: "查询失败",
+		// 				icon: "none"
+		// 			});
+		// 		});
+		// },
 
 	},
 };

+ 7 - 8
package/jobIntention/underReview.vue

@@ -67,14 +67,13 @@ export default {
   
   methods: {
     goCompleteMsg() {
-		if(this.companyinfo.status!=2){
-			//  uni.navigateTo({ url: "/my/renzheng/editCompany" });
-			 uni.switchTab({ url: "/pages/my/index" });
-		}else{
-			 uni.navigateTo({ url: "/package/jobIntention/completeMsg" });
-		}
-		
-     
+		// if(this.companyinfo.status!=2){
+		// 	//  uni.navigateTo({ url: "/my/renzheng/editCompany" });
+		// 	 uni.switchTab({ url: "/pages/my/index" });
+		// }else{
+		// 	 uni.navigateTo({ url: "/package/jobIntention/completeMsg" });
+		// }
+		uni.switchTab({ url: "/pages/my/index" });
     },
     
     // 查询用户企业状态

+ 73 - 62
pages/my/VIP/benefits.vue

@@ -51,63 +51,63 @@
 					<view class="header-cell basic">基础权益</view>
 					<view class="header-cell regular active">
 						<!-- <view class="plan-tag">生效中</view> -->
-						<view class="plan-name">常规版</view>
-						<view class="plan-expire">剩余5天到期</view>
+						<view class="plan-name">{{trialVersion.vipName}}</view>
+						<!-- <view class="plan-expire">剩余5天到期</view> -->
 					</view>
-					<view class="header-cell vip">VIP版</view>
+					<view class="header-cell vip">{{monthlyPayment.vipName}}</view>
 					<view class="header-cell flagship recommended">
 						<view class="plan-tag">推荐</view>
-						<view class="plan-name">旗舰版</view>
+						<view class="plan-name">{{annual.vipName}}</view>
 					</view>
 				</view>
 
 				<!-- 表格内容 -->
 				<view class="table-row">
 					<view class="row-cell benefit-type">在线普通职位</view>
-					<view class="row-cell basic">10个</view>
-					<view class="row-cell regular">35个</view>
-					<view class="row-cell vip">45个</view>
-					<view class="row-cell flagship">不限</view>
+					<view class="row-cell basic">1个</view>
+					<view class="row-cell regular">{{trialVersion.vipPostTimes}}个</view>
+					<view class="row-cell vip">{{monthlyPayment.vipPostTimes}}个</view>
+					<view class="row-cell flagship">{{annual.vipPostTimes}}</view>
 				</view>
 
 				<view class="table-row">
 					<view class="row-cell benefit-type">在线急聘职位</view>
 					<view class="row-cell basic">0个</view>
-					<view class="row-cell regular">5个</view>
-					<view class="row-cell vip">15个</view>
-					<view class="row-cell flagship">50个</view>
+					<view class="row-cell regular">{{trialVersion.vipDueTimes}}个</view>
+					<view class="row-cell vip">{{monthlyPayment.vipDueTimes}}个</view>
+					<view class="row-cell flagship">{{annual.vipDueTimes}}个</view>
 				</view>
 
 				<view class="table-row">
 					<view class="row-cell benefit-type">每日查看总数</view>
-					<view class="row-cell basic">20个</view>
-					<view class="row-cell regular">50个</view>
-					<view class="row-cell vip">不限</view>
-					<view class="row-cell flagship">不限</view>
+					<view class="row-cell basic">5个</view>
+					<view class="row-cell regular">{{trialVersion.vipViewTimes}}个</view>
+					<view class="row-cell vip">{{monthlyPayment.vipViewTimes}}</view>
+					<view class="row-cell flagship">{{annual.vipViewTimes}}</view>
 				</view>
 
 				<view class="table-row">
 					<view class="row-cell benefit-type">每日沟通总数</view>
 					<view class="row-cell basic">5个</view>
-					<view class="row-cell regular">20个</view>
-					<view class="row-cell vip">50个</view>
-					<view class="row-cell flagship">100个</view>
+					<view class="row-cell regular">{{trialVersion.vipConTimes}}个</view>
+					<view class="row-cell vip">{{monthlyPayment.vipConTimes}}个</view>
+					<view class="row-cell flagship">{{annual.vipConTimes}}个</view>
 				</view>
 
-				<view class="table-row">
+				<!-- <view class="table-row">
 					<view class="row-cell benefit-type">查看沟通范围</view>
 					<view class="row-cell basic">仅普通职位</view>
 					<view class="row-cell regular">仅普通职位</view>
 					<view class="row-cell vip">不限</view>
 					<view class="row-cell flagship">不限</view>
-				</view>
+				</view> -->
 
 				<view class="table-row price-row">
 					<view class="row-cell benefit-type">价格</view>
 					<view class="row-cell basic">免费</view>
-					<view class="row-cell regular">¥599/年</view>
-					<view class="row-cell vip">¥1599/年</view>
-					<view class="row-cell flagship">¥2599/年</view>
+					<view class="row-cell regular">{{trialVersion.money}}/年</view>
+					<view class="row-cell vip">{{monthlyPayment.money}}/年</view>
+					<view class="row-cell flagship">{{annual.money}}/年</view>
 				</view>
 			</view>
 
@@ -250,7 +250,10 @@
 					regular: 599,
 					vip: 1599,
 					flagship: 2599
-				}
+				},
+				trialVersion:[],
+				monthlyPayment:[],
+				annual:[]
 			}
 		},
 		onLoad() {
@@ -659,6 +662,12 @@
 						if (this.viplist.length > 0) {
 							this.selectedPlan = this.viplist[0].id;
 						}
+						if(res.data){
+							
+						}
+						this.trialVersion = res.data[0];
+						this.monthlyPayment = res.data[1];
+						this.annual = res.data[2];
 					} else {
 						uni.showToast({
 							title: '暂无VIP套餐',
@@ -709,45 +718,47 @@
 			getVipdetile() {
 				 this.$Request.get("/app/UserVip/selectUserVip").then((res) => {
 				        if (res.code == 0) {
-				            const endTimeStr = res.data.endTime; // 到期时间(格式:yyyy-MM-dd HH:mm:ss 或 yyyy-MM-dd)
-				            const createTimeStr = res.data.createTime; // 创建时间(格式同上)
-				            
-				            // 1. 时间字符串转时间戳(兼容不同格式)
-				            const endTime = this.formatTimeToTimestamp(endTimeStr);
-				            const createTime = this.formatTimeToTimestamp(createTimeStr);
-				            const currentTime = new Date().getTime(); // 当前时间戳
-				            
-				            // 2. 验证时间有效性
-				            if (!endTime || !createTime) {
-				                console.error("时间格式错误", { endTimeStr, createTimeStr });
-				                this.remainingDays = 0;
-				                this.vipStatus = "已过期";
-							
-				                return;
-				            }
-				            if(res.data.vipDetails){
-									this.vipName=res.data.vipDetails.vipName
+							if(res.data){
+								const endTimeStr = res.data.endTime; // 到期时间(格式:yyyy-MM-dd HH:mm:ss 或 yyyy-MM-dd)
+								const createTimeStr = res.data.createTime; // 创建时间(格式同上)
+								
+								// 1. 时间字符串转时间戳(兼容不同格式)
+								const endTime = this.formatTimeToTimestamp(endTimeStr);
+								const createTime = this.formatTimeToTimestamp(createTimeStr);
+								const currentTime = new Date().getTime(); // 当前时间戳
+								
+								// 2. 验证时间有效性
+								if (!endTime || !createTime) {
+								    console.error("时间格式错误", { endTimeStr, createTimeStr });
+								    this.remainingDays = 0;
+								    this.vipStatus = "已过期";
+								
+								    return;
+								}
+								if(res.data.vipDetails){
+										this.vipName=res.data.vipDetails.vipName
+								}
+								// 3. 计算剩余时间(毫秒):到期时间 - 当前时间
+								const remainingTime = endTime - currentTime;
+								
+								// 4. 处理不同情况
+								if (remainingTime <= 0) {
+								    // 已过期
+								    this.remainingDays = 0;
+								    this.vipStatus = "已过期";
+								} else {
+								    // 计算剩余天数(向上取整,不足1天按1天算)
+								    const days = Math.ceil(remainingTime / (1000 * 60 * 60 * 24));
+								    this.remainingDays = days;
+								    this.vipStatus = `剩余${days}天到期`;
+								    
+								    // 可选:如果需要显示总有效期(创建到到期的总天数)
+								    this.totalValidDays = Math.ceil((endTime - createTime) / (1000 * 60 * 60 * 24));
+								}
+								
+								console.log("VIP剩余天数:", this.remainingDays);
+								console.log("VIP状态:", this.vipStatus);
 							}
-				            // 3. 计算剩余时间(毫秒):到期时间 - 当前时间
-				            const remainingTime = endTime - currentTime;
-				            
-				            // 4. 处理不同情况
-				            if (remainingTime <= 0) {
-				                // 已过期
-				                this.remainingDays = 0;
-				                this.vipStatus = "已过期";
-				            } else {
-				                // 计算剩余天数(向上取整,不足1天按1天算)
-				                const days = Math.ceil(remainingTime / (1000 * 60 * 60 * 24));
-				                this.remainingDays = days;
-				                this.vipStatus = `剩余${days}天到期`;
-				                
-				                // 可选:如果需要显示总有效期(创建到到期的总天数)
-				                this.totalValidDays = Math.ceil((endTime - createTime) / (1000 * 60 * 60 * 24));
-				            }
-				            
-				            console.log("VIP剩余天数:", this.remainingDays);
-				            console.log("VIP状态:", this.vipStatus);
 				        } else {
 				            // 无VIP数据
 				            this.remainingDays = 0;

+ 1 - 1
pages/recruitmentData/index.vue

@@ -182,7 +182,7 @@ export default {
       this.todayData[1].change=res.data.tySawMe;
       this.todayData[2].number=res.data.iCommunicated;
       this.todayData[2].change=res.data.tyICommunicated;
-      this.todayData[3].number=res.data.tyCandidateCommunicated;
+      this.todayData[3].number=res.data.candidateCommunicated;
       this.todayData[3].change=res.data.tyCandidateCommunicated;
       this.todayData[4].number=res.data.receivedResumes;
       this.todayData[4].change=res.data.tyReceivedResumes;