This commit is contained in:
parent
e5915c1a40
commit
016fd69d22
|
@ -162,7 +162,7 @@
|
|||
</view>
|
||||
<view class="" style="color: #333;">
|
||||
<text style="font-size: 35rpx;font-weight: bold;">
|
||||
¥{{order.price}}
|
||||
¥{{order.massageCouponMoney}}
|
||||
</text>
|
||||
</view>
|
||||
</view>
|
||||
|
@ -203,7 +203,7 @@
|
|||
</view>
|
||||
<view class="flex justify-between add-lin">
|
||||
<view class="add-con-title">订单费用:</view>
|
||||
<view class="add-con-cont">¥<text style="font-size: 26rpx; font-weight: bold;">{{order.price}}</text></view>
|
||||
<view class="add-con-cont">¥<text style="font-size: 26rpx; font-weight: bold;">{{order.massageCouponMoney}}</text></view>
|
||||
</view>
|
||||
<view class="flex justify-between add-lin">
|
||||
<view class="add-con-title">出行费用:</view>
|
||||
|
@ -306,12 +306,19 @@
|
|||
</u-button>
|
||||
|
||||
<u-button
|
||||
v-if="order.addNum ==null"
|
||||
v-if="order.addNum ==null&&order.ordersMassageList[0].massageType"
|
||||
shape="circle" :plain="true"
|
||||
@tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)"
|
||||
class="btns">
|
||||
加钟
|
||||
</u-button>
|
||||
<u-button
|
||||
v-if="order.addNum ==null&&order.ordersMassageList[0].userPackageDetail"
|
||||
shape="circle" :plain="true"
|
||||
@tap="saveJZ(order.ordersMassageList[0].userPackageDetail.massageTypeId)"
|
||||
class="btns">
|
||||
加钟
|
||||
</u-button>
|
||||
</view>
|
||||
<view class="showBtn-view" v-if="gengBtnShow==true" :style="gengNum==index?{display:'inline-block'}:{display:'none'}">
|
||||
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
|
||||
|
@ -406,26 +413,33 @@
|
|||
<!-- 加钟-->
|
||||
<u-popup v-model="showorder" mode="bottom" :closeable="closeable">
|
||||
<scroll-view scroll-y="true" style="width: 750rpx;height: 600rpx;">
|
||||
<view class="list_item" v-for="(item,index) in orderList" :key="index">
|
||||
<image :src="item.massageImg"></image>
|
||||
<view class="listitem_rightview">
|
||||
<view class="titleview">
|
||||
<view class="item_title">{{item.title}}</view>
|
||||
<view class="item_yishou">已售{{item.sales}}</view>
|
||||
</view>
|
||||
<view class="flex flex-wrap" style="margin-top: 10rpx;" v-if="item.labels.length>0">
|
||||
<text class="margin-bottom-xs box" v-for="(items,index) in item.labels"
|
||||
:key="index">{{items}}</text>
|
||||
</view>
|
||||
<view class="btnview">
|
||||
<view class="item_money">
|
||||
<text style="font-size: 24upx;">¥</text>
|
||||
<text>{{item.price}}</text>
|
||||
/<text style="font-weight: 500;font-size: 24upx;">
|
||||
{{item.duration}}分钟
|
||||
</text>
|
||||
<view class="xiangmu" v-for="(item,index) in orderList" :key="index">
|
||||
<image class="xiangmu-img" :src="item.massageImg" mode=""></image>
|
||||
<view class="xiangmu-cont">
|
||||
<view class="xiangmu-cont-top">
|
||||
<view class="xiangmu-cont-top-title">
|
||||
{{item.title}}
|
||||
</view>
|
||||
<view class="xiangmu-cont-top-time">
|
||||
<view class="xiangmu-cont-top-left">服务时长:{{item.duration}}分钟</view>
|
||||
<view class="xiangmu-cont-top-left">已售:{{item.sales}}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="xiangmu-about">
|
||||
{{item.jianjie}}
|
||||
</view>
|
||||
<view class="xiangmu-foot">
|
||||
<view class="xiangmu-foot-left">
|
||||
<view class="xiangmu-foot-left-shiji">
|
||||
<span>¥</span>
|
||||
<span>{{item.price}}</span>
|
||||
<span>元/套</span>
|
||||
</view>
|
||||
<view class="xiangmu-foot-left-dazhe">{{item.oldPrice}}</view>
|
||||
</view>
|
||||
<view class="xiadan" @click="goOrderJ(item,'加钟')">
|
||||
确认加钟
|
||||
</view>
|
||||
<view class="item_btn" @click="goOrderJ(item,'加钟')">确认加钟</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
@ -769,9 +783,7 @@
|
|||
massageId: item.massageTypeId,
|
||||
num: 1,
|
||||
}],
|
||||
price: payMoney,
|
||||
couponId: '',
|
||||
payMoney: payMoney,
|
||||
userId: uni.getStorageSync('userId'),
|
||||
addMassageTypeId:item.massageTypeId,
|
||||
addEntryName:item.title
|
||||
|
|
|
@ -10,13 +10,13 @@
|
|||
<view class="pay-title" style="">服务项目</view>
|
||||
<view class="flex justify-around">
|
||||
<view class="" style="width: 160upx;height: 160upx;">
|
||||
<image :src="order.ordersMassageList[0].massageType.massageImg"
|
||||
<image :src="order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.massageImg:order.ordersMassageList[0].userPackageDetail.massageImg"
|
||||
style="width: 100%;height: 100%;border-radius: 19upx;"></image>
|
||||
</view>
|
||||
<view class="u-flex-1 margin-left-sm">
|
||||
<view class="flex head-title-right">
|
||||
<view class="margin-right-xs text-df u-skeleton-fillet head-title">
|
||||
{{order.ordersMassageList[0].massageType.title}}
|
||||
{{order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.title:order.ordersMassageList[0].userPackageDetail.title}}
|
||||
</view>
|
||||
<view class="zhuangtai">
|
||||
<view v-if="order.status ==1">待支付</view>
|
||||
|
@ -34,12 +34,10 @@
|
|||
<view class="flex align-center">
|
||||
<view style="width: 100%;">
|
||||
<view class="flex justify-between margin-tb-sm" style="color: #999999;">
|
||||
<view style="justify-content: space-between;" v-if="order.oldOrdersId==null">
|
||||
{{order.ordersMassageList[0].massageType.duration}}分钟
|
||||
</view>
|
||||
<view style="justify-content: space-between;" v-else>
|
||||
{{order.duration}}2分钟
|
||||
<view style="justify-content: space-between;">
|
||||
{{order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.duration:order.ordersMassageList[0].userPackageDetail.duration}}分钟
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
||||
<view class="money-pay" style="justify-content: space-between;">
|
||||
|
@ -147,11 +145,11 @@
|
|||
</view>
|
||||
<view class="jusitify-line">
|
||||
<view class="line-word">项目名称</view>
|
||||
<view class="line-word-r">{{order.ordersMassageList[0].massageType.title}}</view>
|
||||
<view class="line-word-r">{{order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.title:order.ordersMassageList[0].userPackageDetail.title}}</view>
|
||||
</view>
|
||||
<view class="jusitify-line">
|
||||
<view class="line-word">服务时长</view>
|
||||
<view class="line-word-r">{{order.ordersMassageList[0].massageType.duration}}分钟</view>
|
||||
<view class="line-word-r">{{order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.duration:order.ordersMassageList[0].userPackageDetail.duration}}分钟</view>
|
||||
</view>
|
||||
<view class="jusitify-line">
|
||||
<view class="line-word">项目价格</view>
|
||||
|
@ -287,11 +285,19 @@
|
|||
class="btns">
|
||||
提前结束
|
||||
</u-button>
|
||||
<u-button :custom-style="customStyle2"
|
||||
<u-button
|
||||
v-if="order.ordersMassageList[0].massageType"
|
||||
shape="circle" :plain="true"
|
||||
@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
|
||||
class="dingshi">
|
||||
去投诉
|
||||
@tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)"
|
||||
class="btns">
|
||||
加钟
|
||||
</u-button>
|
||||
<u-button
|
||||
v-if="order.ordersMassageList[0].userPackageDetail"
|
||||
shape="circle" :plain="true"
|
||||
@tap="saveJZ(order.ordersMassageList[0].userPackageDetail.massageTypeId)"
|
||||
class="btns">
|
||||
加钟
|
||||
</u-button>
|
||||
<u-button
|
||||
shape="circle" :plain="true"
|
||||
|
@ -323,22 +329,33 @@
|
|||
<!-- 加钟-->
|
||||
<u-popup v-model="showorder" mode="bottom" :closeable="closeable">
|
||||
<scroll-view scroll-y="true" style="width: 750rpx;height: 600rpx;">
|
||||
<view class="list_item" v-for="(item,index) in orderList" :key="index">
|
||||
<image :src="item.massageImg"></image>
|
||||
<view class="listitem_rightview">
|
||||
<view class="titleview">
|
||||
<view class="item_title">{{item.title}}</view>
|
||||
<view class="item_yishou">已售{{item.sales}}</view>
|
||||
<view class="xiangmu" v-for="(item,index) in orderList" :key="index">
|
||||
<image class="xiangmu-img" :src="item.massageImg" mode=""></image>
|
||||
<view class="xiangmu-cont">
|
||||
<view class="xiangmu-cont-top">
|
||||
<view class="xiangmu-cont-top-title">
|
||||
{{item.title}}
|
||||
</view>
|
||||
<view class="xiangmu-cont-top-time">
|
||||
<view class="xiangmu-cont-top-left">服务时长:{{item.duration}}分钟</view>
|
||||
<view class="xiangmu-cont-top-left">已售:{{item.sales}}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex flex-wrap" style="margin-top: 10rpx;" v-if="item.labels.length>0">
|
||||
<text class="margin-bottom-xs box" v-for="(items,index) in item.labels"
|
||||
:key="index">{{items}}</text>
|
||||
<view class="xiangmu-about">
|
||||
{{item.jianjie}}
|
||||
</view>
|
||||
<view class="btnview">
|
||||
<view class="item_money"> <text style="font-size: 24upx;">¥</text> <text
|
||||
v-if="isVip">{{item.memberPrice}}</text><text v-if="!isVip">{{item.price}}</text>
|
||||
/<text style="font-weight: 500;font-size: 24upx; ">{{item.duration}}分钟</text></view>
|
||||
<view class="item_btn" @click="goOrderJ(item)">确认加钟</view>
|
||||
<view class="xiangmu-foot">
|
||||
<view class="xiangmu-foot-left">
|
||||
<view class="xiangmu-foot-left-shiji">
|
||||
<span>¥</span>
|
||||
<span>{{item.price}}</span>
|
||||
<span>元/套</span>
|
||||
</view>
|
||||
<view class="xiangmu-foot-left-dazhe">{{item.oldPrice}}</view>
|
||||
</view>
|
||||
<view class="xiadan" @click="goOrderJ(item)">
|
||||
确认加钟
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
|
@ -411,26 +411,33 @@
|
|||
<!-- 加钟-->
|
||||
<u-popup v-model="showorder" mode="bottom" :closeable="closeable">
|
||||
<scroll-view scroll-y="true" style="width: 750rpx;height: 600rpx;">
|
||||
<view class="list_item" v-for="(item,index) in orderList" :key="index">
|
||||
<image :src="item.massageImg"></image>
|
||||
<view class="listitem_rightview">
|
||||
<view class="titleview">
|
||||
<view class="item_title">{{item.title}}</view>
|
||||
<view class="item_yishou">已售{{item.sales}}</view>
|
||||
</view>
|
||||
<view class="flex flex-wrap" style="margin-top: 10rpx;" v-if="item.labels.length>0">
|
||||
<text class="margin-bottom-xs box" v-for="(items,index) in item.labels"
|
||||
:key="index">{{items}}</text>
|
||||
</view>
|
||||
<view class="btnview">
|
||||
<view class="item_money">
|
||||
<text style="font-size: 24upx;">¥</text>
|
||||
<text>{{item.price}}</text>
|
||||
/<text style="font-weight: 500;font-size: 24upx;">
|
||||
{{item.duration}}分钟
|
||||
</text>
|
||||
<view class="xiangmu" v-for="(item,index) in orderList" :key="index">
|
||||
<image class="xiangmu-img" :src="item.massageImg" mode=""></image>
|
||||
<view class="xiangmu-cont">
|
||||
<view class="xiangmu-cont-top">
|
||||
<view class="xiangmu-cont-top-title">
|
||||
{{item.title}}
|
||||
</view>
|
||||
<view class="xiangmu-cont-top-time">
|
||||
<view class="xiangmu-cont-top-left">服务时长:{{item.duration}}分钟</view>
|
||||
<view class="xiangmu-cont-top-left">已售:{{item.sales}}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="xiangmu-about">
|
||||
{{item.jianjie}}
|
||||
</view>
|
||||
<view class="xiangmu-foot">
|
||||
<view class="xiangmu-foot-left">
|
||||
<view class="xiangmu-foot-left-shiji">
|
||||
<span>¥</span>
|
||||
<span>{{item.price}}</span>
|
||||
<span>元/套</span>
|
||||
</view>
|
||||
<view class="xiangmu-foot-left-dazhe">{{item.oldPrice}}</view>
|
||||
</view>
|
||||
<view class="xiadan" @click="goOrderJ(item)">
|
||||
确认加钟
|
||||
</view>
|
||||
<view class="item_btn" @click="goOrderJ(item)">确认加钟</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
Loading…
Reference in New Issue