From 732ff3cb50710acb0942c6b349264ecd42b6173f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E5=90=8C=E5=AD=A6?= <2495967527@qq.com>
Date: Mon, 4 Nov 2024 16:59:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/brand/config/popup/to-configure.vue | 13 +++++++++++++
.../logistics-template/popup/add-template.vue | 8 ++++++--
2 files changed, 19 insertions(+), 2 deletions(-)
create mode 100644 src/views/modules/brand/config/popup/to-configure.vue
diff --git a/src/views/modules/brand/config/popup/to-configure.vue b/src/views/modules/brand/config/popup/to-configure.vue
new file mode 100644
index 0000000..40e998e
--- /dev/null
+++ b/src/views/modules/brand/config/popup/to-configure.vue
@@ -0,0 +1,13 @@
+
+ 配置
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/modules/logistics-fare/logistics-template/popup/add-template.vue b/src/views/modules/logistics-fare/logistics-template/popup/add-template.vue
index 025a327..3472035 100644
--- a/src/views/modules/logistics-fare/logistics-template/popup/add-template.vue
+++ b/src/views/modules/logistics-fare/logistics-template/popup/add-template.vue
@@ -832,7 +832,9 @@ export default {
if (this.isAdd) {
this.$api.mer_admin
.addShippingTemplate({
- linkId: JSON.parse(sessionStorage.getItem("userInfo")).shopId,
+ linkId: JSON.parse(sessionStorage.getItem("userInfo")).shopId
+ ? JSON.parse(sessionStorage.getItem("userInfo")).shopId
+ : JSON.parse(sessionStorage.getItem("userInfo")).merchantId,
defaults: 0, //默认值,待确认
sort: 0, //默认值,待确认
type: 2, //默认值,待确认
@@ -891,7 +893,9 @@ export default {
this.$api.mer_admin
.updateShippingTemplate({
id: this.modalData.id,
- linkId: JSON.parse(sessionStorage.getItem("userInfo")).shopId,
+ linkId: JSON.parse(sessionStorage.getItem("userInfo")).shopId
+ ? JSON.parse(sessionStorage.getItem("userInfo")).shopId
+ : JSON.parse(sessionStorage.getItem("userInfo")).merchantId,
defaults: 0, //默认值,待确认
sort: 0, //默认值,待确认
type: 2, //默认值,待确认