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

调整页面，修改订单无法选择技师BUG

This commit is contained in:
曹磊 2024-09-03 17:11:26 +08:00
parent debd127c3a
commit 8363be8f88
5 changed files with 102 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
my/address/address.vue
View File

@ -62,7 +62,8 @@
address: '', address: '',
isfa: '', isfa: '',
noneData:'地址', noneData:'地址',
orderXm:[] orderXm:[],
pageName:'',
} }
}, },
onShow() { onShow() {
@ -73,8 +74,9 @@
}, },
onLoad(e) { onLoad(e) {
this.isfa = e.id this.isfa = e.id
this.pageName = e.pageName
console.log(this.pageName);
let userId = this.$queue.getData('userId'); let userId = this.$queue.getData('userId');
if (userId) { if (userId) {
this.getAddressList(); this.getAddressList();
@ -90,7 +92,8 @@
this.updateaddress() this.updateaddress()
}else if (this.isfa == 2) { }else if (this.isfa == 2) {
uni.reLaunch({ uni.reLaunch({
url:'/my/order/payModify' // url:'/my/order/payModify',
url:'/my/order/'+this.pageName,
}) })
}else if (this.isfa == '104') { }else if (this.isfa == '104') {
uni.reLaunch({ uni.reLaunch({

91
my/order/payModifyDzhifu.vue
View File

@ -31,7 +31,7 @@
<view style="width: 100%;"> <view style="width: 100%;">
<view class="flex justify-between margin-tb-sm" style="color: #999999;"> <view class="flex justify-between margin-tb-sm" style="color: #999999;">
<view style="justify-content: space-between;"> <view style="justify-content: space-between;">
{{orderXm.duration}}分钟 <text class="title-font">时长：</text><text class="value-font">{{orderXm.duration}}分钟</text>
</view> </view>
</view> </view>
@ -39,11 +39,10 @@
<view class="money-pay-zhen" v-if="orderXm.userPackageDetailId==null"> <view class="money-pay-zhen" v-if="orderXm.userPackageDetailId==null">
<text class="title-font">价格：</text> <text class="title-font">价格：</text>
<span>￥</span> <span>￥</span>
<span> <span>{{technicianRate}}</span>
{{technicianRate}}
</span>
</view> </view>
<view class="money-pay-zhen" v-else> <view class="money-pay-zhen" v-else>
<text class="title-font">价格：</text>
<span>￥</span> <span>￥</span>
<span>{{orderXm.priceMarkup}}</span> <span>{{orderXm.priceMarkup}}</span>
</view> </view>
@ -56,7 +55,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="add-content" @click="getAddressList()" > <view class="add-content" @click="getAddressList()" >
<view v-if="!detailaddress">请选择地址</view> <view v-if="!detailaddress">请选择地址</view>
<view class="Service-Address"> <view class="Service-Address">
@ -124,15 +123,15 @@
</view> --> </view> -->
</view> </view>
<view class="padding margin-top-sm header-view"> <view class="padding margin-top-sm header-view">
<view class="fuwu-time" @click="liliaoshi"> <view class="jusitify-line" @click="liliaoshi">
<view class="fuwu-title" > <view class="title-font" >
<span>技师</span>
<span v-if="jishiName">{{jishiName.technicianTypeName}}</span> <span v-if="jishiName">{{jishiName.technicianTypeName}}</span>
<span>技师</span>
</view> </view>
<view class="liliao-bottom" style="margin-right: 6px;"> <view>
<span v-if="jishiName">{{jishiName.artificerName?jishiName.artificerName:jishiName.artificer.artificerName}}</span> <span class="line-word-r value-font" v-if="jishiName">{{jishiName.artificerName?jishiName.artificerName:jishiName.artificer.artificerName}}</span>
<span v-else>选择不同技师价格可能不一样哦~</span> <span class="line-word-r value-font" v-else>选择不同技师价格可能不一样哦~</span>
<span class="view-more"></span> <span class="view-more"></span>
</view> </view>
</view> </view>
<!--<view class="liliao"> <!--<view class="liliao">
@ -145,9 +144,9 @@
<span v-else>选择不同技师价格可能不一样哦~</span> <span v-else>选择不同技师价格可能不一样哦~</span>
</view> </view>
</view>--> </view>-->
<view class="liliao"> <view class="jusitify-line">
<view class="fuwu-title"> <view class="title-font">
<span>平台优惠劵</span> <span>优惠券</span>
</view> </view>
<view class="header-bottom-money-zhen"> <view class="header-bottom-money-zhen">
<view v-if="orderXm.couponMoney" class="" style="margin-right: 5px;"> <view v-if="orderXm.couponMoney" class="" style="margin-right: 5px;">
@ -157,26 +156,24 @@
<!-- <span class="view-more"></span> --> <!-- <span class="view-more"></span> -->
</view> </view>
</view> </view>
<view class="fuwu-time"> <view class="jusitify-line">
<view class="fuwu-title"> <view class="title-font">
服务时间 服务时间
</view> </view>
<!-- <view class="fuwu-time-view" @change="changeLog"> <!-- <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> <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> <image style="margin-left: 5px;" class="fuwu-img" src="../../static/images/my/jiantou.png" mode=""></image>
</view> --> </view> -->
<view class="flex align-center justify-between" <view class="flex align-center justify-between value-font">
style="height: 100rpx;line-height: 100rpx;padding: 0rpx 10rpx;">
<view class="flex justify-between margin-tb-sm" @click="openData()"> <view class="flex justify-between margin-tb-sm" @click="openData()">
<view v-if="startTime">{{startTime}}</view> <view v-if="startTime">{{startTime}}</view>
<view class="tetx-sm" v-else>请选择预约时间<span class="view-more"></span></view> <view class="value-font" v-else>请选择预约时间<span class="view-more"></span></view>
<!---<u-icon name="arrow-right" color="#999999"></u-icon>--> </view>
</view>
</view> </view>
</view> </view>
</view> </view>
<view class="header-view header-padd" style="margin-bottom: 100px;"> <view class="header-view header-padd" style="margin-bottom: 100px;">
<view class="d-title"> <view class="d-title title-font">
<span>给技师捎句话</span> <span>给技师捎句话</span>
<!-- <span style="color: rgb(9, 111, 75);" @click="kuaijie">快捷输入</span> --> <!-- <span style="color: rgb(9, 111, 75);" @click="kuaijie">快捷输入</span> -->
</view> </view>
@ -429,6 +426,15 @@
this.technicianRate=Math.ceil(this.orderXm.price+(this.orderXm.price*(this.orderXm.technicianRate/100))) this.technicianRate=Math.ceil(this.orderXm.price+(this.orderXm.price*(this.orderXm.technicianRate/100)))
} }
console.log("orderXm",this.orderXm) console.log("orderXm",this.orderXm)
if(this.orderXm.ordersMassageList[0].userPackageDetail !=null){
this.orderXm.classifyId = this.orderXm.ordersMassageList[0].userPackageDetail.classifyId
this.orderXm.city = this.orderXm.ordersMassageList[0].userPackageDetail.city
}else{
this.orderXm.classifyId = this.orderXm.ordersMassageList[0].massageType.classifyId
this.orderXm.city = this.orderXm.ordersMassageList[0].massageType.city
}
// this.getOrder() // this.getOrder()
}, },
@ -754,7 +760,7 @@
// title:'请同意服务保障！' // title:'请同意服务保障！'
// }) // })
// } // }
if(this.jishiName==''||this.jishiName==undefined){ if(this.jishiName==''||this.jishiName==undefined){
uni.showToast({ uni.showToast({
title:'请选择技师，不同等级技师价格不同！' title:'请选择技师，不同等级技师价格不同！'
@ -813,14 +819,15 @@
let massageTypeId = this.orderXm.massageTypeId?this.orderXm.massageTypeId:this.orderXm.ordersMassageList[0].massageType.massageTypeId; let massageTypeId = this.orderXm.massageTypeId?this.orderXm.massageTypeId:this.orderXm.ordersMassageList[0].massageType.massageTypeId;
let longitude = this.longitude; let longitude = this.longitude;
let latitude = this.latitude; let latitude = this.latitude;
let classifyId= this.orderXm.classifyId?this.orderXm.classifyId:this.orderXm.ordersMassageList[0].massageType.classifyId; let classifyId= this.orderXm.classifyId;
let city=this.orderXm.city?this.orderXm.city:this.orderXm.ordersMassageList[0].massageType.city; let city=this.orderXm.city;
let technicianType=this.orderXm.technicianType
uni.setStorage({ uni.setStorage({
key: 'taocanDd', key: 'taocanDd',
data: '修改', data: '修改',
success: function () { success: function () {
uni.navigateTo({ uni.navigateTo({
url: '/pages/therapist/therapistDingdan?massageTypeId='+massageTypeId+'&latitude='+latitude+'&longitude='+longitude+'&classifyId='+classifyId+'&city='+city url: '/pages/therapist/therapistDingdan?massageTypeId='+massageTypeId+'&latitude='+latitude+'&longitude='+longitude+'&classifyId='+classifyId+'&city='+city+'&technicianType='+technicianType
}) })
} }
}); });
@ -891,7 +898,7 @@
}); });
} else { } else {
uni.navigateTo({ uni.navigateTo({
url: '../address/address?id=' + 2 url: '../address/address?id=' + 2 +'&pageName=payModifyDzhifu'
}) })
} }
@ -1475,7 +1482,7 @@
.header-margin{ .header-margin{
margin:20rpx; margin:20rpx;
} }
.kuaijie-btn{ .kuaijie-btn{
width: 100%; width: 100%;
height: 40px; height: 40px;
@ -1484,7 +1491,7 @@
font-weight: bold; font-weight: bold;
font-size: 14px; font-size: 14px;
margin-top: 10px; margin-top: 10px;
// color: #049F89; // color: #049F89;
} }
.huiBtn { .huiBtn {
@ -1516,7 +1523,11 @@
justify-content: space-between; justify-content: space-between;
} }
.title-font{ .title-font{
font-size:30rpx; font-size: 30rpx;
color: #666666;
}
.value-font{
font-size: 30rpx;
color: #333333; color: #333333;
} }
.head-bottom{ .head-bottom{
@ -1561,9 +1572,9 @@
} }
.pay-title{ .pay-title{
font-weight: bold; font-weight: bold;
font-size: 31rpx; font-size: 32rpx;
color: #333333; color: #333333;
margin-bottom: 8px; margin-bottom: 12px;
} }
.view-more{ .view-more{
display:inline-block; display:inline-block;
@ -1585,9 +1596,9 @@
} }
.header-bottom-money-zhen span{ .header-bottom-money-zhen span{
color: #F95900 !important; color: #FF6000 !important;
font-weight: bold !important; font-size:32rpx !important;
font-size: 26rpx !important; font-weight: bold;
} }
.header-bottom-money-zhen{ .header-bottom-money-zhen{
display: flex; display: flex;
@ -1758,6 +1769,12 @@
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.jusitify-line{
height: 78rpx;
padding: 20rpx 0;
display: flex;
justify-content: space-between;
}
.adders-view image{ .adders-view image{
margin-top: 5px; margin-top: 5px;
} }
@ -1868,8 +1885,6 @@
} }
.d-title{ .d-title{
font-weight: bold; font-weight: bold;
font-size: 32rpx;
color: #333333;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;

4
my/order/payModifyTcMy.vue
View File

@ -94,7 +94,7 @@
<view class="flex justify-between" @click="openData()"> <view class="flex justify-between" @click="openData()">
<view v-if="startTime">{{startTime}}</view> <view v-if="startTime">{{startTime}}</view>
<view class="line-word-r value-font" v-else>请选择预约时间<span class="view-more"></span></view> <view class="line-word-r value-font" v-else>请选择预约时间<span class="view-more"></span></view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
@ -1410,7 +1410,7 @@
font-weight: bold; font-weight: bold;
font-size: 14px; font-size: 14px;
margin-top: 10px; margin-top: 10px;
// color: #049F89; // color: #049F89;
} }
.huiBtn { .huiBtn {

32
pages/my/hangyedana.vue
View File

@ -19,7 +19,7 @@
</view> </view>
</view> </view>
</view> </view>
</template> </template>
<template #loadingMoreNoMore> <template #loadingMoreNoMore>
<custom-nomore /> <custom-nomore />
@ -63,7 +63,7 @@
<view class="timea-hui">休息中</view> <view class="timea-hui">休息中</view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
@ -165,7 +165,9 @@
limit: pageSize, limit: pageSize,
isGoods: '1', isGoods: '1',
classifyId: this.classifyId, classifyId: this.classifyId,
artificerName: this.searchValue artificerName: this.searchValue,
by: 1,
status:-1
} }
this.$Request.get('/app/artificer/selectArtificerList', params).then(res => { this.$Request.get('/app/artificer/selectArtificerList', params).then(res => {
this.$refs.paging.complete(res.data.list); this.$refs.paging.complete(res.data.list);
@ -195,8 +197,8 @@
url: '/pages/therapist/orderDetail?artificerId=' + item.artificerId + "&classifyId=" + this url: '/pages/therapist/orderDetail?artificerId=' + item.artificerId + "&classifyId=" + this
.tabIndex .tabIndex
}); });
} }
} }
} }
@ -357,7 +359,7 @@
height: auto; height: auto;
border-radius: 10rpx; border-radius: 10rpx;
position: relative; position: relative;
} }
.touxiang-left-content-img-ditu{ .touxiang-left-content-img-ditu{
width: 150rpx; width: 150rpx;
@ -389,8 +391,8 @@
flex-direction: column; flex-direction: column;
align-items: baseline; align-items: baseline;
} }
/deep/.zp-empty-view-center{ /deep/.zp-empty-view-center{
position: absolute; position: absolute;
margin-top: 106px; margin-top: 106px;
@ -401,7 +403,7 @@
display: flex; display: flex;
justify-content: end; justify-content: end;
// overflow: hidden; // overflow: hidden;
.leftTab { .leftTab {
width:19%; width:19%;
height: 100%; height: 100%;
@ -415,7 +417,7 @@
left: 0; left: 0;
.tabBox { .tabBox {
height: 100%; height: 100%;
.tabItem { .tabItem {
text-align: center; text-align: center;
padding: 14rpx 0; padding: 14rpx 0;
@ -425,14 +427,14 @@
font-weight: bold; font-weight: bold;
margin-bottom: 20rpx; margin-bottom: 20rpx;
} }
.tabActive { .tabActive {
background: #f2fffb; background: #f2fffb;
color: #019c88; color: #019c88;
} }
} }
} }
.rightGoods { .rightGoods {
width:76%; width:76%;
height: 100%; height: 100%;
@ -453,8 +455,8 @@
font-size: 26rpx; font-size: 26rpx;
font-weight: bold; font-weight: bold;
} }
} }
} }
} }
@ -819,4 +821,4 @@
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
} }
</style> </style>

