From 9b1860f14489c81a9dd581d29e83289a5e114ace Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Mon, 12 Jul 2021 09:02:43 +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 | 8 +++++---
1 files changed, 5 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 1982dfd..185869e 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;
}
@@ -690,7 +690,9 @@
callback: function (data) {
_this.isRefund = false;
_this.dialogSettleVisible = false;
- _this.queryOrderDetailData(_this.data.oldOrderId);
+ var param = {};
+ param.id = _this.data.oldOrderId;
+ _this.queryOrderDetailData(param);
}
});
@@ -763,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;
--
Gitblit v1.9.1