From 3539d67072a5fd179bd44385ebefce0d1a6e8cb4 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 21 四月 2026 16:03:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/App.vue | 118 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 69 insertions(+), 49 deletions(-)
diff --git a/small-program/App.vue b/small-program/App.vue
index 98f7ec4..1060210 100644
--- a/small-program/App.vue
+++ b/small-program/App.vue
@@ -1,6 +1,7 @@
<script>
import { mapState } from 'vuex'
- var QQMapWX = require('@/utils/qqmap-wx-jssdk.js')
+ // var QQMapWX = require('@/utils/qqmap-wx-jssdk.js')
+ var amapFile = require('@/utils/amap-wx.130.js')
export default {
computed: {
...mapState(['userInfo','token'])
@@ -14,9 +15,10 @@
let { code } = loginRes;
let res = await that.$u.api.wxLogin({ code })
if (res && res.code === 200) {
+ console.log(res, '==================鐧诲綍鎴愬姛');
// 鍒ゆ柇鏈夋棤openid
if (res.data.openid) {
- await that.$store.commit('setOpenId', res.data.openid)
+ await that.$store.commit('setOpenid', res.data.openid)
}
// 鍒ゆ柇鏈夋棤token
if (res.data.token) {
@@ -25,7 +27,7 @@
// 鍒ゆ柇鏈夋棤鐢ㄦ埛淇℃伅
if (res.data.member) {
await that.$store.commit('setUserInfo', res.data.member)
- await that.$store.commit('setOpenId', res.data.member.openId)
+ await that.$store.commit('setOpenid', res.data.member.openId)
}
// 璁剧疆瀹氫綅
await that.checkLocationAuth()
@@ -37,7 +39,7 @@
let res = await that.$u.api.getMemberInfo({})
if (res.code === 200) {
await that.$store.commit('setUserInfo', res.data)
- await that.$store.commit('setOpenId', res.data.openId)
+ await that.$store.commit('setOpenid', res.data.openId)
}
// 璁剧疆瀹氫綅
await that.checkLocationAuth()
@@ -59,34 +61,58 @@
isHighAccuracy: true,
success: function (addr) {
const locParam = { latitude: addr.latitude, longitude: addr.longitude };
- const qqmapsdk = new QQMapWX({
- key: 'WE3BZ-HN6WS-ONDOH-62QCV-MNL6F-5NFNE'
- });
- qqmapsdk.reverseGeocoder({
- locParam,
- success: async function(res) {
- console.log(res, '==================鑾峰彇鍦板潃');
- let info = res.result;
- locParam.province = info.address_component.province;
- locParam.city = info.address_component.city;
- locParam.area = info.address_component.district;
- locParam.street = info.address_component.street;
- var ta = info.address || '鍦板潃鑾峰彇澶辫触' ;
- if(info.formatted_addresses && info.formatted_addresses.recommend){
- ta =info.formatted_addresses.recommend
- }
- locParam.address =ta
- const resCity = await that.$u.api.getCityByName({ cityName: locParam.city })
- if (resCity.code === 200) {
- locParam.cityId = resCity.data.id
- }
- that.$store.commit('setPosition',locParam)
+ uni.setStorageSync('address', locParam);
+ var address = null
+ var myAmapFun = new amapFile.AMapWX({ key: 'e4d46c87adf151dca20060317592b1b6' });
+ myAmapFun.getRegeo({
+ location: addr.longitude + ',' + addr.latitude,
+ success: function(data) {
+ console.log(data, '==================鑾峰彇鍦板潃');
+ let info = data[0];
+ locParam.province = info.province;
+ locParam.city = info.city;
+ locParam.area = info.district;
+ locParam.street = info.street;
+ var ta = info.name || '鍦板潃鑾峰彇澶辫触';
+ locParam.address = ta
+ that.$store.commit('setPosition', locParam)
that.$isResolve()
},
- fail: (err) => {
+ fail: function(err) {
+ console.error('鑾峰彇浣嶇疆澶辫触===========', err);
+ that.$store.commit('setPosition', locParam)
that.$isResolve()
}
});
+
+ // const qqmapsdk = new QQMapWX({
+ // key: 'WE3BZ-HN6WS-ONDOH-62QCV-MNL6F-5NFNE'
+ // });
+ // qqmapsdk.reverseGeocoder({
+ // locParam,
+ // success: async function(res) {
+ // console.log(res, '==================鑾峰彇鍦板潃');
+ // let info = res.result;
+ // locParam.province = info.address_component.province;
+ // locParam.city = info.address_component.city;
+ // locParam.area = info.address_component.district;
+ // locParam.street = info.address_component.street;
+ // var ta = info.address || '鍦板潃鑾峰彇澶辫触' ;
+ // if(info.formatted_addresses && info.formatted_addresses.recommend){
+ // ta =info.formatted_addresses.recommend
+ // }
+ // locParam.address =ta
+ // const resCity = await that.$u.api.getCityByName({ cityName: locParam.city })
+ // if (resCity.code === 200) {
+ // locParam.cityId = resCity.data.id
+ // }
+ // that.$store.commit('setPosition',locParam)
+ // that.$isResolve()
+ // },
+ // fail: (err) => {
+ // that.$isResolve()
+ // }
+ // });
}
});
},
@@ -138,31 +164,25 @@
success: (addr) => {
const locParam = { latitude: addr.latitude, longitude: addr.longitude };
uni.setStorageSync('address', locParam);
- var address =null
- const qqmapsdk = new QQMapWX({
- key: 'WE3BZ-HN6WS-ONDOH-62QCV-MNL6F-5NFNE' //鑵捐鍦板浘鐢宠鐨刱ey锛堝悗缁渶瑕佸叕鍙告彁渚涳紝涓汉寮�鍙戣�呴搴︽湁闄愶級
- });
- // 鑵捐鍦板浘閫嗗湴鐞嗙紪鐮�
- qqmapsdk.reverseGeocoder({
- locParam,
- success: function(res) {
- console.log(res, '==================鑾峰彇鍦板潃');
- let info = res.result;
- locParam.province = info.address_component.province;
- locParam.city = info.address_component.city;
- locParam.area = info.address_component.district;
- locParam.street = info.address_component.street;
- var ta = info.address || '鍦板潃鑾峰彇澶辫触' ;
- if(info.formatted_addresses && info.formatted_addresses.recommend){
- ta =info.formatted_addresses.recommend
- }
- locParam.address =ta
- that.$store.commit('setPosition',locParam)
+ var address = null
+ var myAmapFun = new amapFile.AMapWX({ key: 'f2e6c0bfcac14c27b4f0d6d0d5b9d7d' });
+ myAmapFun.getRegeo({
+ location: addr.longitude + ',' + addr.latitude,
+ success: function(data) {
+ console.log(data, '==================鑾峰彇鍦板潃');
+ let info = data[0];
+ locParam.province = info.province;
+ locParam.city = info.city;
+ locParam.area = info.district;
+ locParam.street = info.street;
+ var ta = info.name || '鍦板潃鑾峰彇澶辫触';
+ locParam.address = ta
+ that.$store.commit('setPosition', locParam)
that.$isResolve()
},
- fail: (err) => {
+ fail: function(err) {
console.error('鑾峰彇浣嶇疆澶辫触===========', err);
- that.$store.commit('setPosition',locParam)
+ that.$store.commit('setPosition', locParam)
that.$isResolve()
}
});
--
Gitblit v1.9.3