diff --git a/src/components/lazyCascader/index.vue b/src/components/lazyCascader/index.vue
index adf4193..87a1d66 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="top-start">
+    <el-popover v-else @show="handleShow" ref="popover" trigger="click" placement="top-start">
       <!-- 搜索 -->
       <div class="lazy-cascader-search">
         <el-autocomplete
@@ -199,6 +199,9 @@ export default {
     this.initOptions()
   },
   methods: {
+    handleShow(){
+      console.log('ssssss');
+    },
     // 搜索是否选中
     isChecked(value) {
       // 多选
diff --git a/src/libs/modal-templates.js b/src/libs/modal-templates.js
index 511b7b3..9610c60 100644
--- a/src/libs/modal-templates.js
+++ b/src/libs/modal-templates.js
@@ -6,7 +6,7 @@ export default function modalTemplates(id, callback, componentKey) {
       title: '运费模板',
       customClass: 'upload-form-temp',
       closeOnClickModal: false,
-      lockScroll: true,
+      // lockScroll: true,
       showClose: false,
       message: h('div', { class: 'common-form-upload' }, [
         h('templatesFrom', {
diff --git a/src/views/systemForm/setSystem/modifyStoreInfo.vue b/src/views/systemForm/setSystem/modifyStoreInfo.vue
index 80f790d..d64d209 100644
--- a/src/views/systemForm/setSystem/modifyStoreInfo.vue
+++ b/src/views/systemForm/setSystem/modifyStoreInfo.vue
@@ -52,9 +52,9 @@
           </div>
         </div>
         <div class="basic-information">
-          <div v-if="merData.is_margin != 0">
+          <div>
             <!--未支付-->
-            <div v-if="merData.is_margin == 1">
+            <div v-if="merData.is_margin == 1" class="margin_main">
               <span class="basic-label">店铺保证金：</span>
               <span class="font_red">{{ marginNumber }}元</span>
               <div class="margin_count" @mouseenter="getCode('all')">
@@ -83,7 +83,7 @@
               <el-button v-if="!merData.offline.includes(10) && merData.ot_margin-merData.margin>0" type="success" size="small" class="mr10 pay_btn" @click="handleTransfer(10)">提交转账信息</el-button>
             </div>
             <!--技术服务费-->
-            <div v-if="merData.is_service == 1">
+            <div v-if="merData.is_service == 1" class="margin_main">
               <span class="basic-label">技术服务费：</span>
               <span class="font_red">{{ serviceNumber}}元</span>
               <div class="margin_count" @mouseenter="getCode('service')">
@@ -103,7 +103,7 @@
               <el-button v-if="!merData.offline.includes(30) && merData.ot_service_cost-merData.service_cost>0" type="success" size="small" class="mr10 pay_btn" @click="handleTransfer(30)">提交转账信息</el-button>
             </div>
             <!--商品上架费-->
-            <div v-if="merData.is_goods == 1">
+            <div v-if="merData.is_goods == 1" class="margin_main">
               <span class="basic-label">上架费：</span>
               <span class="font_red">{{ goodsNumber }}元</span>
               <div class="margin_count" @mouseenter="getCode('goods')">
@@ -128,24 +128,7 @@
               <div class="margin_count">
                 <span class="mr10 spanBtn" @click="viewRecords('mer_margin')">查看转账记录</span>
               </div>
-              <div v-if="merData.marginStatus" style="display: inline-block;">
-                <div class="margin_count" @mouseenter="getCode('all')">
-                  <el-button type="text" size="small" class="mr10 pay_btn">去补缴保证金</el-button>
-                  <!--支付二维码-->
-                <div class="erweima">
-                  <div class="pay_title">对公账户</div>
-                  <div>
-                    <!-- <vue-qr class="bicode" :text="goodsQrcode" :size="310" /> -->
-                    <!-- <div class="pay_type">请使用微信扫码支付</div> -->
-                    <div class="pay_price">￥{{ marginNumber }}元</div>
-                    <div class="pay_time">支付账户名称： {{ merData.bank_info.bank_account_name }}</div>
-                    <div class="pay_time">开户银行： {{ merData.bank_info.bank_name }}</div>
-                    <div class="pay_time">银行卡号： {{ merData.bank_info.bank_account_code }}</div>
-                  </div>
-                </div>
-                </div>
-                <el-button v-if="!merData.offline.includes('10') && merData.ot_margin-merData.margin>0" type="success" size="small" class="mr10 pay_btn" @click="handleTransfer(10)">提交转账信息</el-button>
-              </div>
+              <el-button v-if="!merData.offline.includes('10') && merData.ot_margin-merData.margin>0" type="success" size="small" class="mr10 pay_btn" @click="handleTransfer(10)">提交转账信息</el-button>
             </div>
             <!-- 技术服务费 -->
             <div v-if="merData.is_service == 10 " class="margin_main">
@@ -154,24 +137,7 @@
               <div class="margin_count">
                 <span class="mr10 spanBtn" @click="viewRecords('mer_service')">查看转账记录</span>
               </div>
-              <div v-if="merData.serviceStatus" style="display: inline-block;">
-                <div class="margin_count" @mouseenter="getCode('all')">
-                  <el-button type="text" size="small" class="mr10 pay_btn">去补缴技术服务费</el-button>
-                  <!--支付二维码-->
-                <div class="erweima">
-                  <div class="pay_title">对公账户</div>
-                  <div>
-                    <!-- <vue-qr class="bicode" :text="goodsQrcode" :size="310" /> -->
-                    <!-- <div class="pay_type">请使用微信扫码支付</div> -->
-                    <div class="pay_price">￥{{ serviceNumber }}元</div>
-                    <div class="pay_time">支付账户名称： {{ merData.bank_info.bank_account_name }}</div>
-                    <div class="pay_time">开户银行： {{ merData.bank_info.bank_name }}</div>
-                    <div class="pay_time">银行卡号： {{ merData.bank_info.bank_account_code }}</div>
-                  </div>
-                </div>
-                </div>
-                <el-button v-if="!merData.offline.includes('30') && merData.ot_service_cost-merData.service_cost>0" type="success" size="small" class="mr10 pay_btn" @click="handleTransfer(30)">提交转账信息</el-button>
-              </div>
+              <el-button v-if="!merData.offline.includes('30') && merData.ot_service_cost-merData.service_cost>0" type="success" size="small" class="mr10 pay_btn" @click="handleTransfer(30)">提交转账信息</el-button>
             </div>
             <!-- 上架费 -->
             <div v-if="merData.is_goods == 10 " class="margin_main">
@@ -189,24 +155,7 @@
                   </div>
                 </div> -->
               </div>
-              <div v-if="merData.goodsStatus" style="display: inline-block;">
-                <div class="margin_count" @mouseenter="getCode('all')">
-                  <el-button type="text" size="small" class="mr10 pay_btn">去补缴上架费</el-button>
-                  <!--支付二维码-->
-                <div class="erweima">
-                  <div class="pay_title">对公账户</div>
-                  <div>
-                    <!-- <vue-qr class="bicode" :text="goodsQrcode" :size="310" /> -->
-                    <!-- <div class="pay_type">请使用微信扫码支付</div> -->
-                    <div class="pay_price">￥{{ goodsNumber }}元</div>
-                    <div class="pay_time">支付账户名称： {{ merData.bank_info.bank_account_name }}</div>
-                    <div class="pay_time">开户银行： {{ merData.bank_info.bank_name }}</div>
-                    <div class="pay_time">银行卡号： {{ merData.bank_info.bank_account_code }}</div>
-                  </div>
-                </div>
-                </div>
-                <el-button v-if="!merData.offline.includes('40') && merData.goods_cost-merData.goods_cost>0" type="success" size="small" class="mr10 pay_btn" @click="handleTransfer(40)">提交转账信息</el-button>
-              </div>
+              <el-button v-if="!merData.offline.includes('40') && merData.ot_goods_cost-merData.goods_cost>0" type="success" size="small" class="mr10 pay_btn" @click="handleTransfer(40)">提交转账信息</el-button>
             </div>
             <div v-if="merData.is_margin == -10 || merData.is_margin == -1" class="margin_main">
               <span class="basic-label">店铺保证金：</span>
@@ -1299,9 +1248,13 @@ export default {
 }
 .margin_main{
   position: relative;
+  height: 32px;
   .margin_price{
     cursor: pointer;
   }
+  & + .margin_main{
+    margin-top: 5px;
+  }
 }
 .margin_modal{
     position: absolute;