This commit is contained in:
Mr.jiang 2024-06-25 13:59:23 +08:00
parent 148e9b7fd8
commit b8b9e24eef
6 changed files with 89 additions and 62 deletions

View File

@ -305,7 +305,7 @@
<u-button
v-if="order.status == 6"
shape="circle" :plain="true"
@click="goNav('/my/wallet/index?ordersId='+order.ordersId+'&artificerId='+order.artificerId)"
@click="goNav('/my/wallet/index?artificerId='+order.artificerId)"
class="btns">
充值
</u-button>

View File

@ -25,7 +25,7 @@
<view class="padding-lr padding-bottom">
<view class="chongzhi">
<span class="yu-e">余额充值</span>
<span v-if="artificerId.artificerId=='my'||artificerId.artificerId==undefined" @click="goNavtherapist('/pages/therapist/therapistDingdan')">为TA充值</span>
<span v-if="artificerIdMy==true" @click="goNavtherapist('/pages/therapist/therapistDingdan')">为TA充值</span>
</view>
<view class="flex justify-between flex-wrap" v-if="wallet.length > 0">
<view v-for="(item,index) in wallet" :key='index' class="padding-sm radius"
@ -338,12 +338,19 @@
nameTxt:'',
couponId:'',
artificerId:'',
artificerIdMy:''
artificerIdMy:false
}
},
onLoad(d) {
this.artificerId=d;
this.artificerIdMy=this.$queue.getData('getJishi')
if(d.artificerId){
this.artificerId=d.artificerId;
}
if(d.text){
this.artificerIdMy=true
}else{
this.artificerIdMy=false
}
console.log("artificerId",this.artificerId)
if (d.tabIndex) {
this.tabIndex = d.tabIndex;
this.title_color = 2;
@ -681,7 +688,7 @@
payClassifyId: this.thisSelect.payClassifyId,
type: 2,
userId: uni.getStorageSync('userId'),
artificerId:this.artificerId.artificerId==undefined?this.artificerIdMy.artificerId:this.artificerId.artificerId
artificerId:this.artificerId==''?this.artificerIdMy.artificerId:this.artificerId
}
this.$Request.post('/app/aliPay/payOrderMoney', data).then(
res => {

View File

@ -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({

View File

@ -109,7 +109,7 @@
取消订单
</u-button>
<u-button v-if="item.status == 6" :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
@click="goNav('/my/wallet/index?ordersId='+item.ordersId+'&artificerId='+item.artificerId)">
@click="goNav('/my/wallet/index?artificerId='+item.artificerId)">
充值
</u-button>
<u-button v-if="item.addNum < item.ordersMassageList[0].massageType.addNum && item.status == 6" :custom-style="customStyle1" class="btns" shape="circle" :plain="true"

View File

@ -359,7 +359,7 @@ import permision from "@/components/permission.js";
});
that.getTypeList();
uni.getLocation({
type: 'wgs84',
type: 'gcj02',
geocode: true, //true
highAccuracyExpireTime: 500,
success: function(res) {
@ -417,29 +417,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
@ -497,7 +497,7 @@ import permision from "@/components/permission.js";
}else if(this.dataIndex=='充值'){
this.$queue.setData('getJishi',e);
uni.reLaunch({
url:'/my/wallet/index'
url:'/my/wallet/index?artificerId='+e.artificerId+'&text='+'my'
})
}
},
@ -615,12 +615,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;

View File

@ -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) {