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

.hbuilderx/launch.json

@@ -2,8 +2,8 @@
     "version" : "1.0",
     "configurations" : [
         {
-            "customPlaygroundType" : "device",
-            "playground" : "standard",
+            "customPlaygroundType" : "local",
+            "playground" : "custom",
             "type" : "uni-app:app-android"
         }
     ]

package/jobIntention/basicInfo.vue

@@ -5,7 +5,7 @@
 		<view class="form-content">
 			<!-- 头像 -->
 			<view class="form-item">
-				<view class="form-label">头像</view>
+				<view class="form-label">头像(为了更换头像需要访问您的相册和摄像头)</view>
 				<view @click="chooseAvatar" class="avatar-container">
 					<image :src="avatar?avatar:'../../static/logo.png'" class="user-avatar" mode="aspectFill"></image>
 					<view class="edit-avatar-icon">
@@ -413,7 +413,7 @@
 				.edit-avatar-icon {
 					position: absolute;
 					bottom: 10rpx;
-					right: 5rpx;
+					left: 60rpx;
 					width: 25rpx;
 					height: 25rpx;
 					border-radius: 50%;

pages/index/index.vue

@@ -881,6 +881,17 @@
 				if (!hasLocation) return;
 				// #endif
 				let that = this;
+				if(!uni.getStorageSync('city') || uni.getStorageSync('city') == '' || uni.getStorageSync('city') == null)
+					this.$queue.appConfirm('获取您的位置信息是为了方便筛选适合您所在城市的岗位或牛人',function(res){
+						if(res)
+						 that.getCity()
+					})
+				else
+					that.getCity()
+			},
+			
+			getCity(){
+				var that=this
 				// 权限通过，调用定位API
 				uni.getLocation({
 					type: 'wgs84', //wgs84  gcj02

pages/my/VIP/benefits.vue

@@ -16,25 +16,25 @@
 			<view class="card-content">
 				<view class="card-left">
 					<view class="card-title">我的权益</view>
-					<view class="card-subtitle">{{vipStatus}} 剩余{{remainingDays}}天到期</view>
+					<view class="card-subtitle">{{vipName}} 剩余{{remainingDays}}天到期</view>
 				</view>
 
 				<view class="card-right">
 					<view class="benefit-item">
 						<view class="benefit-label">查看权益</view>
-						<view class="benefit-count">{{browseCount}}/{{50}}</view>
+						<view class="benefit-count">{{myViewTimes}}/{{vipViewTimes}}</view>
 					</view>
 					<view class="benefit-item">
 						<view class="benefit-label">沟通权益</view>
-						<view class="benefit-count">{{chatCount}}/{{50}}</view>
+						<view class="benefit-count">{{myConTimes}}/{{vipConTimes}}</view>
 					</view>
 					<view class="benefit-item">
 						<view class="benefit-label">普通职位</view>
-						<view class="benefit-count">{{10}}/{{50}}</view>
+						<view class="benefit-count">{{myPostTimes}}/{{vipPostTimes}}</view>
 					</view>
 					<view class="benefit-item">
 						<view class="benefit-label">急聘职位</view>
-						<view class="benefit-count">{{10}}/{{50}}</view>
+						<view class="benefit-count">{{myDueTimes}}/{{vipDueTimes}}</view>
 					</view>
 				</view>
 			</view>
@@ -190,7 +190,6 @@
 				statusBarHeight: 0, // 状态栏高度
 				// 当前会员信息
 				currentPlan: 'regular',
-				remainingDays: 5,
 				openWay: 1,
 				isVip: false,
 				isVipC: "",
@@ -212,8 +211,18 @@
 				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,
+					
 				// 权益使用情况
 				benefits: {
 					view: {
@@ -678,9 +687,25 @@
 					}
 				});
 			},
+			//获取vip个人信息
+			getUserInfo() {
+				this.$Request.get("/app/user/vipData").then((res) => {
+					if (res.code == 0) {
+				
+								this.myPostTimes=res.data.myPostTimes || 0
+						        this.vipDueTimes=res.data.vipDueTimes || 0
+						        this.vipConTimes=res.data.vipConTimes || 0
+						        this.myViewTimes=res.data.myViewTimes || 0
+						        this.vipViewTimes=res.data.vipViewTimes || 0
+						        this.myConTimes=res.data.myConTimes || 0
+						        this.vipPostTimes=res.data.vipPostTimes || 0
+						        this.myDueTimes=res.data.myDueTimes || 0
+					}
+				});
+			},
 
 
-	//会员剩余天数
+			//会员剩余天数
 			getVipdetile() {
 				 this.$Request.get("/app/UserVip/selectUserVip").then((res) => {
 				        if (res.code == 0) {
@@ -697,9 +722,12 @@
 				                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;
 				            

pages/my/index.vue

@@ -1269,8 +1269,8 @@
 			goVipUpgrade() {
 				if (uni.getStorageSync("token")) {
 					uni.navigateTo({
-						//url: "/pages/my/VIP/benefits",
-						url: "/my/vip/index"
+						url: "/pages/my/VIP/benefits",
+						//url: "/my/vip/index"
 					});
 				} else {
 					this.noLogin();

pages/my/userinfo.vue

@@ -15,7 +15,7 @@
 
 		<view class="usermain">
 			<view class="usermain-item ">
-				<view class="usermain-item-title">头像</view>
+				<view class="usermain-item-title">头像(为了更换头像需要访问您的相册和摄像头)</view>
 				<view class="avatar-wrapper">
 					<!-- #ifdef MP-WEIXIN -->
 					<button open-type="chooseAvatar" class="avatar-button" @chooseavatar="onChooseAvatar">
@@ -620,7 +620,7 @@
 	.edit-avatar-icon {
 		position: absolute;
 		bottom: 10rpx;
-		right: 2rpx;
+		left: 60rpx;
 		width: 24rpx;
 		height: 24rpx;
 		// background: #fff;