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

.hbuilderx/launch.json

@@ -5,6 +5,10 @@
             "customPlaygroundType" : "local",
             "playground" : "custom",
             "type" : "uni-app:app-android"
+        },
+        {
+            "playground" : "custom",
+            "type" : "uni-app:app-ios"
         }
     ]
 }

common/httpRequest.js

@@ -226,11 +226,12 @@ module.exports = {
 								title: '用户信息失效，请重新登录！',
 								icon: 'none'
 							})
-						}else if (result.data.code !=0&&result.data.msg!='未进入公司') 
-							uni.showToast({
-								title: result.data.msg||'查询失败',
-								icon: 'none'
-							})
+						}else if (result.data.code !=0&&result.data.msg!='未进入公司') {
+							// uni.showToast({
+							// 	title: result.data.msg||'查询失败！',
+							// 	icon: 'none'
+							// })
+							}
 						succ.call(self, result.data)
 					},
 					fail: function(e) {
@@ -248,11 +249,12 @@ module.exports = {
 						"content-type": header
 					},
 					success: function(result) {
-						if (result.data.code !=0&&result.data.msg!='未进入公司')
-							uni.showToast({
-								title: result.data.msg||'查询失败',
-								icon: 'none'
-							})
+						if (result.data.code !=0&&result.data.msg!='未进入公司'){
+							// uni.showToast({
+							// 	title: result.data.msg||'查询失败.',
+							// 	icon: 'none'
+							// })
+						}
 						succ.call(self, result.data)
 					},
 					fail: function(e) {
@@ -291,11 +293,12 @@ module.exports = {
 							title: '用户信息失效，请重新登录！',
 							icon: 'none'
 						})
-					}else if (result.data.code !=0&&result.data.msg!='未进入公司') 
-							uni.showToast({
-								title: result.data.msg||'查询失败',
-								icon: 'none'
-							})
+					}else if (result.data.code !=0&&result.data.msg!='未进入公司') {
+							// uni.showToast({
+							// 	title: result.data.msg||'查询失败？',
+							// 	icon: 'none'
+							// })
+					}
 					succ.call(self, result.data)
 				},
 				fail: function(e) {

pages/index/index.vue

@@ -243,8 +243,10 @@
 					<empty />
 				</view>
 			</view>
+			
 			<!---------------------------------------- 企业版 -------------------------------------------------------->
 			<view v-else class="page-container" :style="{ paddingTop: (12 + statusBarHeight) + 'px' }">
+				<image class="qySx-bg" src="/static/images/index/index-bg1.png" mode="widthFix"></image>
 				<view class="topbg-sticky">
 					<!-- 标题-搜索 -->
 					<view class="topbg-sticky-box">
@@ -289,7 +291,6 @@
 				<!-- :style="{ paddingTop: (12 + statusBarHeight) + 'px !important' }" -->
 				<u-sticky @fixed="isfixed" @unfixed="isunfixed" h5-nav-height="0" bg-color="#F2F2F7" :enable="enable">
 					<view class="qySx flex justify-center" :class="isfixeds == true ? 'isfixed' : 'isfixeds'">
-						<image class="qySx-bg" src="/static/images/index/index-bg1.png" mode="widthFix"></image>
 						<view class="qySx-box">
 							<!-- 第一行：tabs -->
 							<view class="qySx-box-row flex justify-between align-center">
@@ -916,10 +917,10 @@ export default {
 					this.getPeopList()
 				}
 			} else {
-				uni.showToast({
-					title: '已加载全部数据',
-					icon: 'none'
-				})
+				// uni.showToast({
+				// 	title: '已加载全部数据',
+				// 	icon: 'none'
+				// })
 			}
 		},
 		//去企业详情
@@ -2464,6 +2465,12 @@ page {
 .isfixeds {
 	// border-radius: 40rpx 40rpx 0 0;
 }
+.qySx-bg {
+	position: absolute;
+	top: 0;
+	z-index: 0;
+	width: 100%;
+}
 
 .qySx {
 	// position: fixed;
@@ -2475,12 +2482,7 @@ page {
 	// padding: 20rpx;
 	margin-bottom: 12rpx;
 
-	.qySx-bg {
-		position: absolute;
-		top: 0;
-		z-index: 0;
-		width: 100%;
-	}
+	
 
 	.qySx-box {
 		width: 100%;

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

@@ -264,9 +264,6 @@ export default {
 			this.$queue.setData('inviterCode', scene.split(',')[0]);
 		}
 		// #endif
-		uni.showLoading({
-			title: '加载中'
-		})
 		this.weekMember = uni.getStorageSync('weekMember')
 		this.userId = uni.getStorageSync('userId') ? uni.getStorageSync('userId') : 0
 		if (option.resumesId) {
@@ -274,7 +271,7 @@ export default {
 			this.getDetail()
 		} else if (option.userId) {
 			this.byuserId = option.userId
-			this.getDetails()
+			this.getDetail()
 		}
 		// 获取邀请码保存到本地
 		if (option.postPushId) {
@@ -301,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({