Bläddra i källkod

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

lyuis 6 månader sedan
förälder
incheckning
bb7c6f4441

+ 25 - 26
package/jobIntention/companyImg.vue

@@ -25,10 +25,7 @@
 					<text style="margin-top: 8rpx;">已选择 PDF</text>
 					<view class="delete-btn" @click="deletePDF">×</view>
 				</view>
-				<view v-else class="text-item" @click="choosePDF">
-					<u-icon name="plus" color="#999" size="40" style="margin-bottom: 8rpx;"></u-icon>
-					上传在职证明
-				</view>
+				<fileSelector v-else :isShowStyle="false" title="上传在职证明" allowType=".pdf" @fileSelected="choosePDF" />
 			</view>
 			<view class="warning-title">注意事项</view>
 			<view class="warning-desc">1.请上传加盖公章的在职证明(仅限 PDF 文件)</view>
@@ -56,6 +53,8 @@
 <script>
 	import navBar from "@/components/nav-bar/index.vue";
 	import configdata from '../../common/config.js';
+	// 引入组件
+	import fileSelector from '@/uni_modules/zhouquan-fileSelector/components/zhouquan-fileSelector/file-selector.vue';
 
 	export default {
 		data() {
@@ -74,7 +73,7 @@
 				action: configdata.APIHOST1 + '/alioss/upload'
 			};
 		},
-		components: { navBar },
+		components: { navBar,fileSelector},
 		onLoad(options) {
 			if (options.companyName) this.companyName = decodeURIComponent(options.companyName);
 			if (options.companyId) this.companyId = options.companyId;
@@ -133,27 +132,28 @@
 			},
 
 			// ======= 在职证明上传 (PDF) =======
