diff --git a/src/views/marketing/agent/agent/index.vue b/src/views/marketing/agent/agent/index.vue
index 27ab657..7af4dbb 100644
--- a/src/views/marketing/agent/agent/index.vue
+++ b/src/views/marketing/agent/agent/index.vue
@@ -58,6 +58,8 @@
                       {{ Object.values(scope.row.merList).length > 1 ? '+'+Object.values(scope.row.merList).length : '' }}
                     </el-tag>
                   </template>
+                  <!--是否为总部-->
+                  <el-tag v-if="Number(scope.row.is_headquarters) == 1" type="warning" effect="dark" size="small">总部</el-tag>
                 </div>
               </div>
             </div>
diff --git a/src/views/marketing/agent/agent/template/edit.vue b/src/views/marketing/agent/agent/template/edit.vue
index e41ed0a..1b2ee89 100644
--- a/src/views/marketing/agent/agent/template/edit.vue
+++ b/src/views/marketing/agent/agent/template/edit.vue
@@ -44,8 +44,17 @@
                   </el-tooltip>
                 </el-form-item>
               </el-col>
+              <!--是否为总部-->
+              <!--<el-col :span="12" v-if="info.agent_type != 1">-->
+              <!--  <el-form-item label="是否为总部：">-->
+              <!--    <el-radio-group v-model="info.is_headquarters" type="button">-->
+              <!--      <el-radio :label="0">不是</el-radio>-->
+              <!--      <el-radio :label="1">是</el-radio>-->
+              <!--    </el-radio-group>-->
+              <!--  </el-form-item>-->
+              <!--</el-col>-->
               <!-- 地区选择，仅需要的显示  类型：1=发起人,2=省公司,3=省合伙人(外勤),4=省合伙人(内勤),5=区县运营商,6=区县合伙人,7=餐厅,8=配送商 -->
-              <el-col :span="24" v-if="['2','3','4','5','6','7'].includes(String(info.agent_type))">
+              <el-col :span="24" v-if="['2','3','4','5','6','7'].includes(String(info.agent_type)) && info.is_headquarters == 0">
                 <el-form-item label="地区：">
                   <div class="selected-city">
                     <!--省选择-->
@@ -78,7 +87,7 @@
                 </el-form-item>
               </el-col>
               <!-- 仅餐厅 显示详细地址、定位、商户关联（单个） -->
-              <template v-if="info.agent_type == 7">
+              <template v-if="info.agent_type == 7 && info.is_headquarters == 0">
                 <el-col :span="24">
                   <el-form-item label="经纬度：" prop="lat">
                     <el-input :value="(info.lat || '') + ',' + (info.lng || '')" readonly enter-button="查找位置" style="width: 100%;" placeholder="请点击查找位置选择位置">
@@ -98,7 +107,7 @@
                 </el-col>
               </template>
               <!-- 仅配送商  显示商户关联（多个）-->
-              <el-col :span="24" v-if="info.agent_type == 8">
+              <el-col :span="24" v-if="info.agent_type == 8 && info.is_headquarters == 0">
                 <el-form-item label="关联商户：">
                   <search-mer :mer_id="info.mer_id_list" @change="changeMer($event,-1)" :is_multiple="true"></search-mer>
                 </el-form-item>
@@ -163,6 +172,14 @@
                       <el-input v-model="children_list[index].contact_phone" placeholder="请填写联系人电话" />
                     </el-form-item>
                   </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="是否为总部：">
+                      <el-radio-group v-model="children_list[index].is_headquarters" type="button" :disabled="info.id > 0 && info.agent_type != 1">
+                        <el-radio :label="0">不是</el-radio>
+                        <el-radio :label="1">是</el-radio>
+                      </el-radio-group>
+                    </el-form-item>
+                  </el-col>
                   <!-- 仅发起人显示 -->
                   <el-col :span="12" v-if="children_list[index].agent_type == 1">
                     <el-form-item label="股份：" prop="agent_stock">
@@ -170,7 +187,7 @@
                     </el-form-item>
                   </el-col>
                   <!-- 地区选择，仅需要的显示  类型：1=发起人,2=省公司,3=省合伙人(外勤),4=省合伙人(内勤),5=区县运营商,6=区县合伙人,7=餐厅,8=配送商 -->
