Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-04-06 abe25c659140b8c3f4db90ce943f4143a7d7f40f

 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);

                                //重新计算业绩金额