diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java index ed8e010..424d6a8 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java @@ -807,6 +807,7 @@ public class SaleOrderServiceImpl implements SaleOrderService { // 查询默认单价 entry.setPrice(price); } + entry.setUnit(FuncUtil.toStr(itemDTO.getUnit())); entryList.add(entry); List productSkuList = itemDTO.getProductSkuList(); // sku diff --git a/hangtag-ui/hangtag-ui-front/index.html b/hangtag-ui/hangtag-ui-front/index.html index e6afc7c..ab246e3 100644 --- a/hangtag-ui/hangtag-ui-front/index.html +++ b/hangtag-ui/hangtag-ui-front/index.html @@ -1,152 +1,206 @@ - - + + - %VITE_APP_TITLE% - - - -
- -
-
-
- - -
-
-
-
-
-
-
+ + + + + + Edge图标 +
+
推荐使用Edge浏览器
Recommend using Edge browser
+
点击下载 Click Download
- - - + + +
+
+
+
+ + +
+
+
+
+
+
+
+
+ + + + \ No newline at end of file diff --git a/hangtag-ui/hangtag-ui-front/public/download/MicrosoftEdgeSetup.exe b/hangtag-ui/hangtag-ui-front/public/download/MicrosoftEdgeSetup.exe new file mode 100644 index 0000000..6880d77 Binary files /dev/null and b/hangtag-ui/hangtag-ui-front/public/download/MicrosoftEdgeSetup.exe differ diff --git a/hangtag-ui/hangtag-ui-front/public/img/edge.png b/hangtag-ui/hangtag-ui-front/public/img/edge.png new file mode 100644 index 0000000..3596c04 Binary files /dev/null and b/hangtag-ui/hangtag-ui-front/public/img/edge.png differ diff --git a/hangtag-ui/hangtag-ui-front/src/views/Home/Index.vue b/hangtag-ui/hangtag-ui-front/src/views/Home/Index.vue index 0c8d697..915142c 100644 --- a/hangtag-ui/hangtag-ui-front/src/views/Home/Index.vue +++ b/hangtag-ui/hangtag-ui-front/src/views/Home/Index.vue @@ -252,4 +252,11 @@ const getAllApi = async () => { } getAllApi() + +setTimeout(()=>{ + const elementById = document.getElementById("showDownBrowser"); + if(elementById){ + elementById.style.display= 'none'; + } +},1000) diff --git a/hangtag-ui/hangtag-ui-front/src/views/oms/order/createorder/index.vue b/hangtag-ui/hangtag-ui-front/src/views/oms/order/createorder/index.vue index 6b20608..3eeed39 100644 --- a/hangtag-ui/hangtag-ui-front/src/views/oms/order/createorder/index.vue +++ b/hangtag-ui/hangtag-ui-front/src/views/oms/order/createorder/index.vue @@ -750,11 +750,11 @@ const submitPreHandler = (showMsg = true) => { item.productSkuList.forEach((item2, i2) => { console.log("item2", item2) if (item2.productTemplateType === '1' && !item2.previewImage) { - const t = `${t("createOrder.tipsSkuError3")} ${index + 1} ‘${item.productName}’SKU ${i2 + 1}`; + const tips = `${t("createOrder.tipsSkuError3")} ${index + 1} ‘${item.productName}’SKU ${i2 + 1}`; if (showMsg) { - useMessage().warning(t) + useMessage().warning(tips) } - reject(t) + reject(tips) } }) })