yangjun
/
sadjv3_user
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

技师等级

This commit is contained in:
曹磊 2024-08-14 22:23:18 +08:00
parent 1e58bed6f6
commit 1582a437b5
26 changed files with 166 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
my/order/pay.vue
View File

@ -1330,13 +1330,13 @@ export default {
uni.hideLoading() uni.hideLoading()
this.order = res.data; this.order = res.data;
if(res.data["technicianType"] == 3){ if(res.data["technicianType"] == 3){
this.order["technicianTypeName"] = "新手" this.order["technicianTypeName"] = "资深"
} }
if(res.data["technicianType"] == 4){ if(res.data["technicianType"] == 4){
this.order["technicianTypeName"] = "专家" this.order["technicianTypeName"] = "金牌"
} }
if(res.data["technicianType"] == 5){ if(res.data["technicianType"] == 5){
this.order["technicianTypeName"] = "资深" this.order["technicianTypeName"] = "专家"
} }
var date = new Date(); // 当前日期和时间 var date = new Date(); // 当前日期和时间
// var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳 // var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳

6
my/order/payJaZ.vue
View File

@ -1125,13 +1125,13 @@ export default {
uni.hideLoading() uni.hideLoading()
this.order = res.data; this.order = res.data;
if(res.data["technicianType"] == 3){ if(res.data["technicianType"] == 3){
this.order["technicianTypeName"] = "新手" this.order["technicianTypeName"] = "资深"
} }
if(res.data["technicianType"] == 4){ if(res.data["technicianType"] == 4){
this.order["technicianTypeName"] = "专家" this.order["technicianTypeName"] = "金牌"
} }
if(res.data["technicianType"] == 5){ if(res.data["technicianType"] == 5){
this.order["technicianTypeName"] = "资深" this.order["technicianTypeName"] = "专家"
} }
var date = new Date(); // 当前日期和时间 var date = new Date(); // 当前日期和时间
var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳 var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳

10
my/order/payModify.vue
View File

@ -309,8 +309,8 @@
selectedString:'', selectedString:'',
fuwuBtn: [ fuwuBtn: [
{'title':'请速回电'}, {'title':'请速回电'},
{'title':'切勿大声敲门'}, {'title':'勿大声敲门'},
{'title':'请尽快上门服务'}, {'title':'尽快上门服务'},
{'title':'直接来即可'}, {'title':'直接来即可'},
], ],
} }
@ -694,6 +694,12 @@
}, },
goOrder() {//生成orderId goOrder() {//生成orderId
let that = this let that = this
if(that.detailaddress==''){
uni.showToast({
title:'请选择服务地址！'
})
return;
}
let data = { let data = {
address:that.province+that.city+that.district+that.detailaddress, address:that.province+that.city+that.district+that.detailaddress,
artificerId:that.jishiName.artificerId, artificerId:that.jishiName.artificerId,

4
my/order/payModifyDzhifu.vue
View File

@ -275,8 +275,8 @@
return { return {
fuwuBtn: [ fuwuBtn: [
{'title':'请速回电'}, {'title':'请速回电'},
{'title':'切勿大声敲门'}, {'title':'勿大声敲门'},
{'title':'请尽快上门服务'}, {'title':'尽快上门服务'},
{'title':'直接来即可'}, {'title':'直接来即可'},
], ],
selected:[], selected:[],

4
my/order/payModifyJsDetail.vue
View File

@ -311,8 +311,8 @@
selectedString:'', selectedString:'',
fuwuBtn: [ fuwuBtn: [
{'title':'请速回电'}, {'title':'请速回电'},
{'title':'切勿大声敲门'}, {'title':'勿大声敲门'},
{'title':'请尽快上门服务'}, {'title':'尽快上门服务'},
{'title':'直接来即可'}, {'title':'直接来即可'},
], ],
} }

25
my/order/payModifyTcMy.vue
View File

@ -290,8 +290,8 @@
selectedString:'', selectedString:'',
fuwuBtn: [ fuwuBtn: [
{'title':'请速回电'}, {'title':'请速回电'},
{'title':'切勿大声敲门'}, {'title':'勿大声敲门'},
{'title':'请尽快上门服务'}, {'title':'尽快上门服务'},
{'title':'直接来即可'}, {'title':'直接来即可'},
], ],
} }
@ -304,13 +304,13 @@
} }
this.orderXm=this.$queue.getData('mainData'); this.orderXm=this.$queue.getData('mainData');
if(this.orderXm.level == 3){ if(this.orderXm.level == 3){
this.orderXm.levelName = "新手" this.orderXm.levelName = "资深"
} }
if(this.orderXm.level == 4){ if(this.orderXm.level == 4){
this.orderXm.levelName = "专家" this.orderXm.levelName = "金牌"
} }
if(this.orderXm.level == 5){ if(this.orderXm.level == 5){
this.orderXm.levelName = "资深" this.orderXm.levelName = "专家"
} }
console.log("this.orderXm",this.orderXm) console.log("this.orderXm",this.orderXm)
this.detailData=this.$queue.getData('detailData'); this.detailData=this.$queue.getData('detailData');
@ -417,6 +417,12 @@
}, },
goOrder() {//生成orderId goOrder() {//生成orderId
let that = this let that = this
if(that.detailaddress==''){
uni.showToast({
title:'请选择服务地址！'
})
return;
}
// let payMoney =item.price; // let payMoney =item.price;
// let payMoney = that.isVip ? item.memberPrice : item.price; // let payMoney = that.isVip ? item.memberPrice : item.price;
let data = { let data = {
@ -1408,7 +1414,7 @@
} }
.huiBtn { .huiBtn {
color:#333; color:#333;
background: #ccc; background: #f3f3f3;
// color: #333333; // color: #333333;
} }
.lanBtn { .lanBtn {
@ -1416,16 +1422,17 @@
background: #049F89; background: #049F89;
} }
.guke-btn { .guke-btn {
width: 45%; width:24%;
// height: 40px; // height: 40px;
line-height: 40px; line-height:34px;
// margin-left: 5px; // margin-left: 5px;
text-align: center; text-align: center;
// line-height: 40px; // line-height: 40px;
font-weight: bold; font-weight: bold;
font-size: 12px; font-size:11px;
border-radius: 6px; border-radius: 6px;
margin-top:5px; margin-top:5px;
margin-right:2px;
// border-bottom: 1px solid #ccc; // border-bottom: 1px solid #ccc;
} }
.guke-list { .guke-list {

6
my/order/payModifyTcMyDaiB.vue
View File

@ -533,13 +533,13 @@
uni.hideLoading() uni.hideLoading()
this.order = res.data; this.order = res.data;
if (res.data["technicianType"] == 3) { if (res.data["technicianType"] == 3) {
this.order["technicianTypeName"] = "新手" this.order["technicianTypeName"] = "资深"
} }
if (res.data["technicianType"] == 4) { if (res.data["technicianType"] == 4) {
this.order["technicianTypeName"] = "专家" this.order["technicianTypeName"] = "金牌"
} }
if (res.data["technicianType"] == 5) { if (res.data["technicianType"] == 5) {
this.order["technicianTypeName"] = "资深" this.order["technicianTypeName"] = "专家"
} }
var date = new Date(); // 当前日期和时间 var date = new Date(); // 当前日期和时间
// var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳 // var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳

6
my/order/payShengji.vue
View File

@ -1443,13 +1443,13 @@
uni.hideLoading() uni.hideLoading()
this.order = res.data; this.order = res.data;
if(res.data["technicianType"] == 3){ if(res.data["technicianType"] == 3){
this.order["technicianTypeName"] = "新手" this.order["technicianTypeName"] = "资深"
} }
if(res.data["technicianType"] == 4){ if(res.data["technicianType"] == 4){
this.order["technicianTypeName"] = "专家" this.order["technicianTypeName"] = "金牌"
} }
if(res.data["technicianType"] == 5){ if(res.data["technicianType"] == 5){
this.order["technicianTypeName"] = "资深" this.order["technicianTypeName"] = "专家"
} }
var date = new Date(); // 当前日期和时间 var date = new Date(); // 当前日期和时间
var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳 var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳

8
my/order/payding.vue
View File

@ -114,7 +114,7 @@
<image style="width: 120rpx; height: 45rpx;" :src="order.technicianType=='3'?'../../static/vip/grade1.gif':order.technicianType=='4'?'../../static/vip/grade2.gif':'../../static/vip/grade3.gif'" mode=""></image> <image style="width: 120rpx; height: 45rpx;" :src="order.technicianType=='3'?'../../static/vip/grade1.gif':order.technicianType=='4'?'../../static/vip/grade2.gif':'../../static/vip/grade3.gif'" mode=""></image>
</view> </view>
</view> </view>
<!-- <view class="level_button">{{order.technicianType=='3'?'新手':order.technicianType=='4'?'专家':'资深'}}</view> --> <!-- <view class="level_button">{{order.technicianType=='3'?'资深':order.technicianType=='4'?'金牌':'专家'}}</view> -->
<!-- <view class="flex align-center flex-wrap" v-if="order.artificer.ordersCount"> <!-- <view class="flex align-center flex-wrap" v-if="order.artificer.ordersCount">
<view class="margin-right"> <view class="margin-right">
@ -495,13 +495,13 @@
uni.hideLoading() uni.hideLoading()
this.order = res.data; this.order = res.data;
if(res.data["technicianType"] == 3){ if(res.data["technicianType"] == 3){
this.order["technicianTypeName"] = "新手" this.order["technicianTypeName"] = "资深"
} }
if(res.data["technicianType"] == 4){ if(res.data["technicianType"] == 4){
this.order["technicianTypeName"] = "专家" this.order["technicianTypeName"] = "金牌"
} }
if(res.data["technicianType"] == 5){ if(res.data["technicianType"] == 5){
this.order["technicianTypeName"] = "资深" this.order["technicianTypeName"] = "专家"
} }
var date = new Date(); // 当前日期和时间 var date = new Date(); // 当前日期和时间
// var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳 // var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳

2
my/order/paydingDd.vue
View File

@ -207,7 +207,7 @@
</view> </view>
<view class="fei-view-list"> <view class="fei-view-list">
<span>技师等级</span> <span>技师等级</span>
<span>{{order.technicianType=='3'?'新手':order.technicianType=='4'?'专家':'资深'}}</span> <span>{{order.technicianType=='3'?'资深':order.technicianType=='4'?'金牌':'专家'}}</span>
</view> </view>
<view class="fei-view-list"> <view class="fei-view-list">
<span>技师服务佣金上浮比例</span> <span>技师服务佣金上浮比例</span>

6
my/order/paydingTCX.vue
View File

@ -570,13 +570,13 @@
uni.hideLoading() uni.hideLoading()
this.order = res.data; this.order = res.data;
if(res.data["technicianType"] == 3){ if(res.data["technicianType"] == 3){
this.order["technicianTypeName"] = "新手" this.order["technicianTypeName"] = "资深"
} }
if(res.data["technicianType"] == 4){ if(res.data["technicianType"] == 4){
this.order["technicianTypeName"] = "专家" this.order["technicianTypeName"] = "金牌"
} }
if(res.data["technicianType"] == 5){ if(res.data["technicianType"] == 5){
this.order["technicianTypeName"] = "资深" this.order["technicianTypeName"] = "专家"
} }
var date = new Date(); // 当前日期和时间 var date = new Date(); // 当前日期和时间
// var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳 // var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳

2
my/order/paydingXiuGai.vue
View File

@ -94,7 +94,7 @@
<!-- <image src="../../static/img/phone.png" class="phone-pay" <!-- <image src="../../static/img/phone.png" class="phone-pay"
@click="bindphone(order.artificer.phone)"></image> --> @click="bindphone(order.artificer.phone)"></image> -->
</view> </view>
<view>{{order.technicianType=='3'?'新手':order.technicianType=='4'?'专家':'资深'}}</view> <view>{{order.technicianType=='3'?'资深':order.technicianType=='4'?'金牌':'专家'}}</view>
<!-- <view class="flex align-center flex-wrap" v-if="order.artificer.ordersCount"> <!-- <view class="flex align-center flex-wrap" v-if="order.artificer.ordersCount">
<view class="margin-right"> <view class="margin-right">
<image src="../../static/images/start.png" style="width: 24rpx;height: 22rpx;"> <image src="../../static/images/start.png" style="width: 24rpx;height: 22rpx;">

12
pages/my/cikarDrtail.vue
View File

@ -649,13 +649,13 @@
that.$Request.get('/app/massage/packageDetail/findAppPage', data).then(res => { that.$Request.get('/app/massage/packageDetail/findAppPage', data).then(res => {
if (res.code == 0) { if (res.code == 0) {
if(res.mainData.level == 3){ if(res.mainData.level == 3){
res.mainData.levelName = "新手" res.mainData.levelName = "资深"
} }
if(res.mainData.level == 4){ if(res.mainData.level == 4){
res.mainData.levelName = "专家" res.mainData.levelName = "金牌"
} }
if(res.mainData.level == 5){ if(res.mainData.level == 5){
res.mainData.levelName = "资深" res.mainData.levelName = "专家"
} }
that.mainData=res.mainData; that.mainData=res.mainData;
that.contentImg=that.mainData.contentImg.split(","); that.contentImg=that.mainData.contentImg.split(",");
@ -674,13 +674,13 @@
that.$Request.get('/app/user/package/detail/findMyPackageDetailList', data).then(res => { that.$Request.get('/app/user/package/detail/findMyPackageDetailList', data).then(res => {
if (res.code == 0) { if (res.code == 0) {
if(res.data.mainData.level == 3){ if(res.data.mainData.level == 3){
res.data.mainData.levelName = "新手" res.data.mainData.levelName = "资深"
} }
if(res.data.mainData.level == 4){ if(res.data.mainData.level == 4){
res.data.mainData.levelName = "专家" res.data.mainData.levelName = "金牌"
} }
if(res.data.mainData.level == 5){ if(res.data.mainData.level == 5){
res.data.mainData.levelName = "资深" res.data.mainData.levelName = "专家"
} }
that.mainData=res.data.mainData; that.mainData=res.data.mainData;
that.contentImg=that.mainData.contentImg.split(","); that.contentImg=that.mainData.contentImg.split(",");

12
pages/my/fuwuliaochengDetail.vue
View File

@ -659,13 +659,13 @@
that.$Request.get('/app/massage/packageDetail/findAppPage', data).then(res => { that.$Request.get('/app/massage/packageDetail/findAppPage', data).then(res => {
if (res.code == 0) { if (res.code == 0) {
if(res.mainData.level == 3){ if(res.mainData.level == 3){
res.mainData.levelName = "新手" res.mainData.levelName = "资深"
} }
if(res.mainData.level == 4){ if(res.mainData.level == 4){
res.mainData.levelName = "专家" res.mainData.levelName = "金牌"
} }
if(res.mainData.level == 5){ if(res.mainData.level == 5){
res.mainData.levelName = "资深" res.mainData.levelName = "专家"
} }
that.mainData=res.mainData; that.mainData=res.mainData;
that.detailData=res.detailData.list; that.detailData=res.detailData.list;
@ -685,13 +685,13 @@
that.$Request.get('/app/user/package/detail/findMyPackageDetailList', data).then(res => { that.$Request.get('/app/user/package/detail/findMyPackageDetailList', data).then(res => {
if (res.code == 0) { if (res.code == 0) {
if(res.data.mainData.level == 3){ if(res.data.mainData.level == 3){
res.data.mainData.levelName = "新手" res.data.mainData.levelName = "资深"
} }
if(res.data.mainData.level == 4){ if(res.data.mainData.level == 4){
res.data.mainData.levelName = "专家" res.data.mainData.levelName = "金牌"
} }
if(res.data.mainData.level == 5){ if(res.data.mainData.level == 5){
res.data.mainData.levelName = "资深" res.data.mainData.levelName = "专家"
} }
that.mainData=res.data.mainData; that.mainData=res.data.mainData;
that.detailData=res.data.detailData; that.detailData=res.data.detailData;

6
pages/my/miaoShaOderDrtail.vue
View File

@ -220,13 +220,13 @@
that.$Request.get('/app/user/package/detail/findMyPackageDetailList',data).then(res => { that.$Request.get('/app/user/package/detail/findMyPackageDetailList',data).then(res => {
if (res.code == 0) { if (res.code == 0) {
if(res.data.mainData.level == 3){ if(res.data.mainData.level == 3){
res.data.mainData.levelName = "新手" res.data.mainData.levelName = "资深"
} }
if(res.data.mainData.level == 4){ if(res.data.mainData.level == 4){
res.data.mainData.levelName = "专家" res.data.mainData.levelName = "金牌"
} }
if(res.data.mainData.level == 5){ if(res.data.mainData.level == 5){
res.data.mainData.levelName = "资深" res.data.mainData.levelName = "专家"
} }
that.mainData=res.data.mainData; that.mainData=res.data.mainData;
that.detailData=res.data.detailData; that.detailData=res.data.detailData;

6
pages/my/myMsOderDrtail.vue
View File

@ -171,13 +171,13 @@
that.$Request.get('/app/user/package/detail/getMyPackageDetail', data).then(res => { that.$Request.get('/app/user/package/detail/getMyPackageDetail', data).then(res => {
if (res.code == 0) { if (res.code == 0) {
if(res.data.level == 3){ if(res.data.level == 3){
res.data.levelName = "新手" res.data.levelName = "资深"
} }
if(res.data.level == 4){ if(res.data.level == 4){
res.data.levelName = "专家" res.data.levelName = "金牌"
} }
if(res.data.level == 5){ if(res.data.level == 5){
res.data.levelName = "资深" res.data.levelName = "专家"
} }
that.getList=res.data; that.getList=res.data;
that.backgroundImageUrl=that.getList.massageImg that.backgroundImageUrl=that.getList.massageImg

12
pages/my/newseckilldetails.vue
View File

@ -656,13 +656,13 @@
that.isEnd = false; that.isEnd = false;
} }
if(res.data.level == 3){ if(res.data.level == 3){
res.data.levelName = "新手" res.data.levelName = "资深"
} }
if(res.data.level == 4){ if(res.data.level == 4){
res.data.levelName = "专家" res.data.levelName = "金牌"
} }
if(res.data.level == 5){ if(res.data.level == 5){
res.data.levelName = "资深" res.data.levelName = "专家"
} }
that.mainData=res.data; that.mainData=res.data;
that.backgroundImageUrl=res.data.packageImg that.backgroundImageUrl=res.data.packageImg
@ -683,13 +683,13 @@
this.$set(res.data, 'btnShow', false) this.$set(res.data, 'btnShow', false)
} }
if(res.data.level == 3){ if(res.data.level == 3){
res.data.levelName = "新手" res.data.levelName = "资深"
} }
if(res.data.level == 4){ if(res.data.level == 4){
res.data.levelName = "专家" res.data.levelName = "金牌"
} }
if(res.data.level == 5){ if(res.data.level == 5){
res.data.levelName = "资深" res.data.levelName = "专家"
} }
that.mainData=res.data; that.mainData=res.data;
that.backgroundImageUrl=res.data.packageImg that.backgroundImageUrl=res.data.packageImg

6
pages/my/pTuanOderDrtail.vue
View File

@ -153,13 +153,13 @@
that.$Request.get('/app/user/package/detail/getMyPackageDetail', data).then(res => { that.$Request.get('/app/user/package/detail/getMyPackageDetail', data).then(res => {
if (res.code == 0) { if (res.code == 0) {
if(res.data.level == 3){ if(res.data.level == 3){
res.data.levelName = "新手" res.data.levelName = "资深"
} }
if(res.data.level == 4){ if(res.data.level == 4){
res.data.levelName = "专家" res.data.levelName = "金牌"
} }
if(res.data.level == 5){ if(res.data.level == 5){
res.data.levelName = "资深" res.data.levelName = "专家"
} }
that.getList=res.data; that.getList=res.data;
that.backgroundImageUrl=that.getList.massageImg that.backgroundImageUrl=that.getList.massageImg

6
pages/my/pinTuanOderDrtail.vue
View File

@ -219,13 +219,13 @@
that.$Request.get('/app/user/package/detail/findMyPackageDetailList',data).then(res => { that.$Request.get('/app/user/package/detail/findMyPackageDetailList',data).then(res => {
if (res.code == 0) { if (res.code == 0) {
if(res.data.mainData.level == 3){ if(res.data.mainData.level == 3){
res.data.mainData.levelName = "新手" res.data.mainData.levelName = "资深"
} }
if(res.data.mainData.level == 4){ if(res.data.mainData.level == 4){
res.data.mainData.levelName = "专家" res.data.mainData.levelName = "金牌"
} }
if(res.data.mainData.level == 5){ if(res.data.mainData.level == 5){
res.data.mainData.levelName = "资深" res.data.mainData.levelName = "专家"
} }
that.mainData=res.data.mainData; that.mainData=res.data.mainData;
that.detailData=res.data.detailData; that.detailData=res.data.detailData;

12
pages/my/serviceOderDrtail.vue
View File

@ -691,13 +691,13 @@
that.$Request.get('/app/user/package/detail/findMyPackageDetailList',data).then(res => { that.$Request.get('/app/user/package/detail/findMyPackageDetailList',data).then(res => {
if (res.code == 0) { if (res.code == 0) {
if(res.data.mainData.level == 3){ if(res.data.mainData.level == 3){
res.data.mainData.levelName = "新手" res.data.mainData.levelName = "资深"
} }
if(res.data.mainData.level == 4){ if(res.data.mainData.level == 4){
res.data.mainData.levelName = "专家" res.data.mainData.levelName = "金牌"
} }
if(res.data.mainData.level == 5){ if(res.data.mainData.level == 5){
res.data.mainData.levelName = "资深" res.data.mainData.levelName = "专家"
} }
that.mainData=res.data.mainData; that.mainData=res.data.mainData;
that.detailData=res.data.detailData; that.detailData=res.data.detailData;
@ -714,13 +714,13 @@
that.$Request.get('/app/massage/packageDetail/findAppPage',data).then(res => { that.$Request.get('/app/massage/packageDetail/findAppPage',data).then(res => {
if (res.code == 0) { if (res.code == 0) {
if(res.mainData.level == 3){ if(res.mainData.level == 3){
res.mainData.levelName = "新手" res.mainData.levelName = "资深"
} }
if(res.mainData.level == 4){ if(res.mainData.level == 4){
res.mainData.levelName = "专家" res.mainData.levelName = "金牌"
} }
if(res.mainData.level == 5){ if(res.mainData.level == 5){
res.mainData.levelName = "资深" res.mainData.levelName = "专家"
} }
that.mainData=res.mainData; that.mainData=res.mainData;
that.detailData=res.detailData.list; that.detailData=res.detailData.list;

12
pages/shop/qiyeDatail.vue
View File

@ -192,13 +192,13 @@
that.$Request.get('/app/massage/packageDetail/findAppPage', data).then(res => { that.$Request.get('/app/massage/packageDetail/findAppPage', data).then(res => {
if (res.code == 0) { if (res.code == 0) {
if(res.mainData.level == 3){ if(res.mainData.level == 3){
res.mainData.levelName = "新手" res.mainData.levelName = "资深"
} }
if(res.mainData.level == 4){ if(res.mainData.level == 4){
res.mainData.levelName = "专家" res.mainData.levelName = "金牌"
} }
if(res.mainData.level == 5){ if(res.mainData.level == 5){
res.mainData.levelName = "资深" res.mainData.levelName = "专家"
} }
that.mainData=res.mainData; that.mainData=res.mainData;
that.contentImg=that.mainData.contentImg.split(","); that.contentImg=that.mainData.contentImg.split(",");
@ -218,13 +218,13 @@
that.$Request.get('/app/user/package/detail/findMyPackageDetailList', data).then(res => { that.$Request.get('/app/user/package/detail/findMyPackageDetailList', data).then(res => {
if (res.code == 0) { if (res.code == 0) {
if(res.data.mainData.level == 3){ if(res.data.mainData.level == 3){
res.data.mainData.levelName = "新手" res.data.mainData.levelName = "资深"
} }
if(res.data.mainData.level == 4){ if(res.data.mainData.level == 4){
res.data.mainData.levelName = "专家" res.data.mainData.levelName = "金牌"
} }
if(res.data.mainData.level == 5){ if(res.data.mainData.level == 5){
res.data.mainData.levelName = "资深" res.data.mainData.levelName = "专家"
} }
that.mainData=res.data.mainData; that.mainData=res.data.mainData;
that.contentImg=that.mainData.contentImg.split(","); that.contentImg=that.mainData.contentImg.split(",");

2
pages/therapist/orderDetail.vue
View File

@ -35,7 +35,7 @@
<view class="jian-view-name">{{order.artificerName}}</view> <view class="jian-view-name">{{order.artificerName}}</view>
<!--<view class="headset-line"> <!--<view class="headset-line">
<image class="headset-img" src="../../static/vip/headset1.png" mode=""></image> <image class="headset-img" src="../../static/vip/headset1.png" mode=""></image>
<span class="headset-text">新手</span> <span class="headset-text">资深</span>
</view> </view>
<view class="headset-line"> <view class="headset-line">
<image class="headset-img" src="../../static/vip/headset2.png" mode=""></image> <image class="headset-img" src="../../static/vip/headset2.png" mode=""></image>

162
pages/therapist/therapist.vue
View File

@ -72,17 +72,16 @@
</view> </view>
</view> </view>
<view class="flex thera-lin thera-bottom"> <view class="flex thera-lin thera-bottom">
<view class="flex" v-if="item.consortiaName">
<image class="therapist-bottom-img" src="../../static/dituzhaoren5.png"></image>
<view v-if="item.consortiaName" class="therapist-mian-bottom-text">{{item.consortiaName}}</view>
</view>
<view class="flex align-center" v-if="item.distance"> <view class="flex align-center" v-if="item.distance">
<image class="therapist-bottom-dingwei" src="../../static/dituzhaoren6.png"></image> <image class="therapist-bottom-dingwei" src="../../static/dituzhaoren6.png"></image>
<view class="therapist-bottom-dingwei-text"> <view class="therapist-bottom-dingwei-text">
{{ item.distance }} {{ item.distance }}
</view> </view>
</view> </view>
<view class="flex" v-if="item.consortiaName">
<image class="therapist-bottom-img" src="../../static/dituzhaoren5.png"></image>
<view v-if="item.consortiaName" class="therapist-mian-bottom-text">{{item.consortiaName}}</view>
</view>
</view> </view>
</view> </view>
</view> </view>
@ -169,17 +168,16 @@
</view> </view>
</view> </view>
<view class="flex thera-lin thera-bottom"> <view class="flex thera-lin thera-bottom">
<view class="flex" v-if="getOrderByCurrentMarkerIndex().consortiaName">
<image class="therapist-bottom-img" src="../../static/dituzhaoren5.png"></image>
<view v-if="getOrderByCurrentMarkerIndex().consortiaName" class="therapist-mian-bottom-text">{{getOrderByCurrentMarkerIndex().consortiaName}}</view>
</view>
<view class="flex align-center" v-if="getOrderByCurrentMarkerIndex().distance"> <view class="flex align-center" v-if="getOrderByCurrentMarkerIndex().distance">
<image class="therapist-bottom-dingwei" src="../../static/dituzhaoren6.png"></image> <image class="therapist-bottom-dingwei" src="../../static/dituzhaoren6.png"></image>
<view class="therapist-bottom-dingwei-text"> <view class="therapist-bottom-dingwei-text">
{{ getOrderByCurrentMarkerIndex().distance }} {{ getOrderByCurrentMarkerIndex().distance }}
</view> </view>
</view> </view>
<view class="flex" v-if="getOrderByCurrentMarkerIndex().consortiaName">
<image class="therapist-bottom-img" src="../../static/dituzhaoren5.png"></image>
<view v-if="getOrderByCurrentMarkerIndex().consortiaName" class="therapist-mian-bottom-text">{{getOrderByCurrentMarkerIndex().consortiaName}}</view>
</view>
</view> </view>
<!-- <view class="therapist-mian-bottom"> <!-- <view class="therapist-mian-bottom">
<view class="flex flex-wrap align-center" v-if="getOrderByCurrentMarkerIndex().consortiaName"> <view class="flex flex-wrap align-center" v-if="getOrderByCurrentMarkerIndex().consortiaName">
@ -217,7 +215,7 @@
</view> </view>
</view> </view>
<!-- 经验筛选 --> <!-- 经验筛选 -->
<!-- <u-select v-model="Cityshow" :list="cityList" @confirm="getCity"></u-select> --> <u-select v-model="Cityshow" :list="cityList" @confirm="getCity"></u-select>
</view> </view>
</template> </template>
<script> <script>
@ -246,17 +244,17 @@ import permision from "@/components/permission.js";
{ {
id: 3, id: 3,
name: "", name: "",
value: "新手", value: "资深",
}, },
{ {
id: 4, id: 4,
name: "", name: "",
value: "专家", value: "金牌",
}, },
{ {
id: 5, id: 5,
name: "", name: "",
value: "资深", value: "专家",
}, },
], ],
technicianType:3, technicianType:3,
@ -331,9 +329,6 @@ import permision from "@/components/permission.js";
onLoad(e) { onLoad(e) {
let that = this let that = this
uni.showLoading({
title: '加载中...'
})
that.massageTypeId = e.massageTypeId; that.massageTypeId = e.massageTypeId;
// that.getLocation();//低精度，快就完事了 // that.getLocation();//低精度，快就完事了
// that.getLocation(true);//高精度，慢慢查询 // that.getLocation(true);//高精度，慢慢查询
@ -360,7 +355,6 @@ import permision from "@/components/permission.js";
that.selectCity(that.longitude,that.latitude) that.selectCity(that.longitude,that.latitude)
}, },
fail: function(e) { fail: function(e) {
that.getlist()
console.log('获取地址失败1', e) console.log('获取地址失败1', e)
// #ifdef APP-PLUS // #ifdef APP-PLUS
that.checkPermission(); that.checkPermission();
@ -392,9 +386,6 @@ import permision from "@/components/permission.js";
}, },
onShow() { onShow() {
let that = this let that = this
uni.showLoading({
title: '加载中...'
})
that.XCXIsSelect = this.$queue.getData("XCXIsSelect"); that.XCXIsSelect = this.$queue.getData("XCXIsSelect");
var add=uni.getStorageSync('cityTherapist'); var add=uni.getStorageSync('cityTherapist');
if(add!=''){ if(add!=''){
@ -405,9 +396,9 @@ import permision from "@/components/permission.js";
that.latitude = location[1] that.latitude = location[1]
that.componentKey++ that.componentKey++
that.initMap(); that.initMap();
console.log("location========>location",add) console.log("location========>",add)
} }
// that.getKTCityList(); that.getKTCityList();
that.getTpCount(); that.getTpCount();
that.getTpMy(); that.getTpMy();
that.userId = uni.getStorageSync('userId') that.userId = uni.getStorageSync('userId')
@ -429,15 +420,13 @@ import permision from "@/components/permission.js";
geocode: true, //设置该参数为true可直接获取经纬度及城市信息 geocode: true, //设置该参数为true可直接获取经纬度及城市信息
success: function(res) { success: function(res) {
console.log(res, '地理位置onShow') console.log(res, '地理位置onShow')
that.latitude = res.latitude; that.latitude = res.latitude
that.longitude = res.longitude; that.longitude = res.longitude
that.page = 1; that.page = 1
that.selectCity(that.longitude,that.latitude) that.getTypeList();
// that.getTypeList();
// that.getlist() // that.getlist()
}, },
fail: function() { fail: function() {
that.getlist()
console.log('获取地址失败2') console.log('获取地址失败2')
} }
}) })
@ -463,46 +452,6 @@ import permision from "@/components/permission.js";
//this.closeSocket(); //this.closeSocket();
}, },
methods: { methods: {
selectCity(longitude, latitude) {
var that=this;
var longitude = that.longitude;
var latitude = that.latitude;
let amapKey = that.Key2; // 替换为你的高德地图API Key
let url = `https://restapi.amap.com/v3/geocode/regeo?key=${amapKey}&location=${longitude},${latitude}&radius=1000`;
uni.request({
url: url,
success: (response) => {
if(response.data && response.data.regeocode) {
let address = response.data.regeocode.formatted_address;
let province = response.data.regeocode.addressComponent.province;
let city = response.data.regeocode.addressComponent.city;
let district = response.data.regeocode.addressComponent.district;
let township = response.data.regeocode.addressComponent.township;
let streetNumber = response.data.regeocode.addressComponent.streetNumber.street;
let number = response.data.regeocode.addressComponent.streetNumber.number;
that.cityname = address.replace(province,'').replace(city,'').replace(district,'').replace(streetNumber,'').replace(number,'').replace(township,'')
that.city=city
var add=uni.getStorageSync('cityTherapist');
console.log('getStorageSync===========', add);
if(add!=''){
that.cityname=add.name;
that.city=add.cityname;
var location=add.location.split(",")
that.longitude = location[0]
that.latitude = location[1]
}
that.page = 1
that.getlist()
} else {
console.log('逆地理编码失败', response.data);
}
},
fail: (error) => {
uni.hideLoading();
console.log('网络请求失败', error);
}
});
},
changeClick(index,item){ changeClick(index,item){
this.artificerName=''; this.artificerName='';
this.technicianType=item.id; this.technicianType=item.id;
@ -527,8 +476,7 @@ import permision from "@/components/permission.js";
console.log("that.current=======",that.current) console.log("that.current=======",that.current)
console.log("that.page=======",that.page) console.log("that.page=======",that.page)
that.$Request.get("/app/artificer/selectArtificerList", data).then(res => { that.$Request.get("/app/artificer/selectArtificerList", data).then(res => {
// that.loading = false; that.loading = false;
uni.hideLoading();
if (res.code == 0) { if (res.code == 0) {
for (var i = 0; i < res.data.list.length; i++) { for (var i = 0; i < res.data.list.length; i++) {
if (res.data.list[i].lifePhoto) { if (res.data.list[i].lifePhoto) {
@ -703,7 +651,7 @@ import permision from "@/components/permission.js";
this.getTpCount(); this.getTpCount();
this.getTpMy(); this.getTpMy();
} else { } else {
// uni.hideLoading(); uni.hideLoading();
uni.showModal({ uni.showModal({
showCancel: false, showCancel: false,
title: '投票失败', title: '投票失败',
@ -731,12 +679,12 @@ import permision from "@/components/permission.js";
}); });
}, },
getCity(e) { getCity(e) {
// console.log("得到的城市-------------》",e[0].label); console.log("得到的城市-------------》",e[0].label);
// this.city = e[0].label; this.city = e[0].label;
// uni.setStorageSync('city', this.city) uni.setStorageSync('city', this.city)
// this.getKTCityList(); this.getKTCityList();
// this.page = 1 this.page = 1
// this.getlist() this.getlist()
}, },
getKTCityList() { getKTCityList() {
let cityName; let cityName;
@ -760,7 +708,7 @@ import permision from "@/components/permission.js";
console.log("请求-----------------请求>",this.cityList) console.log("请求-----------------请求>",this.cityList)
if (!isOpen) { if (!isOpen) {
// debugger; // debugger;
// this.orderList = [] this.orderList = []
this.showTP = true; this.showTP = true;
// uni.showToast({ // uni.showToast({
// title: '当前城市暂未开通，请切换城市', // title: '当前城市暂未开通，请切换城市',
@ -789,7 +737,37 @@ import permision from "@/components/permission.js";
} }
}); });
}, },
selectCity(longitude, latitude) {
var that=this;
var longitude = that.longitude;
var latitude = that.latitude;
let amapKey = that.Key2; // 替换为你的高德地图API Key
let url = `https://restapi.amap.com/v3/geocode/regeo?key=${amapKey}&location=${longitude},${latitude}&radius=1000`;
uni.request({
url: url,
success: (response) => {
if(response.data && response.data.regeocode) {
let address = response.data.regeocode.formatted_address;
let province = response.data.regeocode.addressComponent.province;
let city = response.data.regeocode.addressComponent.city;
let district = response.data.regeocode.addressComponent.district;
let township = response.data.regeocode.addressComponent.township;
let streetNumber = response.data.regeocode.addressComponent.streetNumber.street;
let number = response.data.regeocode.addressComponent.streetNumber.number;
that.cityname = address.replace(province,'').replace(city,'').replace(district,'').replace(streetNumber,'').replace(number,'').replace(township,'')
that.city=city
that.page = 1
that.getlist()
that.getKTCityList();
} else {
console.log('逆地理编码失败', response.data);
}
},
fail: (error) => {
console.log('网络请求失败', error);
}
});
},
tanChange(index, item) { tanChange(index, item) {
this.orderIndex = index this.orderIndex = index
this.tabIndex = item.id this.tabIndex = item.id
@ -879,19 +857,6 @@ import permision from "@/components/permission.js";
} }
}) })
} }
uni.requestSubscribeMessage({
tmplIds: this.arr,
success(re) {
console.log(JSON.stringify(re), 111111111111)
var datas = JSON.stringify(re);
if (datas.indexOf("accept") != -1) {
// console.log(re)
}
},
fail: (res) => {
// console.log(res)
}
})
this.defaultIndex = [0, 0, 0] this.defaultIndex = [0, 0, 0]
// this.$refs.uDropdown.close(); // this.$refs.uDropdown.close();
this.page = 1 this.page = 1
@ -972,6 +937,7 @@ import permision from "@/components/permission.js";
//地图初始化， //地图初始化，
getLocation(isHighAccuracy = false) { getLocation(isHighAccuracy = false) {
console.log('获取地理位置，精度：', isHighAccuracy);
let that = this; let that = this;
//获取地理坐标 //获取地理坐标
uni.getLocation({ uni.getLocation({
@ -982,8 +948,11 @@ import permision from "@/components/permission.js";
success: function(res) { success: function(res) {
let longitude = res.longitude; let longitude = res.longitude;
let latitude = res.latitude; let latitude = res.latitude;
console.log('当前位置的经度：' + longitude);
console.log('当前位置的纬度：' + latitude);
getApp().globalData['longitude'] = longitude; getApp().globalData['longitude'] = longitude;
getApp().globalData['latitude'] = latitude; getApp().globalData['latitude'] = latitude;
console.log('定位成功', latitude, longitude);
if (that.amap) { if (that.amap) {
uni.amap.setCenter([longitude, latitude]) uni.amap.setCenter([longitude, latitude])
} }
@ -1006,6 +975,7 @@ import permision from "@/components/permission.js";
this.amap = amap; this.amap = amap;
let that = this; let that = this;
setTimeout(() => { setTimeout(() => {
uni.hideLoading();
this.current = 0; this.current = 0;
uni.getLocation({ uni.getLocation({
// type: 'wgs84', // type: 'wgs84',
@ -1013,7 +983,6 @@ import permision from "@/components/permission.js";
highAccuracyExpireTime: 3000, highAccuracyExpireTime: 3000,
isHighAccuracy: true, isHighAccuracy: true,
success: function(res) { success: function(res) {
// uni.hideLoading();
let longitude = res.longitude; let longitude = res.longitude;
let latitude = res.latitude; let latitude = res.latitude;
console.log('当前位置的经度=========1：' + longitude); console.log('当前位置的经度=========1：' + longitude);
@ -1026,11 +995,12 @@ import permision from "@/components/permission.js";
that.latitude = location[1] that.latitude = location[1]
console.log("locationlocationlocationlocation>",location) console.log("locationlocationlocationlocation>",location)
uni.amap.setCenter([location[0],location[1]]) uni.amap.setCenter([location[0],location[1]])
} }
} }
}, },
fail(res) { fail(res) {
// uni.hideLoading();
console.log('定位失败！', res); console.log('定位失败！', res);
} }
}); });
@ -1048,6 +1018,8 @@ import permision from "@/components/permission.js";
}, },
creatMarker(map) { creatMarker(map) {
let that = this; let that = this;
console.log("uni.amap=============>",uni.amap)
console.log("map=============>",map)
webMap.addMarker(uni.amap, map, this.orderList, (e, udata) => { webMap.addMarker(uni.amap, map, this.orderList, (e, udata) => {
that.currentMarkerIndex = udata.userId; that.currentMarkerIndex = udata.userId;
that.showPopup = true; that.showPopup = true;

6
pages/therapist/therapist1.vue
View File

@ -258,17 +258,17 @@ import permision from "@/components/permission.js";
{ {
id: 3, id: 3,
name: "", name: "",
value: "新手", value: "资深",
}, },
{ {
id: 4, id: 4,
name: "", name: "",
value: "专家", value: "金牌",
}, },
{ {
id: 5, id: 5,
name: "", name: "",
value: "资深", value: "专家",
}, },
], ],
technicianType:3, technicianType:3,

6
pages/therapist/therapistList.vue
View File

@ -226,17 +226,17 @@ import permision from "@/components/permission.js";
{ {
id: 3, id: 3,
name: "", name: "",
value: "新手", value: "资深",
}, },
{ {
id: 4, id: 4,
name: "", name: "",
value: "专家", value: "金牌",
}, },
{ {
id: 5, id: 5,
name: "", name: "",
value: "资深", value: "专家",
}, },
], ],
technicianType:3, technicianType:3,

2
pages/therapist/therapistList1.vue
View File

@ -356,8 +356,8 @@
data() { data() {
return { return {
tabList:[ tabList:[
{value:'新手'},
{value:'资深'}, {value:'资深'},
{value:'金牌'},
{value:'专家'} {value:'专家'}
], ],
Cityshow: false, Cityshow: false,