更新

pages/grain_pulse/details.vue

@@ -375,7 +375,7 @@
 				margin-bottom:10px;
 			}
 			.phone{
-				width:14px;height:14px;margin-left:6px;
+				width:22rpx;height:22rpx;margin-left:6px;
 			}
 		}
 	}

pages/grain_pulse/distribution/distribution.nvue

@@ -111,6 +111,7 @@
 			},
 			getList(val) {
 				this.metreList = []
+				let that = this;
 				let detailedAddress = ""
 				if (val) {
 					detailedAddress = this.position.name
@@ -120,12 +121,14 @@
 					pageSize: 10000,
 					currentPage: 1,
 					detailedAddress:detailedAddress,
-					mainBusinessType:this.mainBusinessType
+					mainBusinessType:this.mainBusinessType,
+					searchType: 2,
+					location:that.position.cityname
 				}).then(res => {
 					let newmarker =[];
 					var id=1;
 						console.log('res',res)
-					if (res.data.code == 200) {debugger
+					if (res.data.code == 200) {
 					
 						this.datalist = res.data.data.records
 						let lat1 = this.nowLocation.latitude

pages/grain_pulse/home.vue

@@ -174,6 +174,7 @@
 						//拼接当前定位回显地址
 						// #ifdef APP-PLUS
 						that.position.name = res.address.poiName
+						that.position.cityname = res.address.city
 						that.position.location = res.longitude + "," +  res.latitude
 						uni.setStorage({
 							key: 'setLocaltion',
@@ -222,7 +223,8 @@
 					pageSize: this.pageSize,
 					currentPage: this.currentPage,
 					pcFlag: 2,
-					searchType: 2
+					searchType: 2,
+					location:that.position.cityname
 				}).then(res => {
 					if (res.data.code == 200) {
 						var data = res.data.data.records
@@ -259,6 +261,7 @@
 				})
 			},
 			getInfo(){
+				var that = this
 				uni.showLoading({
 					title:"正在加载"
 				})
@@ -267,7 +270,8 @@
 					pageSize: this.pageSize,
 					currentPage: 1,
 					pcFlag: 2,
-					searchType: 2
+					searchType: 2,
+					location:that.position.cityname
 				}).then(res => {
 					if (res.data.code == 200) {
 						this.datalist = res.data.data.records

pages/sale/information.vue

@@ -219,26 +219,7 @@
 				});
 			}
 			var that = this
-			this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
-				console.log("checkSession",res)
-				if (res.data.data == "INVALID") {
-					uni.showModal({
-						title: '登录提示',
-						content: 'Session过期需要重新登录，是否立即登录？',
-						showCancel: true,
-						confirmText: '登录',
-						success: (e) => {
-							if (e.confirm) {
-								uni.navigateTo({
-									url: '/pages/public/login'
-								})
-							}
-						},
-						fail: () => {},
-						complete: () => {}
-					})
-				}
-			})
+			
 			uni.getSystemInfo({
 				success: function(res) {
 					console.log("statusBarHeight", res.statusBarHeight)