From 162fd6cf9cc47858c29d0b488bd7f018b77a56b4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 06 Apr 2021 11:29:49 +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/order-form.html |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
index 6bdb364..474b61e 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
@@ -928,10 +928,10 @@
                                 let count = parseFloat(item.count);
                                 let zkPrice = parseFloat(item.zkPrice);
 
-                                if (optionType != 1) {
+                                // if (optionType != 1) {
                                     //直接修改支付金额不重置支付金额
                                     item.payMoney = zkPrice * count;
-                                }
+                                // }
                                 _this.order.payMoney += parseFloat(item.payMoney);
 
                                 //重新计算业绩金额

--
Gitblit v1.9.1