From 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 四月 2026 09:42:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/App.vue | 207 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 160 insertions(+), 47 deletions(-)
diff --git a/small-program/App.vue b/small-program/App.vue
index 98f7ec4..b26826c 100644
--- a/small-program/App.vue
+++ b/small-program/App.vue
@@ -1,6 +1,6 @@
<script>
import { mapState } from 'vuex'
- var QQMapWX = require('@/utils/qqmap-wx-jssdk.js')
+ var amapFile = require('@/utils/amap-wx.130.js')
export default {
computed: {
...mapState(['userInfo','token'])
@@ -14,9 +14,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 +26,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 +38,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,31 +60,29 @@
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
+ var myAmapFun = new amapFile.AMapWX({ key: that.$gaodeMapKey});
+ myAmapFun.getRegeo({
+ location: addr.longitude + ',' + addr.latitude,
+ success: async function(data) {
+ let info = data[0];
+ console.log(info, '==================鑾峰彇鍦板潃');
+ locParam.province = info.province;
+ locParam.city = info.regeocodeData.addressComponent.city;
+ var ta = info.desc || '鍦板潃鑾峰彇澶辫触';
+ locParam.address = ta
const resCity = await that.$u.api.getCityByName({ cityName: locParam.city })
- if (resCity.code === 200) {
+ if (resCity.code === 200 && resCity.data) {
locParam.cityId = resCity.data.id
- }
- that.$store.commit('setPosition',locParam)
+ that.$store.commit('setPosition', locParam)
+ } else {
+ that.$store.commit('setPosition', locParam)
+ that.$store.commit('clearCityId')
+ }
that.$isResolve()
},
- fail: (err) => {
+ fail: function(err) {
+ console.error('鑾峰彇浣嶇疆澶辫触===========', err);
+ that.$store.commit('setPosition', locParam)
that.$isResolve()
}
});
@@ -138,31 +137,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()
}
});
@@ -185,4 +178,124 @@
width: 500px !important;
font-size: 14px !important;
}
+ /*姣忎釜椤甸潰鍏叡css */
+ .tc {
+ width: calc(100vw - 148rpx);
+ .tc-btn {
+ width: 100%;
+ height: 102rpx;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ border-top: 1rpx solid #EEEEEE;
+ .tc-btn-item {
+ flex: 1;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-weight: 400;
+ font-size: 32rpx;
+ color: #666666;
+ border-right: 1rpx solid #EEEEEE;
+ &:last-child {
+ border: none !important;
+ }
+ }
+ }
+ .tc-contemt {
+ width: 100%;
+ padding: 40rpx 0;
+ box-sizing: border-box;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-direction: column;
+ .tc-contemt-title {
+ width: 100%;
+ text-align: center;
+ font-weight: 600;
+ font-size: 32rpx;
+ color: #111111;
+ }
+ .tc-contemt-nr {
+ width: 472rpx;
+ text-align: center;
+ font-weight: 400;
+ font-size: 28rpx;
+ color: #333333;
+ margin-top: 40rpx;
+ }
+ }
+ }
+ .nomore{
+ margin-top: 30rpx;
+ width: 100%;
+ text-align: center;
+ font-size: 24rpx;
+ color: #666666;
+ }
+ .phone {
+ width: 100%;
+ padding-top: 40rpx;
+ box-sizing: border-box;
+ .phone-botton {
+ width: 100%;
+ height: 88rpx;
+ line-height: 88rpx;
+ text-align: center;
+ font-weight: 500;
+ font-size: 32rpx;
+ color: #FFFFFF;
+ background: #00BC12;
+ border-radius: 44rpx;
+ margin-top: 60rpx;
+ }
+ .phone-head {
+ width: 100%;
+ text-align: center;
+ justify-content: space-between;
+ margin-bottom: 40rpx;
+ text {
+ font-weight: 800;
+ font-size: 32rpx;
+ color: #222222;
+ }
+ }
+
+ .phone-item {
+ width: 100%;
+ text-align: center;
+ display: flex;
+ justify-content: center;
+ flex-direction: column;
+ // border-bottom: 1rpx solid #eeeeee;
+ line-height: 78rpx;
+ button{
+ border: 1rpx white solid;
+ display: inline;
+ width: 300rpx;
+ font-weight: 500;
+ font-size: 32rpx;
+ line-height: 32rpx;
+ color: #222222;
+ }
+ image{
+ width: 28rpx;
+ height: 28rpx;
+ margin-right: 30rpx;
+ }
+ .line{
+ width: 100%;
+ height: 1rpx;
+ background-color: #f2f2f2
+ }
+ text {
+ font-weight: 500;
+ font-size: 28rpx;
+ line-height: 28rpx;
+ color: #222222;
+ }
+ }
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.3