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

my/order/pay.vue

@@ -40,7 +40,7 @@
 				<view class="section-title">失败原因</view>
 				<view class="reason-list">
 					<view class="reason-item">
-						<text class="reason-text">{{ info.auditContent || '暂无数据'}}</text>
+						<text class="reason-text">{{ info.auditContent || '暂无数据' }}</text>
 					</view>
 				</view>
 			</view>
@@ -51,7 +51,8 @@
 			<view class="remarks flex justify-center">
 				<view class="remarks-box flex justify-between align-center">
 					<text style="color: rgba(1, 107, 246, 1);font-weight: bold;">{{ info.status == 1 ? '待审核' :
-						(info.status == 2 ? '进行中' : (info.status == 3 ? '已拒绝' : (info.status == 4 ? '已取消' : info.status == 5 ? '已关闭':'暂存')))
+						(info.status == 2 ? '进行中' : (info.status == 3 ? '已拒绝' : (info.status == 4 ? '已取消' : info.status
+							== 5 ? '已关闭' : '暂存')))
 					}}</text>
 					<text style="color: rgba(156, 164, 171, 1);font-size: 24rpx;">{{ info.createTime }}</text>
 				</view>
@@ -94,7 +95,7 @@
 							</view>
 						</view>
 						<view class="warning-box">
-							<image src="@/static/images/index/tishi.png"/>
+							<image src="@/static/images/index/tishi.png" />
 							<view class="warning-txt">请注意辨认信息真伪，拒绝交纳报名费、线下交易等要求，谨防上当受骗</view>
 						</view>
 
@@ -222,19 +223,19 @@
 					<view style="font-size: 16px;font-weight: 600;">职位招聘数据</view>
 					<view class="postNum-ul flex justify-around align-center">
 						<view class="postNum-li">
-							<view class="postNum-li-num align-center">34</view>
+							<view class="postNum-li-num align-center">{{ postData.chatCount||0 }}</view>
 							<view class="postNum-li-txt">沟通过</view>
 						</view>
 						<view class="postNum-li ">
-							<view class="postNum-li-num">34</view>
+							<view class="postNum-li-num">{{ postData.viewCount||0 }}</view>
 							<view class="postNum-li-txt">查看过</view>
 						</view>
-						<view class="postNum-li">
+						<!-- <view class="postNum-li">
 							<view class="postNum-li-num">34</view>
 							<view class="postNum-li-txt">分享</view>
-						</view>
+						</view> -->
 						<view class="postNum-li">
-							<view class="postNum-li-num">34</view>
+							<view class="postNum-li-num">{{ postData.collectCount||0 }}</view>
 							<view class="postNum-li-txt">收藏</view>
 						</view>
 					</view>
@@ -244,7 +245,7 @@
 
 			</view>
 		</view>
-		
+
 		<!-- 底部操作 -->
 		<view>
 			<!-- <view class="btn flex justify-center" v-if="info.status == 1">
@@ -252,7 +253,8 @@
 					取消招聘
 				</view>
 			</view> -->
-			<view class="btn flex justify-center" v-if="info.status == 1 || info.status == 3 || info.status == 4 || info.status == 6"
+			<view class="btn flex justify-center"
+				v-if="info.status == 1 || info.status == 3 || info.status == 4 || info.status == 6"
 				@click="updataServeType(info.postPushId, 'save')">
 				<view class="btn-box bgBox flex justify-center align-center" style="background: linear-gradient(90deg, rgba(13, 39, 247, 1), rgba(19, 193, 234, 1) 100%);">
 					重新发布
@@ -272,7 +274,8 @@
 						style="background-color: #ffffff;border: 1px solid #016bf6;color: #016bf6;">
 						编辑
 					</view> -->
-					<view class="btn-box bgBox btn-boxs flex justify-center align-center" @click="closeOpenJob('close')">
+					<view class="btn-box bgBox btn-boxs flex justify-center align-center"
+						@click="closeOpenJob('close')">
 						关闭岗位
 					</view>
 				</view>
