diff --git a/package-lock.json b/package-lock.json index 9b9430c..d613ae6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,25 @@ { + "name": "wthmini-master", + "lockfileVersion": 2, "requires": true, - "lockfileVersion": 1, + "packages": { + "": { + "dependencies": { + "@vant/area-data": "^1.2.3", + "@vant/weapp": "^1.10.2" + } + }, + "node_modules/@vant/area-data": { + "version": "1.2.3", + "resolved": "https://registry.npmmirror.com/@vant/area-data/-/area-data-1.2.3.tgz", + "integrity": "sha512-9bDgEsFnTjdaYXPvsYKRQmxzKDdLCl0c1dOo4JGE6RhaIcq2kR2f5cK0LUdGK+U/SuBz9NfW5ejL1lejcFiP1Q==" + }, + "node_modules/@vant/weapp": { + "version": "1.10.2", + "resolved": "https://registry.npmmirror.com/@vant/weapp/-/weapp-1.10.2.tgz", + "integrity": "sha512-caqA0xQxM4lMRncFsRPPVMDdEzUBCJ4xdFXuKReXpEU3qwnVIP/WIjVDIi7mWyS7xqz8C9WfSW5JL4PrlSq31w==" + } + }, "dependencies": { "@vant/area-data": { "version": "1.2.3", diff --git a/pages/contactUs/contactUs.js b/pages/contactUs/contactUs.js index a51e6bf..e8d1acf 100644 --- a/pages/contactUs/contactUs.js +++ b/pages/contactUs/contactUs.js @@ -24,7 +24,7 @@ Page({ }, biaoji(e) { - console.log("标记目的地点击", that.data.latitude) + console.log("标记目的地点击", e) wx.getLocation({//获取当前地址信息 type: 'wgs84', success(res) { @@ -33,8 +33,8 @@ Page({ const speed = res.speed const accuracy = res.accuracy wx.openLocation({//跳转腾讯地图查看并可以进行导航 - latitude: that.data.latitude, - longitude: that.data.longitude + latitude: parseFloat(that.data.latitude), + longitude: parseFloat(that.data.longitude) }) },fail(res){//未授权地理位置处理 wx.showModal({ @@ -70,11 +70,11 @@ Page({ address: res.data.address, tel:res.data.tel, phone:res.data.phone, - longitude:res.data.map.split(',')[0], - latitude:res.data.map.split(',')[1], + longitude:parseFloat(res.data.map.split(',')[0]), + latitude:parseFloat(res.data.map.split(',')[1]), markers: [{ - longitude:res.data.map.split(',')[0], - latitude:res.data.map.split(',')[1], + longitude:parseFloat(res.data.map.split(',')[0]), + latitude:parseFloat(res.data.map.split(',')[1]), }], userPhone: res.data.contact_phone }) @@ -106,6 +106,7 @@ Page({ onShow() { that.getTabBar().init(); that.getAboutDetails() + }, /** diff --git a/pages/contactUs/contactUs.wxml b/pages/contactUs/contactUs.wxml index 3e6931b..7183f7b 100644 --- a/pages/contactUs/contactUs.wxml +++ b/pages/contactUs/contactUs.wxml @@ -14,7 +14,7 @@ {{phone}} - + diff --git a/project.private.config.json b/project.private.config.json index 86f13c3..a4cbb33 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -4,5 +4,5 @@ }, "condition": {}, "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", - "projectname": "wechat.junfei.iiixo.com" + "projectname": "安徽骏飞小程序" } \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 981b37c..64de354 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3,11 +3,11 @@ "@vant/area-data@^1.2.3": - version "1.2.3" - resolved "https://registry.npmmirror.com/@vant/area-data/-/area-data-1.2.3.tgz#9c1b5a0e5e563836969bfc78f8a56e63657f3007" - integrity sha512-9bDgEsFnTjdaYXPvsYKRQmxzKDdLCl0c1dOo4JGE6RhaIcq2kR2f5cK0LUdGK+U/SuBz9NfW5ejL1lejcFiP1Q== + "integrity" "sha512-9bDgEsFnTjdaYXPvsYKRQmxzKDdLCl0c1dOo4JGE6RhaIcq2kR2f5cK0LUdGK+U/SuBz9NfW5ejL1lejcFiP1Q==" + "resolved" "https://registry.npmmirror.com/@vant/area-data/-/area-data-1.2.3.tgz" + "version" "1.2.3" "@vant/weapp@^1.10.2": - version "1.10.2" - resolved "https://registry.npmmirror.com/@vant/weapp/-/weapp-1.10.2.tgz#013fbf2fdc6d59d9e92bb82a0f772f032fb52945" - integrity sha512-caqA0xQxM4lMRncFsRPPVMDdEzUBCJ4xdFXuKReXpEU3qwnVIP/WIjVDIi7mWyS7xqz8C9WfSW5JL4PrlSq31w== + "integrity" "sha512-caqA0xQxM4lMRncFsRPPVMDdEzUBCJ4xdFXuKReXpEU3qwnVIP/WIjVDIi7mWyS7xqz8C9WfSW5JL4PrlSq31w==" + "resolved" "https://registry.npmmirror.com/@vant/weapp/-/weapp-1.10.2.tgz" + "version" "1.10.2"