diff --git a/common/config.js b/common/config.js index 62340aa..15b0486 100644 --- a/common/config.js +++ b/common/config.js @@ -6,6 +6,7 @@ const ROOTPATH3 = "wss://192.168.2.222:8187/wss/websocket/"; const ROOTPATH = "http://192.168.2.222:8187/sqx_fast"; const ROOTPATH1 = "http://192.168.2.222:8187/sqx_fast"; + // const ROOTPATH = "http://192.168.2.13:8187/sqx_fast"; // const ROOTPATH1 = "http://192.168.2.13:8187/sqx_fast"; // const ROOTPATH3 = "wss://192.168.2.13:8187/wss/websocket/"; diff --git a/my/wallet/index.vue b/my/wallet/index.vue index 5b6899e..882b7b4 100644 --- a/my/wallet/index.vue +++ b/my/wallet/index.vue @@ -350,7 +350,6 @@ }else{ this.artificerIdMy=false } - console.log("artificerId",this.artificerId) if (d.tabIndex) { this.tabIndex = d.tabIndex; this.title_color = 2; @@ -688,8 +687,11 @@ payClassifyId: this.thisSelect.payClassifyId, type: 2, userId: uni.getStorageSync('userId'), - artificerId:this.artificerId==''?this.artificerIdMy.artificerId:this.artificerId } + if(this.artificerId){ + data.artificerId=this.artificerId + } + this.$Request.post('/app/aliPay/payOrderMoney', data).then( res => { if (res.code == 0) { diff --git a/pages/therapist/therapist.vue b/pages/therapist/therapist.vue index df6686d..456612f 100644 --- a/pages/therapist/therapist.vue +++ b/pages/therapist/therapist.vue @@ -104,7 +104,7 @@ + style="margin-top: 60px;justify-content: space-between;">
 
@@ -351,9 +351,10 @@ import permision from "@/components/permission.js"; that.massageTypeId = e.massageTypeId // that.getLocation();//低精度,快就完事了 // that.getLocation(true);//高精度,慢慢查询 + that.getTypeList(); uni.getLocation({ - type: 'wgs84', + type: 'gcj02', geocode: true, //设置该参数为true可直接获取经纬度及城市信息 highAccuracyExpireTime: 500, success: function(res) { @@ -411,29 +412,29 @@ import permision from "@/components/permission.js"; that.getTpMy(); that.token = uni.getStorageSync('token') - // if (uni.getStorageSync('token')) { - if (that.latitude && that.longitude) { - that.page = 1 - that.getlist() - } 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 (uni.getStorageSync('token')) { + if (that.latitude && that.longitude) { + that.page = 1 + that.getlist() + } 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') + } + }) + } } - // } that.myId = uni.getStorageSync('userId') // console.log(that.showModal, '------', that.myId) // #ifdef MP-WEIXIN @@ -599,12 +600,7 @@ import permision from "@/components/permission.js"; }); }, getTpMy() { - var data={ - page:'', - limit:'', - state:'' - } - this.$Request.getT('/app/message/selectMessageByUserId',data).then(res => { + 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; @@ -1227,6 +1223,12 @@ import permision from "@/components/permission.js";