diff --git a/pages/index/map/map.vue b/pages/index/map/map.vue index 5ace49c..e4c982f 100644 --- a/pages/index/map/map.vue +++ b/pages/index/map/map.vue @@ -117,7 +117,6 @@ }, //确认位置 handleConfirm() { - console.log('======-----------' + JSON.stringify(this.address)); uni.$emit('onAddressChange', this.address); app.globalData.storeMessage = this.address; setTimeout(function() { diff --git a/pages/index/mcc-list/mcc-list.vue b/pages/index/mcc-list/mcc-list.vue index 95aeeb9..af5e652 100644 --- a/pages/index/mcc-list/mcc-list.vue +++ b/pages/index/mcc-list/mcc-list.vue @@ -53,7 +53,7 @@ this.getMccList(); }, //选择某个mcc 并返回 - changemcc(item) { + changemcc(item) { app.globalData.mccid = item.maccCode; app.globalData.mccname = item.name; uni.navigateBack({}) diff --git a/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue b/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue index 9e7e117..83977f0 100644 --- a/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue +++ b/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue @@ -633,9 +633,10 @@ 门店地址 - - + @@ -765,6 +766,10 @@ getBankCardBin, recognizeBankAccount } from '../../../Utils/Api.js'; + const QQMapWX = require('../../../Utils/js/qqmap-wx-jssdk'); + const qqmapsdk = new QQMapWX({ + key: '7UMBZ-HFEHX-HSD4Q-Z3QY6-OQKN7-2QBDB' + }) let app = getApp(); export default { components: { @@ -859,7 +864,7 @@ merId: '', //开户id merDetailInfo: '', //用户信息 rateCodeList: [], //费率字典 - merRateList: [] //提交费率数组 + merRateList: [], //提交费率数组 } }, computed: { @@ -916,7 +921,7 @@ app.globalData.mccname = ''; app.globalData.branchBankNo = ''; app.globalData.clearNo = ''; - app.globalData.storeMessage = ''; + app.globalData.storeMessage = ''; app.globalData.depositaryBank = ''; }, methods: { @@ -1604,6 +1609,10 @@ // this.storeaccount = res.return_data.storeModel.account.loginName; this.storename = res.return_data.storeModel.name; this.storephone = res.return_data.storeModel.telephone; + this.storeAddress = res.return_data.storeModel.storeRegion.address; + this.storeareaCode = res.return_data.storeModel.storeRegion.areaCode; + this.storelongitude = res.return_data.storeModel.storeRegion.longitude; + this.storelatitude = res.return_data.storeModel.storeRegion.latitude; this.getImgSignedUrl(6, res.return_data.storeModel.doorHeadImg, 2); this.getImgSignedUrl(7, res.return_data.storeModel.cashRegisterImg, 2); this.getImgSignedUrl(8, res.return_data.storeModel.internalImg, 2); @@ -2141,6 +2150,26 @@ url: '/pages/index/map/map' }) }, + //解析地址为经纬度 + formSubmit() { + //调用地址解析接口 + qqmapsdk.geocoder({ + //获取表单传入地址 + address: this.storeAddress, //这里写的是地址 地址参数,例:固定地址,address: '北京市海淀区彩和坊路海淀西大街74号' + success: res => { //成功后的回调 + this.storeareaCode = res.result.ad_info.adcode; + this.storelongitude = res.result.location.lng; + this.storelatitude = res.result.location.lat; + }, + fail: function(error) { + console.error(error); + }, + complete: function(res) { + console.log(res); + } + }) + }, + //提交门店进行审核 submitsotre() { let that = this; @@ -2176,6 +2205,14 @@ }); return; } + if (!that.storeareaCode) { + uni.showToast({ + title: '请输入正确的门店地址', + icon: "none", + duration: 2000 + }); + return; + } if (!that.storeimg1) { uni.showToast({ title: '请上传门头照片', @@ -2218,10 +2255,13 @@ "doorHeadImg": that.uploadstoreimg1, "cashRegisterImg": that.uploadstoreimg2, "internalImg": that.uploadstoreimg3, - "address": that.storeAddress, - "areaCode": that.storeareaCode, - "longitude": that.storelongitude, - "latitude": that.storelatitude + "storeRegion": { + "address": that.storeAddress, + "areaCode": that.storeareaCode, + "longitude": that.storelongitude, + "latitude": that.storelatitude + } + } configMerStore(datas).then(res => { uni.hideLoading();