From 9203a43facf5fd967aaafcfc41541a9f4565869a Mon Sep 17 00:00:00 2001
From: li-guang <153605324@qq.com>
Date: Thu, 07 Jan 2021 11:29:28 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/jyyforjava/hive-app
---
hive-app/pages/workbench/serviceOrderList.vue | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/hive-app/pages/workbench/serviceOrderList.vue b/hive-app/pages/workbench/serviceOrderList.vue
index adf2219..2ab8b80 100644
--- a/hive-app/pages/workbench/serviceOrderList.vue
+++ b/hive-app/pages/workbench/serviceOrderList.vue
@@ -42,7 +42,7 @@
</view>
</view>
- <view class="flex flex-v right">
+ <view class="flex flex-v right" style="flex: 0 0 70px;">
<text class="gray mb-5">{{item.timeLength}}分钟</text>
<text class="gray mt-5" v-for="(op, index) in item.projs">{{op.beautyName || '-'}}</text>
<text class="mt-10" :class="item.status==7 || item.status==8?'gray':'blue'">{{item.status | formatStatus}}</text>
@@ -91,7 +91,11 @@
},
{
state: 1,
- name: '待预约'
+ name: '待确认'
+ },
+ {
+ state: 8,
+ name: '待排班'
},
{
state: 2,
--
Gitblit v1.9.1