From 7f8aa838ab463151b8b1a784c48d0034ca005b61 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期二, 21 五月 2024 11:22:30 +0800
Subject: [PATCH] no message
---
CoreCms.Net.Services/Distribution/CoreCmsDistributionServices.cs | 2 +-
CoreCms.Net.Services/Distribution/CoreCmsDistributionOrderServices.cs | 4 ++--
CoreCms.Net.Web.Admin/wwwroot/views/liao.js | 34 ++++++++++++++++++++++++++++++++++
CoreCms.Net.Web.Admin/wwwroot/views/order/orders/details.html | 2 +-
4 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/CoreCms.Net.Services/Distribution/CoreCmsDistributionOrderServices.cs b/CoreCms.Net.Services/Distribution/CoreCmsDistributionOrderServices.cs
index a139dce..6a44513 100644
--- a/CoreCms.Net.Services/Distribution/CoreCmsDistributionOrderServices.cs
+++ b/CoreCms.Net.Services/Distribution/CoreCmsDistributionOrderServices.cs
@@ -271,8 +271,8 @@
//};
}
- amount += mathMoney;
- orderDetails.amount = mathMoney;
+ amount += mathMoney*item.nums;
+ orderDetails.amount = mathMoney * item.nums;
distributionOrderDetails.Add(orderDetails);
}
diff --git a/CoreCms.Net.Services/Distribution/CoreCmsDistributionServices.cs b/CoreCms.Net.Services/Distribution/CoreCmsDistributionServices.cs
index 001b29b..b34a3d2 100644
--- a/CoreCms.Net.Services/Distribution/CoreCmsDistributionServices.cs
+++ b/CoreCms.Net.Services/Distribution/CoreCmsDistributionServices.cs
@@ -425,7 +425,7 @@
{
var jm = new WebApiCallBack();
//鐧惧垎鍏垫硶鍒ゆ柇鏄惁鏄粡閿�鍟�
- if(await _bfbfComAPIService.IsDictionary(userId))
+ if(!await _bfbfComAPIService.IsDictionary(userId))
{
jm.msg = "涓嶆槸缁忛攢鍟嗙殑锛屼笉杩斿埄";
return jm;
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/liao.js b/CoreCms.Net.Web.Admin/wwwroot/views/liao.js
index 9aca275..5ed1075 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/liao.js
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/liao.js
@@ -245,4 +245,38 @@
const dateTimePattern = /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/;
// 浣跨敤姝ｅ垯琛ㄨ揪寮忔ā寮忔祴璇曞瓧绗︿覆
return dateTimePattern.test(str);
+}
+
+/**
+ * 鏍煎紡鍖栧晢鍝佸垎绫婚�夋嫨杈撳叆妗�
+ * @param {object} coreHelper 鏍稿績杈呭姪瀵硅薄锛岀敤浜庡彂閫佽姹傜瓑鎿嶄綔
+ * @param {object} form 琛ㄥ崟瀵硅薄锛岀敤浜庨噸鏂版覆鏌搒elect鍏冪礌
+ * @param {string} idname 杈撳叆妗嗙殑id鍚嶇О
+ * @param {string} selectedID 榛樿閫変腑鐨勫垎绫籌D锛屼负绌烘椂榛樿涓嶉�変腑浠讳綍椤�
+ */
+function formatGoodsCategorySelInPut(coreHelper, form, idname,selectedID="") {
+
+ // 鍚戞湇鍔″櫒鍙戦�佽姹傦紝鑾峰彇鐢ㄦ埛鍒楄〃
+ coreHelper.PostForm("Api/CommonAPI/GetGoodsCategory", { }, function (data) {
+ if (debug) { console.log(data); } // 濡傛灉澶勪簬璋冭瘯妯″紡锛屾墦鍗拌繑鍥炵殑鏁版嵁
+
+ if (data.code == 0) {
+ // 鑾峰彇鎸囧畾 id 鐨� select 鍏冪礌
+ var selectElement = document.getElementById(idname);
+
+ // 閬嶅巻杩斿洖鐨勭敤鎴锋暟鎹紝涓� select 鍏冪礌鍒涘缓骞舵坊鍔犳柊鐨� option 閫夐」
+ for (var i = 0; i < data.data.length; i++) {
+ var option = document.createElement('option');
+ option.value = data.data[i].id;
+ if(selectedID==data.data[i].id){
+ option.selected=true;
+ }
+ option.innerHTML = data.data[i].name;
+ selectElement.appendChild(option);
+ }
+
+ // 閲嶆柊娓叉煋 select 鍏冪礌锛岀‘淇濇柊鐨勯�夐」鐢熸晥
+ form.render('select');
+ }
+ })
}
\ No newline at end of file
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/details.html b/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/details.html
index 2241827..8de0075 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/details.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/details.html
@@ -348,7 +348,7 @@
<td>{{item.shipMobile}}</td>
<td>{{item.shipAreaIdName}}-{{item.shipAddress}}</td>
<td>
- <button type="button" class="layui-btn layui-btn-warm layui-btn-xs" data-deliveryId="{{item.deliveryId}}" lay-active="refreshDelivery" style="margin-left: 0px">鍚屾鐩存挱璁㈠崟</button>
+ <!-- <button type="button" class="layui-btn layui-btn-warm layui-btn-xs" data-deliveryId="{{item.deliveryId}}" lay-active="refreshDelivery" style="margin-left: 0px">鍚屾鐩存挱璁㈠崟</button> -->
</td>
</tr>
{{# }); }}
--
Gitblit v1.9.1