46
pages/therapist/orderDetail.vue
View File

@ -9,7 +9,7 @@
<image class="swiper-image" :src="item" mode="aspectFit" style="height: 100%;"> <image class="swiper-image" :src="item" mode="aspectFit" style="height: 100%;">
</image> </image>
<view class="xiangshi" v-if="order.bdxsl">相识度：{{order.bdxsl}}%</view> <view class="xiangshi" v-if="order.bdxsl">相识度：{{order.bdxsl}}%</view>
</swiper-item> </swiper-item>
</swiper> </swiper>
</view> </view>
@ -46,7 +46,7 @@
<span class="headset-text2">{{order.technicianTypeName}}</span> <span class="headset-text2">{{order.technicianTypeName}}</span>
</view> </view>
</view> </view>
<view class="jian-view-right"> <view class="jian-view-right">
<view class="oder-mian-qing" @click="shangxian" v-if="order.status == 2">请TA上线</view> <view class="oder-mian-qing" @click="shangxian" v-if="order.status == 2">请TA上线</view>
<view class="keyuyue"> <view class="keyuyue">
@ -91,7 +91,7 @@
<image class="order-sname-img" src="../../static/orderDetail/chengchi.png" mode=""></image> <image class="order-sname-img" src="../../static/orderDetail/chengchi.png" mode=""></image>
<span class="order-sname-text">{{order.consortiaName}}</span> <span class="order-sname-text">{{order.consortiaName}}</span>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
@ -123,7 +123,7 @@
{{order.content}} {{order.content}}
</view> </view>
</view> </view>
<view class="oder-footer"> <view class="oder-footer">
<u-tabs :list="tabs" :is-scroll="true" :current="tabIndex" @change="tabChange" active-color="#000000" <u-tabs :list="tabs" :is-scroll="true" :current="tabIndex" @change="tabChange" active-color="#000000"
gutter="60"> gutter="60">
@ -252,7 +252,7 @@
</view> </view>
<view class="guanbi" @click="guanbi"> <view class="guanbi" @click="guanbi">
<image src="@/static/closeimg.png"></image> <image src="@/static/closeimg.png"></image>
</view> </view>
</view> </view>
</uni-popup> </uni-popup>
</view> </view>
@ -326,6 +326,7 @@
longitude: '', longitude: '',
imgArr: [], imgArr: [],
status: "", status: "",
acceptOrders: '',
XCXIsSelect: '否', XCXIsSelect: '否',
hyCheck: '否', hyCheck: '否',
imageHeight: '358', imageHeight: '358',
@ -337,7 +338,7 @@
} }
}, },
onLoad(option) { onLoad(option) {
this.hyCheck = this.$queue.getData('hyCheck'); this.hyCheck = this.$queue.getData('hyCheck');
uni.showLoading({ uni.showLoading({
title: '加载中...', title: '加载中...',
@ -400,7 +401,7 @@
if (res.code == 0) { if (res.code == 0) {
that.swiperDateLists = res.data.list||{} that.swiperDateLists = res.data.list||{}
// this.dataList=res.data.records // this.dataList=res.data.records
} else { } else {
uni.showToast({ uni.showToast({
title: res.msg, title: res.msg,
@ -475,12 +476,12 @@
} }
} }
}) })
}, },
guanzhu(item) {// 关注 guanzhu(item) {// 关注
let oldIsFollow = this.isFollow; let oldIsFollow = this.isFollow;
let that = this; let that = this;
let data = { let data = {
artificerId: that.artificerId, artificerId: that.artificerId,
userId: that.myId, userId: that.myId,
@ -499,7 +500,7 @@
icon: 'none' icon: 'none'
}) })
} }
} else { } else {
uni.showToast({ uni.showToast({
title: res.msg, title: res.msg,
@ -558,6 +559,7 @@
if (res.code == 0) { if (res.code == 0) {
this.order = res.data this.order = res.data
this.status = res.data.status this.status = res.data.status
this.acceptOrders = res.data.acceptOrders
this.tripWay = res.data.tripWay; this.tripWay = res.data.tripWay;
this.artificerClassifyList=res.data.artificerClassifyList this.artificerClassifyList=res.data.artificerClassifyList
console.log("artificerClassifyList",this.artificerClassifyList) console.log("artificerClassifyList",this.artificerClassifyList)
@ -692,7 +694,7 @@
} }
}) })
}, },
saveImg(imgs, index) { saveImg(imgs, index) {
// console.log(imgs) // console.log(imgs)
let that = this; let that = this;
@ -799,7 +801,7 @@
position: absolute; position: absolute;
top:1rpx; top:1rpx;
left:-1rpx; left:-1rpx;
} }
.headset-text{ .headset-text{
background: linear-gradient(90deg, #88abec, #4e7dd3); background: linear-gradient(90deg, #88abec, #4e7dd3);
@ -972,7 +974,7 @@
align-items: center; align-items: center;
margin-top:14rpx; margin-top:14rpx;
} }
.popup-mian{ .popup-mian{
width: 88%; width: 88%;
display: flex; display: flex;
@ -1010,7 +1012,7 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.content{ .content{
width: 100%; width: 100%;
background-color: #f7f7f7; background-color: #f7f7f7;
@ -1043,7 +1045,7 @@
/* padding-left:50rpx; */ /* padding-left:50rpx; */
font-size: 28rpx; font-size: 28rpx;
font-weight: bold; font-weight: bold;
} }
.oder-mian-qing{ .oder-mian-qing{
height: 47rpx; height: 47rpx;
@ -1099,7 +1101,7 @@
font-size: 21rpx; font-size: 21rpx;
color: #878787; color: #878787;
} }
.video-list-top{ .video-list-top{
width: 100%; width: 100%;
display: flex; display: flex;
@ -1136,7 +1138,7 @@
height:50rpx; height:50rpx;
line-height: 52rpx; line-height: 52rpx;
margin-left: 8rpx; margin-left: 8rpx;
} }
.shouchang-img{ .shouchang-img{
width: 30rpx; width: 30rpx;
@ -1223,7 +1225,7 @@
color: #333333; color: #333333;
margin-bottom: 5rpx; margin-bottom: 5rpx;
} }
.xiangmu-cont-top{ .xiangmu-cont-top{
width: 100%; width: 100%;
display: flex; display: flex;
@ -1350,7 +1352,7 @@
align-items: center; align-items: center;
border-radius: 7rpx; border-radius: 7rpx;
} }
.oder-mian-left{ .oder-mian-left{
display: flex; display: flex;
flex-direction: row; flex-direction: row;
@ -1364,14 +1366,14 @@
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.jian-view-right-weizhi{ .jian-view-right-weizhi{
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
margin-left: 10px; margin-left: 10px;
} }
.view-head{ .view-head{
padding-bottom: 5px; padding-bottom: 5px;
margin: 15px 24px 0px 24px; margin: 15px 24px 0px 24px;
@ -1537,4 +1539,4 @@
margin-right: 10rpx; margin-right: 10rpx;
margin-top: 5px; margin-top: 5px;
} }
</style> </style>