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 @@
+<template>
+  <div>配置</div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
\ 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, //默认值，待确认