Merge pull request '邓洁 : 地图接口' (#52) from djj into master

Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/52
2023-11-16 04:51:33 +00:00
parent e50e90c841 88dfe5760b
commit 97115ad6a2
4 changed files with 83 additions and 31 deletions
--- a/pages.json
+++ b/pages.json
@@ -125,6 +125,8 @@
 			"path": "pages/index/NavBarPages/zrxx/zrxx",
 			"style": {
 				"navigationBarTitleText": "转让信息",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#339967",
 				"enablePullDownRefresh": false
 			}
 		},
@@ -132,6 +134,8 @@
 			"path": "pages/index/NavBarPages/zdxx/zdxx",
 			"style": {
 				"navigationBarTitleText": "找店信息",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#339967",
 				"enablePullDownRefresh": false
 			}
 		},
@@ -139,6 +143,8 @@
 			"path": "pages/index/NavBarPages/czxx/czxx",
 			"style": {
 				"navigationBarTitleText": "出租信息",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#339967",
 				"enablePullDownRefresh": false
 			}
 		},
@@ -146,6 +152,8 @@
 			"path": "pages/index/NavBarPages/xmzs/xmzs",
 			"style": {
 				"navigationBarTitleText": "项目招商",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#339967",
 				"enablePullDownRefresh": false
 			}
 		},
@@ -153,6 +161,8 @@
 			"path": "pages/index/NavBarPages/cjal/cjal",
 			"style": {
 				"navigationBarTitleText": "成交案例",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#339967",
 				"enablePullDownRefresh": false
 			}
 		},
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -3,18 +3,13 @@
 		<InputAndSwiper type='0' :bannerURL="swiperList"></InputAndSwiper>
 		<view class="home-content">
 			<view class="service">
-				<u-image src="/static/statistics/sy_icon_lxkf.png" width="108rpx" height="108rpx"/>
-				<button 
-					open-type="contact" 
-					bindcontact="handleContact" 
-					session-from="sessionFrom"
-					class="service-btn"
-					>
+				<u-image src="/static/statistics/sy_icon_lxkf.png" width="108rpx" height="108rpx" />
+				<button open-type="contact" bindcontact="handleContact" session-from="sessionFrom" class="service-btn">
 				</button>
 			</view>
 			<HomeNavCard></HomeNavCard>
 			<HomeNoticeBar :text="notice" />
-			<Statistics :statNum="statNum"/>
+			<Statistics :statNum="statNum" />
 			<view class="show-and-search">
 				<view class="show-tab list-tab" :class="{ 'tab-activate': chooseIndex === 0 }" @click="this.chooseIndex=0">
 					<text>店铺列表</text>
@@ -46,7 +41,7 @@
 				notice: [],
 				chooseIndex: 0,
 				statNum: {},
