From e6d19def344a8875a2ec850068df41647649b20a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 14 Apr 2021 16:30:12 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop

---
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html
index 7eeaf03..17397a9 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html
@@ -187,11 +187,13 @@
                 break;
             case '需配料':
                 html +=btns[3].replace('VALUE',value);
+                html += btns[2].replace('VALUE',value);
                 break;
             case '配料完成':
                 break;
             case '服务完成':
                 html +=btns[4].replace('VALUE',value);
+                html += btns[2].replace('VALUE',value);
                 break;
         }
         html += btns[5].replace('VALUE',value);

--
Gitblit v1.9.1