@@ -300,6 +303,11 @@ export default {
 			statusBarHeight: 0, // 状态栏高度
 			postPushId: '',
 			info: {}, //岗位详情
+			postData: {
+				chatCount: 0,
+				collectCount: 0,
+				viewCount: 0,
+			},//岗位招聘数据
 		};
 	},
 	onLoad(option) {
@@ -307,7 +315,8 @@ export default {
 		let systemInfo = uni.getSystemInfoSync();
 		this.statusBarHeight = systemInfo.statusBarHeight || 0;
 		this.postPushId = option.postPushId
-		this.getInfo()
+		this.getInfo();
+		this.getPostData();
 	},
 	methods: {
 		//返回上一页
@@ -434,6 +443,20 @@ export default {
 				}
 			})
 		},
+		// 获取岗位招聘数据
+		getPostData() {
+			this.$Request.get('/app/postPush/postPushData', {
+				postPushId: this.postPushId
+			}).then(res => {
+				if (res.code == 0) {
+					this.postData = {
+						...this.postData, ...res.data
+					}
+				} else {
+					this.$queue.showToast(res.msg);
+				}
+			});
+		}
 	}
 }
 </script>
@@ -457,13 +480,15 @@ page {
 	margin-top: 20rpx;
 	display: flex;
 	align-items: center;
-	.warning-txt{
+
+	.warning-txt {
 		flex: 1;
 		overflow: hidden;
 		white-space: nowrap;
 		text-overflow: ellipsis;
 	}
-	image{
+
+	image {
 		width: 32rpx;
 		height: 32rpx;
 		flex-shrink: 0;
@@ -485,6 +510,7 @@ page {
 	align-items: center;
 	position: relative;
 	z-index: 9999;
+
 	.nav-left,
 	.nav-right {
 		width: 32.61px;

pages/my/index.vue

@@ -414,7 +414,7 @@
 				</view>
 				<view class="user-content">
 					<!-- 升级VIP -->
-					<view v-if="isAndroid" class="vip-upgrade-banner" @click="goVipUpgrade">
+					<view v-if="isAndroid||iosAudit==0" class="vip-upgrade-banner" @click="goVipUpgrade">
 						<view class="vip-banner-content">
 							<view class="vip-banner-text"> 升级VIP专享超值权益 </view>
 							<view class="vip-upgrade-button"> 去升级 </view>
@@ -623,7 +623,7 @@
 											规则中心
 										</view>
 									</view>
-									<view v-if="isAndroid" class="util-item" @click="goNav('/pages/my/VIP/benefits')">
+									<view v-if="isAndroid||iosAudit==0" class="util-item" @click="goNav('/pages/my/VIP/benefits')">
 										<image src="../../static/images/my/icon/utils/benefits.png"
 											style="width: 54rpx; height: 54rpx" mode=""></image>
 										<view class="" style="color: #1a1a1a; font-size: 24rpx; margin-top: 15rpx">
@@ -1278,6 +1278,7 @@ export default {
 					this.chatCount = res.data.chatCount;
 					this.interviewCount = res.data.interviewCount;
 					this.postPushCount = res.data.postPushCount;
+					this.iosAudit=res.data.iosAudit
 				}
 			});
 		},

pages/my/setup.vue

@@ -50,6 +50,7 @@
 		<view v-if="token" class="footer-btn">
 			<view class="usermain-btn" @click="goOut()">退出</view>
 		</view>
+		<view class="version">{{appname}}<text>v {{appversion}}</text></view>
 		<!-- 权限说明弹窗 -->
 		<u-popup mode="top" ref="permission">
 			<view class="popup-content">
@@ -93,7 +94,7 @@ export default {
 			arr: [],
 			storageSize: 0.,
 			appname: '亿职赞',//默认名称只对小程序生效，因为小程序获取不到名称
-			appversion: '',
+			appversion: '1.0.1',
 			token: ''
 		};
 	},
@@ -723,4 +724,13 @@ button {
 	background: #f5f7fa !important;
 	transform: scale(0.99);
 }
+.version{
+	text-align: center;
+	margin-top: 300rpx;
+	color: #ccc;
+	font-size: 24rpx;
+	text{
+		margin-left: 20rpx;
+	}
+}
 </style>

pages/talentSearch/resumeDetail.vue

@@ -298,7 +298,7 @@ export default {
 				focusedUserId: uni.getStorageSync('userId'),//当前登录者Id
 				postPushId: this.postPushId,
 				resumesId: this.resumesId,
-				// type:2,
+				type:2,
 			}).then(ret => {
 				if (ret.code == 0) {
 					uni.navigateTo({