This commit is contained in:
Mr.jiang 2024-07-04 19:13:27 +08:00
parent 9c5d794cad
commit 4c3abc3612
5 changed files with 9 additions and 7 deletions

View File

@ -795,7 +795,7 @@
classifyId:item.classifyId, classifyId:item.classifyId,
ordersId:that.order.ordersId, ordersId:that.order.ordersId,
massageTypeId:that.order.massageTypeId, massageTypeId:that.order.massageTypeId,
userPackageDetailId:that.order.userPackageDetailId, // userPackageDetailId:that.order.userPackageDetailId,
ordersMassageList:[ ordersMassageList:[
{massageId: item.massageTypeId,num: 1}, {massageId: item.massageTypeId,num: 1},
], ],

View File

@ -4,13 +4,13 @@
<view style="color: red;font-size:26rpx">(订单已超时)</view> <view style="color: red;font-size:26rpx">(订单已超时)</view>
</view> </view>
<view class="padding-bottom u-skeleton"> <view class="padding-bottom u-skeleton">
<view class="bgImg u-skeleton-fillet" v-if="order.ordersMassageList && order.ordersMassageList.length > 0" <view class="bgImg u-skeleton-fillet"
style="padding: 0 29rpx;"> style="padding: 0 29rpx;">
<view class="head-top"> <view class="head-top">
<view class="pay-title" style="">服务项目</view> <view class="pay-title" style="">服务项目</view>
<view class="flex justify-around"> <view class="flex justify-around">
<view class="" style="width: 160upx;height: 160upx;"> <view class="" style="width: 160upx;height: 160upx;">
<image :src="order.oldOrdersMassageList[0].massageType.massageImg" <image :src="order.oldOrdersMassageList[0].massageType?order.oldOrdersMassageList[0].massageType.massageImg:order.oldOrdersMassageList[0].userPackageDetail.massageImg"
style="width: 100%;height: 100%;border-radius: 19upx;"></image> style="width: 100%;height: 100%;border-radius: 19upx;"></image>
</view> </view>
<view class="u-flex-1 margin-left-sm"> <view class="u-flex-1 margin-left-sm">

View File

@ -608,7 +608,7 @@
if(that.getList.text=='my'&&that.getList.artificerId){ if(that.getList.text=='my'&&that.getList.artificerId){
that.textMoney='是否确定为技师'+ that.getJishi.artificerName +'充值'+'吗?' that.textMoney='是否确定为技师'+ that.getJishi.artificerName +'充值'+'吗?'
}else{ }else{
that.textMoney='是否确定充值!' that.textMoney='是否确定充值!'
} }
uni.showModal({ uni.showModal({
title: '提示', title: '提示',

View File

@ -227,6 +227,7 @@
</swiper> </swiper>
</view> </view>
</view> </view>
<view style="width: 100%;height: 700px;"></view>
<!-- 经验筛选 --> <!-- 经验筛选 -->
<u-select v-model="Cityshow" style="height: auto;" :list="cityList" @confirm="getCity"></u-select> <u-select v-model="Cityshow" style="height: auto;" :list="cityList" @confirm="getCity"></u-select>
</view> </view>
@ -1343,7 +1344,7 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
background: linear-gradient(180deg,rgba(238, 250, 246,0.6),rgba(255, 255, 255,0.9)); background: linear-gradient(180deg,rgba(238, 250, 246,0.6),rgba(255, 255, 255,0.9));
margin: 20rpx 0px 230px 0px; margin: 20rpx 0px 0px 0px;
} }
.index-fujin-jie-id{ .index-fujin-jie-id{
height: 30rpx; height: 30rpx;

View File

@ -169,14 +169,14 @@
<style scoped> <style scoped>
/deep/.refresh-body{ /deep/.refresh-body{
height: 100% !important; height: 845px !important;
background-color: #f7f7f7; background-color: #f7f7f7;
margin-top: 35px; margin-top: 35px;
} }
.content-view{ .content-view{
width: 100%; width: 100%;
height: 100vh; height: 100vh;
overflow: auto; overflow: hidden;
} }
.item-view-bottom-btn{ .item-view-bottom-btn{
text-align: center; text-align: center;
@ -426,6 +426,7 @@
justify-content: space-between; justify-content: space-between;
position: fixed; position: fixed;
background-color: #fff; background-color: #fff;
z-index: 999;
} }
</style> </style>