调整页面，修改订单无法选择技师BUG
This commit is contained in:
parent
debd127c3a
commit
8363be8f88
|
|
@ -62,7 +62,8 @@
|
|||
address: '',
|
||||
isfa: '',
|
||||
noneData:'地址',
|
||||
orderXm:[]
|
||||
orderXm:[],
|
||||
pageName:'',
|
||||
}
|
||||
},
|
||||
onShow() {
|
||||
|
|
@ -73,8 +74,9 @@
|
|||
},
|
||||
onLoad(e) {
|
||||
this.isfa = e.id
|
||||
this.pageName = e.pageName
|
||||
console.log(this.pageName);
|
||||
|
||||
|
||||
let userId = this.$queue.getData('userId');
|
||||
if (userId) {
|
||||
this.getAddressList();
|
||||
|
|
@ -90,7 +92,8 @@
|
|||
this.updateaddress()
|
||||
}else if (this.isfa == 2) {
|
||||
uni.reLaunch({
|
||||
url:'/my/order/payModify'
|
||||
// url:'/my/order/payModify',
|
||||
url:'/my/order/'+this.pageName,
|
||||
})
|
||||
}else if (this.isfa == '104') {
|
||||
uni.reLaunch({
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
<view style="width: 100%;">
|
||||
<view class="flex justify-between margin-tb-sm" style="color: #999999;">
|
||||
<view style="justify-content: space-between;">
|
||||
{{orderXm.duration}}分钟
|
||||
<text class="title-font">时长：</text><text class="value-font">{{orderXm.duration}}分钟</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
|
@ -39,11 +39,10 @@
|
|||
<view class="money-pay-zhen" v-if="orderXm.userPackageDetailId==null">
|
||||
<text class="title-font">价格：</text>
|
||||
<span>￥</span>
|
||||
<span>
|
||||
{{technicianRate}}
|
||||
</span>
|
||||
<span>{{technicianRate}}</span>
|
||||
</view>
|
||||
<view class="money-pay-zhen" v-else>
|
||||
<text class="title-font">价格：</text>
|
||||
<span>￥</span>
|
||||
<span>{{orderXm.priceMarkup}}</span>
|
||||
</view>
|
||||
|
|
@ -56,7 +55,7 @@
|
|||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
<view class="add-content" @click="getAddressList()" >
|
||||
<view v-if="!detailaddress">请选择地址</view>
|
||||
<view class="Service-Address">
|
||||
|
|
@ -124,15 +123,15 @@
|
|||
</view> -->
|
||||
</view>
|
||||
<view class="padding margin-top-sm header-view">
|
||||
<view class="fuwu-time" @click="liliaoshi">
|
||||
<view class="fuwu-title" >
|
||||
<span>技师</span>
|
||||
<view class="jusitify-line" @click="liliaoshi">
|
||||
<view class="title-font" >
|
||||
<span v-if="jishiName">{{jishiName.technicianTypeName}}</span>
|
||||
<span>技师</span>
|
||||
</view>
|
||||
<view class="liliao-bottom" style="margin-right: 6px;">
|
||||
<span v-if="jishiName">{{jishiName.artificerName?jishiName.artificerName:jishiName.artificer.artificerName}}</span>
|
||||
<span v-else>选择不同技师价格可能不一样哦~</span>
|
||||
<span class="view-more"></span>
|
||||
<view>
|
||||
<span class="line-word-r value-font" v-if="jishiName">{{jishiName.artificerName?jishiName.artificerName:jishiName.artificer.artificerName}}</span>
|
||||
<span class="line-word-r value-font" v-else>选择不同技师价格可能不一样哦~</span>
|
||||
<span class="view-more"></span>
|
||||
</view>
|
||||
</view>
|
||||
<!--<view class="liliao">
|
||||
|
|
@ -145,9 +144,9 @@
|
|||
<span v-else>选择不同技师价格可能不一样哦~</span>
|
||||
</view>
|
||||
</view>-->
|
||||
<view class="liliao">
|
||||
<view class="fuwu-title">
|
||||
<span>平台优惠劵</span>
|
||||
<view class="jusitify-line">
|
||||
<view class="title-font">
|
||||
<span>优惠券</span>
|
||||
</view>
|
||||
<view class="header-bottom-money-zhen">
|
||||
<view v-if="orderXm.couponMoney" class="" style="margin-right: 5px;">
|
||||
|
|
@ -157,26 +156,24 @@
|
|||
<!-- <span class="view-more"></span> -->
|
||||
</view>
|
||||
</view>
|
||||
<view class="fuwu-time">
|
||||
<view class="fuwu-title">
|
||||
<view class="jusitify-line">
|
||||
<view class="title-font">
|
||||
服务时间
|
||||
</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 align-center justify-between value-font">
|
||||
<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 class="value-font" v-else>请选择预约时间<span class="view-more"></span></view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="header-view header-padd" style="margin-bottom: 100px;">
|
||||
<view class="d-title">
|
||||
<view class="d-title title-font">
|
||||
<span>给技师捎句话</span>
|
||||
<!-- <span style="color: rgb(9, 111, 75);" @click="kuaijie">快捷输入</span> -->
|
||||
</view>
|
||||
|
|
@ -429,6 +426,15 @@
|
|||
this.technicianRate=Math.ceil(this.orderXm.price+(this.orderXm.price*(this.orderXm.technicianRate/100)))
|
||||
}
|
||||
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()
|
||||
},
|
||||
|
||||
|
|
@ -754,7 +760,7 @@
|
|||
// title:'请同意服务保障！'
|
||||
// })
|
||||
// }
|
||||
|
||||
|
||||
if(this.jishiName==''||this.jishiName==undefined){
|
||||
uni.showToast({
|
||||
title:'请选择技师，不同等级技师价格不同！'
|
||||
|
|
@ -813,14 +819,15 @@
|
|||
let massageTypeId = this.orderXm.massageTypeId?this.orderXm.massageTypeId:this.orderXm.ordersMassageList[0].massageType.massageTypeId;
|
||||
let longitude = this.longitude;
|
||||
let latitude = this.latitude;
|
||||
let classifyId= this.orderXm.classifyId?this.orderXm.classifyId:this.orderXm.ordersMassageList[0].massageType.classifyId;
|
||||
let city=this.orderXm.city?this.orderXm.city:this.orderXm.ordersMassageList[0].massageType.city;
|
||||
let classifyId= this.orderXm.classifyId;
|
||||
let city=this.orderXm.city;
|
||||
let technicianType=this.orderXm.technicianType
|
||||
uni.setStorage({
|
||||
key: 'taocanDd',
|
||||
data: '修改',
|
||||
success: function () {
|
||||
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 {
|
||||
uni.navigateTo({
|
||||
url: '../address/address?id=' + 2
|
||||
url: '../address/address?id=' + 2 +'&pageName=payModifyDzhifu'
|
||||
})
|
||||
}
|
||||
|
||||
|
|
@ -1475,7 +1482,7 @@
|
|||
.header-margin{
|
||||
margin:20rpx;
|
||||
}
|
||||
|
||||
|
||||
.kuaijie-btn{
|
||||
width: 100%;
|
||||
height: 40px;
|
||||
|
|
@ -1484,7 +1491,7 @@
|
|||
font-weight: bold;
|
||||
font-size: 14px;
|
||||
margin-top: 10px;
|
||||
|
||||
|
||||
// color: #049F89;
|
||||
}
|
||||
.huiBtn {
|
||||
|
|
@ -1516,7 +1523,11 @@
|
|||
justify-content: space-between;
|
||||
}
|
||||
.title-font{
|
||||
font-size:30rpx;
|
||||
font-size: 30rpx;
|
||||
color: #666666;
|
||||
}
|
||||
.value-font{
|
||||
font-size: 30rpx;
|
||||
color: #333333;
|
||||
}
|
||||
.head-bottom{
|
||||
|
|
@ -1561,9 +1572,9 @@
|
|||
}
|
||||
.pay-title{
|
||||
font-weight: bold;
|
||||
font-size: 31rpx;
|
||||
font-size: 32rpx;
|
||||
color: #333333;
|
||||
margin-bottom: 8px;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
.view-more{
|
||||
display:inline-block;
|
||||
|
|
@ -1585,9 +1596,9 @@
|
|||
}
|
||||
|
||||
.header-bottom-money-zhen span{
|
||||
color: #F95900 !important;
|
||||
font-weight: bold !important;
|
||||
font-size: 26rpx !important;
|
||||
color: #FF6000 !important;
|
||||
font-size:32rpx !important;
|
||||
font-weight: bold;
|
||||
}
|
||||
.header-bottom-money-zhen{
|
||||
display: flex;
|
||||
|
|
@ -1758,6 +1769,12 @@
|
|||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.jusitify-line{
|
||||
height: 78rpx;
|
||||
padding: 20rpx 0;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.adders-view image{
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
|
@ -1868,8 +1885,6 @@
|
|||
}
|
||||
.d-title{
|
||||
font-weight: bold;
|
||||
font-size: 32rpx;
|
||||
color: #333333;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@
|
|||
<view class="flex justify-between" @click="openData()">
|
||||
<view v-if="startTime">{{startTime}}</view>
|
||||
<view class="line-word-r value-font" v-else>请选择预约时间<span class="view-more"></span></view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -1410,7 +1410,7 @@
|
|||
font-weight: bold;
|
||||
font-size: 14px;
|
||||
margin-top: 10px;
|
||||
|
||||
|
||||
// color: #049F89;
|
||||
}
|
||||
.huiBtn {
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
</template>
|
||||
<template #loadingMoreNoMore>
|
||||
<custom-nomore />
|
||||
|
|
@ -63,7 +63,7 @@
|
|||
<view class="timea-hui">休息中</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -165,7 +165,9 @@
|
|||
limit: pageSize,
|
||||
isGoods: '1',
|
||||
classifyId: this.classifyId,
|
||||
artificerName: this.searchValue
|
||||
artificerName: this.searchValue,
|
||||
by: 1,
|
||||
status:-1
|
||||
}
|
||||
this.$Request.get('/app/artificer/selectArtificerList', params).then(res => {
|
||||
this.$refs.paging.complete(res.data.list);
|
||||
|
|
@ -195,8 +197,8 @@
|
|||
url: '/pages/therapist/orderDetail?artificerId=' + item.artificerId + "&classifyId=" + this
|
||||
.tabIndex
|
||||
});
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -357,7 +359,7 @@
|
|||
height: auto;
|
||||
border-radius: 10rpx;
|
||||
position: relative;
|
||||
|
||||
|
||||
}
|
||||
.touxiang-left-content-img-ditu{
|
||||
width: 150rpx;
|
||||
|
|
@ -389,8 +391,8 @@
|
|||
flex-direction: column;
|
||||
align-items: baseline;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/deep/.zp-empty-view-center{
|
||||
position: absolute;
|
||||
margin-top: 106px;
|
||||
|
|
@ -401,7 +403,7 @@
|
|||
display: flex;
|
||||
justify-content: end;
|
||||
// overflow: hidden;
|
||||
|
||||
|
||||
.leftTab {
|
||||
width:19%;
|
||||
height: 100%;
|
||||
|
|
@ -415,7 +417,7 @@
|
|||
left: 0;
|
||||
.tabBox {
|
||||
height: 100%;
|
||||
|
||||
|
||||
.tabItem {
|
||||
text-align: center;
|
||||
padding: 14rpx 0;
|
||||
|
|
@ -425,14 +427,14 @@
|
|||
font-weight: bold;
|
||||
margin-bottom: 20rpx;
|
||||
}
|
||||
|
||||
|
||||
.tabActive {
|
||||
background: #f2fffb;
|
||||
color: #019c88;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
.rightGoods {
|
||||
width:76%;
|
||||
height: 100%;
|
||||
|
|
@ -453,8 +455,8 @@
|
|||
font-size: 26rpx;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -819,4 +821,4 @@
|
|||
flex-direction: row;
|
||||
align-items: center;
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
<image class="swiper-image" :src="item" mode="aspectFit" style="height: 100%;">
|
||||
</image>
|
||||
<view class="xiangshi" v-if="order.bdxsl">相识度：{{order.bdxsl}}%</view>
|
||||
|
||||
|
||||
</swiper-item>
|
||||
</swiper>
|
||||
</view>
|
||||
|
|
@ -46,7 +46,7 @@
|
|||
<span class="headset-text2">{{order.technicianTypeName}}</span>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
<view class="jian-view-right">
|
||||
<view class="oder-mian-qing" @click="shangxian" v-if="order.status == 2">请TA上线</view>
|
||||
<view class="keyuyue">
|
||||
|
|
@ -91,7 +91,7 @@
|
|||
<image class="order-sname-img" src="../../static/orderDetail/chengchi.png" mode=""></image>
|
||||
<span class="order-sname-text">{{order.consortiaName}}</span>
|
||||
</view>
|
||||
|
||||
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -123,7 +123,7 @@
|
|||
{{order.content}}
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
<view class="oder-footer">
|
||||
<u-tabs :list="tabs" :is-scroll="true" :current="tabIndex" @change="tabChange" active-color="#000000"
|
||||
gutter="60">
|
||||
|
|
@ -252,7 +252,7 @@
|
|||
</view>
|
||||
<view class="guanbi" @click="guanbi">
|
||||
<image src="@/static/closeimg.png"></image>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</uni-popup>
|
||||
</view>
|
||||
|
|
@ -326,6 +326,7 @@
|
|||
longitude: '',
|
||||
imgArr: [],
|
||||
status: "",
|
||||
acceptOrders: '',
|
||||
XCXIsSelect: '否',
|
||||
hyCheck: '否',
|
||||
imageHeight: '358',
|
||||
|
|
@ -337,7 +338,7 @@
|
|||
}
|
||||
},
|
||||
onLoad(option) {
|
||||
|
||||
|
||||
this.hyCheck = this.$queue.getData('hyCheck');
|
||||
uni.showLoading({
|
||||
title: '加载中...',
|
||||
|
|
@ -400,7 +401,7 @@
|
|||
if (res.code == 0) {
|
||||
that.swiperDateLists = res.data.list||{}
|
||||
// this.dataList=res.data.records
|
||||
|
||||
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: res.msg,
|
||||
|
|
@ -475,12 +476,12 @@
|
|||
}
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
},
|
||||
guanzhu(item) {// 关注
|
||||
let oldIsFollow = this.isFollow;
|
||||
let that = this;
|
||||
|
||||
|
||||
let data = {
|
||||
artificerId: that.artificerId,
|
||||
userId: that.myId,
|
||||
|
|
@ -499,7 +500,7 @@
|
|||
icon: 'none'
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: res.msg,
|
||||
|
|
@ -558,6 +559,7 @@
|
|||
if (res.code == 0) {
|
||||
this.order = res.data
|
||||
this.status = res.data.status
|
||||
this.acceptOrders = res.data.acceptOrders
|
||||
this.tripWay = res.data.tripWay;
|
||||
this.artificerClassifyList=res.data.artificerClassifyList
|
||||
console.log("artificerClassifyList",this.artificerClassifyList)
|
||||
|
|
@ -692,7 +694,7 @@
|
|||
}
|
||||
})
|
||||
},
|
||||
|
||||
|
||||
saveImg(imgs, index) {
|
||||
// console.log(imgs)
|
||||
let that = this;
|
||||
|
|
@ -799,7 +801,7 @@
|
|||
position: absolute;
|
||||
top:1rpx;
|
||||
left:-1rpx;
|
||||
|
||||
|
||||
}
|
||||
.headset-text{
|
||||
background: linear-gradient(90deg, #88abec, #4e7dd3);
|
||||
|
|
@ -972,7 +974,7 @@
|
|||
align-items: center;
|
||||
margin-top:14rpx;
|
||||
}
|
||||
|
||||
|
||||
.popup-mian{
|
||||
width: 88%;
|
||||
display: flex;
|
||||
|
|
@ -1010,7 +1012,7 @@
|
|||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
|
||||
.content{
|
||||
width: 100%;
|
||||
background-color: #f7f7f7;
|
||||
|
|
@ -1043,7 +1045,7 @@
|
|||
/* padding-left:50rpx; */
|
||||
font-size: 28rpx;
|
||||
font-weight: bold;
|
||||
|
||||
|
||||
}
|
||||
.oder-mian-qing{
|
||||
height: 47rpx;
|
||||
|
|
@ -1099,7 +1101,7 @@
|
|||
font-size: 21rpx;
|
||||
color: #878787;
|
||||
}
|
||||
|
||||
|
||||
.video-list-top{
|
||||
width: 100%;
|
||||
display: flex;
|
||||
|
|
@ -1136,7 +1138,7 @@
|
|||
height:50rpx;
|
||||
line-height: 52rpx;
|
||||
margin-left: 8rpx;
|
||||
|
||||
|
||||
}
|
||||
.shouchang-img{
|
||||
width: 30rpx;
|
||||
|
|
@ -1223,7 +1225,7 @@
|
|||
color: #333333;
|
||||
margin-bottom: 5rpx;
|
||||
}
|
||||
|
||||
|
||||
.xiangmu-cont-top{
|
||||
width: 100%;
|
||||
display: flex;
|
||||
|
|
@ -1350,7 +1352,7 @@
|
|||
align-items: center;
|
||||
border-radius: 7rpx;
|
||||
}
|
||||
|
||||
|
||||
.oder-mian-left{
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
|
|
@ -1364,14 +1366,14 @@
|
|||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
||||
|
||||
.jian-view-right-weizhi{
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
|
||||
.view-head{
|
||||
padding-bottom: 5px;
|
||||
margin: 15px 24px 0px 24px;
|
||||
|
|
@ -1537,4 +1539,4 @@
|
|||
margin-right: 10rpx;
|
||||
margin-top: 5px;
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
|
|
|
|||
Loading…
Reference in New Issue