-			async choosePDF() {
-				uni.chooseFile({
-					count: 1,
-					type: 'file',
-					extension: ['pdf'],
-					success: async (res) => {
-						const path = res.tempFiles[0].path;
-						this.pdfFilePath = path;
-
-						uni.showLoading({ title: '上传PDF中...' });
-						try {
-							this.employmentVerification = await this.uploadSingleFile(path);
-							uni.showToast({ title: 'PDF上传成功', icon: 'success' });
-						} catch (e) {
-							uni.showToast({ title: '上传失败', icon: 'none' });
-						} finally {
-							uni.hideLoading();
-						}
+			async choosePDF(e) {
+				var that = this
+				const validExtensions = ['pdf', 'doc', 'docx'];
+				const ext = e.name.split('.').pop().toLowerCase();
+				if (!validExtensions.includes(ext)) {
+					this.$queue.showToast('仅支持PDF/DOC/DOCX格式')
+					return;
+				}
+				uni.getFileInfo({
+					filePath: e.path,
+					success: (info) => {
+						let attachment_size = (info.size / 1024).toFixed(1)
+						that.$queue.uploadFile(e.path, function (path) {
+							if (path){
+								that.pdfFilePath = path;
+								that.employmentVerification = path;
+							}else
+								that.$queue.showToast('文件上传失败')
+						})
 					},
-					fail: () => {
-						uni.showToast({ title: '请选择PDF文件', icon: 'none' });
+					fail: (err) => {
+						console.error('获取失败', err);
 					}
 				});
 			},
@@ -226,7 +226,6 @@
 					employmentVerification: this.employmentVerification,
 					companyVerification: this.companyProofUrls.join(',')
 				};
-
 				uni.showLoading({ title: '提交中...' });
 				try {
 					const res = await this.$Request.postJson("/app/company/updateCompany", data);

+ 27 - 16
pages/msg/addmsg.vue

@@ -62,19 +62,13 @@
 			<!-- 右侧内容区域 -->
 			<view class="content-area">
 				<view v-if="tabCurrentIndex == 0">
-					<view v-for="item in list" :key="item.id" @click="goAdd(1,0,item.id)">
-					<view
-						style="margin-top: 20rpx;color: #000000;display: flex;align-items: center;background: #FFFFFF;padding: 0rpx 40rpx;">
-						<view style="height: 80rpx;width: 80%;">
-							{{item.content}}
-						</view>
-						
-						<!--
-							<view style="width: 20%;display: flex;justify-content: flex-end;">
-								<image src="../../static/images/my/right_icon.png" style="width: 15rpx;height: 30rpx;"></image>
+					<view v-for="item in list" :key="item.id">
+						<view class="content-area-box flex justify-between">
+							<view @click="copyContent(item.content)">{{item.content}}</view>
+							<view class="content-area-edit" @click="goAdd(1, 0, item.id)">
+								<view>编辑<u-icon name="arrow-right"></u-icon></view>
 							</view>
-						-->
-					</view>
+						</view>
 					</view>
 					
 					<!-- 空状态显示 -->
@@ -82,9 +76,6 @@
 					
 					<!-- 自定义标签下的添加按钮 -->
 					<view class="custom-add-button" @click="goAdd(0,0,0)">
-						<!-- 
-							<u-icon name="plus" color="#fff" size="30" style="margin-right: 10upx;"></u-icon>
-						-->
 						添加常用语
 					</view>
 				</view>
@@ -169,6 +160,11 @@
 			this.loadData();
 		},
 		methods: {
+			copyContent(content){
+				const eventChannel = this.getOpenerEventChannel();
+				eventChannel.emit('selectData', content);
+				uni.navigateBack();
+			},
 			// 返回上一页
 			goBack() {
 				uni.navigateBack()
@@ -259,7 +255,21 @@
 	}
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
+	.content-area-box{
+		margin: 40rpx 0;
+		color: #000000;
+		background: #FFFFFF;
+	}
+	.content-area-edit{
+		color: rgba(153, 153, 153, 1);
+		font-family: DM Sans;
+		font-style: Regular;
+		font-size: 24rpx;
+		font-weight: 400;
+		flex-shrink: 0;
+		margin-left: 20rpx;
+	}
 	page {
 		padding-top: 80rpx;
 	}
@@ -486,6 +496,7 @@
 
 	// 自定义添加按钮样式
 	.custom-add-button {
+		margin-top: 80rpx;
 		display: flex;
 		align-items: center;
 		justify-content: center;

+ 13 - 5
pages/msg/im.vue

@@ -691,14 +691,14 @@
 						<image src="../../static/im/changgui.svg" style="width: 56rpx;height: 56rpx;" mode=""></image>
 					</view>
 					<view class="box">
-						<input style="color: #000000;" auto-height="true" @confirm='setChatSave(1)' v-model="content"
+						<textarea style="color: #000000;" auto-height="true" @confirm='setChatSave(1)' v-model="content"
 							@focus="textareaFocus" />
 					</view>
 					<view class="em" @tap="chooseEmoji">
 						<image src="../../static/im/smail.svg" style="width: 56rpx;height: 56rpx;" mode=""></image>
 					</view>
 					<!-- #ifdef H5 -->
-					<view class="more" @tap="showMore" style="height: auto;">
+					<view class="more" @tap="showMore" style="height: 70rpx;">
 						<image src="../../static/im/buleAdd.svg" style="width: 56rpx;height: 56rpx;" mode=""></image>
 					</view>
 					<!-- #endif -->
@@ -2118,7 +2118,9 @@
 				// this.form.game = e[0].label
 				// this.form.gameId = e[0].value
 				this.content = e[0].label;
-				this.setChatSave(1);
+				this.showMore();
+				this.showChangYong = false;
+				// this.setChatSave(1);
 			},
 			getChangYong() {
 				let state = 0
@@ -2194,7 +2196,14 @@
 			goAdd() {
 				this.showMore();
 				uni.navigateTo({
-					url: '/pages/msg/addmsg'
+					url: '/pages/msg/addmsg',
+					success: (res) => {
+						// 监听返回的数据
+						res.eventChannel.on('selectData', (data) => {
+							console.log('子页面返回的数据:', data);
+							this.content = data;
+						});
+					}
 				});
 			},
 			goHistory() {
@@ -2791,7 +2800,6 @@
 								name: 'file',
 								success: (uploadFileRes) => {
 									let content = JSON.parse(uploadFileRes.data).data;
-									// this.setChatSave(2);
 									uni.hideLoading();
 									let data = {
 										userId: that.byUserId,

+ 167 - 100
pages/my/VIP/benefits.vue

@@ -44,71 +44,70 @@
 		<view class="benefits-section">
 			<!-- 权益对比表格 -->
 			<view class="benefits-table">
-				<view class="section-title">购买VIP, 享受更多权益</view>
-				<!-- 表头 -->
-				<view class="table-header">
-					<view class="header-cell benefit-type">权益类型</view>
-					<view class="header-cell basic">基础权益</view>
-					<view class="header-cell regular active">
-						<!-- <view class="plan-tag">生效中</view> -->
-						<view class="plan-name">{{trialVersion.vipName}}</view>
-						<!-- <view class="plan-expire">剩余5天到期</view> -->
-					</view>
-					<view class="header-cell vip">{{monthlyPayment.vipName}}</view>
-					<view class="header-cell flagship recommended">
-						<view class="plan-tag">推荐</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">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">{{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">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">{{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="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 class="table-row price-row">
-					<view class="row-cell benefit-type">价格</view>
-					<view class="row-cell basic">免费</view>
-					<view class="row-cell regular">{{trialVersion.money}}/{{ vipNameTypeText(trialVersion.vipNameType) }}</view>
-					<view class="row-cell vip">{{monthlyPayment.money}}/{{ vipNameTypeText(monthlyPayment.vipNameType) }}</view>
-					<view class="row-cell flagship">{{annual.money}}/{{ vipNameTypeText(annual.vipNameType) }}</view>
-				</view>
+			  <view class="section-title">购买VIP, 享受更多权益</view>
+			
+			  <!-- 表头 -->
+			  <view class="table-header">
+			    <view class="header-cell benefit-type">权益类型</view>
+			    <view class="header-cell basic">基础权益</view>
+			    <view v-for="(vip, index) in viplist" :key="vip.id"
+			          :class="['header-cell', index === 0 ? 'active' : index === 1 ? 'vip' : 'recommended']">
+				  <view v-if="vip.vipName === vipName" class="plan-tag-left">生效中</view>
+			      <view v-if="vip.vipName === '年度版'" class="plan-tag-right">推荐</view>
+			      <view class="plan-name">{{ vip.vipName }}</view>
+				  <view v-if="vip.vipName === vipName" style="font-size: 20rpx;">{{ endTimeStr ? endTimeStr.split(' ')[0] : '' }}到期</view>
+			    </view>
+			  </view>
+			
+			  <!-- 在线普通职位 -->
+			  <view class="table-row">
+			    <view class="row-cell benefit-type">在线普通职位</view>
+			    <view class="row-cell basic">{{nonVipInfo.postTimes}}个</view>
+			    <view v-for="(vip, index) in viplist" :key="vip.id"
+			          :class="['row-cell', index === 0 ? 'regular' : index === 1 ? 'vip' : 'flagship']">
+			      {{ vip.vipPostTimes }}个
+			    </view>
+			  </view>
+			
+			  <!-- 在线急聘职位 -->
+			  <view class="table-row">
+			    <view class="row-cell benefit-type">在线急聘职位</view>
+			    <view class="row-cell basic">{{nonVipInfo.dueTimes}}个</view>
+			    <view v-for="(vip, index) in viplist" :key="vip.id"
+			          :class="['row-cell', index === 0 ? 'regular' : index === 1 ? 'vip' : 'flagship']">
+			      {{ vip.vipDueTimes }}个
+			    </view>
+			  </view>
+			
+			  <!-- 每日查看总数 -->
+			  <view class="table-row">
+			    <view class="row-cell benefit-type">每日查看总数</view>
+			    <view class="row-cell basic">{{nonVipInfo.viewTimes}}个</view>
+			    <view v-for="(vip, index) in viplist" :key="vip.id"
+			          :class="['row-cell', index === 0 ? 'regular' : index === 1 ? 'vip' : 'flagship']">
+			      {{ vip.vipViewTimes }}个
+			    </view>
+			  </view>
+			
+			  <!-- 每日沟通总数 -->
+			  <view class="table-row">
+			    <view class="row-cell benefit-type">每日沟通总数</view>
+			    <view class="row-cell basic">{{nonVipInfo.conTimes}}个</view>
+			    <view v-for="(vip, index) in viplist" :key="vip.id"
+			          :class="['row-cell', index === 0 ? 'regular' : index === 1 ? 'vip' : 'flagship']">
+			      {{ vip.vipConTimes }}个
+			    </view>
+			  </view>
+			
+			  <!-- 价格 -->
+			  <view class="table-row price-row">
+			    <view class="row-cell benefit-type">价格</view>
+			    <view class="row-cell basic">免费</view>
+			    <view v-for="(vip, index) in viplist" :key="vip.id"
+			          :class="['row-cell', index === 0 ? 'regular' : index === 1 ? 'vip' : 'flagship']">
+			      {{ vip.money }}/{{ vipNameTypeText(vip.vipNameType) }}
+			    </view>
+			  </view>
 			</view>
 
 			<!-- 说明文字 -->
@@ -173,6 +172,24 @@
 						</view>
 					</view>
 				</view>
+				
+				<view style="padding: 32rpx;">
+					<view style="font-weight: 500;font-size: 16px;padding-bottom: 32rpx">
+						支付方式
+					</view>
+					<view v-for="(item, i) in openLists" :key="i" @click="selectWay(item)">
+						<view class="rule-item">
+							<image 
+							:src="item.id == openWay 
+							? require('@/static/images/jobApplicant/check.svg') 
+							: require('@/static/images/jobApplicant/border.svg')"
+							  mode="scaleToFill"
+							/>
+							<text>{{ item.text }}</text>
+						</view>
+					</view>
+				</view>
+
 
 				<!-- 支付按钮 -->
 				<view class="payment-button" @click="confirmPayment">
@@ -191,6 +208,7 @@
 				// 当前会员信息
 				currentPlan: 'regular',
 				openWay: 1,
+				openLists:[],
 				isVip: false,
 				isVipC: "",
 				dataTime: "", //到期时间
@@ -210,18 +228,18 @@
 				viplist: [],
 				endTime:"",
 				createTime:"",
-				  remainingDays: 0, // 剩余天数
-				  vipName:"",
-					vipStatus: "未开通VIP", // VIP状态文字(已过期/剩余x天到期/未开通VIP)
-					totalValidDays: 0, // 总有效期天数(可选)
-					myPostTimes:0,
-					vipDueTimes:0,
-					vipConTimes:0,
-					myViewTimes:0,
-					vipViewTimes:0,
-					myConTimes:0,
-					vipPostTimes:0,
-					myDueTimes:0,
+				remainingDays: 0, // 剩余天数
+				vipName:"",
+				vipStatus: "未开通VIP", // VIP状态文字(已过期/剩余x天到期/未开通VIP)
+				totalValidDays: 0, // 总有效期天数(可选)
+				myPostTimes:0,
+				vipDueTimes:0,
+				vipConTimes:0,
+				myViewTimes:0,
+				vipViewTimes:0,
+				myConTimes:0,
+				vipPostTimes:0,
+				myDueTimes:0,
 					
 				// 权益使用情况
 				benefits: {
@@ -251,9 +269,8 @@
 					vip: 1599,
 					flagship: 2599
 				},
-				trialVersion:[],
-				monthlyPayment:[],
-				annual:[]
+				nonVipInfo:{},
+				endTimeStr:''
 			}
 		},
 		onLoad() {
@@ -317,16 +334,13 @@
 					id: 1,
 				}, ];
 			}
-
 			this.openWay = 1;
 			// #endif
-			
-
-
 		},
 		onShow() {
 			this.getUserInfoVipList();
 			this.selectVipDetails();
+			this.getNonVipDetails();
 			this.getVipdetile();
 		},
 		methods: {
@@ -639,7 +653,8 @@
 					},
 				});
 			},
-			selectWay: function(item) {
+			// 选择支付方式
+			selectWay(item) {
 				this.openWay = item.id;
 			},
 			//获取会员开通价格
@@ -671,12 +686,6 @@
 						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套餐',
@@ -685,7 +694,20 @@
 					}
 				});
 			},
-
+			// 基础套餐
+			getNonVipDetails(){
+				this.$Request.get("/app/VipDetails/getNonVipDetails").then((res) => {
+					console.log(res)
+					if (res.code == 0) {
+						this.nonVipInfo = res.data;
+					} else {
+						uni.showToast({
+							title: '暂无基础套餐',
+							icon: 'none'
+						})
+					}
+				});
+			},
 			//获取个人信息
 			getUserInfo() {
 				this.$Request.get("/app/user/selectUserById").then((res) => {
@@ -728,17 +750,17 @@
 				 this.$Request.get("/app/UserVip/selectUserVip").then((res) => {
 				        if (res.code == 0) {
 							if(res.data){
-								const endTimeStr = res.data.endTime; // 到期时间(格式:yyyy-MM-dd HH:mm:ss 或 yyyy-MM-dd)
+								this.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 endTime = this.formatTimeToTimestamp(this.endTimeStr);
 								const createTime = this.formatTimeToTimestamp(createTimeStr);
 								const currentTime = new Date().getTime(); // 当前时间戳
 								
 								// 2. 验证时间有效性
 								if (!endTime || !createTime) {
-								    console.error("时间格式错误", { endTimeStr, createTimeStr });
+								    // console.error("时间格式错误", { endTimeStr, createTimeStr });
 								    this.remainingDays = 0;
 								    this.vipStatus = "已过期";
 								
@@ -1022,12 +1044,13 @@
 		box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.1);
 
 		.table-header {
-			display: grid;
-			grid-template-columns: 1fr 1fr 1fr 1fr 1fr;
+			display: flex;
+			// grid-template-columns: 1fr 1fr 1fr 1fr 1fr;
 			background: #f8f9fa;
 			border-bottom: 4rpx solid #FFFFFF;
 
 			.header-cell {
+				flex:1;
 				padding: 12rpx;
 				color: rgba(23, 23, 37, 1);
 				font-family: DM Sans;
@@ -1082,7 +1105,7 @@
 					color: rgba(212, 131, 0, 1);
 				}
 
-				.plan-tag {
+				.plan-tag-right {
 					position: absolute;
 					top: 0rpx;
 					right: 0rpx;
@@ -1114,6 +1137,38 @@
 						z-index: -1;
 					}
 				}
+				.plan-tag-left {
+					position: absolute;
+					top: 0rpx;
+					left: 0rpx;
+					background: linear-gradient(90.00deg, rgba(13, 39, 247, 1), rgba(19, 193, 234, 1) 100%);
+					color: rgba(255, 255, 255, 1);
+					font-family: DM Sans;
+					font-size: 12rpx;
+					font-weight: 400;
+					line-height: 14rpx;
+					letter-spacing: 0px;
+					text-align: left;
+					padding: 4rpx 12rpx;
+					border-radius: 16rpx 0rpx 16rpx 0rpx;
+					transform-origin: center;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					overflow: hidden;
+				
+					&::before {
+						content: '';
+						position: absolute;
+						top: 0;
+						left: 0;
+						right: 0;
+						bottom: 0;
+						background: inherit;
+						transform: rotate(-45deg);
+						z-index: -1;
+					}
+				}
 
 				.plan-name {
 					font-size: 24rpx;
@@ -1129,8 +1184,8 @@
 		}
 
 		.table-row {
-			display: grid;
-			grid-template-columns: 1fr 1fr 1fr 1fr 1fr;
+			display: flex;
+			// grid-template-columns: 1fr 1fr 1fr 1fr 1fr;
 			border-bottom: 4rpx solid #FFFFFF;
 
 			&:last-child {
@@ -1151,6 +1206,7 @@
 			}
 
 			.row-cell {
+				flex: 1;
 				padding: 24rpx 12rpx;
 				font-size: 16rpx;
 				text-align: center;
@@ -1370,4 +1426,15 @@
 			font-weight: 600;
 		}
 	}
+	// 密码要求列表
+	.rule-item {
+	  display: flex;
+	  align-items: center;
+	  margin-bottom: 8rpx;
+	  image{
+	    width: 32rpx;
+	    height: 32rpx;
+	    margin-right: 16rpx;
+	  }
+	}
 </style>

+ 18 - 50
pages/my/index.vue

@@ -16,45 +16,12 @@
 							style="margin-top: 40rpx;margin-right:30rpx" @click="goNav('switchRoles')" />
 						<image src="@/static/images/jobApplicant/shezhi.svg" mode="scaleToFill"
 							style="margin-top: 40rpx;" @click="goNav('/pages/my/setup')" />
-						<!-- <image
-              src="../../static/images/my/icon/selectUser.png"
-              style="width: 40rpx; height: 100%; margin-right: 40rpx"
-              mode=""
-              @click="bindQe(userType)"
-            >
-            </image>
-            <image
-              src="../../static/images/my/icon/set.png"
-              style="width: 36rpx; height: 36rpx;margin-top: 40rpx"
-              mode="aspectFill"
-            >
-            </image> -->
 					</view>
 				</view>
 				<view class="user-content">
 					<view class="info flex justify-center"
 						:style="{ paddingTop: token && XCXIsSelect != '否' ? '0' : '100rpx' }">
 						<view class="info-box">
-							<!-- <view
-                class="info-box-btn flex justify-end align-center"
-                v-if="token && XCXIsSelect != '否'"
-              >
-                <image
-                  src="@/static/images/jobApplicant/qiehuan.svg"
-                  mode="scaleToFill"
-                  style="margin-top: 40rpx"
-                  @click="bindQe(userType)"
-                />
-                <image
-              src="../../static/images/my/icon/selectUser.png"
-              style="width: 40rpx; height: 100%; margin-right: 40rpx"
-              mode=""
-              @click="bindQe(userType)"
-            >
-            </image>
-                <image src="../../static/images/my/icon/set.png" style="width: 44rpx;height: 100%;" mode="">
-						</image>
-              </view> -->
 							<view @click="goNav('/pages/my/onlineResume')"
 								class="info-box-header flex justify-between align-center">
 								<view style="width: 60%; height: 100%" class="flex align-center">
@@ -63,17 +30,11 @@
 									</view>
 									<view class="info-box-header-r">
 										<view class="info-box-header-r-name flex align-center">
-											<view class="" style="
-                          height: fit-content;
-                          overflow: hidden;
-                          white-space: nowrap;
-                          text-overflow: ellipsis;
-                          -o-text-overflow: ellipsis;
-                        ">
+											<view class="info-box-header-r-text">
 												{{ userName }}
 											</view>
-											<image v-if="isVip == true" src="../../static/images/my/isVip.png"
-												style="margin-left: 10rpx; width: 80rpx; height: 30rpx" mode=""></image>
+											<!-- <image v-if="isVip == true" src="../../static/images/my/isVip.png"
+												style="margin-left: 10rpx; width: 80rpx; height: 30rpx" mode=""></image> -->
 										</view>
 										<view v-if="token && XCXIsSelect != '否'"
 											class="info-box-header-r-bj flex align-center">
@@ -370,7 +331,7 @@
 								<view class="info-box-header-r">
 									<view class="info-box-header-r-name flex align-center">
 										{{ userName }}
-										<image v-if="isCompanyVip"
+										<image v-if="isUserVip"
 											style="margin-left: 10rpx; width: 80rpx; height: 30rpx"
 											src="../../static/images/my/isVip.png" mode=""></image>
 									</view>
@@ -473,7 +434,7 @@
                   margin-right: 10rpx;
                 "
               >
-                {{ isCompanyVip == true ? "已开通" : "去开通" }}
+                {{ isUserVip == true ? "已开通" : "去开通" }}
                 <u-icon name="play-right-fill" color="#914016" size="18"></u-icon>
               </view>
             </view>
@@ -860,7 +821,7 @@ export default {
 			interviewCount: 0,
 			postPushCount: 0,//在线职位数量
 			isVip: false, //用户是否是vip
-			isCompanyVip: false, //企业是否是vip
+			isUserVip: false, //企业是否是vip
 			resumesStatus: 1, //求职状态
 			resumesId: "",
 			token: "",
@@ -1199,7 +1160,7 @@ export default {
 							title: "刷新成功",
 						});
 					} else {
-						if (this.isCompanyVip) {
+						if (this.isUserVip) {
 							uni.showToast({
 								title: res.msg,
 								icon: "none",
@@ -1439,12 +1400,12 @@ export default {
 						uni.setStorageSync("userType", 2);
 						uni.setStorageSync("vipDueTimes", res.data.vipDueTimes ? res.data.vipDueTimes : 0);
 						uni.setStorageSync("vipPostTimes", res.data.vipPostTimes ? res.data.vipPostTimes : 0);
-						if (res.data.isCompanyVip == 1) {
+						if (res.data.isUserVip == 1) {
 							//判断企业用户是否是vip
-							this.isCompanyVip = true;
-							uni.setStorageSync("isCompanyVip", 0);
+							this.isUserVip = true;
+							uni.setStorageSync("isUserVip", 0);
 						} else {
-							this.isCompanyVip = false;
+							this.isUserVip = false;
 						}
 
 					}
@@ -2421,4 +2382,11 @@ page {
 	margin-top: 20rpx;
 	border-radius: 40rpx;
 }
+.info-box-header-r-text{
+	height: fit-content;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	-o-text-overflow: ellipsis;
+}
 </style>

+ 21 - 4
uni_modules/zhouquan-fileSelector/components/zhouquan-fileSelector/file-selector.vue

@@ -1,8 +1,9 @@
 <template>
-    <view class="main">
+    <view :class="isShowStyle?'main':'text-item'" @click="fileRender.createFileInputDom">
         <!-- 上传区域 -->
-        <view class="upload-area" @click="fileRender.createFileInputDom">
-            <text class="upload-text">{{title}}</text>
+		<u-icon v-if="!isShowStyle" name="plus" color="#999" size="40" style="margin-bottom: 8rpx;"></u-icon>
+        <view :class="isShowStyle?'upload-area':''">
+            <text :class="isShowStyle?'upload-text':''">{{title}}</text>
         </view>
         
         <!-- 文件列表 -->
@@ -14,7 +15,7 @@
                 <view class="file-info">
                     <text class="file-name">{{file.name}}</text>
                 </view>
-                <view class="delete-btn" @click="removeFile(index)">
+                <view class="delete-btn" @click.stop="removeFile(index)">
                     <text class="delete-icon">×</text>
                 </view>
             </view>
@@ -33,6 +34,10 @@ export default {
 		allowType:{
 			type: String,
 			default: '*'
+		},
+		isShowStyle:{
+			type:Boolean ,
+			default: true
 		}
     },
     data() {
@@ -177,6 +182,18 @@ export default {
 </script>
 
 <style>
+.text-item {
+	width: 142rpx;
+	height: 142rpx;
+	color: #666;
+	font-size: 16rpx;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	flex-direction: column;
+	background: #eee;
+	border-radius: 12rpx;
+}
 /* 基础样式 */
 .main {
     padding: 20rpx;