From ee5f03d3e8bd87d0054e858dd61cd850b73863bf Mon Sep 17 00:00:00 2001
From: 1154079537 <1154079537@qq.com>
Date: Tue, 14 May 2024 17:58:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E9=94=80=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 3 ++
src/components/deliveryRecord/index.vue | 2 +-
src/layout/navBars/breadcrumb/setings.vue | 1 -
src/views/order/orderCancellate.vue | 52 +++++++++++++----------
src/views/order/orderCancellate/index.vue | 2 +-
5 files changed, 35 insertions(+), 25 deletions(-)
diff --git a/package.json b/package.json
index de489f4..bfa5970 100644
--- a/package.json
+++ b/package.json
@@ -67,9 +67,11 @@
"printjs": "^1.1.0",
"qiniu-js": "^2.5.5",
"qrcodejs2": "0.0.2",
+ "regenerator-runtime": "^0.14.1",
"screenfull": "4.2.0",
"showdown": "1.9.0",
"sortablejs": "^1.15.0",
+ "svg-baker-runtime": "^1.4.7",
"v-viewer": "^1.5.1",
"view-design": "^4.3.2",
"vue": "2.6.10",
@@ -78,6 +80,7 @@
"vue-qr": "^2.5.0",
"vue-router": "3.0.2",
"vue-splitpane": "1.0.4",
+ "vue-style-loader": "^4.1.3",
"vue-ueditor-wrap": "^2.4.1",
"vuedraggable": "2.20.0",
"vuex": "3.1.0",
diff --git a/src/components/deliveryRecord/index.vue b/src/components/deliveryRecord/index.vue
index 8ab9ba5..8b20077 100644
--- a/src/components/deliveryRecord/index.vue
+++ b/src/components/deliveryRecord/index.vue
@@ -234,7 +234,7 @@ export default {
if (lebData.export.length) {
data = data.concat(lebData.export)
excelData.page++
- }
+ }
}
createWorkBook(lebData.header, lebData.title, data, lebData.foot,lebData.filename);
return
diff --git a/src/layout/navBars/breadcrumb/setings.vue b/src/layout/navBars/breadcrumb/setings.vue
index 7d8c287..4557081 100644
--- a/src/layout/navBars/breadcrumb/setings.vue
+++ b/src/layout/navBars/breadcrumb/setings.vue
@@ -443,7 +443,6 @@ export default {
themeSelect["--prev-bg-menuBarColor"] = "#fff";
themeSelect["--prev-MenuActiveColor"] = "#fff";
if (val == "theme-1") {
- console.log("1111111");
themeSelect["--prev-bg-menu-hover-ba-color"] = "#4073FA";
themeSelect["--prev-bg-menuBar"] = "#282c34";
themeSelect["--prev-border-color-lighter"] = "#282c34";
diff --git a/src/views/order/orderCancellate.vue b/src/views/order/orderCancellate.vue
index c332192..d43d4fb 100644
--- a/src/views/order/orderCancellate.vue
+++ b/src/views/order/orderCancellate.vue
@@ -5,7 +5,8 @@