r
/
hangtag
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev

This commit is contained in:
wwb 2025-12-09 08:19:23 +08:00
parent 7c7db11e9f 8e5b2dc02c
commit 93616ea3e3
6 changed files with 172 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java
View File

@ -807,6 +807,7 @@ public class SaleOrderServiceImpl implements SaleOrderService {
// 查询默认单价
entry.setPrice(price);
}
entry.setUnit(FuncUtil.toStr(itemDTO.getUnit()));
entryList.add(entry);
List<SaleOrderSkuDTO> productSkuList = itemDTO.getProductSkuList();
// sku

268
hangtag-ui/hangtag-ui-front/index.html
View File

@ -1,152 +1,206 @@
<!DOCTYPE html>
<html lang="en">
<head>
<html lang="zh">
<head>
<meta charset="UTF-8" />
<link rel="icon" href="/favicon.ico" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta
name="keywords"
content="芋道管理系统 基于 vue3 + CompositionAPI + typescript + vite3 + element plus 的后台开源免费管理系统！"
/>
<meta
name="description"
content="芋道管理系统 基于 vue3 + CompositionAPI + typescript + vite3 + element plus 的后台开源免费管理系统！"
name="keywords"
content="东莞嘉晋OMS下单系统！"
/>
<title>%VITE_APP_TITLE%</title>
<script src="/js/dom-to-image.js"></script>
</head>
<body>
<div id="app">
<style>
<script src="/js/dom-to-image.js"></script>
<style>
/* 新增Edge推荐样式 */
.edge-recommend {
position: fixed;
top: 10%;
right: 20px;
align-items: center;
display: none;
gap: 8px;
padding: 8px 16px;
background-color: #f3f4f6;
border-radius: 8px;
box-shadow: 0 2px 8px rgba(0,0,0,0.1);
cursor: pointer;
z-index: 9999;
text-decoration: none;
color: #111827;
font-size: 14px;
transition: background-color 0.2s ease;
}
.edge-recommend:hover {
background-color: #e5e7eb;
}
.edge-icon {
width: 48px;
height: 48px;
}
.edge-recommend.show {
display: flex; /* 非Edge时显示 */
}
.edge-text {
line-height: 1;
font-size: 1.2rem;
}
.app-loading {
display: flex;
width: 100%;
height: 100%;
justify-content: center;
align-items: center;
flex-direction: column;
background: #f0f2f5;
display: flex;
width: 100%;
height: 100%;
justify-content: center;
align-items: center;
flex-direction: column;
background: #f0f2f5;
}
.app-loading .app-loading-wrap {
position: absolute;
top: 50%;
left: 50%;
display: flex;
-webkit-transform: translate3d(-50%, -50%, 0);
transform: translate3d(-50%, -50%, 0);
justify-content: center;
align-items: center;
flex-direction: column;
position: absolute;
top: 50%;
left: 50%;
display: flex;
-webkit-transform: translate3d(-50%, -50%, 0);
transform: translate3d(-50%, -50%, 0);
justify-content: center;
align-items: center;
flex-direction: column;
}
.app-loading .app-loading-title {
margin-bottom: 30px;
font-size: 20px;
font-weight: bold;
text-align: center;
margin-bottom: 30px;
font-size: 20px;
font-weight: bold;
text-align: center;
}
.app-loading .app-loading-logo {
width: 100px;
margin: 0 auto 15px auto;
width: 100px;
margin: 0 auto 15px auto;
}
.app-loading .app-loading-item {
position: relative;
display: inline-block;
width: 60px;
height: 60px;
vertical-align: middle;
border-radius: 50%;
position: relative;
display: inline-block;
width: 60px;
height: 60px;
vertical-align: middle;
border-radius: 50%;
}
.app-loading .app-loading-outter {
position: absolute;
width: 100%;
height: 100%;
border: 4px solid #2d8cf0;
border-bottom: 0;
border-left-color: transparent;
border-radius: 50%;
animation: loader-outter 1s cubic-bezier(0.42, 0.61, 0.58, 0.41) infinite;
position: absolute;
width: 100%;
height: 100%;
border: 4px solid #2d8cf0;
border-bottom: 0;
border-left-color: transparent;
border-radius: 50%;
animation: loader-outter 1s cubic-bezier(0.42, 0.61, 0.58, 0.41) infinite;
}
.app-loading .app-loading-inner {
position: absolute;
top: calc(50% - 20px);
left: calc(50% - 20px);
width: 40px;
height: 40px;
border: 4px solid #87bdff;
border-right: 0;
border-top-color: transparent;
border-radius: 50%;
animation: loader-inner 1s cubic-bezier(0.42, 0.61, 0.58, 0.41) infinite;
position: absolute;
top: calc(50% - 20px);
left: calc(50% - 20px);
width: 40px;
height: 40px;
border: 4px solid #87bdff;
border-right: 0;
border-top-color: transparent;
border-radius: 50%;
animation: loader-inner 1s cubic-bezier(0.42, 0.61, 0.58, 0.41) infinite;
}
@-webkit-keyframes loader-outter {
0% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
0% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(360deg);
transform: rotate(360deg);
}
100% {
-webkit-transform: rotate(360deg);
transform: rotate(360deg);
}
}
@keyframes loader-outter {
0% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
0% {
transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(360deg);
transform: rotate(360deg);
}
100% {
transform: rotate(360deg);
}
}
@-webkit-keyframes loader-inner {
0% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
0% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(-360deg);
transform: rotate(-360deg);
}
100% {
-webkit-transform: rotate(-360deg);
transform: rotate(-360deg);
}
}
@keyframes loader-inner {
0% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
0% {
transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(-360deg);
transform: rotate(-360deg);
}
100% {
transform: rotate(-360deg);
}
}
</style>
<div class="app-loading">
<div class="app-loading-wrap">
<div class="app-loading-title">
<!-- <img src="/logo.gif" class="app-loading-logo" alt="Logo" />-->
<!-- <div class="app-loading-title">%VITE_APP_TITLE%</div>-->
</div>
<div class="app-loading-item">
<div class="app-loading-outter"></div>
<div class="app-loading-inner"></div>
</div>
</div>
</div>
</style>
</head>
<body>
<a id="showDownBrowser" href="/download/MicrosoftEdgeSetup.exe" class="edge-recommend" target="_blank">
<img src="/img/edge.png" class="edge-icon" alt="Edge图标" />
<div>
<div class="edge-text">推荐使用Edge浏览器<br/>Recommend using Edge browser</div>
<div class="edge-text" style="margin-top: 6px">点击下载 Click Download</div>
</div>
<script type="module" src="/src/main.ts"></script>
</body>
</html>
</a>
<div id="app">
<div class="app-loading">
<div class="app-loading-wrap">
<div class="app-loading-title">
<!-- <img src="/logo.gif" class="app-loading-logo" alt="Logo" />-->
<!-- <div class="app-loading-title">%VITE_APP_TITLE%</div>-->
</div>
<div class="app-loading-item">
<div class="app-loading-outter"></div>
<div class="app-loading-inner"></div>
</div>
</div>
</div>
</div>
<script type="module" src="/src/main.ts">
</script>
<script>
// 检测是否为Edge浏览器（包含Chromium内核Edge和传统Edge）
function isEdgeBrowser() {
const userAgent = navigator.userAgent.toLowerCase();
// 匹配Chromium内核Edge（Edge/xxx）或传统Edge（edg/xxx）
return /edg(e)?\/\d+/.test(userAgent);
}
if (!isEdgeBrowser()) {
setTimeout(()=>{
const elementById = document.getElementById("showDownBrowser");
console.log("222",elementById)
if(elementById){
elementById.style.display= 'flex';
}
},600)
}
</script>
</body>
</html>

BIN
hangtag-ui/hangtag-ui-front/public/download/MicrosoftEdgeSetup.exe Normal file
View File

Binary file not shown.

BIN
hangtag-ui/hangtag-ui-front/public/img/edge.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.3 KiB

7
hangtag-ui/hangtag-ui-front/src/views/Home/Index.vue
View File

@ -252,4 +252,11 @@ const getAllApi = async () => {
}
getAllApi()
setTimeout(()=>{
const elementById = document.getElementById("showDownBrowser");
if(elementById){
elementById.style.display= 'none';
}
},1000)
</script>

6
hangtag-ui/hangtag-ui-front/src/views/oms/order/createorder/index.vue
View File

@ -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)
}
})
})