From 3267b4ef438541bab82222486862edb6ade450bf Mon Sep 17 00:00:00 2001
From: jingquanliang <540692237@qq.com>
Date: Sun, 15 Mar 2020 12:18:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 25 ++++++-------------
.../www/logic/order/OrderOperateMapper.xml | 1 +
WebRoot/jqladmin/order/js/order-detail.js | 4 ++-
WebRoot/order/js/order-detail.js | 4 ++-
WebRoot/ueditor/ueditor.config.js | 4 +--
.../www/logic/order/OrderOperateMapper.xml | 1 +
6 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d51309e..3559526 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,23 +7,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
@@ -391,7 +379,10 @@
-
+
+
+
+
diff --git a/WebRoot/WEB-INF/classes/admin/ru/own/www/logic/order/OrderOperateMapper.xml b/WebRoot/WEB-INF/classes/admin/ru/own/www/logic/order/OrderOperateMapper.xml
index c79ebc3..499a7ba 100644
--- a/WebRoot/WEB-INF/classes/admin/ru/own/www/logic/order/OrderOperateMapper.xml
+++ b/WebRoot/WEB-INF/classes/admin/ru/own/www/logic/order/OrderOperateMapper.xml
@@ -126,6 +126,7 @@
+
diff --git a/WebRoot/jqladmin/order/js/order-detail.js b/WebRoot/jqladmin/order/js/order-detail.js
index d3d3b93..fddec81 100644
--- a/WebRoot/jqladmin/order/js/order-detail.js
+++ b/WebRoot/jqladmin/order/js/order-detail.js
@@ -253,9 +253,11 @@ function generateXiangXiInfo(order,odsvoList,uinfo,currencyArgs)
//支付总金额
//price
// var tempAmount=od.price*od.ordercount;
+ productPrice = parseFloat(productPrice)
var tempAmount=productPrice*od.ordercount;
productAmount=productAmount+tempAmount//商品总价格
- var tempAmountEx= parseFloat(calculateFeeByExchangeRate(tempAmount,orderCurrencyRate)).toFixed(2)
+ // var tempAmountEx= parseFloat(calculateFeeByExchangeRate(tempAmount,orderCurrencyRate)).toFixed(2)
+ var tempAmountEx= parseFloat(tempAmount).toFixed(2)
var tempAmountPrice=orderCurrencyShowSybol+" "+tempAmountEx;//calculateFeeByExchangeRate in math.js
// var tempAmountPrice=orderCurrencyShowSybol+" "+calculateFeeByExchangeRate(tempAmount,orderCurrencyRate);//calculateFeeByExchangeRate in math.js
html+="";
diff --git a/WebRoot/order/js/order-detail.js b/WebRoot/order/js/order-detail.js
index cf73c62..5adbc4e 100644
--- a/WebRoot/order/js/order-detail.js
+++ b/WebRoot/order/js/order-detail.js
@@ -141,9 +141,11 @@ function generateXiangXiInfo(order,odsvoList,currencyArgs)
//支付总金额
//price
// var tempAmount=od.price*od.ordercount;
+ productPrice = parseFloat(productPrice)
var tempAmount=productPrice*od.ordercount;
productAmount=productAmount+tempAmount//商品总价格
- var tempAmountEx= parseFloat(calculateFeeByExchangeRate(tempAmount,orderCurrencyRate)).toFixed(2)
+ // var tempAmountEx= parseFloat(calculateFeeByExchangeRate(tempAmount,orderCurrencyRate)).toFixed(2)
+ var tempAmountEx= parseFloat(tempAmount).toFixed(2)
var tempAmountPrice=orderCurrencyShowSybol+" "+tempAmountEx;//calculateFeeByExchangeRate in math.js
html+=" | ";
html+=""+tempAmountPrice+"";
diff --git a/WebRoot/ueditor/ueditor.config.js b/WebRoot/ueditor/ueditor.config.js
index 0f8b3b4..70aecc4 100644
--- a/WebRoot/ueditor/ueditor.config.js
+++ b/WebRoot/ueditor/ueditor.config.js
@@ -19,8 +19,8 @@
* 因此，UEditor提供了针对不同页面的编辑器可单独配置的根路径，具体来说，在需要实例化编辑器的页面最顶部写上如下代码即可。当然，需要令此处的URL等于对应的配置。
* window.UEDITOR_HOME_URL = "/xxxx/xxxx/";
*/
-// var URL = window.UEDITOR_HOME_URL || getUEBasePath();
- var URL = "/own/ueditor/";
+ var URL = window.UEDITOR_HOME_URL || getUEBasePath();
+// var URL = "/own/ueditor/";
/**
* 配置项主体。注意，此处所有涉及到路径的配置别遗漏URL变量。
diff --git a/src/admin/ru/own/www/logic/order/OrderOperateMapper.xml b/src/admin/ru/own/www/logic/order/OrderOperateMapper.xml
index c79ebc3..499a7ba 100644
--- a/src/admin/ru/own/www/logic/order/OrderOperateMapper.xml
+++ b/src/admin/ru/own/www/logic/order/OrderOperateMapper.xml
@@ -126,6 +126,7 @@
+
|