diff --git a/src/components/userList/index.vue b/src/components/userList/index.vue
index 4f392d0..7e899ab 100644
--- a/src/components/userList/index.vue
+++ b/src/components/userList/index.vue
@@ -62,7 +62,7 @@
 <script>
 
 import { userLstApi } from '@/api/system'
-import {getConfigApi} from "@/api/systemForm";
+
 export default {
   name: 'UserList',
   filters: {
@@ -105,10 +105,9 @@ export default {
   },
   mounted() {
     this.getList(1)
-    getConfigApi().then(res => {
-      this.config = res.data || {};
-    }).catch(res => {
-      this.$message.error(res.message)
+    // 获取配置信息
+    this.$root.getConfig().then((res) => {
+      this.config = res
     })
   },
   methods: {
diff --git a/src/main.js b/src/main.js
index e5d5f18..a3c9419 100644
--- a/src/main.js
+++ b/src/main.js
@@ -9,7 +9,7 @@ import Element from 'element-ui'
 import Moment from 'moment'
 import cascader from 'element-ui/lib/cascader'
 import './styles/element-variables.scss'
-import 'viewerjs/dist/viewer.css';
+import 'viewerjs/dist/viewer.css'
 
 import '@/styles/index.scss' // global css
 import '@/styles/iconfont/iconfont.css'
@@ -21,7 +21,7 @@ import VueLazyload from 'vue-lazyload'
 import App from './App'
 import store from './store'
 import router from './router'
-import Viewer from 'v-viewer';
+import Viewer from 'v-viewer'
 import FormCreate from '@form-create/element-ui'
 import uploadPicture from './components/uploadPicture/uploadFrom'
 import VueUeditorWrap from 'vue-ueditor-wrap'
@@ -45,15 +45,16 @@ import { modalSureDelete } from '@/libs/public'
 import * as filters from './filters' // global filters modalTemplates
 import notice from '@/libs/notice' // global filters
 import { getToken } from './utils/auth'
+import { getConfigApi } from '@/api/systemForm'
 
 Vue.use(uploadPicture)
 Vue.use(FormCreate)
 Vue.use(VueAwesomeSwiper)
 Vue.use(Viewer, {
   defaultOptions: {
-    zIndex: 9999,
-  },
-});
+    zIndex: 9999
+  }
+})
 Vue.use(VueLazyload, {
   preLoad: 1.3,
   error: require('./assets/images/no.png'),
@@ -115,11 +116,26 @@ Vue.config.productionTip = false
 export default new Vue({
   el: '#app',
   data: {
-    notice: _notice
+    notice: _notice,
+    config: {}
   },
+  created() {},
+  mounted() {},
   methods: {
     closeNotice() {
       this.notice && this.notice()
+    },
+    async getConfig() {
+      let _this = this
+      if (Object.values(_this.config).length <= 0) {
+        await getConfigApi().then(res => {
+          _this.config = res.data || {}
+        }).catch(err => {
+          console.log('配置信息获取失败' + err)
+        })
+      }
+
+      return _this.config
     }
   },
   router,
diff --git a/src/views/systemForm/setSystem/modifyStoreInfo.vue b/src/views/systemForm/setSystem/modifyStoreInfo.vue
index b4eeb95..ff75375 100644
--- a/src/views/systemForm/setSystem/modifyStoreInfo.vue
+++ b/src/views/systemForm/setSystem/modifyStoreInfo.vue
@@ -1,51 +1,54 @@
 <template>
   <div class="information">
-    <el-tabs v-if="tabList.length > 0" v-model="infoType">
-      <el-tab-pane v-for="(item,index) in tabList" :key="index" :name="item.value" :label="item.title " />
+    <el-tabs v-model="infoType">
+      <el-tab-pane name="1" label="基本信息" />
+      <el-tab-pane name="2" label="店铺信息" />
+      <el-tab-pane name="3" label="功能信息" />
+      <el-tab-pane name="4" label="二维码信息" v-if="config.merchant_type != 2" />
     </el-tabs>
     <div v-if="merModel" class="business-msg" style="min-height: 600px;">
       <div v-if="infoType == '1'" class="user-msg">
         <div class="basic-information">
-          <span class="basic-label">商户名称：</span>
-           {{ merData.mer_name }}
+          <span class="basic-label">{{ typeText }}名称：</span>
+          {{ merData.mer_name }}
         </div>
-         <div class="basic-information">
-          <span class="basic-label">商户负责人手机号：</span>
-           {{ merData.mer_phone }}
+        <div class="basic-information">
+          <span class="basic-label">{{ typeText }}负责人手机号：</span>
+          {{ merData.mer_phone }}
         </div>
         <div v-if="merData.merchantCategory" class="basic-information">
-          <span class="basic-label">商户分类：</span>
-           {{ merData.merchantCategory.category_name || "" }}
+          <span class="basic-label">{{ typeText }}分类：</span>
+          {{ merData.merchantCategory.category_name || "" }}
         </div>
         <div v-if="merData.merchantType" class="basic-information">
-          <span class="basic-label"> 商户类型：</span>
+          <span class="basic-label"> {{ typeText }}类型：</span>
           {{ merData.merchantType.type_name }}
         </div>
         <div v-if="merData.merchantCategory" class="basic-information">
-          <span class="basic-label"> 商户类别：</span>
+          <span class="basic-label"> {{ typeText }}类别：</span>
           {{ merData.is_trader ? "自营" : "非自营" }}
         </div>
         <div class="basic-information">
-          <span class="basic-label"> 商户负责人姓名：</span>
-           {{ merData.real_name }}
+          <span class="basic-label"> {{ typeText }}负责人姓名：</span>
+          {{ merData.real_name }}
         </div>
         <div class="basic-information">
-          <span class="basic-label"> 商户入驻时间：</span>
+          <span class="basic-label"> {{ typeText }}入驻时间：</span>
           {{ merData.create_time }}
         </div>
         <div v-if="merData.sub_mchid" class="basic-information">
-          <span class="basic-label"> 商户入驻时间：</span>
+          <span class="basic-label"> {{ typeText }}入驻时间：</span>
           {{ merData.create_time }}
         </div>
         <div v-if="merData.sub_mchid && merData.merchantType" class="basic-information">
           <span class="basic-label"> 店铺类型：</span>
           {{ merData.merchantType.type_name }}
         </div>
-        <div class="basic-information">
+        <div v-if="config.merchant_type != 2" class="basic-information">
           <div>
-            <span class="basic-label">是否开启商户：</span>
+            <span class="basic-label">是否开启{{ typeText }}：</span>
             <el-tooltip v-if="merData.is_margin == 1 && merData.mer_state == 0" class="item" effect="dark" content="请先支付店铺保证金！" placement="top-start">
-              <el-switch disabled v-model="merData.mer_state" active-text="开启" inactive-text="关闭" :active-value="1" :inactive-value="0" />
+              <el-switch v-model="merData.mer_state" disabled 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" />
             <span class="trip">开启，店铺即可展示在移动端</span>
@@ -56,7 +59,7 @@
             <!--未支付-->
             <div v-if="merData.is_margin == 1">
               <span class="basic-label">店铺保证金：</span>
-              <span class="font_red">{{merData.margin}}元</span>
+              <span class="font_red">{{ merData.margin }}元</span>
               <div class="margin_count" @mouseenter="getCode()">
                 <el-button type="text" size="small" class="mr10 pay_btn">去支付保证金</el-button>
                 <!--支付二维码-->
@@ -64,68 +67,70 @@
                   <div class="pay_title">支付保证金</div>
                   <div>
                     <vue-qr class="bicode" :text="qrCode" :size="310" />
-                    <div class="pay_type" >请使用微信扫码支付</div>
-                     <div class="pay_price" >￥{{marginPrice}}元</div>
-                    <div class="pay_time">支付码过期时间： {{qrEndTime}}</div>
+                    <div class="pay_type">请使用微信扫码支付</div>
+                    <div class="pay_price">￥{{ marginPrice }}元</div>
+                    <div class="pay_time">支付码过期时间： {{ qrEndTime }}</div>
                   </div>
                 </div>
               </div>
             </div>
             <!--已支付-->
-            <div class="margin_main" v-if="merData.is_margin == 10 ">
+            <div v-if="merData.is_margin == 10 " class="margin_main">
               <span class="basic-label">店铺保证金：</span>
-              <span class="margin_price">{{merData.margin}}元</span>
+              <span class="margin_price">{{ merData.margin }}元</span>
               <div class="margin_count">
                 <span class="mr10 spanBtn" @click="viewRecords">查看保证金记录</span>
-                 <!--保证金弹窗-->
-                <div class="margin_modal"  @mouseleave="supplyPay=false">
+                <!--保证金弹窗-->
+                <div class="margin_modal" @mouseleave="supplyPay=false">
                   <div>
-                    <img src="@/assets/images/margin03.png"/>
+                    <img src="@/assets/images/margin03.png">
                     <div class="alic">
-                      <span class="text_g">剩余保证金￥{{merData.margin}}元</span>
-                      <el-button v-if="merData.margin>0" type="primary" size="small" @click="applyReturn">申请退回保证金</el-button>
+                      <span class="text_g">剩余保证金￥{{ merData.margin }}元</span>
+                      <el-button v-if="merData.margin>0" type="primary" size="small" @click="applyReturn">申请退回保证金
+                      </el-button>
                     </div>
                   </div>
                 </div>
               </div>
               <div v-if="merData.marginStatus" style="display: inline-block;">
                 <div class="margin_count" @mouseenter="getCode()">
-                <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="qrCode" :size="310" />
-                    <div class="pay_type" >请使用微信扫码支付</div>
-                     <div class="pay_price" >￥{{marginPrice}}元</div>
-                    <div class="pay_time">支付码过期时间： {{qrEndTime}}</div>
+                  <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="qrCode" :size="310" />
+                      <div class="pay_type">请使用微信扫码支付</div>
+                      <div class="pay_price">￥{{ marginPrice }}元</div>
+                      <div class="pay_time">支付码过期时间： {{ qrEndTime }}</div>
+                    </div>
                   </div>
                 </div>
               </div>
-              </div>
             </div>
-            <div class="margin_main" v-if="merData.is_margin == -10 || merData.is_margin == -1">
+            <div v-if="merData.is_margin == -10 || merData.is_margin == -1" class="margin_main">
               <span class="basic-label">店铺保证金：</span>
-              <span class="margin_price">{{merData.margin}}元</span>
+              <span class="margin_price">{{ merData.margin }}元</span>
               <div class="margin_count">
-                 <span class="mr10 spanBtn" @click="viewRecords">查看保证金记录</span>
+                <span class="mr10 spanBtn" @click="viewRecords">查看保证金记录</span>
                 <!--保证金弹窗-->
                 <div class="margin_modal" @mouseleave="goPay=false">
                   <div>
-                    <img v-if="merData.is_margin == -10" src="@/assets/images/margin01.png"/>
-                    <img v-if="merData.is_margin == -1" src="@/assets/images/margin02.png"/>
-                    <img v-if="merData.is_margin == 10" src="@/assets/images/margin03.png"/>
-                    <div class="alic" v-if="merData.is_margin == 10">
-                      <span class="text_g">剩余保证金￥{{merData.margin}}元</span>
-                      <el-button v-if="merData.margin>0" type="primary" size="small" @click="applyReturn">申请退回保证金</el-button>
+                    <img v-if="merData.is_margin == -10" src="@/assets/images/margin01.png">
+                    <img v-if="merData.is_margin == -1" src="@/assets/images/margin02.png">
+                    <img v-if="merData.is_margin == 10" src="@/assets/images/margin03.png">
+                    <div v-if="merData.is_margin == 10" class="alic">
+                      <span class="text_g">剩余保证金￥{{ merData.margin }}元</span>
+                      <el-button v-if="merData.margin>0" type="primary" size="small" @click="applyReturn">申请退回保证金
+                      </el-button>
                     </div>
-                    <div class="alic"  v-if="merData.is_margin == -1">
+                    <div v-if="merData.is_margin == -1" class="alic">
                       <span class="text_b b01"> 审核中</span>
                       <div class="margin_refused">您申请退回保证金，正在审核中…</div>
                     </div>
-                    <div class="alic"  v-if="merData.is_margin == -10">
+                    <div v-if="merData.is_margin == -10" class="alic">
                       <span class="text_b b02">审核未通过</span>
-                      <div class="margin_refused">未通过原因：<span>{{merData.refundMarginOrder.refusal}}</span></div>
+                      <div class="margin_refused">未通过原因：<span>{{ merData.refundMarginOrder.refusal }}</span></div>
                       <el-button type="primary" size="small" @click="applyReturn">再次申请</el-button>
                     </div>
                   </div>
@@ -136,7 +141,7 @@
         </div>
       </div>
       <!--申请退回保障金银行信息弹窗-->
-       <el-dialog
+      <el-dialog
         v-if="modalBank"
         v-model="modalBank"
         :visible.sync="modalBank"
@@ -148,14 +153,14 @@
         <div class="bank-container">
           <div class="item">说明： <span class="red">申请退回保证金则视为关闭店铺，请谨慎操作！</span></div>
           <div class="item">
-            <div v-if="online > 0">线上支付的保证金 <span class="red">{{online}}元</span>会原路返回</div>
+            <div v-if="online > 0">线上支付的保证金 <span class="red">{{ online }}元</span>会原路返回</div>
 
             <div v-if="offline > 0">
-              线下支付的保证金<span class="red">{{offline}}元，</span>会通过下方账号信息返回，请务必确认下方您的收款信息真实有效，以确保资金可顺利退回，感谢配合！
+              线下支付的保证金<span class="red">{{ offline }}元，</span>会通过下方账号信息返回，请务必确认下方您的收款信息真实有效，以确保资金可顺利退回，感谢配合！
             </div>
           </div>
           <div class="title">账号信息：</div>
-           <el-form ref="bankValidate" :model="bankValidate" :rules="bankRules" label-width="100px" @submit.native.prevent>
+          <el-form ref="bankValidate" :model="bankValidate" :rules="bankRules" label-width="100px" @submit.native.prevent>
             <el-form-item label="真实姓名：" prop="name">
               <el-input v-model="bankValidate.name" type="text" size="small" placeholder="请输入真实姓名" />
             </el-form-item>
@@ -202,7 +207,7 @@
                 <div class="trip">建议尺寸：120*120px</div>
               </div>
             </el-form-item>
-            <el-form-item class="form-item" label="店铺街背景图：">
+            <el-form-item v-if="config.merchant_type != 2" class="form-item" label="店铺街背景图：">
               <div class="upLoadPicBox" @click="modalPicTap('3')">
                 <div v-if="merData.mini_banner" class="pictrue">
                   <img :src="merData.mini_banner">
@@ -230,11 +235,17 @@
               </div>
             </el-form-item>
             <el-form-item label="配送方式:" prop="delivery_way">
-              <el-checkbox-group v-model="merData.delivery_way">
-                <el-checkbox v-for="item in deliveryList" :key="item.value" :label="item.value">
-                  {{ item.name }}
-                </el-checkbox>
-              </el-checkbox-group> <span class="trip">只选择一种配送方式时,会自动修改店铺所有商品的配送方式</span>
+              <template v-if="config.merchant_type == 2">
+                <el-checkbox-group v-model="merData.delivery_way">
+                  <el-checkbox :label="'2'" checked>快递配送</el-checkbox>
+                </el-checkbox-group>
+              </template>
+              <template v-else>
+                <el-checkbox-group v-model="merData.delivery_way">
+                  <el-checkbox v-for="item in deliveryList" :key="item.value" :label="item.value">{{ item.name }}</el-checkbox>
+                </el-checkbox-group>
+                <span class="trip">只选择一种配送方式时,会自动修改店铺所有商品的配送方式</span>
+              </template>
             </el-form-item>
             <el-row v-if="(merData.delivery_way.length == 1 && merData.delivery_way[0] == '1') || (merData.delivery_way.length == 2)" :gutter="24">
               <el-col :span="24">
@@ -251,7 +262,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row v-if="(merData.delivery_way.length == 1 && merData.delivery_way[0] == '1') || (merData.delivery_way.length == 2)" >
+            <el-row v-if="(merData.delivery_way.length == 1 && merData.delivery_way[0] == '1') || (merData.delivery_way.length == 2)">
               <el-col :span="24">
                 <el-form-item label="详细地址：" prop="mer_take_address">
                   <el-input v-model="merData.mer_take_address" placeholder="请输入详细地址" />
@@ -269,13 +280,14 @@
                       slot="append"
                       type="primary"
                       @click="onSearchs"
-                    >查找位置</el-button>
+                    >查找位置
+                    </el-button>
                   </el-input>
                   <div slot="content">请点击查找位置选择位置</div>
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row v-if="(merData.delivery_way.length == 1 && merData.delivery_way[0] == '1') || (merData.delivery_way.length == 2)" >
+            <el-row v-if="(merData.delivery_way.length == 1 && merData.delivery_way[0] == '1') || (merData.delivery_way.length == 2)">
               <el-col :span="24">
                 <el-form-item label="提货点营业日期：" prop="mer_take_day">
                   <el-select
@@ -299,25 +311,25 @@
                     v-model="value1"
                     placeholder="开始时间"
                     value-format="HH:mm"
-                    @change="onchangeTime1">
-                  </el-time-picker>
+                    @change="onchangeTime1"
+                  />
                   <el-time-picker
                     v-model="value2"
                     placeholder="结束时间"
                     value-format="HH:mm"
-                    @change="onchangeTime2">
-                  </el-time-picker>
+                    @change="onchangeTime2"
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="24">
-                <el-form-item label="商户简介：" prop="mer_info">
+                <el-form-item :label="typeText + '简介：'" prop="mer_info">
                   <el-input v-model="merData.mer_info" type="textarea" placeholder="文字简介，200字以内" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="商户关键字：" prop="mer_keyword">
+                <el-form-item v-if="config.merchant_type != 2" :label="typeText + '关键字：'" prop="mer_keyword">
                   <div class="tip-form">
                     <el-input v-model="merData.mer_keyword" style="min-width: 200px;" placeholder="用户在搜索该关键字时，可搜索到本店铺" />
                   </div>
@@ -331,14 +343,14 @@
                   </el-radio-group>
                 </el-form-item>
                 <el-form-item label="客服电话：">
-                  <el-input v-model="merData.service_phone" type="number"/>
+                  <el-input v-model="merData.service_phone" type="number" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="24">
-                <el-form-item label="商户地址：" prop="mer_address">
-                  <el-input v-model="merData.mer_address" enter-button="查找位置" placeholder="请输入商户地址（地址中请包含城市名称，否则会影响搜索精度）">
+                <el-form-item :label="typeText + '地址：'" prop="mer_address">
+                  <el-input v-model="merData.mer_address" enter-button="查找位置" :placeholder="'请输入' + typeText + '地址（地址中请包含城市名称，否则会影响搜索精度）'">
                     <el-button slot="append" type="primary" @click="onSearch">查找位置</el-button>
                   </el-input>
                 </el-form-item>
@@ -352,31 +364,33 @@
         </div>
       </div>
       <div v-if="infoType == '3'" class="user-msg">
-        <div class="basic-information" v-if="merData.merchantCategory">
+        <div v-if="merData.merchantCategory" class="basic-information">
           <span class="basic-label"> 商户手续费：</span>
-          {{ Number(merData.commission_rate) > 0 ? (parseFloat(merData.commission_rate)).toFixed(2) : (parseFloat(merData.merchantCategory.commission_rate * 100)).toFixed(2)}}%
+          {{
+            Number(merData.commission_rate) > 0 ? (parseFloat(merData.commission_rate)).toFixed(2) : (parseFloat(merData.merchantCategory.commission_rate * 100)).toFixed(2)
+          }}%
         </div>
         <div class="basic-information">
           <span class="basic-label"> 添加商品：</span>
           {{ merData.is_audit ? "需平台审核" : "平台免审核" }}
         </div>
-        <div class="basic-information">
+        <div class="basic-information" v-if="config.merchant_type != 2">
           <span class="basic-label"> 开启直播间：</span>
           {{ merData.is_bro_room ? "需平台审核" : "平台免审核" }}
         </div>
-        <div class="basic-information">
+        <div class="basic-information" v-if="config.merchant_type != 2">
           <span class="basic-label"> 添加直播商品：</span>
           {{ merData.is_bro_goods ? "需平台审核" : "平台免审核" }}
         </div>
-        <div class="basic-information">
+        <div class="basic-information" v-if="config.merchant_type != 2">
           <span class="basic-label"> 平台首页推荐商户：</span>
           {{ merData.is_best ? "是" : "否" }}
         </div>
       </div>
-      <div v-if="infoType == '4'" class="user-msg">
+      <div v-if="infoType == '4' && config.merchant_type != 2" class="user-msg">
         <div class="qr-code-box">
           <div class="title">在线买单二维码</div>
-          <img class="qr-code-img" :src="merData.online_payment_qr_code" />
+          <img class="qr-code-img" :src="merData.online_payment_qr_code">
         </div>
       </div>
       <div v-if="infoType != 3 && infoType != 4" class="submit-button">
@@ -404,34 +418,34 @@
       class="mapBox"
       custom-class="dialog-scustom"
     >
-     <el-table :data="tableData.data" :loading="loading" size="small">
-      <el-table-column label="序号" min-width="50">
-        <template scope="scope">
-          <span>{{ scope.$index+(tableFrom.page - 1) * tableFrom.limit + 1 }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="标题" min-width="90" prop="title" />
-      <el-table-column prop="number" label="金额" min-width="60">
-        <template scope="scope">
-          <span v-if="scope.row.pm == 1" style="color:#13ce66">+{{scope.row.number}}</span>
-          <span v-else style="color:rgb(237, 64, 20)">-{{scope.row.number}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="balance" label="保证金结余" min-width="100" />
-      <el-table-column label="备注" min-width="150" prop="mark" />
-      <el-table-column prop="create_time" label="操作时间" min-width="120" />
-    </el-table>
-    <div class="acea-row row-right page">
-      <el-pagination
-        :page-sizes="[20, 40, 60, 80]"
-        :page-size="tableFrom.limit"
-        :current-page="tableFrom.page"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="tableData.total"
-        @size-change="handleSizeChange"
-        @current-change="pageChange"
-      />
-    </div>
+      <el-table :data="tableData.data" :loading="loading" size="small">
+        <el-table-column label="序号" min-width="50">
+          <template scope="scope">
+            <span>{{ scope.$index + (tableFrom.page - 1) * tableFrom.limit + 1 }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="标题" min-width="90" prop="title" />
+        <el-table-column prop="number" label="金额" min-width="60">
+          <template scope="scope">
+            <span v-if="scope.row.pm == 1" style="color:#13ce66">+{{ scope.row.number }}</span>
+            <span v-else style="color:rgb(237, 64, 20)">-{{ scope.row.number }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="balance" label="保证金结余" min-width="100" />
+        <el-table-column label="备注" min-width="150" prop="mark" />
+        <el-table-column prop="create_time" label="操作时间" min-width="120" />
+      </el-table>
+      <div class="acea-row row-right page">
+        <el-pagination
+          :page-sizes="[20, 40, 60, 80]"
+          :page-size="tableFrom.limit"
+          :current-page="tableFrom.page"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="tableData.total"
+          @size-change="handleSizeChange"
+          @current-change="pageChange"
+        />
+      </div>
     </el-dialog>
   </div>
 </template>
@@ -441,73 +455,15 @@
 import { storeGetInfoApi, marginCode, marginMakeCode, marginRecordLst, marginRefund, marginRefundApply } from '@/api/setting'
 import { getBaseInfo, merchantUpdate } from '@/api/user.js'
 import Maps from '@/components/map/map.vue'
-
-import { mapState } from 'vuex'
 import { getToken } from '@/utils/auth'
 import SettingMer from '@/libs/settingMer'
 import { roterPre } from '@/settings'
-// 二维码组件
-import VueQr from 'vue-qr'
+import VueQr from 'vue-qr'// 二维码组件
+
 export default {
   name: 'Information',
   components: { Maps, VueQr },
   data() {
-    var checkPhone = (rule, value, callback) => {
-      if (value === '') {
-        callback(new Error('请输入客服电话'))
-      } else {
-        let regPone = null
-        const mobile = /^1(3|4|5|6|7|8|9)\d{9}$/ // 最新16手机正则
-        const tel = /^(0[0-9]{2,3}\-)([2-9][0-9]{4,7})+(\-[0-9]{1,4})?$/ // 座机
-        const tels = /^400-[016789]\d{2}-\d{4}$/
-        if (value.charAt(0) == 0) {
-          // charAt查找第一个字符方法，用来判断输入的是座机还是手机号
-          regPone = tel
-        }else if(value.charAt(0) == 4){
-          regPone = tels
-        } else {
-          regPone = mobile
-        }
-        if (!regPone.test(value)) {
-          return callback(new Error("请填写客服电话(座机格式'区号-座机号码'),400格式：400-XXX-XXXX"))
-        }
-        callback()
-      }
-    }
-
-  // const checkPhone= (rule, value, callback) =>{
-  //     const phoneExp = /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/;
-  //     setTimeout(()=>{
-  //       if(value !== undefined && value !==''){
-  //         if ((!phoneExp.test(value)) && value !== '') {
-  //           callback(new Error('请输入正确的格式！'));
-  //         } else {
-  //           callback();
-  //         }
-  //       }else{
-  //         callback()
-  //       }
-  //     },100)
-  //   }
-
-// var checkPhone = (rule, value, callback) => {
-//       if (value === '') {
-//         callback(new Error('请输入电话号码'))
-//       }
-//       if (value.length !== 11) {
-//         callback(new Error('请输入正确电话号码'))
-//       }
-//       if (value.length !== 11) {
-//         callback(new Error('请输入正确电话号码'))
-//       }
-//       // 验证电话号码手机号码，包含至今所有号段? ?
-//       var ab = /^[1][3,4,5,7,8][0-9]{9}$/
-//       if (ab.test(value) === false) {
-//         callback(new Error('请输入正确电话号码'))
-//       }
-//       callback()
-//     }
-
     const validatePhone = (rule, value, callback) => {
       if (!value) {
         return callback(new Error('请填写手机号'))
@@ -536,8 +492,8 @@ export default {
         total: 0,
         data: []
       },
-      value1: "",
-      value2: "",
+      value1: '',
+      value2: '',
       marginPrice: 0,
       merData: {
         delivery_way: [],
@@ -548,7 +504,8 @@ export default {
         mer_take_day: [],
         mer_take_location: '',
         id: 0,
-        mer_take_status: 0 }, // 默认数据
+        mer_take_status: 0
+      }, // 默认数据
       myHeaders: { 'X-Token': getToken() },
       uploadedQualifications: [], // 资质图片列表
       mapKey: '', // 地图key
@@ -569,14 +526,14 @@ export default {
         { value: '2', name: '快递配送' }
       ],
       rules: {
-        mer_banner: [{ required: true, message: '请上传店铺banner' }],
-        mer_avatar: [{ required: true, message: '请上传店铺头像' }],
-        mer_info: [{ required: true, message: '请输入商户简介', trigger: 'blur' },
+        mer_banner: [{ required: true, message: '请上传banner' }],
+        mer_avatar: [{ required: true, message: '请上传头像' }],
+        mer_info: [{ required: true, message: '请输入简介', trigger: 'blur' },
           { min: 3, max: 200, message: '长度在 3 到 200 个字符', trigger: 'blur' }
         ],
-        mer_keyword: [{ required: false, message: '请输入商户关键字', trigger: 'blur' }],
-        mer_address: [{ required: true, message: '请输入商户地址', trigger: 'blur' }],
-        uploadedqualifications: [{ required: true, message: '请上传商户资质', trigger: 'blur' }],
+        mer_keyword: [{ required: false, message: '请输入关键字', trigger: 'blur' }],
+        mer_address: [{ required: true, message: '请输入地址', trigger: 'blur' }],
+        uploadedqualifications: [{ required: true, message: '请上传资质', trigger: 'blur' }],
         delivery_way: [{ required: true, message: '请选择送货方式', trigger: 'change' }],
         mer_take_name: [{ required: true, message: '请输入提货点名称', trigger: 'blur' }],
         mer_take_day: [{ required: true, type: 'array', message: '请选择提货点营业日期', trigger: 'change' }],
@@ -586,10 +543,10 @@ export default {
         mer_take_location: [{ required: true, message: '请选择经纬度', trigger: 'blur' }]
       },
       bankValidate: {
-        code: "",
-        name: "",
+        code: '',
+        name: '',
         type: 1,
-        pic: ""
+        pic: ''
       },
       bankRules: {
         code: [{ required: true, message: '请输入开户银行', trigger: 'blur' }],
@@ -597,23 +554,26 @@ export default {
           { required: true, message: '请输入银行卡号', trigger: 'blur' },
           { pattern: /\d{10,19}/, message: '请输入正确的银行账号', trigger: 'blur' }
         ],
-        name: [{ required: true, message: '请输入真实姓名', trigger: 'blur' }],
+        name: [{ required: true, message: '请输入真实姓名', trigger: 'blur' }]
       },
-      offline: "",
-      online: "",
+      offline: '',
+      online: '',
       keyUrl: '',
       infoType: '1',
-      tabList: [
-        {value: '1',title: '基本信息'},
-        {value: '2',title: '店铺信息'},
-        {value: '3',title: '功能信息'},
-        {value: '4',title: '二维码信息'}
-      ]
+      // 基本配置信息
+      config: {}
     }
   },
   computed: {
     fileUrl() {
       return SettingMer.https + `/upload/certificate`
+    },
+    typeText() {
+      const type = this.config.merchant_type || 0
+      // 商户类别：0=普通商户，1=酒道馆，2=供应商
+      if (type == 1) return '酒道馆'
+      else if (type == 2) return '供应商'
+      else '商户'
     }
   },
   watch: {
@@ -628,33 +588,31 @@ export default {
   },
   created() {
     this.getMapInfo()
-
-
   },
-  mounted: function() {
-    window.addEventListener(
-      'message',
-      function(event) {
-        // 接收位置信息，用户选择确认位置点后选点组件会触发该事件，回传用户的位置信息
-        var loc = event.data
-        if (loc && loc.module === 'locationPicker') {
-          // 防止其他应用也会向该页面post信息，需判断module是否为'locationPicker'
-          window.parent.selectAdderss(loc)
-        }
-      },
-      false
-    )
+  mounted() {
+    window.addEventListener('message', function(event) {
+      // 接收位置信息，用户选择确认位置点后选点组件会触发该事件，回传用户的位置信息
+      var loc = event.data
+      if (loc && loc.module === 'locationPicker') {
+        // 防止其他应用也会向该页面post信息，需判断module是否为'locationPicker'
+        window.parent.selectAdderss(loc)
+      }
+    }, false)
     window.selectAdderss = this.selectAdderss
     this.getInfo()
+    // 获取配置信息
+    this.$root.getConfig().then((res) => {
+      this.config = res
+    })
   },
   methods: {
     // 营业时间
     onchangeTime1(e) {
-      this.value1 = e;
+      this.value1 = e
       this.merData.mer_take_time[0] = e
     },
     onchangeTime2(e) {
-      this.value2 = e;
+      this.value2 = e
       this.merData.mer_take_time[1] = e
     },
     // 选择经纬度
@@ -663,7 +621,9 @@ export default {
       this.modalMap = false
     },
     onSearchs() {
-      if (!this.key || this.key == '') { this.$message.error('平台未配置腾讯地图KEY') } else this.modalMap = true
+      if (!this.key || this.key == '') {
+        this.$message.error('平台未配置腾讯地图KEY')
+      } else this.modalMap = true
     },
     // 地图信息获取
     getCoordinates(data) {
@@ -694,9 +654,9 @@ export default {
         that.marginPrice = info.is_margin
         that.merData.margin = info.margin
         that.merData.mer_take_location =
-            info.mer_take_location && info.mer_take_location.length
-              ? info.mer_take_location[0] + ',' + info.mer_take_location[1]
-              : ''
+          info.mer_take_location && info.mer_take_location.length
+            ? info.mer_take_location[0] + ',' + info.mer_take_location[1]
+            : ''
         that.merData.mer_take_status = info.mer_take_status || 0
         that.merData.refundMarginOrder = info.refundMarginOrder
         that.merData.marginStatus = info.ot_margin > info.margin
@@ -708,17 +668,17 @@ export default {
         } else {
           that.uploadedQualifications = []
         }
-        if(that.merData.is_margin == 1)(this.getCode())
+        if (that.merData.is_margin == 1) (this.getCode())
       })
     },
     // 提交线下转账信息
-    bankConfirm(name){
+    bankConfirm(name) {
       this.$refs[name].validate(valid => {
         if (valid) {
           marginRefundApply(this.bankValidate)
             .then((res) => {
               this.$message.success(res.message)
-              this.modalBank = false;
+              this.modalBank = false
               this.getInfo()
             })
             .catch((res) => {
@@ -732,7 +692,7 @@ export default {
     },
     // 提交/修改
     submitForm(formName) {
-      if(this.infoType == 2){
+      if (this.infoType == 2) {
         this.$refs[formName].validate(valid => {
           if (valid) {
             const dataKey = Object.keys(this.rules)
@@ -765,12 +725,12 @@ export default {
             return false
           }
         })
-      }else{
-        let data = {
+      } else {
+        const data = {
           mer_state: this.merData.mer_state,
           type: this.infoType
         }
-         merchantUpdate(data)
+        merchantUpdate(data)
           .then((res) => {
             console.log(res)
             this.submitLoading = false
@@ -779,52 +739,52 @@ export default {
           .catch((rej) => {
             this.submitLoading = false
             this.$message.error(rej.data.message)
-        })
+          })
       }
     },
     // 获取支付二维码
     getCode() {
-      let that = this
-      if(this.merData.marginStatus){
+      const that = this
+      if (this.merData.marginStatus) {
         marginMakeCode()
-        .then((res) => {
-          that.qrCode = res.data.config
-          that.qrEndTime = res.data.endtime
-          that.marginPrice = res.data.price
-        })
-        .catch(function(res) {
-          that.$message.error(res.message)
-        })
-      }else{
+          .then((res) => {
+            that.qrCode = res.data.config
+            that.qrEndTime = res.data.endtime
+            that.marginPrice = res.data.price
+          })
+          .catch(function(res) {
+            that.$message.error(res.message)
+          })
+      } else {
         marginCode()
-        .then((res) => {
-          that.qrCode = res.data.config
-          that.qrEndTime = res.data.endtime
-          that.marginPrice = res.data.price
-        })
-        .catch(function(res) {
-          that.$message.error(res.message)
-        })
+          .then((res) => {
+            that.qrCode = res.data.config
+            that.qrEndTime = res.data.endtime
+            that.marginPrice = res.data.price
+          })
+          .catch(function(res) {
+            that.$message.error(res.message)
+          })
       }
     },
     // 查看保证金记录
     viewRecords() {
-      this.tableFrom.page = 1;
-      this.modalRecord = true;
+      this.tableFrom.page = 1
+      this.modalRecord = true
       this.getRecordList()
     },
     // 保证金记录列表
-    getRecordList(){
-      let that = this
-      that.loading = true;
-      marginRecordLst(that.tableFrom).then(async (res) => {
-        that.tableData.data = res.data.list;
-        that.tableData.total = res.data.count;
-        that.loading = false;
+    getRecordList() {
+      const that = this
+      that.loading = true
+      marginRecordLst(that.tableFrom).then(async(res) => {
+        that.tableData.data = res.data.list
+        that.tableData.total = res.data.count
+        that.loading = false
       }).catch((res) => {
-        that.loading = false;
-        that.$message.error(res.message);
-      });
+        that.loading = false
+        that.$message.error(res.message)
+      })
     },
     pageChange(page) {
       this.tableFrom.page = page
@@ -836,33 +796,33 @@ export default {
     },
     // 申请退回保证金
     applyReturn() {
-      let that = this;
+      const that = this
       that.$confirm('申请退回保证金则视为关闭店铺，请谨慎操作！您是否确定继续操作？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
         marginRefund()
-        .then((res) => {
-          that.bankValidate = res.data.info
-          that.offline = res.data.offline
-          that.online = res.data.online
-          if(Number(res.data.offline) <= 0){
-           marginRefundApply(this.bankValidate)
-            .then((res) => {
-              this.$message.success(res.message)
-              this.getInfo()
-            })
-            .catch((res) => {
-              this.$message.error(res.message)
-            })
-          }else{
-            that.modalBank = true
-          }
-        })
-        .catch(function(res) {
-          that.$message.error(res.message)
-        })
+          .then((res) => {
+            that.bankValidate = res.data.info
+            that.offline = res.data.offline
+            that.online = res.data.online
+            if (Number(res.data.offline) <= 0) {
+              marginRefundApply(this.bankValidate)
+                .then((res) => {
+                  this.$message.success(res.message)
+                  this.getInfo()
+                })
+                .catch((res) => {
+                  this.$message.error(res.message)
+                })
+            } else {
+              that.modalBank = true
+            }
+          })
+          .catch(function(res) {
+            that.$message.error(res.message)
+          })
       })
     },
     // 查找位置
@@ -875,7 +835,7 @@ export default {
       const that = this
       storeGetInfoApi()
         .then((res) => {
-          console.log(res)
+          // console.log(res)
           this.mapKey = res.data.tx_map_key
         })
         .catch(function(res) {
@@ -928,25 +888,29 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-/deep/.el-textarea__inner{
+/deep/ .el-textarea__inner {
   height: 90px;
 }
+
 .information {
   width: 100%;
   padding: 10px 20px 80px 20px;
+
   h2 {
     text-align: center;
     color: #303133;
     font-weight: bold;
     font-size: 20px;
   }
+
   .lab-title {
     width: max-content;
     font-size: 14px;
     font-weight: bold;
     color: #303133;
     margin: 10px 10%;
-    &::before{
+
+    &::before {
       content: "";
       display: inline-block;
       width: 3px;
@@ -957,20 +921,24 @@ export default {
       top: 1px;
     }
   }
+
   .user-msg {
     padding: 0 20px;
     margin-top: 20px;
-    .qr-code-box{
+
+    .qr-code-box {
       display: inline-flex;
       flex-direction: row;
       align-items: center;
       flex-wrap: nowrap;
       justify-content: flex-start;
       padding-left: 200px;
-      .title{
+
+      .title {
         font-size: 18px;
       }
-      .qr-code-img{
+
+      .qr-code-img {
         margin-left: 50px;
         border: 1px solid #CFCFCF;
         height: 200px;
@@ -979,6 +947,7 @@ export default {
       }
     }
   }
+
   .basic-information {
     padding: 0 100px;
     margin-bottom: 20px;
@@ -986,36 +955,45 @@ export default {
     text-rendering: optimizeLegibility;
     font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
     color: #606266;
-    .basic-label{
+
+    .basic-label {
       display: inline-block;
       text-align: right;
       width: 150px;
       margin-right: 10px;
     }
   }
+
   .trip {
     color: #999999;
     font-weight: normal;
     font-size: 12px;
   }
-  /deep/.el-form-item__label{
+
+  /deep/ .el-form-item__label {
     color: #303133;
   }
-  .demo-ruleForm{
+
+  .demo-ruleForm {
     overflow: hidden;
   }
+
   .form-data {
     padding: 30px 8%;
+
     .map-sty {
       width: 100%;
     }
+
     .pictrue img {
       border-radius: 4px;
       object-fit: cover;
     }
+
     .tip-form {
       display: flex;
       align-items: center;
+
       span {
         white-space: nowrap;
         padding-left: 10px;
@@ -1023,6 +1001,7 @@ export default {
       }
     }
   }
+
   .submit-button {
     display: flex;
     justify-content: center;
@@ -1034,109 +1013,132 @@ export default {
     background-color: rgba(255, 255, 255, 0.7);
   }
 }
-.bank-container{
+
+.bank-container {
   padding: 0 20px;
-  .item{
+
+  .item {
     margin-top: 10px;
     color: #282828;
     font-size: 13px;
     line-height: 26px;
   }
-  .red{
-    color:rgb(237, 64, 20);;
+
+  .red {
+    color: rgb(237, 64, 20);;
   }
-  .title{
-    color:#303133;
+
+  .title {
+    color: #303133;
     margin: 15px 0;
     font-weight: bold;
 
   }
 }
+
 .font_red {
   color: red;
   margin-right: 5px;
 }
-.spanBtn{
-  color:#437FFD;
-  font-size:12px;
+
+.spanBtn {
+  color: #437FFD;
+  font-size: 12px;
   cursor: pointer;
 }
-.margin_main{
+
+.margin_main {
   position: relative;
-  .margin_price{
+
+  .margin_price {
     cursor: pointer;
   }
 }
-.margin_modal{
-    position: absolute;
-    left: -20px;
-    top: 20px;
-    border-radius: 8px;
-    background: #fff;
-    align-items: center;
-    justify-content: center;
-    z-index: 9;
-    width: 250px;
-    padding-bottom: 30px;
-    box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
-    display: none;
-    .alic{
-      text-align: center;
-    }
-    img{
-      display: block;
-      width: 150px;
-      height: 116px;
-      margin: 20px auto 50px;
-    }
-    span{
-      margin-bottom: 10px;
-      display: block;
-      font-weight: normal;
-      text-align: center;
-    }
-    .text_g{
-      font-size: 16px;
-      color: #303133;
-    }
-    .text_b{
-      color: #606266;
-      font-size: 18px;
-      font-weight: bold;
-      margin-bottom: 14px;
-      &.b02{
-        color: #EF9B6F;
-      }
-      &.b01{
-        color: #57D1A0;
-      }
-    }
-    .el-button{
-      margin-top: 25px;
-    }
-  }
-  .margin_refused{
-    display: block;
-    margin-bottom: 10px;
+
+.margin_modal {
+  position: absolute;
+  left: -20px;
+  top: 20px;
+  border-radius: 8px;
+  background: #fff;
+  align-items: center;
+  justify-content: center;
+  z-index: 9;
+  width: 250px;
+  padding-bottom: 30px;
+  box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
+  display: none;
+
+  .alic {
     text-align: center;
+  }
+
+  img {
+    display: block;
+    width: 150px;
+    height: 116px;
+    margin: 20px auto 50px;
+  }
+
+  span {
+    margin-bottom: 10px;
+    display: block;
+    font-weight: normal;
+    text-align: center;
+  }
+
+  .text_g {
+    font-size: 16px;
+    color: #303133;
+  }
+
+  .text_b {
     color: #606266;
-    span{
-      display: inline;
-      // color: red;
+    font-size: 18px;
+    font-weight: bold;
+    margin-bottom: 14px;
+
+    &.b02 {
+      color: #EF9B6F;
+    }
+
+    &.b01 {
+      color: #57D1A0;
     }
   }
+
+  .el-button {
+    margin-top: 25px;
+  }
+}
+
+.margin_refused {
+  display: block;
+  margin-bottom: 10px;
+  text-align: center;
+  color: #606266;
+
+  span {
+    display: inline;
+    // color: red;
+  }
+}
+
 .margin_count {
   position: relative;
   display: inline-block;
   padding-bottom: 10px;
+
   .pay_btn:hover + .erweima {
     display: block;
   }
-  &:hover{
-    .margin_modal{
+
+  &:hover {
+    .margin_modal {
       display: block;
     }
   }
+
   .erweima {
     position: absolute;
     left: 0;
@@ -1151,28 +1153,32 @@ export default {
     padding: 10px;
     box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
 
-    img{
+    img {
       width: 160px;
       height: 160px;
       margin-top: 20px;
     }
-    .pay_type{
+
+    .pay_type {
       font-size: 16px;
       color: #303133;
       font-weight: normal;
 
     }
-    .pay_price{
+
+    .pay_price {
       font-size: 18px;
       color: #E57272;
       margin: 10px 0;
     }
-    .pay_title{
+
+    .pay_title {
       font-size: 16px;
       color: #303133;
       margin-top: 20px;
     }
-    .pay_time{
+
+    .pay_time {
       font-size: 12px;
       color: #6D7278;
 
@@ -1180,13 +1186,14 @@ export default {
   }
 
 }
+
 /deep/ .el-upload--picture-card {
   width: 58px;
   height: 58px;
   line-height: 70px;
 }
 
-/deep/.el-upload-list__item {
+/deep/ .el-upload-list__item {
   width: 58px;
   height: 58px;
 }
@@ -1194,11 +1201,13 @@ export default {
 .upLoadPicBox_qualification {
   display: flex;
   flex-wrap: wrap;
+
   .uploadpicBox_list {
     position: relative;
     height: 58px;
     width: 58px;
     margin: 0 20px 20px 0;
+
     .uploadpicBox_list_image {
       position: absolute;
       top: 0;
@@ -1207,6 +1216,7 @@ export default {
       height: 58px;
       border-radius: 4px;
       overflow: hidden;
+
       img {
         width: 100%;
         height: 100%;
@@ -1232,6 +1242,7 @@ export default {
     }
   }
 }
+
 .uploadpicBox_list:hover .uploadpicBox_list_method {
   z-index: 11;
   opacity: 1;