From 274fceda8d8ae15eead0fc6490f4d1680d9ab3c5 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 16:45:27 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/resources/templates/views/admin/hive-erp/order/orderXq-form.html | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/orderXq-form.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/orderXq-form.html
index 0f3eb7d..021105c 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/orderXq-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/orderXq-form.html
@@ -625,7 +625,7 @@
//获取用户列表
AjaxProxy.requst({
app: _this,
- url: basePath + '/admin/shopAll',
+ url: basePath + '/admin/all',
callback: function (data) {
_this.userList = data.rows;
}
@@ -765,7 +765,7 @@
_this.dialogSettleVisible = true;
},
calOrderTotalFormatter(row, column) {
- return row.count * row.zkPrice;
+ return (row.count * row.zkPrice).toFixed(2);
},
getVipMoneyCards() {
let _this = this;
@@ -976,7 +976,7 @@
title: "打印订单",
area: ['250px', '550px'],
maxmin: true,
- content: [basePath + '/admin/redirect/hive/beautySalon/print-order?id=' + id]
+ content: [basePath + '/admin/order/printOrder?id=' + id]
});
},
handleClick() {
--
Gitblit v1.9.1