-                  <el-col :span="24" v-if="['2','3','4','5','6','7'].includes(String(children_list[index].agent_type))">
+                  <el-col :span="24" v-if="['2','3','4','5','6','7'].includes(String(children_list[index].agent_type)) && children_list[index].is_headquarters == 0">
                     <el-form-item label="地区：">
                       <div class="selected-city">
                         <!--省选择-->
@@ -207,7 +224,7 @@
                     </el-form-item>
                   </el-col>
                   <!-- 仅餐厅 显示详细地址、定位、商户关联（单个） -->
-                  <template v-if="children_list[index].agent_type == 7">
+                  <template v-if="children_list[index].agent_type == 7 && children_list[index].is_headquarters == 0">
                     <el-col :span="24">
                       <el-form-item label="经纬度：" prop="lat">
                         <el-input :value="(children_list[index].lat || '') + ',' + (children_list[index].lng || '')" readonly enter-button="查找位置" style="width: 100%;" placeholder="请点击查找位置选择位置">
@@ -227,7 +244,7 @@
                     </el-col>
                   </template>
                   <!-- 仅配送商  显示商户关联（多个）-->
-                  <el-col :span="24" v-if="children_list[index].agent_type == 8">
+                  <el-col :span="24" v-if="children_list[index].agent_type == 8 && children_list[index].is_headquarters == 0">
                     <el-form-item label="关联商户：">
                       <search-mer :mer_id="children_list[index].mer_id_list" @change="changeMer($event,index)" :is_multiple="true"></search-mer>
                     </el-form-item>
@@ -424,10 +441,6 @@ export default {
       // 商户选择
       mer_loading: false,
       mer_list: {},
-
-
-
-
     };
   },
   watch: {
@@ -578,6 +591,7 @@ export default {
           mer_id: '',
           mer_id_list: [],
           user: item,
+          is_headquarters: this.info.is_headquarters || 0,
         };
         this.children_list = Object.assign({}, this.children_list);
       }
diff --git a/src/views/merchant/list/handle/merInfo.vue b/src/views/merchant/list/handle/merInfo.vue
index 38c3aac..fc067ad 100644
--- a/src/views/merchant/list/handle/merInfo.vue
+++ b/src/views/merchant/list/handle/merInfo.vue
@@ -11,11 +11,11 @@
                 {{merData.mer_name}}
               </div>
             </li>
-            <li class="item">
+            <li class="item" v-if="defaultMerchantType == 0">
               <div>{{ mar_type_name }}类型：</div>
               <div class="value">{{merData.is_trader == 1 ? "自营" : "非自营"}}</div>
             </li>
-            <li class="item">
+            <li class="item" v-if="defaultMerchantType == 0">
               <div>{{ mar_type_name }}分类：</div>
               <div v-if="merData.merchantCategory" class="value">
                 {{merData.merchantCategory.category_name}}
@@ -26,7 +26,7 @@
               <div>推荐{{ mar_type_name }}：</div>
               <div class="value">{{merData.is_best == 1 ? "是" : "否"}}</div>
             </li>
-            <li v-if="merData.merchantType" class="item">
+            <li v-if="merData.merchantType  && defaultMerchantType == 0" class="item">
               <div>店铺类型：</div>
               <div class="value">{{merData.merchantType.type_name}}</div>
             </li>
@@ -46,7 +46,7 @@
               <div>备注：</div>
               <div class="value">{{merData.mark}}</div>
             </li>
-            <li class="item">
+            <li class="item" v-if="defaultMerchantType == 0">
               <div>人均消费额：</div>
               <div class="value">{{merData.avg_consumption}}</div>
             </li>
@@ -188,7 +188,7 @@
               <div class="value" v-else>未设置</div>
             </li>
             <li class="item">
-              <div>{{ mar_type_name }}类别：</div>
+              <div>商户类别：</div>
               <!--商户类别：0=普通商户，1=酒道馆，2=供应商-->
               <div class="value" v-if="merData.merchant_type == 0">普通商户</div>
               <div class="value" v-else-if="merData.merchant_type == 1">酒道馆</div>