From ba8ce4451b48b5902a307df075442bf016b5e4ae Mon Sep 17 00:00:00 2001
From: queenwuli <942534046@qq.com>
Date: Mon, 11 Jan 2021 17:06:21 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/jyyforjava/hive-app into master
---
hive-app/pages/workbench/serviceOrderDetail.vue | 80 ++++++++++++++++++++++++---------------
1 files changed, 49 insertions(+), 31 deletions(-)
diff --git a/hive-app/pages/workbench/serviceOrderDetail.vue b/hive-app/pages/workbench/serviceOrderDetail.vue
index f2b0617..a1f2803 100644
--- a/hive-app/pages/workbench/serviceOrderDetail.vue
+++ b/hive-app/pages/workbench/serviceOrderDetail.vue
@@ -7,35 +7,35 @@
<view class="list-content">
<view class="flex justify-between">
<text>会员姓名</text>
- <text class="gray">李某某</text>
+ <text class="gray">{{orderInfo.vipName}}</text>
</view>
<view class="flex justify-between">
<text>联系方式</text>
- <text class="gray">15588881231</text>
+ <text class="gray">{{orderInfo.phone}}</text>
</view>
<view class="flex justify-between">
<text>服务单号</text>
- <text class="gray">N12371237123173</text>
+ <text class="gray">{{orderInfo.serviceNo}}</text>
</view>
<view class="flex justify-between">
<text>预约时间</text>
- <text class="gray">2020-12-12 19:06:08</text>
+ <text class="gray">{{orderInfo.yyTime}}</text>
</view>
<view class="flex justify-between">
<text>预约床位</text>
- <text class="gray">VIP-2</text>
+ <text class="gray">{{orderInfo.bedName || '-'}}</text>
</view>
<view class="flex justify-between">
<text>服务总时间</text>
- <text class="gray">180分钟</text>
+ <text class="gray">{{orderInfo.totalTime}}分钟</text>
</view>
<view class="flex justify-between">
<text>配料师</text>
- <text class="gray">广哥</text>
+ <text class="gray">{{orderInfo.plsName || '-'}}</text>
</view>
<view class="flex justify-between">
<text>下单总顾问</text>
- <text class="gray">广哥</text>
+ <text class="gray">{{orderInfo.staffName}}</text>
</view>
</view>
</view>
@@ -44,33 +44,33 @@
<text>服务明细</text>
</view>
<view class="list-content">
- <view class="list-content-row" v-for="item in 2">
+ <view class="list-content-row" v-for="item in orderList">
<view class="flex justify-between align-center font-15">
- <view>
- <text class="mr-20">富脂肽原液(单支)</text>
- <text>x1</text>
+ <view class="list-content-name">
+ <text class="mr-20 font-14">{{item.name}}</text>
+ <text>x{{item.count}}</text>
</view>
- <text class="blue font-16">￥0.99</text>
+ <text class="blue font-16">￥{{item.price}}</text>
</view>
- <view class="flex justify-between mt-5">
- <text class="gray">服务开始时间</text>
- <text>2020-12-12 19:06:08</text>
+ <view class="flex justify-between mt-5 gray">
+ <text>服务开始时间</text>
+ <text>{{item.beginTime || '-'}}</text>
</view>
- <view class="flex justify-between">
- <text class="gray">服务结束时间</text>
- <text>2020-12-12 19:06:08</text>
+ <view class="flex justify-between gray">
+ <text>服务结束时间</text>
+ <text>{{item.endTime || '-'}}</text>
</view>
- <view class="flex justify-between">
- <text class="gray">服务时长</text>
- <text>90分钟</text>
+ <view class="flex justify-between gray">
+ <text>服务时长</text>
+ <text>{{item.timeLength}}分钟</text>
</view>
- <view class="flex justify-between">
- <text class="gray">美疗师</text>
- <text>广哥</text>
+ <view class="flex justify-between gray">
+ <text>美疗师</text>
+ <text>{{item.beautyName || '-'}}</text>
</view>
- <view class="flex justify-between">
- <text class="gray">提成</text>
- <text>￥0.50</text>
+ <view class="flex justify-between gray">
+ <text>提成</text>
+ <text>￥{{item.commission || 0}}</text>
</view>
</view>
</view>
@@ -88,9 +88,24 @@
<script>
export default {
data() {
- return {
-
- }
+ return {
+ orderInfo: {},
+ orderList: []
+ }
+ },
+ onLoad(options) {
+ this.loadServiceOrderDetail(options.id);
+ },
+ methods:{
+ loadServiceOrderDetail(id){
+ this.$httpUtils.request('/api/serviceOrder/findServiceOrderDetail/'+id).then((res) => {
+ if(res.status == 200){
+ let result = res.mapInfo.detail;
+ this.orderInfo = result;
+ this.orderList = result.items;
+ }
+ })
+ }
}
}
</script>
@@ -126,6 +141,9 @@
border-bottom: 0;
padding-bottom: 0;
}
+ .list-content-name{
+ max-width: 550rpx;
+ }
.font-through{
text-decoration: line-through;
}
--
Gitblit v1.9.1