From 51090791d31706c732213f7c2be77c526df9c61d Mon Sep 17 00:00:00 2001
From: 15820893422 <1978476055@qq.com>
Date: Wed, 24 Apr 2024 18:33:01 +0800
Subject: [PATCH] edit

---
 src/components/lazyCascader/index.vue              | 2 +-
 src/components/templatesFrom/index.vue             | 5 +++--
 src/libs/modal-templates.js                        | 1 +
 src/styles/index.scss                              | 3 ++-
 src/views/systemForm/setSystem/modifyStoreInfo.vue | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/components/lazyCascader/index.vue b/src/components/lazyCascader/index.vue
index be20747..adf4193 100644
--- a/src/components/lazyCascader/index.vue
+++ b/src/components/lazyCascader/index.vue
@@ -31,7 +31,7 @@
     </div>
     <!-- 禁用状态 -->
     <!-- 可选状态 -->
-    <el-popover v-else ref="popover" trigger="click" placement="bottom-start">
+    <el-popover v-else ref="popover" trigger="click" placement="top-start">
       <!-- 搜索 -->
       <div class="lazy-cascader-search">
         <el-autocomplete
diff --git a/src/components/templatesFrom/index.vue b/src/components/templatesFrom/index.vue
index 7aa4996..6427185 100644
--- a/src/components/templatesFrom/index.vue
+++ b/src/components/templatesFrom/index.vue
@@ -16,7 +16,7 @@
       </el-form-item>
       <el-form-item label="配送区域及运费：" prop="region">
         <el-table v-loading="listLoading" :data="ruleForm.region" border fit highlight-current-row size="small" class="tempBox">
-          <el-table-column align="center" label="可配送区域" width="250">
+          <el-table-column align="center" label="可配送区域" min-width="250">
             <template slot-scope="scope">
               <span v-if="scope.$index === 0">默认全国   <span style="font-weight: bold;">(开启指定区域不配送时无效)</span></span>
               <LazyCascader
@@ -482,7 +482,8 @@ export default {
   text-overflow: clip;
 }
 ::v-deep .lazy-cascader{
-  width: 220px!important;
+  // width: 220px!important;
+  width: 90% !important;
   text-align: left;
 }
 </style>
diff --git a/src/libs/modal-templates.js b/src/libs/modal-templates.js
index 3523b25..511b7b3 100644
--- a/src/libs/modal-templates.js
+++ b/src/libs/modal-templates.js
@@ -6,6 +6,7 @@ export default function modalTemplates(id, callback, componentKey) {
       title: '运费模板',
       customClass: 'upload-form-temp',
       closeOnClickModal: false,
+      lockScroll: true,
       showClose: false,
       message: h('div', { class: 'common-form-upload' }, [
         h('templatesFrom', {
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 94659ed..d4997e8 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -153,7 +153,8 @@ div:focus {
   color: #fff;
 }
 .upload-form-temp{
-  width: 1100px;
+  width: 80%;
+  top: 4%;
 }
 // el-image 的 关闭预览样式
 .el-image-viewer__close {
diff --git a/src/views/systemForm/setSystem/modifyStoreInfo.vue b/src/views/systemForm/setSystem/modifyStoreInfo.vue
index 2f96b49..da07039 100644
--- a/src/views/systemForm/setSystem/modifyStoreInfo.vue
+++ b/src/views/systemForm/setSystem/modifyStoreInfo.vue
@@ -44,7 +44,7 @@
         <div class="basic-information">
           <div>
             <span class="basic-label">是否开启商户：</span>
-            <el-tooltip v-if="merData.is_margin == 1 && merData.mer_state == 0" class="item" effect="dark" content="请先支付店铺保证金！" placement="top-start">
+            <el-tooltip v-if="(marginNumber>0 || serviceNumber>0 || goodsNumber>0) && merData.mer_state == 0" class="item" effect="dark" content="请先支付店铺保证金！" placement="top-start">
               <el-switch v-model="merData.mer_state" disabled :width="55" active-text="开启" inactive-text="关闭" :active-value="1" :inactive-value="0" />
             </el-tooltip>
             <el-switch v-else v-model="merData.mer_state" active-text="开启" inactive-text="关闭" :active-value="1" :inactive-value="0" :width="55" />