套餐订单 修改理疗师更改叫加上

This commit is contained in:
Mr.jiang 2024-07-01 15:59:33 +08:00
parent d5b03511a5
commit 80330c34cd
38 changed files with 2230 additions and 198 deletions

View File

@ -390,7 +390,7 @@
this.$queue.setData('ylTxSel', res.data.value);
}
});
// 390
// 390
this.$Request.get('/app/common/type/390').then(res => {
if (res.code == 0) {
this.$queue.setData('jsczSel', res.data.value);
@ -408,7 +408,7 @@
this.$queue.setData('closeKC', res.data.value);
}
});
// 421
// 421
this.$Request.get('/app/common/type/421').then(res => {
if (res.code == 0) {
this.$queue.setData('imageHeight', res.data.value);

View File

@ -93,6 +93,10 @@
})
} else if (this.isfa == 3) {
this.updateaddress()
}else if (this.isfa == 4) {
uni.reLaunch({
url:'/my/order/payModifyTcMy'
})
}
},

View File

@ -55,7 +55,7 @@
<view class="tool-card">
<view class="tool-item" @click="navToLogin('/my/gonghui/therapist?consortiaId=' + consortiaId)">
<view class="item-right">
<view class="view-text">商家理疗</view>
<view class="view-text">商家</view>
<image src="/static/images/index/right.png" class="view-image-right"></image>
</view>
</view>

View File

@ -97,7 +97,7 @@
<text
style="color: #F93731;margin-left: 5rpx;">{{order.artificer.ordersCount}}</text>
</view>
<text class="margin-bottom-xs box" style="margin-right: 10upx;">健康理疗</text>
<text class="margin-bottom-xs box" style="margin-right: 10upx;">健康</text>
</view>
</view>
</view>
@ -155,7 +155,7 @@
</view>
<view class="" style="color: #333;">
<text style="font-size: 35rpx;font-weight: bold;">
{{(order.massagePrice*order.ordersMassageList[0].num)*(order.vipRate/100)*(1+order.technicianRate/100)}}
{{order.massageMoney}}
</text>
</view>
</view>
@ -190,7 +190,7 @@
<view class="flex align-center margin-top-lg justify-between">
<view style="color: #333;font-size: 26rpx;">订单费用</view>
<view class="" style="color: #333;"><text
style="font-size: 26rpx;font-weight: bold;">{{order.massagePrice*(order.vipRate/100)*(1+order.technicianRate/100)}}</text></view>
style="font-size: 26rpx;font-weight: bold;">{{order.massageMoney}}</text></view>
</view>
<view class="flex align-center margin-top-lg justify-between">
<view style="color: #333;font-size: 26rpx;">出行费用</view>
@ -207,7 +207,7 @@
<view style="color: #333;font-size: 26rpx;">合计</view>
<view class="" style="color: #333;">
<text style="font-size: 35rpx;font-weight: bold;">
{{order.oldMassageMoney==null?order.payMoney:((order.payMoney+order.oldMassageMoney).toFixed(2))}}
{{order.payMoney}}
</text>
</view>
</view>

View File

@ -100,7 +100,7 @@
<text
style="color: #F93731;margin-left: 5rpx;">{{order.artificer.ordersCount}}</text>
</view>
<text class="margin-bottom-xs box" style="margin-right: 10upx;">健康理疗</text>
<text class="margin-bottom-xs box" style="margin-right: 10upx;">健康</text>
</view>
</view>
</view>

View File

