From b8b9e24eef3904297fb8824abb8a3e983323dcac Mon Sep 17 00:00:00 2001 From: "Mr.jiang" <714156421@qq.com> Date: Tue, 25 Jun 2024 13:59:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=85=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- my/order/pay.vue | 2 +- my/wallet/index.vue | 17 +++++-- pages/my/index.vue | 2 +- pages/order/index.vue | 2 +- pages/therapist/therapistDingdan.vue | 55 ++++++++++----------- pages/therapist/therapistList.vue | 73 +++++++++++++++++++--------- 6 files changed, 89 insertions(+), 62 deletions(-) diff --git a/my/order/pay.vue b/my/order/pay.vue index bb2b8a6..7b99082 100644 --- a/my/order/pay.vue +++ b/my/order/pay.vue @@ -305,7 +305,7 @@ 充值 diff --git a/my/wallet/index.vue b/my/wallet/index.vue index 907540f..5b6899e 100644 --- a/my/wallet/index.vue +++ b/my/wallet/index.vue @@ -25,7 +25,7 @@ 余额充值 - 为TA充值 + 为TA充值 { diff --git a/pages/my/index.vue b/pages/my/index.vue index c67682c..8a4b6fc 100644 --- a/pages/my/index.vue +++ b/pages/my/index.vue @@ -437,7 +437,7 @@ chonghi(link){//我的钱包 if(link=='充值'){ uni.navigateTo({ - url:'/my/wallet/index?artificerId='+'my' + url:'/my/wallet/index?text='+'my' }) }else{ uni.navigateTo({ diff --git a/pages/order/index.vue b/pages/order/index.vue index 4b358a9..ee49c15 100644 --- a/pages/order/index.vue +++ b/pages/order/index.vue @@ -109,7 +109,7 @@ 取消订单 + @click="goNav('/my/wallet/index?artificerId='+item.artificerId)"> 充值 { + this.$Request.getT('/app/message/selectMessageByUserId?page=1&limit=1&state=11').then(res => { if (res.code == 0) { if (res.data && res.data.list && res.data.list.length > 0) { this.tpSel = 1; diff --git a/pages/therapist/therapistList.vue b/pages/therapist/therapistList.vue index 66e8501..88dff08 100644 --- a/pages/therapist/therapistList.vue +++ b/pages/therapist/therapistList.vue @@ -475,6 +475,33 @@ // }); let that = this; that.massageTypeId = e.massageTypeId; + uni.getLocation({ + type: 'gcj02', + geocode: true, //设置该参数为true可直接获取经纬度及城市信息 + highAccuracyExpireTime: 500, + success: function(res) { + console.log(res, '地理位置-----------------------》') + that.latitude = res.latitude + that.longitude = res.longitude + + uni.setStorageSync('latitude', res.latitude) + uni.setStorageSync('longitude', res.longitude) + if (that.amap) { + that.amap.setCenter(new AMap.LngLat(res.latitude, res.longitude)); + } + if (that.infoWindow) { + that.infoWindow.setPosition(new TMap.LatLng(res.latitude, res.longitude)); + } + that.page = 1 + that.getTypeList(); + }, + fail: function(e) { + console.log('获取地址失败1', e) + // #ifdef APP-PLUS + that.checkPermission(); + // #endif + } + }) // console.log('-------------1---------------'); // that.getLocation();//低精度,快就完事了 // that.getLocation(true);//高精度,慢慢查询 @@ -531,33 +558,31 @@ if (e.classifyId) { that.classifyId = e.classifyId } - uni.getLocation({ - type: 'gcj02', - geocode: true, //设置该参数为true可直接获取经纬度及城市信息 - highAccuracyExpireTime: 500, - success: function(res) { - console.log( '地理位置',res) - - that.latitude = res.latitude - that.longitude = res.longitude - uni.setStorageSync('latitude', res.latitude) - uni.setStorageSync('longitude', res.longitude) - if (that.cmap) { - that.cmap.setCenter(new TMap.LatLng(res.latitude, res.longitude)); - } - if (that.infoWindow) { - that.infoWindow.setPosition(new TMap.LatLng(res.latitude, res.longitude)); - } - if(that.amap){ - - } + + if (uni.getStorageSync('token')) { + if (that.latitude && that.longitude) { that.page = 1 that.getlist() - }, - fail: function(e) { - console.log('获取地址失败', e) + } else { + uni.getLocation({ + type: 'gcj02', + highAccuracyExpireTime: 500, + geocode: true, //设置该参数为true可直接获取经纬度及城市信息 + success: function(res) { + console.log(res, '地理位置') + that.latitude = res.latitude + that.longitude = res.longitude + that.page = 1 + // that.getTypeList(); + that.getlist() + }, + fail: function() { + console.log('获取地址失败2') + } + }) } - }) + } + // 获取邀请码保存到本地 if (e.invitation) {