修复bug

components/hg-level4-address/hgLevel4Address.vue

@@ -214,13 +214,13 @@
 	.address-page {
 		display: flex;
 		flex-direction: column;
-		height: 100%;
 		background: #FBFBFB;
 		margin: 0 16rpx;
+		flex: 1;
+		box-sizing: border-box;
 	}
 	.picker-content {
 		display: flex;
-		flex: 1;
 		overflow: auto;
 		gap: 16rpx;
 	}

package/jobIntention/city.vue

@@ -129,6 +129,7 @@
 			 * 定位获取经纬度
 			 */
 			async getLatOrLng() {
+				// #ifdef APP
 				let that = this;
 				  const hasPermission = await this.$queue.checkPermission(
 				    'location', // 固定传 'location'，双端通用
@@ -139,7 +140,7 @@
 				    uni.showToast({ title: '未获取定位权限，无法推荐附近岗位', icon: 'none' });
 				    return;
 				  }
-				
+				// #endif
 				
 				
 				uni.getLocation({

package/screen/city.vue

@@ -1,6 +1,6 @@
 <template>
-	<view style="display: flex;flex-direction: column;height: 100vh;background: #FBFBFB;">
-		<view class="custom-navbar" :style="{ paddingTop: (12 + statusBarHeight) + 'px' }">
+	<view class="page-container" :style="{ paddingTop: (12 + statusBarHeight) + 'px' }">
+		<view class="custom-navbar">
 			<view class="navbar-content">
 				<view class="nav-left" @click="goBack">
 					<u-icon name="close" color="#333" size="32"></u-icon>
@@ -11,12 +11,8 @@
 				</view>
 			</view>
 		</view>
-		 <view class="content">
-			<hg-level4-address :city="city" :county="county" :street="street"
-			  placeholder="请选择地址"
-			  @confirm="onAddressConfirm"
-			  >         
-			</hg-level4-address>
+		<view class="page-content">
+		  <hg-level4-address :city="city" :county="county" :street="street" @confirm="onAddressConfirm"></hg-level4-address>
 		</view>
 	</view>
 </template>
@@ -71,11 +67,18 @@
 </script>
 
 <style lang="scss" scoped>
+	.page-container{
+		display: flex;
+		flex-direction: column;
+		height: 100vh;
+		background: #FBFBFB;
+	}
 	.custom-navbar {
 		width: 100%;
 		height: 88rpx;
-		margin-bottom: 20rpx;
 		box-sizing: border-box;
+		display: flex;
+		flex-direction: column;
 		.navbar-content {
 			display: flex;
 			align-items: center;
@@ -116,10 +119,9 @@
 			}
 		}
 	}
-	.content{
+	.page-content {
 		flex: 1;
-		display: flex;
-		flex-direction: column;
 		overflow: hidden;
+		display: flex;
 	}
 </style>

package/search/search.vue

@@ -378,6 +378,7 @@
 					content: "确定删除吗？",
 					confirmColor: "#016BF6",
 					success: function(res) {
+						if(res.cancel)return;
 						that.$Request.post('/app/record/deleteRecord', {recordId:''}).then(res => {
 							if (res.code == 0) {
 								that.searchList = []

pages/index/game/gameList.vue

@@ -541,7 +541,7 @@ export default {
         postType: this.typeList.length > 0 ? this.typeList[this.current].name : "",
 		ruleClassifyName: this.typeList.length > 0 ? this.typeList[this.current].name : "", //岗位名称
         screen: +this.currentSx + 1, //1推荐 2最新
-        city: this.city == "全国" ? "" : this.city,
+        city: this.city == "区域" || this.city == "全国"? "" : this.city,
         lng: this.longitude,
         lat: this.latitude,
 		isDue:1,
@@ -600,7 +600,7 @@ export default {
         limit: this.searchLimit,
         postType: this.typeList.length > 0 ? this.typeList[this.current].name : "",
         screen: +this.currentSx + 1, //1推荐 2最新
-        city: this.city == "全国" ? "" : this.city,
+        city: this.city == "区域" || this.city == "全国"? "" : this.city,
         lng: this.longitude,
         lat: this.latitude,
 		isDue:1,

pages/index/index.vue

@@ -723,9 +723,9 @@
 			}
 			// #endif
 			// this.XCXIsSelect = this.$queue.getData("XCXIsSelect");
-			uni.showLoading({
-				title: '加载中'
-			})
+			// uni.showLoading({
+			// 	title: '加载中'
+			// })
 
 			if (uni.getStorageSync('userType')) {
 				this.userType = uni.getStorageSync('userType');
@@ -744,10 +744,9 @@
 			})
 
 
-
+			this.getLocalJobs();
 			this.getDomWidth()
 			this.$Request.getT('/app/common/type/255').then(res => {
-				uni.hideLoading();
 				if (res.code === 0) {
 					if (res.data && res.data.value) {
 						this.tuiguang = res.data.value;
@@ -955,11 +954,14 @@
 			},
 			// 
 			async getLocalJobs() {
+				// #ifdef APP
 				const hasLocation = await this.$queue.checkPermission(
 					'location',
 					'获取位置需要定位权限，用于推荐同城的求职岗位'
 				);
 				if (!hasLocation) return;
+				// #endif
+				let that = this;
 				// 权限通过，调用定位API
 				uni.getLocation({
 					type: 'wgs84', //wgs84  gcj02

pages/my/index.vue

@@ -1341,24 +1341,24 @@
 			getUserInfo() {
 				this.$Request.get("/app/user/selectUserById").then((res) => {
 					if (res.code == 0) {
-						uni.setStorageSync("weChatNum", res.data.weChatNum);
-						uni.setStorageSync("zhiRate", res.data.zhiRate);
-						if (res.data.avatar) {
+						uni.setStorageSync("weChatNum", res.data?.weChatNum);
+						uni.setStorageSync("zhiRate", res.data?.zhiRate);
+						if (res.data?.avatar) {
 							this.avatar = res.data.avatar;
 						}
-						if (res.data.userName) {
+						if (res.data?.userName) {
 							this.userName = res.data.userName;
 						}
-						uni.setStorageSync("userId", res.data.userId);
-						if (res.data.companyId) {
+						uni.setStorageSync("userId", res.data?.userId);
+						if (res.data?.companyId) {
 							uni.setStorageSync("companyId", res.data.companyId);
 						}
-						if (res.data.userType == 1 || res.data.userType == null) {
+						if (res.data?.userType == 1 || res.data?.userType == null) {
 							
 							this.userType = 1;
 							uni.setStorageSync("userType", 1);
 							
-							if (res.data.isUserVip == 1) {
+							if (res.data?.isUserVip == 1) {
 								//判断用户是否是vip
 								this.isVip = true;
 								uni.setStorageSync("isUserVip", 1);