@ -68,6 +68,29 @@
</view>
</view>
<view class="ske-padding margin-top-sm header-view">
<view class="fuwu-time" @click="liliaoshi">
<view class="fuwu-title" >
<span>技师</span>
<span v-if="jishiName">{{jishiName.technicianTypeName}}</span>
</view>
<view class="liliao-bottom" style="margin-right: 6px;">
<span v-if="jishiName">{{jishiName.artificerName}}</span>
<span v-else>选择不同技师价格可能不一样哦~</span>
<span class="view-more"></span>
</view>
</view>
<view class="liliao" @click="youhuijuan">
<view class="fuwu-title">
<span>平台优惠劵</span>
</view>
<view class="header-bottom-money-zhen">
<view v-if="couponDataList" class="" style="margin-right: 5px;">
<span>-{{couponDataList}}</span>
</view>
<span v-else>选择优惠劵</span>
<span class="view-more"></span>
</view>
</view>
<view class="fuwu-time">
<view class="fuwu-title">
服务时间
@ -85,39 +108,8 @@
</view>
</view>
</view>
<view class="fuwu-time" @click="liliaoshi">
<view class="fuwu-title" >
<span>理疗师</span>
<span v-if="jishiName">{{jishiName.technicianTypeName}}</span>
</view>
<view class="liliao-bottom" style="margin-right: 6px;">
<span v-if="jishiName">{{jishiName.artificerName}}</span>
<span v-else>选择不同技师价格可能不一样哦~</span>
<span class="view-more"></span>
</view>
</view>
<!--<view class="liliao">
<view class="liliao-top" style="width: 30%;">
<span>理疗师</span>
<span v-if="jishiName">{{jishiName.technicianTypeName}}</span>
</view>
<view class="liliao-bottom">
<span v-if="jishiName">{{jishiName.artificerName}}</span>
<span v-else>选择不同技师价格可能不一样哦~</span>
</view>
</view>-->
<view class="liliao" @click="youhuijuan">
<view class="fuwu-title">
<span>平台优惠劵</span>
</view>
<view class="header-bottom-money-zhen">
<view v-if="couponDataList" class="" style="margin-right: 5px;">
<span>-{{couponDataList}}</span>
</view>
<span v-else>选择优惠劵</span>
<span class="view-more"></span>
</view>
</view>
</view>
<view class="margin-top-xl pay-ding">
<view class="d-title">备注</view>
@ -441,7 +433,7 @@
})
}else if(this.jishiName==''){
uni.showToast({
title:'请选择理疗师!'
title:'请选择师!'
})
}else{
// this.showpay = true;

View File

@ -76,26 +76,10 @@
</view>
</view>
<view class="padding margin-top-sm header-view">
<view class="fuwu-time">
<view class="fuwu-title">
服务时间
</view>
<!-- <view class="fuwu-time-view" @change="changeLog">
<uni-datetime-picker :hide-second='true' v-model="single" type="datetime">{{single==''?order.serveTime:single}}</uni-datetime-picker>
<image style="margin-left: 5px;" class="fuwu-img" src="../../static/images/my/jiantou.png" mode=""></image>
</view> -->
<view class="flex align-center justify-between"
style="height: 100rpx;line-height: 100rpx;padding: 0rpx 10rpx;">
<view class="flex justify-between margin-tb-sm" @click="openData()">
<view v-if="startTime">{{startTime}}</view>
<view class="tetx-sm" style="color:#999999;" v-else>请选择预约时间</view>
<u-icon name="arrow-right" color="#999999"></u-icon>
</view>
</view>
</view>
<view class="liliao" @click="liliaoshi(orderXm)">
<view class="liliao-top" style="width: 30%;">
<span>理疗</span>
<span>技师</span>
<span v-if="jishiName">{{jishiName.technicianTypeName}}</span>
</view>
<view class="liliao-bottom">
@ -116,6 +100,23 @@
<!-- <image class="fuwu-img" src="../../static/images/my/jiantou.png" mode=""></image> -->
</view>
</view>
<view class="fuwu-time">
<view class="fuwu-title">
服务时间
</view>
<!-- <view class="fuwu-time-view" @change="changeLog">
<uni-datetime-picker :hide-second='true' v-model="single" type="datetime">{{single==''?order.serveTime:single}}</uni-datetime-picker>
<image style="margin-left: 5px;" class="fuwu-img" src="../../static/images/my/jiantou.png" mode=""></image>
</view> -->
<view class="flex align-center justify-between"
style="height: 100rpx;line-height: 100rpx;padding: 0rpx 10rpx;">
<view class="flex justify-between margin-tb-sm" @click="openData()">
<view v-if="startTime">{{startTime}}</view>
<view class="tetx-sm" style="color:#999999;" v-else>请选择预约时间</view>
<u-icon name="arrow-right" color="#999999"></u-icon>
</view>
</view>
</view>
</view>
<view class="margin-top-xl pay-ding">
<view class="d-title">备注</view>
@ -438,7 +439,7 @@
})
}else if(this.jishiName==''){
uni.showToast({
title:'请选择理疗师!'
title:'请选择师!'
})
}else{
// this.showpay = true;

View File

@ -85,26 +85,10 @@
</view>
</view>
<view class="ske-padding margin-top-sm header-view">
<view class="fuwu-time">
<view class="fuwu-title">
服务时间
</view>
<!-- <view class="fuwu-time-view" @change="changeLog">
<uni-datetime-picker :hide-second='true' v-model="single" type="datetime">{{single==''?order.serveTime:single}}</uni-datetime-picker>
<image style="margin-left: 5px;" class="fuwu-img" src="../../static/images/my/jiantou.png" mode=""></image>
</view> -->
<view class="flex align-center justify-between"
style="height: 100rpx;line-height: 100rpx;padding: 0rpx 10rpx;">
<view class="flex justify-between margin-tb-sm" @click="openData()">
<view v-if="startTime">{{startTime}}</view>
<view class="tetx-sm" v-else>请选择预约时间<span class="view-more"></span></view>
<!---<u-icon name="arrow-right" color="#999999"></u-icon>-->
</view>
</view>
</view>
<view class="fuwu-time" @click="liliaoshi">
<view class="fuwu-title" >
<span>理疗</span>
<span>技师</span>
<span v-if="jishiName">{{jishiName.technicianTypeName}}</span>
</view>
<view class="liliao-bottom" style="margin-right: 6px;">
@ -115,7 +99,7 @@
</view>
<!--<view class="liliao">
<view class="liliao-top" style="width: 30%;">
<span>理疗</span>
<span></span>
<span v-if="jishiName">{{jishiName.technicianTypeName}}</span>
</view>
<view class="liliao-bottom">
@ -135,6 +119,23 @@
<!-- <span class="view-more"></span> -->
</view>
</view>
<view class="fuwu-time">
<view class="fuwu-title">
服务时间
</view>
<!-- <view class="fuwu-time-view" @change="changeLog">
<uni-datetime-picker :hide-second='true' v-model="single" type="datetime">{{single==''?order.serveTime:single}}</uni-datetime-picker>
<image style="margin-left: 5px;" class="fuwu-img" src="../../static/images/my/jiantou.png" mode=""></image>
</view> -->
<view class="flex align-center justify-between"
style="height: 100rpx;line-height: 100rpx;padding: 0rpx 10rpx;">
<view class="flex justify-between margin-tb-sm" @click="openData()">
<view v-if="startTime">{{startTime}}</view>
<view class="tetx-sm" v-else>请选择预约时间<span class="view-more"></span></view>
<!---<u-icon name="arrow-right" color="#999999"></u-icon>-->
</view>
</view>
</view>
</view>
<view class="margin-top-xl pay-ding">
<view class="d-title">备注</view>
@ -665,7 +666,7 @@
})
}else if(this.jishiName==''){
uni.showToast({
title:'请选择理疗师!'
title:'请选择师!'
})
}else{
// this.showpay = true;

View File

@ -24,7 +24,7 @@
<span>{{orderXm.price}}</span>
</view>
<view>
<uni-number-box :width='27' :min="1" @change="changeValue" />
<uni-number-box :disabled="true" :width='27' :min="1" :value='1' @change="changeValue" />
</view>
</view>
</view>
@ -34,21 +34,68 @@
</view>
</view>
<view class="padding margin-top-sm header-view" style="width: 95%;margin: 0 auto;">
<view class="liliao" style="margin-top: 0px;">
<view class="liliao-top" style="width: 30%;">
<span>平台优惠劵</span>
<view class="ske-padding margin-top-sm header-view">
<view v-if="!detailaddress">请选择地址</view>
<view class="margin-right-xs">
<view class="flex justify-between margin-top-lg">
<view class="header-view-text">联系人</view>
<view class="header-view-data">
<text>{{name}}</text>
<text class="xuanzhe" @click="getAddressList()">修改</text>
</view>
<view class="header-bottom-money-zhen">
<view v-if="couponDataList" class="" style="margin-right: 5px;">
<span>-{{couponDataList}}</span>
</view>
<span v-else >选择优惠劵</span>
<image class="fuwu-img" src="../../static/images/my/jiantou.png" mode=""></image>
<view class="flex justify-between margin-top-lg">
<view class="header-view-text">手机号码</view>
<view class="header-view-data">
{{mobile}}
</view>
</view>
<view class="flex justify-between margin-top-lg">
<view class="header-view-text">详细地址</view>
<view class="flex adders-view">
<span>
{{province}}/{{city}}/{{district}}/{{detailaddress}}
</span>
<span class="view-more"></span>
</view>
</view>
</view>
</view>
<view class="ske-padding margin-top-sm header-view">
<view class="fuwu-time" @click="liliaoshi">
<view class="fuwu-title" >
<span>技师</span>
<!-- <span v-if="jishiName">{{jishiName.technicianTypeName}}</span> -->
</view>
<view class="liliao-bottom" style="margin-right: 6px;">
<span v-if="jishiName">{{jishiName.artificerName}}</span>
<span v-else>请选择技师</span>
<span class="view-more"></span>
</view>
</view>
<view class="fuwu-time">
<view class="fuwu-title">
服务时间
</view>
<view class="flex align-center justify-between"
style="height: 100rpx;line-height: 100rpx;padding: 0rpx 10rpx;">
<view class="flex justify-between margin-tb-sm" @click="openData()">
<view v-if="startTime">{{startTime}}</view>
<view class="tetx-sm" v-else>请选择预约时间<span class="view-more"></span></view>
</view>
</view>
</view>
</view>
<view class="margin-top-xl pay-ding">
<view class="d-title">备注</view>
<view class="list-pay">
<view class="textarea-pay-list">
<textarea @input="textareaChange" class="textarea-pay" v-model="textareaData" placeholder="请输入备注" name="" maxlength="100"></textarea>
</view>
</view>
</view>
<view class="pay_btn" style="margin-top: 30px;" @click="openpay()">去支付</view>
</view>
@ -233,7 +280,7 @@
this.youhuiF(this.couponId)
}
this.ordersId = this.$queue.getData('ordersId');
this.ordersId = this.orderXm.id;
this.userPackageDetailId = this.$queue.getData('userPackageDetailId');
this.youhui()
// this.getOrder()
@ -278,6 +325,45 @@
// #endif
},
methods: {
goOrder() {//orderId
let that = this
// let payMoney =item.price;
// let payMoney = that.isVip ? item.memberPrice : item.price;
let data = {
address:that.province+that.city+that.district+that.detailaddress,
artificerId:that.jishiName.artificerId,
phone:that.mobile,
userName:that.name,
tripWay:that.jishiName.tripWay,
city:that.province,
couponId: '',
userId: uni.getStorageSync('userId'),
longitude:that.longitude,
latitude:that.latitude,
serveTime:that.startTime,
remark:that.textareaData,
ordersMassageList:[
{massageId:that.ordersId,num: 1},
],
userPackageDetailId : that.ordersId
}
that.$Request.postJson("/app/artificer/insertOrders", data).then(res => {
that.showorder = false
if (res.code == 0) {
that.tordersId = res.data.ordersId;
that.tpayMoney = res.data.payMoney;
// that.showpay = true;
that.paySel = 1;
// console.log("res.data",res.data)
uni.navigateTo({
url:'/my/order/paydingTCX?ordersId='+ res.data.ordersId
})
} else {
that.$queue.showToast(res.msg)
}
});
},
changeValue(value){
this.number=value
},
@ -377,7 +463,7 @@
liliaoshi(){
uni.setStorage({
key: 'taocanDd',
data: '支付',
data: '我的套餐',
success: function () {
uni.navigateTo({
url: '/pages/therapist/therapistDingdan'
@ -451,7 +537,7 @@
});
} else {
uni.navigateTo({
url: '../address/address?id=' + 2
url: '../address/address?id=' + 4
})
}
@ -535,39 +621,7 @@
}
});
},
goOrder() {//orderId
let that = this
console.log('asdasd',that.couponId)
// let payMoney =item.price;
// let payMoney = that.isVip ? item.memberPrice : item.price;
let data = {
userId: uni.getStorageSync('userId'),
couponId: that.couponId,
oldSumMoney: that.orderXm.oldPrice,
sumMoney: that.orderXm.price,
// oldSumMoney: that.mainData.oldPrice*that.detailData.length,
// sumMoney: that.mainData.price*that.detailData.length,
ordersPackageList:[
{packageId: that.orderXm.id,num: that.number},
]
}
that.$Request.postJson("/app/user/package/order/insertOrders", data).then(res => {
that.showorder = false
if (res.code == 0) {
that.tordersId = res.data.ordersId;
that.tpayMoney = res.data.payMoney;
// that.showpay = true;
that.paySel = 1;
// console.log("res.data",res.data)
uni.navigateTo({
url:'/my/order/paydingTc?ordersId='+ res.data.ordersId
})
} else {
that.$queue.showToast(res.msg)
}
});
},
payJZ() {
let that = this;
if (that.openWay == 1) { //
@ -1209,6 +1263,46 @@
</script>
<style lang="scss" scoped>
.textarea-pay-list{
width: 100%;
height: 126rpx;
margin-top: 10px;
}
.textarea-pay{
background-color: #f3f3f3;
width: 100%;
height: 100%;
background: #F3F3F3;
border-radius: 14rpx;
padding: 7px;
}
.pay-ding{
padding-bottom: 15px;
}
.pay-ding,.feiuong{
background-color: #ffffff;
border-radius: 24rpx;
margin-top: 24rpx;
// padding: 29rpx;
}
.view-more{
display:inline-block;
border-top:1px solid;
border-right:1px solid;
width: 15rpx;
height: 15rpx;
border-color:#999;
transform:rotate(45deg);
margin-top: 14rpx;
}
.tetx-sm{
font-size: 30rpx;
color:#888;
}
.ske-padding{
padding: 5rpx 30rpx 36rpx 30rpx;
}
.header-bottom-money{
width: 100%;
display: flex;

View File

@ -100,7 +100,7 @@
<text
style="color: #F93731;margin-left: 5rpx;">{{order.artificer.ordersCount}}</text>
</view>
<text class="margin-bottom-xs box" style="margin-right: 10upx;">健康理疗</text>
<text class="margin-bottom-xs box" style="margin-right: 10upx;">健康</text>
</view>
</view>
</view>

View File

@ -49,7 +49,7 @@
</view>
<view class="liliao">
<view class="liliao-top">
<span>理疗</span>
<span></span>
<span>资深</span>
</view>
<view class="liliao-bottom">

View File

@ -23,8 +23,8 @@
<view v-if="order.status ==2">待服务</view>
<view v-if="order.status ==5">已完成</view>
<view v-if="order.status ==6">服务中</view>
<view v-if="order.status ==7">理疗师出发</view>
<view v-if="order.status ==8">理疗师到达</view>
<view v-if="order.status ==7">师出发</view>
<view v-if="order.status ==8">师到达</view>
<view v-if="order.status ==3">待评价</view>
<view v-if="order.status ==4">已取消</view>
<view v-if="order.status ==9">待确认</view>
@ -102,7 +102,7 @@
<text
style="color: #F93731;margin-left: 5rpx;">{{order.artificer.ordersCount}}2</text>
</view>
<text class="margin-bottom-xs box" style="margin-right: 10upx;">健康理疗师3</text>
<text class="margin-bottom-xs box" style="margin-right: 10upx;">健康技师</text>
</view> -->
</view>
</view>

View File

@ -23,8 +23,8 @@
<view v-if="order.status ==2">待服务</view>
<view v-if="order.status ==5">已完成</view>
<view v-if="order.status ==6">服务中</view>
<view v-if="order.status ==7">理疗师出发</view>
<view v-if="order.status ==8">理疗师到达</view>
<view v-if="order.status ==7">师出发</view>
<view v-if="order.status ==8">师到达</view>
<view v-if="order.status ==3">待评价</view>
<view v-if="order.status ==4">已取消</view>
<view v-if="order.status ==9">待确认</view>
@ -100,7 +100,7 @@
</image>
<text style="color: #F93731;margin-left: 5rpx;">{{order.artificer.ordersCount}}</text>
</view>
<text class="margin-bottom-xs box" style="margin-right: 10upx;">健康理疗</text>
<text class="margin-bottom-xs box" style="margin-right: 10upx;">健康</text>
</view>
</view>
</view>

1927
my/order/paydingTCX.vue Normal file

File diff suppressed because it is too large Load Diff

View File

@ -23,8 +23,8 @@
<view v-if="order.status ==2">待服务</view>
<view v-if="order.status ==5">已完成</view>
<view v-if="order.status ==6">服务中</view>
<view v-if="order.status ==7">理疗师出发</view>
<view v-if="order.status ==8">理疗师到达</view>
<view v-if="order.status ==7">师出发</view>
<view v-if="order.status ==8">师到达</view>
<view v-if="order.status ==3">待评价</view>
<view v-if="order.status ==4">已取消</view>
<view v-if="order.status ==9">待确认</view>
@ -102,7 +102,7 @@
<text
style="color: #F93731;margin-left: 5rpx;">{{order.artificer.ordersCount}}2</text>
</view>
<text class="margin-bottom-xs box" style="margin-right: 10upx;">健康理疗师3</text>
<text class="margin-bottom-xs box" style="margin-right: 10upx;">健康师3</text>
</view> -->
</view>
</view>

View File

@ -92,7 +92,7 @@
<!-- <view class="flex justify-around margin-top " v-if="jsczSel != '否'">
<view @click="goNav('/pages/therapist/therapistList?index=2')">为TA充值</view>
<view @click="goNav('/pages/therapist/therapistList?index=3')">我的理疗</view>
<view @click="goNav('/pages/therapist/therapistList?index=3')">我的</view>
</view> -->
<view
style="position: fixed;bottom: 0rpx;left: 0;right: 0;background: #FFFFFF;height: 110rpx;line-height: 110rpx;z-index: 999;">

View File

@ -229,7 +229,7 @@
<view class="flex justify-around margin-top " v-if="jsczSel != '否'">
<view @click="goNav('/pages/therapist/therapistList?index=2')">为TA充值</view>
<view @click="goNav('/pages/therapist/therapistList?index=3')">我的理疗</view>
<view @click="goNav('/pages/therapist/therapistList?index=3')">我的</view>
</view>
</view>

View File

@ -78,7 +78,7 @@
{
"path": "pages/index/order/orderDetail",
"style": {
"navigationBarTitleText": "理疗师详情"
"navigationBarTitleText": "师详情"
}
},
@ -454,7 +454,7 @@
{
"path": "pages/therapist/therapist",
"style": {
"navigationBarTitleText": "理疗师",
"navigationBarTitleText": "师",
"enablePullDownRefresh": true,
"app-plus": {
"titleNView": false
@ -466,7 +466,7 @@
{
"path": "pages/therapist/therapist",
"style": {
"navigationBarTitleText": "理疗师",
"navigationBarTitleText": "师",
"enablePullDownRefresh": true,
"app-plus": {
"titleNView": false
@ -477,14 +477,14 @@
{
"path": "pages/therapist/therapistList",
"style": {
"navigationBarTitleText": "选择理疗师",
"navigationBarTitleText": "选择师",
"navigationStyle": "custom",
"enablePullDownRefresh": false
}
}, {
"path": "pages/therapist/orderDetail",
"style": {
"navigationBarTitleText": "理疗师详情",
"navigationBarTitleText": "师详情",
"enablePullDownRefresh": true,
"app-plus": {
"titleNView": false
@ -511,6 +511,15 @@
"titleNView": false
}
}
},{
"path": "order/paydingTCX",
"style": {
"navigationBarTitleText": "我的套餐支付",
"enablePullDownRefresh": false,
"app-plus": {
"titleNView": false
}
}
},{
"path": "order/payModifyTcMy",
"style": {
@ -746,7 +755,7 @@
{
"path": "gonghui/therapist",
"style": {
"navigationBarTitleText": "商家理疗师"
"navigationBarTitleText": "商家师"
}
},
{

View File

@ -30,7 +30,7 @@
<image src="../../static/liliao-1.png" class="dingwei-img"></image>
<view class="localName">{{ city }}</view>
</view>
<u-search class="" placeholder="请输入理疗师名字" :focus="false" shape="square" v-model="artificerName"
<u-search class="" placeholder="请输入师名字" :focus="false" shape="square" v-model="artificerName"
:show-action="true" :animation="true" bg-color="#fff" color="#1A1A1A" @search="onSearch()"
></u-search>
</view>
@ -359,7 +359,7 @@
}
// #endif
that.$Request.getT('/app/common/type/250').then(res => { //
that.$Request.getT('/app/common/type/250').then(res => { //
if (res.code == 0) {
if (res.data && res.data.value) {
that.arr.push(res.data.value)
@ -367,7 +367,7 @@
}
})
that.$Request.getT('/app/common/type/248').then(res => { //
that.$Request.getT('/app/common/type/248').then(res => { //
if (res.code == 0) {
if (res.data && res.data.value) {
that.arr.push(res.data.value)

View File

@ -70,7 +70,7 @@
<view v-if="XCXIsSelect != ''"
style="background: #096f4b;color: #ffffff;line-height: 56upx;border-radius: 8rpx;font-size: 24upx;padding: 0upx 23upx;"
>
选择理疗
选择
</view>
</view>
</view>
@ -233,7 +233,7 @@
}
if (this.myId) {
that.$Request.getT('/app/common/type/250').then(res => { //
that.$Request.getT('/app/common/type/250').then(res => { //
if (res.code == 0) {
if (res.data && res.data.value) {
that.arr.push(res.data.value)
@ -241,7 +241,7 @@
}
})
that.$Request.getT('/app/common/type/248').then(res => { //
that.$Request.getT('/app/common/type/248').then(res => { //
if (res.code == 0) {
if (res.data && res.data.value) {
that.arr.push(res.data.value)

View File

@ -87,14 +87,14 @@
<!-- <view class="item_yishou">已售{{item.sales}}</view> -->
<view class="btnview align-center" :style="item.labels.length > 0 ? '' : 'margin-top: 6rpx'">
<view class="item_btn" v-if="item.classifyName === '足浴按摩'" @click.stop="goOrder(item)">
选择理疗
选择
</view>
<view class="item_btn" v-if="item.classifyName === '健身私教'" @click.stop="goOrder(item)">
选择教练
</view>
<view class="item_btn" v-if="item.classifyName != '健身私教' && item.classifyName != '足浴按摩'"
@click.stop="goOrder(item)">
选择理疗
选择
</view>
</view>
</view>
@ -254,7 +254,7 @@
}
// #endif
that.$Request.getT('/app/common/type/250').then(res => { //
that.$Request.getT('/app/common/type/250').then(res => { //
if (res.code == 0) {
if (res.data && res.data.value) {
that.arr.push(res.data.value)
@ -262,7 +262,7 @@
}
})
that.$Request.getT('/app/common/type/248').then(res => { //
that.$Request.getT('/app/common/type/248').then(res => { //
if (res.code == 0) {
if (res.data && res.data.value) {
that.arr.push(res.data.value)

View File

@ -162,7 +162,7 @@
<view class="text-center" v-if="order.classifyName === '足浴按摩'"
style="width: 665upx;line-height: 78upx;background: linear-gradient(to right, #223845, #00a85b);border-radius: 39upx;margin: 0 auto;color: #FFFFFF;"
@click="goNav(order.massageTypeId,order.classifyId)">
选择理疗
选择
</view>
<view class="text-center" v-if="order.classifyName === '健身私教'"
style="width: 665upx;line-height: 78upx;background: linear-gradient(to right, #223845, #00a85b);border-radius: 39upx;margin: 0 auto;color: #FFFFFF;"
@ -172,7 +172,7 @@
<view class="text-center" v-if="order.classifyName != '健身私教' && order.classifyName != '足浴按摩'"
style="width: 665upx;line-height: 78upx;background: linear-gradient(to right, #223845, #00a85b);border-radius: 39upx;margin: 0 auto;color: #FFFFFF;"
@click="goNav(order.massageTypeId,order.classifyId)">
选择理疗
选择
</view>
</view>
<!-- <u-picker v-model="show" mode="time" :params="params" @confirm="statusChange"></u-picker> -->

View File

@ -66,7 +66,7 @@
<view class="padding-sm bg u-skeleton-fillet margin-top-sm" style="border-radius: 18rpx;">
<view class="flex justify-between align-center" style="padding: 0rpx 10rpx;line-height: 106upx;">
<view class="text-30" style="width: 30%;">
服务理疗
服务
</view>
<view class="flex align-center">
<text class="margin-right-xs">{{order.artificerName}}</text>
@ -639,7 +639,7 @@
}
});
},
//
//
getDet() {
this.$Request.get("/app/artificer/selectArtificerById", {
artificerId: this.artificerId,

View File

@ -56,7 +56,7 @@
<view class="padding-bottom flex justify-between">
<view class="margin-right-xs text-sm"
style="color: #fff4a9;background-color: #333;border-radius: 6rpx;padding: 4rpx 10rpx;">
健康理疗
健康
</view>
</view>
<view class="padding-bottom flex justify-between">

View File

@ -14,7 +14,7 @@
<!-- <view style="width: 6%;" @click="goBack()">
<u-icon name="arrow-left" color="#909399" size="28"></u-icon>
</view> -->
<u-search style="width: 100%;" placeholder="搜索需要的理疗师" :focus="true" v-model="keyword" :show-action="true"
<u-search style="width: 100%;" placeholder="搜索需要的师" :focus="true" v-model="keyword" :show-action="true"
:animation="true" shape="square" bg-color="#F7F7F7" color="#1A1A1A" action-text="取消" @custom="goBack()"
@search="doSearch(false)"></u-search>
<!-- 原样式 end -->
@ -69,7 +69,7 @@
</view>
<view style="width: 100%;display: flex;justify-content: space-between;align-items: center;">
<view class="flex flex-wrap" style="margin-top: 10rpx;">
<text class="margin-bottom-xs box">健康理疗</text>
<text class="margin-bottom-xs box">健康</text>
</view>
<view class="text-center text-sm"
style="background: #096f4b;color: #ffffff;width: 135upx;border-radius: 16upx;line-height: 50upx;"

View File

@ -3,7 +3,7 @@
<view class="flex text-center text-lg bg">
<view class="title_btn flex-sub bg" @click="cut(1)" :class="tabFromIndex==1?'bgCol2': ''">团队用户
</view>
<view class="title_btn flex-sub bg" @click="cut(2)" :class="tabFromIndex==2?'bgCol2': ''">团队理疗
<view class="title_btn flex-sub bg" @click="cut(2)" :class="tabFromIndex==2?'bgCol2': ''">团队
</view>
</view>
<view class="view1">

View File

@ -160,20 +160,19 @@
})
},
goumai(item){//
// this.$queue.setData('getJishi','')
this.$queue.setData('getJishi','')
// this.$queue.setData('ordersId',this.dataList.massageTypeId);
// this.$queue.setData('userPackageDetailId',this.dataList.id);
// this.$queue.setData('daibudan','');
// uni.navigateTo({
// url:'/my/order/payModifyTc?ordersId='+this.dataList.massageTypeId
// })
this.$queue.setData('daibudan','');
this.$queue.setData('mainData',item)
// this.$queue.setData('detailData',this.detailData)
this.$queue.setData('youhui','');
// uni.navigateTo({
// url:'/my/order/payModifyTcMy?ordersId='+item.packageDetailId
// })
uni.navigateTo({
url:'/my/order/payModifyTcMy?ordersId='+item.packageDetailId
url:'/my/order/payModifyTcMy?ordersId='+item.id
})
},
getIndexData(){//
var that=this;

View File

@ -124,7 +124,7 @@
XCXIsSelect: '否',
useList:[
{urlImg:'../../static/my-gong-1.png',text:'我的收藏',link:'/my/gird/shoucang'},
{urlImg:'../../static/my-gong-2.png',text:'成为理疗师',link:'/pages/my/hehuo'},
{urlImg:'../../static/my-gong-2.png',text:'成为师',link:'/pages/my/hehuo'},
{urlImg:'../../static/my-gong-3.png',text:'分享好友',link:'/pages/my/invitationUser'},
{urlImg:'../../static/my-gong-4.png',text:'成为代理商',link:'/pages/my/cooperation'},
{urlImg:'../../static/my-gong-5.png',text:'地址管理',link:'/my/address/address'},

View File

@ -6,7 +6,7 @@
<span class="border-bottom border-bottom-y" v-if="tabFromIndex==1"></span>
</view>
<view class="title_btn flex-sub bg" @click="cut(2)" :class="tabFromIndex==2?'bgCol2': 'bgCol2H'">
<span>团队理疗</span>
<span>团队</span>
<span class="border-bottom border-bottom-l" v-if="tabFromIndex==2"></span>
</view>
</view>

View File

@ -63,7 +63,7 @@
<view class="detail-foot-list" v-for="(item,index) in detailData" :key="index" @click="detail(item)">
<view class="detail-foot-list-top">
<span style="margin-right: 5px;">{{item.title}}</span>
<span style="display: none;">详情</span>
<span>详情</span>
</view>
<view class="detail-view">
<image class="detail-view-img" :src="item.massageImg" mode=""></image>

View File

@ -19,8 +19,8 @@
<view class="text-green" v-if="item.status ==3">待评价</view>
<view class="text-green" v-if="item.status ==5">已完成</view>
<view class="text-green" v-if="item.status ==6">服务中</view>
<view class="text-green" v-if="item.status ==7">理疗师出发</view>
<view class="text-green" v-if="item.status ==8">理疗师到达</view>
<view class="text-green" v-if="item.status ==7">师出发</view>
<view class="text-green" v-if="item.status ==8">师到达</view>
<view class="text-green" v-if="item.status ==4" style="color: #333333;">已取消</view>
<!-- <view class="u-tips-color">{{item.createTime}}</view> -->
</view>
@ -102,10 +102,10 @@
name: '待服务',
status: '2'
}, {
name: '理疗师出发',
name: '师出发',
status: '7'
}, {
name: '理疗师到达',
name: '师到达',
status: '8'
}, {
name: '服务中',

View File

@ -297,7 +297,7 @@
});
},
//
//
getordertherapist() {
this.$Request.get("/app/artificer/selectArtificerMassageList", {
artificerId: this.artificerId
@ -334,7 +334,7 @@
goNav(massageTypeId,classifyId) {
if (this.status == 2) {
uni.showToast({
title: '理疗师已下线',
title: '师已下线',
icon: 'none'
})
} else {

View File

@ -54,7 +54,7 @@
<view class="padding-bottom flex justify-between">
<view class="margin-right-xs text-sm"
style="color: #fff4a9;background-color: #333;border-radius: 6rpx;padding: 4rpx 10rpx;">
健康理疗
健康
</view>
</view>
<view class="padding-bottom flex justify-between">
@ -321,7 +321,7 @@
});
},
//
//
getordertherapist() {
this.$Request.get("/app/artificer/selectArtificerMassageList", {
artificerId: this.artificerId
@ -358,7 +358,7 @@
goNav(massageTypeId,classifyId) {
if (this.status == 2) {
uni.showToast({
title: '理疗师已下线',
title: '师已下线',
icon: 'none'
})
} else {

View File

@ -498,7 +498,7 @@
});
},
//
//
getordertherapist() {
this.$Request.get("/app/artificer/selectArtificerMassageList", {
artificerId: this.artificerId
@ -535,7 +535,7 @@
goNav(massageTypeId,classifyId) {
if (this.status == 2) {
uni.showToast({
title: '理疗师已下线',
title: '师已下线',
icon: 'none'
})
} else {

View File

@ -7,7 +7,7 @@
<image src="../../static/liliao-1.png" class="dingwei-img"></image>
<view class="localName">{{ city }}</view>
</view>
<u-search class="flex-sub" placeholder="请输入理疗师名字" :focus="false" shape="square" v-model="artificerName"
<u-search class="flex-sub" placeholder="请输入师名字" :focus="false" shape="square" v-model="artificerName"
:show-action="true" :animation="true" bg-color="#fff" color="#1A1A1A" @search="onSearch()"
action-text="搜索" @custom="onSearch()"></u-search>
<view class="flex align-center justify-between">
@ -503,7 +503,7 @@ import permision from "@/components/permission.js";
},
showTips() {
uni.showToast({
title: '理疗师已下线',
title: '师已下线',
icon: 'none'
})
},

View File

@ -7,7 +7,7 @@
<image src="../../static/liliao-1.png" class="dingwei-img"></image>
<view class="localName">{{ city }}</view>
</view>
<u-search class="flex-sub" placeholder="请输入理疗师名字" :focus="false" shape="square" v-model="artificerName"
<u-search class="flex-sub" placeholder="请输入师名字" :focus="false" shape="square" v-model="artificerName"
:show-action="true" :animation="true" bg-color="#fff" color="#1A1A1A" @search="onSearch()"
action-text="搜索" @custom="onSearch()"></u-search>
<view class="flex align-center justify-between">
@ -509,6 +509,11 @@
uni.reLaunch({
url:'/my/order/payModifyDzhifu?artificerId='+e.artificerId+'&text='+'my'
})
}else if(this.dataIndex=='我的套餐'){
this.$queue.setData('getJishi',e);
uni.reLaunch({
url:'/my/order/payModifyTcMy?artificerId='+e.artificerId+'&text='+'my'
})
}
},
switch1Change: function (e) {//
@ -522,7 +527,7 @@
},
showTips() {
uni.showToast({
title: '理疗师已下线',
title: '师已下线',
icon: 'none'
})
},

View File

@ -514,12 +514,12 @@
})
} else {
uni.setNavigationBarTitle({
title: '我的理疗师'
title: '我的师'
})
}
} else {
uni.setNavigationBarTitle({
title: '选择理疗师'
title: '选择师'
})
}
// #ifdef MP-WEIXIN
@ -1082,7 +1082,7 @@
if (this.numIndex == 1) {
if (e.status != 1) {
this.$queue.showToast('当前理疗师已下线,请预约其他理疗师!')
this.$queue.showToast('当前技师已下线,请预约其他技师!')
return;
}
uni.navigateTo({

View File

@ -3,7 +3,7 @@
<view class="headbox">
<view class="head flex align-center justify-between">
<image src="../../static/images/index/fanhui.png" style="width: 16px;height: 16px;" @click="goback"></image>
<view class="headtitle">选择理疗师</view>
<view class="headtitle">选择师</view>
<view class="headright"></view>
</view>
<view class="flex align-center justify-between">
@ -477,12 +477,12 @@
})
} else {
uni.setNavigationBarTitle({
title: '我的理疗师'
title: '我的师'
})
}
} else {
uni.setNavigationBarTitle({
title: '选择理疗师'
title: '选择师'
})
}
// #ifdef MP-WEIXIN
@ -1018,7 +1018,7 @@
if (this.numIndex == 1) {
if (e.status != 1) {
this.$queue.showToast('当前理疗师已下线,请预约其他理疗师!')
this.$queue.showToast('当前技师已下线,请预约其他技师!')
return;
}
uni.navigateTo({