提交

@@ -242,7 +242,7 @@
 		<!-- 成为地主弹框区域 -->
 		<view class="becomeLandWrap" v-if="showBecomeLand">
 			<view class="becomeLandCon">
-				<view class="closeBtn" @click="showBecomeLand = false">
+				<view class="closeBtn" @click="closeBecomeLand">
 					<image style="width: 44rpx;height: 44rpx;" src="../../static/image/guanbi-70_1@2x.png" mode=""></image>
 				</view>
 				<view class="becomeLand">
@@ -278,7 +278,7 @@
 					<image style="width: 128rpx;height: 80rpx;position: fixed;right: 120rpx;top: 448rpx;" src="../../static/image/Vector_2@2x.png" mode=""></image>
 					<image style="width: 180rpx;height: 116rpx;position: fixed;right: 48rpx;top: 404rpx;" src="../../static/image/Vector_3@2x.png" mode=""></image>
 				</view>
-				<view class="closeBtn" @click="showUpdateVersion = false">
+				<view class="closeBtn" @click="closeUpdateVersion">
 					<image style="width: 44rpx;height: 44rpx;" src="../../static/image/guanbi-70_1@2x.png" mode=""></image>
 				</view>
 			</view>
@@ -346,8 +346,10 @@
 			})
 		},
 		onShow() {
+			this.scale = 13
 			this.notReadNumber = 0
 			this.getSysNoReadNum()
+			let tempArr = []
 			this.landList = []
 			uni.getLocation({
 			    type: 'wgs84',
@@ -364,11 +366,15 @@
 					this.latitude = 39.908823
 				},
 				complete: () => {
+					uni.createMapContext("around-food-map", this).moveToLocation({
+						longitude: this.longitude,
+						latitude: this.latitude,
+					});
 					let param = this.landParam
-					if(param.latitude != ''){
+					/* if(param.latitude != ''){
 						this.latitude = param.latitude
 						this.longitude = param.longitude
-					}
+					} */
 					let province = ''
 					let city = ''
 					if(param.province == '' && param.city == ''){
@@ -397,7 +403,7 @@
 							longitude: this.longitude
 						},
 						success: (localLandRes) => {
-							this.landList = localLandRes.data.data
+							tempArr = localLandRes.data.data
 							let coverArr = []
 							let index = 0
 							coverArr.push({
@@ -408,13 +414,12 @@
 								height:16,
 								iconPath: '../../static/image/Group_673.png'
 							})
-							this.landList.forEach(item => {
-								/* if(index == 0){
+							tempArr.forEach(item => {
+								if(index == 0 && this.versiondata == null && !uni.getStorageSync('landAlertFlag')){
 									item.showSlide = true
 								}else{
 									item.showSlide = false
-								} */
-								item.showSlide = false
+								}
 								let starList = []
 								if(item.star > 0){
 									for(let i = 0; i < item.star; i ++){
@@ -432,7 +437,10 @@
 								})
 								index++
 							})
-							this.covers = coverArr
+							setTimeout(()=>{
+								this.covers = coverArr
+								this.landList = tempArr
+							},500)
 						}
 					})
 				}
@@ -464,11 +472,6 @@
 			}
 			
 			this.getAllData()
-			//地主列表页返回的首个地主的经纬度
-			if(option.longitude != undefined){
-				this.longitude = option.longitude
-				this.latitude = option.latitude
-			}
 		},
 		watch:{
 			conversationList(newVal,oldVal){
@@ -518,10 +521,60 @@
 						})
 					}
 				});
-				
 			},
-			download(){
+			closeUpdateVersion(){
 				this.showUpdateVersion = false
+				if(!this.showBecomeLand){
+					this.resetLandList()
+				}
+			},
+			closeBecomeLand(){
+				this.showBecomeLand = false
+				if(!this.showUpdateVersion){
+					this.resetLandList()
+				}
+			},
+			resetLandList(){
+				let coverArr = []
+				let tempArr = this.landList
+				this.landList = []
+				let index = 0
+				coverArr.push({
+					id:'me',
+					latitude:this.latitude,
+					longitude:this.longitude,
+					width:16,
+					height:16,
+					iconPath: '../../static/image/Group_673.png'
+				})
+				tempArr.forEach(item => {
+					if(index == 0){
+						item.showSlide = true
+					}else{
+						item.showSlide = false
+					}
+					let starList = []
+					if(item.star > 0){
+						for(let i = 0; i < item.star; i ++){
+							starList.push(i)
+						}
+					}
+					item.starList = starList
+					coverArr.push({
+						id:item.id,
+						latitude:item.latitude,
+						longitude:item.longitude,
+						width:index == 0 ? 39 : 30,
+						height:index == 0 ? 40 : 30,
+						iconPath: index == 0 ? '../../static/image/group_675_choose.png' : '../../static/image/Group_675.png'
+					})
+					index++
+				})
+				this.landList = tempArr
+				this.covers = coverArr
+			},
+			download(){
+				this.closeUpdateVersion()
 				if (plus.os.name.toLowerCase() == 'ios') {
 					// 跳转到下载页面
 					plus.runtime.openURL(this.versiondata.downloadurl)
@@ -593,9 +646,7 @@
 			},
 			agree(){
 				if(uni.getStorageSync("token")){
-					const subNVue = uni.getSubNVueById('landAlert')
-					// 关闭 nvue 子窗体  
-					subNVue.hide('fade-out', 300)
+					this.closeBecomeLand()
 					uni.navigateTo({
 						url:'/pages/my/becomeLand'
 					})
@@ -664,12 +715,11 @@
 										parseFloat(item.longitude) > regionRes.southwest.longitude &&
 										parseFloat(item.longitude) < regionRes.northeast.longitude
 									){
-										/* if(index == 0){
+										if(index == 0){
 											item.showSlide = true
 										}else{
 											item.showSlide = false
-										} */
-										item.showSlide = false
+										}
 										let starList = []
 										if(item.star > 0){
 											for(let i = 0; i < item.star; i ++){