-				swiperList:[]
+				swiperList: []
 			}
 		},
 		onLoad() {
@@ -56,18 +51,18 @@
 			this.open()
 		},
 		methods: {
-			getBanner(){
-				this.$api.getBanner().then(res=>{  
-					this.swiperList = res.data.data.map(item=>this.$api.imgUrl+item.img)
+			getBanner() {
+				this.$api.getBanner().then(res => {
+					this.swiperList = res.data.data.map(item => this.$api.imgUrl + item.img)
 				})
 			},
-			getNotice(){
-				this.$api.getHotInfo().then(res=>{
-					this.notice = res.data.data.map(item=>item.title)
+			getNotice() {
+				this.$api.getHotInfo().then(res => {
+					this.notice = res.data.data.map(item => item.title)
 				})
 			},
-			getStat(){
-				this.$api.getStat().then(res=>{
+			getStat() {
+				this.$api.getStat().then(res => {
 					this.statNum = res.data.data
 					console.log(res.data.data);
 				})
@@ -95,6 +90,8 @@
 					success(res) {
 						console.log('res.latitude', res.latitude);
 						console.log('res.longitude', res.longitude);
+						uni.setStorageSync('latitude', res.latitude);
+						uni.setStorageSync('longitude', res.longitude);
 						qqmapsdk.reverseGeocoder({
 							location: {
 								latitude: res.latitude,
@@ -106,7 +103,7 @@
 								console.log(re.result.ad_info.district);
 								let city = re.result.ad_info.city
 								let district = re.result.ad_info.district
-								console.log('city-code',re.result.ad_info.city_code.substring(3));
+								console.log('city-code', re.result.ad_info.city_code.substring(3));
 								uni.setStorageSync('city_code', re.result.ad_info.city_code.substring(3));
 								uni.setStorageSync('city', city.slice(0, 2));
 								uni.setStorageSync('district', district);
@@ -127,11 +124,11 @@
 			open() {
 				var that = this
 				uni.getSetting({
-				  success: function (res) {
-				    if (res.authSetting['scope.userFuzzyLocation']) {
-				      console.log('用户已经授权定位权限');
-				    } else {
-				      console.log('用户未授权定位权限');
+					success: function(res) {
+						if (res.authSetting['scope.userFuzzyLocation']) {
+							console.log('用户已经授权定位权限');
+						} else {
+							console.log('用户未授权定位权限');
 							uni.authorize({
 								scope: 'scope.userFuzzyLocation',
 								success: function() {
@@ -161,8 +158,8 @@
 									return false;
 								}
 							})
-				    }
-				  }
+						}
+					}
 				});
 			}
 		}
@@ -176,11 +173,13 @@

 		.home-content {
 			margin: 0 10px;
+
 			.service {
 				position: fixed;
 				right: 17rpx;
 				top: 1109rpx;
 				z-index: 1;
+
 				.service-btn {
 					position: absolute;
 					top: 0;
@@ -189,6 +188,7 @@
 					width: 108rpx;
 					height: 108rpx;
 				}
+
 				.service-btn::after {
 					border: none;

--- a/pages/index/map/map.vue
+++ b/pages/index/map/map.vue
@@ -76,7 +76,42 @@
 				console.log("markerClusterCreate", e);
 			});
 		},
+		created() {
+			this.getMapList()
+		},
 		methods: {
+			getMapList() {
+				const realData = {
+					longitude: uni.getStorageSync('longitude'),
+					latitude: uni.getStorageSync('latitude'),
+					radius: 100
+				}
+				const mockData = {
+					longitude: 23.40,
+					latitude: 116.38,
+					radius: 1111111111
+				}
+				this.$api.getMap(mockData).then(res => {
+					console.log('getMap', res);
+					let obj = {}
+					if (res.statusCode === 200) {
+						// res.data.data.forEach(item => {
+						// 	obj = {
+						// 		id: parseInt(item.id),
+						// 		latitude: item.lat,
+						// 		longitude: item.lng,
+						// 		// iconPath: '../../../static/map/sp_icon_dw.png',
+						// 		width: '58rpx',
+						// 		height: '72rpx',
+						// 		rotate: 0,
+						// 		alpha: 1
+						// 	}
+						// })
+						// this.marker.push(obj)
+						// console.log('this.marker', this.marker);
+					}
+				})
+			},
 			// 图标点击
 			markerClick(e) {
 				console.log('标记点击', e);
--- a/service/request.js
+++ b/service/request.js
@@ -128,8 +128,8 @@ const toast = {
 }
 const apiService = {
 	serverHost,
-	imgUrl:'https://spsp.feashow.com/',
-	key:'ZRKBZ-Q7FWL-GVZPK-MCRBU-4XFB5-ATBDB',
+	imgUrl: 'https://spsp.feashow.com/',
+	key: 'ZRKBZ-Q7FWL-GVZPK-MCRBU-4XFB5-ATBDB',
 	uploadImgUrl: serverHost + `/upload/image/`,
 	//登录接口
 	login(data) {
@@ -145,6 +145,13 @@ const apiService = {
 			resolve(service.post(url, data))
 		})
 	},
+	//地图
+	getMap(data) {
+		const url = '/home/map'
+		return new Promise((resolve, reject) => {
+			resolve(service.post(url, data))
+		})
+	},
 	// 获取客服电话
 	getCsTel() {
 		const url = '/center/cfg?key=kf_phone'
@@ -203,10 +210,10 @@ const apiService = {
 			resolve(service.get(url))
 		})
 	},
-	editPersonInfo(data){
+	editPersonInfo(data) {
 		const url = `/center/userupdate`
-		return new Promise((resolve,reject) => {
-			resolve(service.post(url,data))
+		return new Promise((resolve, reject) => {
+			resolve(service.post(url, data))
 		})
 	}
 }