diff --git a/public/config/index.js b/public/config/index.js
index 415da64..6476044 100644
--- a/public/config/index.js
+++ b/public/config/index.js
@@ -12,7 +12,7 @@
 (function () {
   window.SITE_CONFIG = {};
   // api接口请求地址
-  window.SITE_CONFIG["baseUrl"] = "https://admin-test.damajishi.cn/";
+  window.SITE_CONFIG["baseUrl"] = "http://60.204.138.3:8899";
   // 在线api接口请求地址
   //  window.SITE_CONFIG['baseUrl'] = 'http://119.29.103.250:8082/red-memory';
   // 在线api接口请求地址
diff --git a/src/api/modules/mer_admin.js b/src/api/modules/mer_admin.js
index 6fdfbce..996da60 100644
--- a/src/api/modules/mer_admin.js
+++ b/src/api/modules/mer_admin.js
@@ -78,10 +78,10 @@ export const mer_admin = {
   //商品详情
   productDetail: data => {
     return $http.request({
-      method: 'get',
-      url: '/merchant-api/product/detail',
+      method: "get",
+      url: "/merchant-api/product/detail",
       params: data
-    })
+    });
   },
   //商户商品分类
   getProductCategory: data => {
@@ -411,5 +411,152 @@ export const mer_admin = {
       url: `/merchant-api/backend/order/v2/overview`,
       params: data
     });
+  },
+
+  // ==================== 摊位管理相关接口 ====================
+
+  /**
+   * 经营者模式-摊位概览
+   * @param {object} data 查询参数
+   * @returns {Promise}
+   */
+  overviewShop: data => {
+    return $http.request({
+      method: "get",
+      url: `/merchant-api/manager/shop/overview`,
+      params: data
+    });
+  },
+
+  /**
+   * 绑定收益人
+   * @param {object} data 绑定参数
+   * @param {number} data.marketId 市场ID
+   * @param {number} data.beneficiaryOperationType 操作类型（1:市场经营者，2:创建新收益人，3:绑定已有供应商账号）
+   * @param {string} data.beneficiaryName 收益人姓名
+   * @param {string} data.beneficiaryMobile 收益人账号
+   * @param {string} data.password 登录密码
+   * @param {string} data.remark 备注
+   * @param {number} data.shopId 店铺ID
+   * @returns {Promise}
+   */
+  bindShopBeneficiary: data => {
+    return $http.post(`/merchant-api/shop/bind/beneficiary`, data);
+  },
+
+  /**
+   * 新增经营者店铺
+   * @param {object} data 店铺参数
+   * @returns {Promise}
+   */
+  addShop: data => {
+    return $http.post(`/merchant-api/shop/add`, data);
+  },
+
+  /**
+   * 经营者模式-摊位列表
+   * @param {object} data 查询参数
+   * @param {number} data.pageNumber 页码
+   * @param {number} data.pageSize 每页数量
+   * @param {number} data.marketId 市场ID
+   * @param {string} data.shopName 摊位名称
+   * @param {number} data.status 业务状态（-1:未配置 0:休息 1:营业）
+   * @returns {Promise}
+   */
+  pageShop: data => {
+    return $http.request({
+      method: "get",
+      url: `/merchant-api/manager/shop/page`,
+      params: data
+    });
+  },
+
+  /**
+   * 邀请摊主入驻
+   * @param {object} data 邀请参数
+   * @param {number} data.marketId 市场ID
+   * @param {number} data.beneficiaryOperationType 操作类型（1:市场经营者，2:创建新收益人，3:绑定已有供应商账号）
+   * @param {string} data.beneficiaryName 收益人姓名
+   * @param {string} data.beneficiaryMobile 收益人账号
+   * @param {string} data.password 登录密码
+   * @returns {Promise}
+   */
+  inviteJoin: data => {
+    return $http.post(`/merchant-api/manager/shop/invite_join`, data);
+  },
+
+  /**
+   * 删除摊位
+   * @param {object} query 删除参数
+   * @param {number} query.shopId 摊位ID
+   * @returns {Promise}
+   */
+  deleteShop: query => {
+    return $http.delete(`/merchant-api/manager/shop/delete`, { params: query });
+  },
+
+  /**
+   * 更新摊位状态
+   * @param {object} data 更新参数
+   * @param {number} data.shopId 摊位ID
+   * @param {number} data.status 状态
+   * @returns {Promise}
+   */
+  updateShopStatus: data => {
+    return $http.put(`/merchant-api/manager/shop/status`, data);
+  },
+
+  /**
+   * 更新摊位信息
+   * @param {object} data 更新参数
+   * @param {number} data.shopId 摊位ID
+   * @returns {Promise}
+   */
+  updateShop: data => {
+    return $http.put(`/merchant-api/manager/shop/update`, data);
+  },
+
+  /**
+   * 获取摊位详情（经营者模式）
+   * @param {object} query 查询参数
+   * @param {number} query.shopId 摊位ID
+   * @returns {Promise}
+   */
+  getShopDetail: query => {
+    return $http.request({
+      method: "get",
+      url: `/merchant-api/manager/shop/detail`,
+      params: query
+    });
+  },
+
+  /**
+   * 获取摊位基础配置（摊主模式）
+   * @param {object} query 查询参数
+   * @param {string} query.shopId 摊位ID
+   * @returns {Promise}
+   */
+  getShopBaseConfig: query => {
+    return $http.request({
+      method: "get",
+      url: `/merchant-api/shop/base_config`,
+      params: query
+    });
+  },
+
+  /**
+   * 更新摊位基础配置（摊主模式）
+   * @param {object} query 查询参数
+   * @param {string} query.shopId 摊位ID
+   * @param {object} data 更新数据
+   * @returns {Promise}
+   */
+  updateShopBaseConfig: (query, data) => {
+    return $http.request({
+      method: "put",
+      url: `/merchant-api/shop/base_config`,
+      params: query,
+      data: data
+    });
   }
 };
diff --git a/src/components/form/InputMap/index.vue b/src/components/form/InputMap/index.vue
index 6a545bf..0ecf77e 100644
--- a/src/components/form/InputMap/index.vue
+++ b/src/components/form/InputMap/index.vue
@@ -1,322 +1,335 @@
 <template>
-    <div>
-        <el-input ref="main"
-                  v-model="address"
-                  :clearable="disabled"
-                  :disabled="disabled"
-                  placeholder="请选择地址"
-                  @clear="handleClear"
-                  @focus="handleShow"
-        />
+  <div>
+    <el-input
+      ref="main"
+      v-model="address"
+      :clearable="disabled"
+      :disabled="disabled"
+      placeholder="请选择地址"
+      @clear="handleClear"
+      @focus="handleShow"
+    />
 
-        <el-dialog
-            :visible.sync="box"
-            append-to-body
-            title="选择位置"
-            width="80%"
-            @close="handleClose"
+    <el-dialog
+      :visible.sync="box"
+      append-to-body
+      title="选择位置"
+      width="80%"
+      @close="handleClose"
+    >
+      <div v-if="box">
+        <el-input
+          id="map__input"
+          v-model="formattedAddress"
+          class="input-map-content-input"
+          :readonly="disabled"
+          clearable
+          placeholder="输入关键字选取地点"
+          @clear="clear"
+        />
+        <div>
+          <div
+            id="map__container"
+            class="input-map-content-container"
+            tabindex="0"
+          />
+          <div id="map__result" class="input-map-content-result" />
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button
+          v-if="!disabled"
+          icon="el-icon-check"
+          type="primary"
+          @click="handleSubmit"
+          >确 定</el-button
         >
-            <div v-if="box">
-                <el-input id="map__input"
-                          v-model="formattedAddress"
-                          class="input-map-content-input"
-                          :readonly="disabled"
-                          clearable
-                          placeholder="输入关键字选取地点"
-                          @clear="clear"
-                />
-                <div>
-                    <div id="map__container"
-                         class="input-map-content-container"
-                         tabindex="0"
-                    />
-                    <div id="map__result"
-                         class="input-map-content-result"
-                    />
-                </div>
-            </div>
-            <span slot="footer"
-                  class="dialog-footer"
-            >
-                <el-button v-if="!(disabled )"
-                           icon="el-icon-check"
-                           type="primary"
-                           @click="handleSubmit"
-                >确 定</el-button>
-            </span>
-        </el-dialog>
-    </div>
+      </span>
+    </el-dialog>
+  </div>
 </template>
 <script>
-import MapLoader from '@/components/form/InputMap/amap.js'
+import MapLoader from "@/components/form/InputMap/amap.js";
 
 export default {
-    name: 'InputMap',
-    props: {
-        disabled: {
-            type: Boolean,
-            default: false
-        }
-    },
-    data() {
-        return {
-            formattedAddress: '',
-            address: '',
-            poi: {},
-            text: '',
-            marker: null,
-            map: null,
-            box: false
-        }
-    },
-    watch: {
-        poi(val) {
-            this.formattedAddress = val.formattedAddress
-        },
-        value(val) {
-            if (!val) {
-                this.poi = {}
-            }
-        },
-        text(val) {
-            if (val) {
-                this.poi = {
-                    longitude: val[0],
-                    latitude: val[1],
-                    formattedAddress: val[2]
-                }
-                this.address = val[2]
-            }
-        },
-        box: {
-            handler() {
-                if (this.box) {
-                    this.$nextTick(() =>
-                        this.init(() => {
-                            if (this.longitude && this.latitude) {
-                                this.addMarker(this.longitude, this.latitude)
-                                this.getAddress(this.longitude, this.latitude)
-                            }
-                        })
-                    )
-                }
-            },
-            immediate: true
-        }
-    },
-    methods: {
-        clear() {
-            this.poi = {}
-            this.clearMarker()
-        },
-        handleSubmit() {
-            this.setVal()
-            this.$emit('input', this.text)
-            this.box = false
-        },
-        handleClear() {
-            this.text = []
-            this.poi = {}
-        },
-        setVal() {
-            this.text = [this.poi.longitude, this.poi.latitude, this.poi.formattedAddress]
-        },
-        handleShow() {
-            this.$refs.main.blur()
-            this.box = true
-        },
-        // 新增坐标
-        addMarker(lng, lat) {
-            this.clearMarker()
-            this.marker = new window.AMap.Marker({
-                position: [lng, lat]
-            })
-            this.map.add(this.marker)
-        },
-        // 清空坐标
-        clearMarker() {
-            if (this.marker) {
-                this.map.remove(this.marker)
-                this.marker = null
-            }
-        },
-        // 获取坐标
-        getAddress(lng, lat) {
-            let that = this
-            window.AMap.plugin('AMap.Geocoder', function() {
-                // 回调函数
-                let geocoder = new window.AMap.Geocoder({})
-                geocoder.getAddress([lng, lat], (status, result) => {
-                    if (status === 'complete' && result.info === 'OK') {
-                        const regeocode = result.regeocode
-                        that.poi = Object.assign(regeocode, {
-                            longitude: lng,
-                            latitude: lat
-                        })
-                        // 自定义点标记内容
-                        that.clearMarker()
-                        let content = `<div><img class="amap-marker-img" src="//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-default.png">
-                            <span class="input-map-marker">${that.poi.formattedAddress}</span></div>`
-                        that.marker = new window.AMap.Marker({
-                            content: content,  // 自定义点标记覆盖物内容
-                            position: [lng, lat],
-                            title: that.poi.formattedAddress,
-                            zoom: 13
-                        })
-                        that.map.add(that.marker)
-                    }
-                })
-            })
-        },
-        // 获取当前位置
-        getCurrentLocation() {
-            let that = this
-            window.AMap.plugin('AMap.Geolocation', function() {
-                let geolocation = new window.AMap.Geolocation({
-                    // 是否使用高精度定位，默认：true
-                    enableHighAccuracy: true,
-                    // 设置定位超时时间，默认：无穷大
-                    timeout: 10000,
-                    // 定位按钮的停靠位置的偏移量，默认：Pixel(10, 20)
-                    buttonOffset: new window.AMap.Pixel(10, 20),
-                    //  定位成功后调整地图视野范围使定位位置及精度范围视野内可见，默认：false
-                    zoomToAccuracy: true,
-                    //  定位按钮的排放位置,  RB表示右下
-                    buttonPosition: 'RB'
-                })
-
-                geolocation.getCurrentPosition(function(status, result) {
-                    if (status == 'complete') {
-                        onComplete(result)
-                    } else {
-                        onError(result)
-                    }
-                })
-
-                function onComplete(data) {
-                    // data是具体的定位信息
-                    console.log(data)
-                    let {lng, lat} = data.position
-                    that.getAddress(lng, lat)
-                }
-
-                function onError(data) {
-                    // 定位出错
-                    console.log(data)
-                }
-            })
-        },
-        handleClose() {
-            window.poiPicker.clearSearchResults()
-            this.box = false
-        },
-        addClick() {
-            this.map.on('click', e => {
-                if (this.disabled) return
-                console.log(e)
-                const lnglat = e.lnglat
-                // 经度
-                const lng = lnglat.lng
-                // 纬度
-                const lat = lnglat.lat
-                this.addMarker(lng, lat)
-                this.getAddress(lng, lat)
-            })
-        },
-        init() {
-            MapLoader().then(AMap => {
-                console.log('地图加载成功')
-                this.map = new AMap.Map('map__container', Object.assign({
-                    zoom: 13,
-                    // 自动定位到所在城市并显示
-                    resizeEnable: true,
-                    center: (() => {
-                        if (this.longitude && this.latitude) return [this.longitude, this.latitude]
-                    })()
-                }, this.params))
-                this.getCurrentLocation()
-                this.initPoip()
-                this.addClick()
-            }, e => {
-                console.log('地图加载失败', e)
-            })
-
-        },
-        initPoip() {
-            // https://lbs.amap.com/api/amap-ui/reference-amap-ui/other/poipicker
-            if (!window.AMapUI) {
-                return
-            }
-            // 加载PoiPicker，loadUI的路径参数为模块名中 'ui/' 之后的部分
-            window.AMapUI.loadUI(['misc/PoiPicker'], PoiPicker => {
-                var poiPicker = new PoiPicker({
-                    input: 'map__input',
-                    placeSearchOptions: {
-                        map: this.map,
-                        pageSize: 10
-                    },
-                    searchResultsContainer: 'map__result'
-                })
-                // 初始化poiPicker
-                this.poiPickerReady(poiPicker)
-            })
-        },
-        poiPickerReady(poiPicker) {
-            window.poiPicker = poiPicker
-            // 选取了某个POI
-            poiPicker.on('poiPicked', poiResult => {
-                this.clearMarker()
-                let source = poiResult.source,
-                    poi = poiResult.item
-                console.log(poiResult)
-                this.poi = Object.assign(poi, {
-                    formattedAddress: poi.name,
-                    longitude: poi.location.lng,
-                    latitude: poi.location.lat
-                })
-
-                if (source !== 'search') {
-                    poiPicker.searchByKeyword(poi.name)
-                }
-            })
-        }
+  name: "InputMap",
+  props: {
+    disabled: {
+      type: Boolean,
+      default: false
     }
-}
+  },
+  data() {
+    return {
+      formattedAddress: "",
+      address: "",
+      poi: {},
+      text: "",
+      marker: null,
+      map: null,
+      box: false
+    };
+  },
+  watch: {
+    poi(val) {
+      this.formattedAddress = val.formattedAddress;
+    },
+    value(val) {
+      if (!val) {
+        this.poi = {};
+      }
+    },
+    text(val) {
+      if (val) {
+        this.poi = {
+          longitude: val[0],
+          latitude: val[1],
+          formattedAddress: val[2]
+        };
+        this.address = val[2];
+      }
+    },
+    box: {
+      handler() {
+        if (this.box) {
+          this.$nextTick(() =>
+            this.init(() => {
+              if (this.longitude && this.latitude) {
+                this.addMarker(this.longitude, this.latitude);
+                this.getAddress(this.longitude, this.latitude);
+              }
+            })
+          );
+        }
+      },
+      immediate: true
+    }
+  },
+  methods: {
+    clear() {
+      this.poi = {};
+      this.clearMarker();
+    },
+    handleSubmit() {
+      this.setVal();
+      this.$emit("input", this.text);
+      this.box = false;
+    },
+    handleClear() {
+      this.text = [];
+      this.poi = {};
+    },
+    setVal() {
+      this.text = [
+        this.poi.longitude,
+        this.poi.latitude,
+        this.poi.formattedAddress
+      ];
+    },
+    handleShow() {
+      this.$refs.main.blur();
+      this.box = true;
+    },
+    // 新增坐标
+    addMarker(lng, lat) {
+      this.clearMarker();
+      this.marker = new window.AMap.Marker({
+        position: [lng, lat]
+      });
+      this.map.add(this.marker);
+    },
+    // 清空坐标
+    clearMarker() {
+      if (this.marker) {
+        this.map.remove(this.marker);
+        this.marker = null;
+      }
+    },
+    // 获取坐标
+    getAddress(lng, lat) {
+      let that = this;
+      window.AMap.plugin("AMap.Geocoder", function() {
+        // 回调函数
+        let geocoder = new window.AMap.Geocoder({});
+        geocoder.getAddress([lng, lat], (status, result) => {
+          if (status === "complete" && result.info === "OK") {
+            const regeocode = result.regeocode;
+            that.poi = Object.assign(regeocode, {
+              longitude: lng,
+              latitude: lat
+            });
+            // 自定义点标记内容
+            that.clearMarker();
+            let content = `<div><img class="amap-marker-img" src="//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-default.png">
+                            <span class="input-map-marker">${that.poi.formattedAddress}</span></div>`;
+            that.marker = new window.AMap.Marker({
+              content: content, // 自定义点标记覆盖物内容
+              position: [lng, lat],
+              title: that.poi.formattedAddress,
+              zoom: 13
+            });
+            that.map.add(that.marker);
+          }
+        });
+      });
+    },
+    // 获取当前位置
+    getCurrentLocation() {
+      let that = this;
+      window.AMap.plugin("AMap.Geolocation", function() {
+        let geolocation = new window.AMap.Geolocation({
+          // 是否使用高精度定位，默认：true
+          enableHighAccuracy: true,
+          // 设置定位超时时间，默认：无穷大
+          timeout: 10000,
+          // 定位按钮的停靠位置的偏移量，默认：Pixel(10, 20)
+          buttonOffset: new window.AMap.Pixel(10, 20),
+          //  定位成功后调整地图视野范围使定位位置及精度范围视野内可见，默认：false
+          zoomToAccuracy: true,
+          //  定位按钮的排放位置,  RB表示右下
+          buttonPosition: "RB"
+        });
+
+        geolocation.getCurrentPosition(function(status, result) {
+          if (status == "complete") {
+            onComplete(result);
+          } else {
+            onError(result);
+          }
+        });
+
+        function onComplete(data) {
+          // data是具体的定位信息
+          console.log(data);
+          let { lng, lat } = data.position;
+          that.getAddress(lng, lat);
+        }
+
+        function onError(data) {
+          // 定位出错
+          console.log(data);
+        }
+      });
+    },
+    handleClose() {
+      window.poiPicker.clearSearchResults();
+      this.box = false;
+    },
+    addClick() {
+      this.map.on("click", e => {
+        if (this.disabled) return;
+        console.log(e);
+        const lnglat = e.lnglat;
+        // 经度
+        const lng = lnglat.lng;
+        // 纬度
+        const lat = lnglat.lat;
+        this.addMarker(lng, lat);
+        this.getAddress(lng, lat);
+      });
+    },
+    init() {
+      MapLoader().then(
+        AMap => {
+          console.log("地图加载成功");
+          this.map = new AMap.Map(
+            "map__container",
+            Object.assign(
+              {
+                zoom: 13,
+                // 自动定位到所在城市并显示
+                resizeEnable: true,
+                center: (() => {
+                  if (this.longitude && this.latitude)
+                    return [this.longitude, this.latitude];
+                })()
+              },
+              this.params
+            )
+          );
+          this.getCurrentLocation();
+          this.initPoip();
+          this.addClick();
+        },
+        e => {
+          console.log("地图加载失败", e);
+        }
+      );
+    },
+    initPoip() {
+      // https://lbs.amap.com/api/amap-ui/reference-amap-ui/other/poipicker
+      if (!window.AMapUI) {
+        return;
+      }
+      // 加载PoiPicker，loadUI的路径参数为模块名中 'ui/' 之后的部分
+      window.AMapUI.loadUI(["misc/PoiPicker"], PoiPicker => {
+        var poiPicker = new PoiPicker({
+          input: "map__input",
+          placeSearchOptions: {
+            map: this.map,
+            pageSize: 10
+          },
+          searchResultsContainer: "map__result"
+        });
+        // 初始化poiPicker
+        this.poiPickerReady(poiPicker);
+      });
+    },
+    poiPickerReady(poiPicker) {
+      window.poiPicker = poiPicker;
+      // 选取了某个POI
+      poiPicker.on("poiPicked", poiResult => {
+        this.clearMarker();
+        let source = poiResult.source,
+          poi = poiResult.item;
+        console.log(poiResult);
+        this.poi = Object.assign(poi, {
+          formattedAddress: poi.name,
+          longitude: poi.location.lng,
+          latitude: poi.location.lat
+        });
+
+        if (source !== "search") {
+          poiPicker.searchByKeyword(poi.name);
+        }
+      });
+    }
+  }
+};
 </script>
 <style scoped>
-
 ::v-deep .amap-marker-img {
-    width: 25px !important;
-    height: 34px !important;
+  width: 25px !important;
+  height: 34px !important;
 }
 ::v-deep .input-map-marker {
-    position: absolute !important;
-    top: -20px !important;
-    right: -118px !important;
-    color: #fff !important;
-    padding: 4px 10px !important;
-    -webkit-box-shadow: 1px 1px 1px rgba(10, 10, 10, 0.2);
-    box-shadow: 1px 1px 1px rgba(10, 10, 10, 0.2);
-    white-space: nowrap;
-    font-size: 12px;
-    background-color: #25a5f7 !important;
-    border-radius: 3px;
+  position: absolute !important;
+  top: -20px !important;
+  right: -118px !important;
+  color: #fff !important;
+  padding: 4px 10px !important;
+  -webkit-box-shadow: 1px 1px 1px rgba(10, 10, 10, 0.2);
+  box-shadow: 1px 1px 1px rgba(10, 10, 10, 0.2);
+  white-space: nowrap;
+  font-size: 12px;
+  background-color: #25a5f7 !important;
+  border-radius: 3px;
 }
 .input-map-content-container {
-    width: 100%;
-    height: 450px;
+  width: 100%;
+  height: 450px;
 }
 .input-map-content-result {
-    display: block !important;
-    position: absolute;
-    top: 0;
-    right: -8px;
-    width: 250px;
-    height: 450px;
-    overflow-y: auto;
+  display: block !important;
+  position: absolute;
+  top: 0;
+  right: -8px;
+  width: 250px;
+  height: 450px;
+  overflow-y: auto;
 }
 .input-map-content-input {
-    margin-bottom: 10px;
+  margin-bottom: 10px;
 }
 
 ::v-deep .el-dialog__headerbtn {
diff --git a/src/router/index.js b/src/router/index.js
index b54c206..0345c95 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -4,230 +4,191 @@
  * 建议:
  * 1. 代码中路由统一使用name属性跳转(不使用path属性)
  */
-import Vue from "vue";
-import Router from "vue-router";
-import http from "@/utils/httpRequest";
-import { isURL } from "@/utils/validate";
-import { clearLoginInfo } from "@/utils";
-import FULL_ROUTERS from "./full-routers";
-import $api from "@/api/index.js";
-import store from "@/store";
-import { Loading } from "element-ui";
+import Vue from 'vue'
+import Router from 'vue-router'
+import http from '@/utils/httpRequest'
+import { isURL } from '@/utils/validate'
+import { clearLoginInfo } from '@/utils'
+import FULL_ROUTERS from './full-routers'
+import $api from '@/api/index.js'
+import store from '@/store'
+import { Loading } from 'element-ui'
 
-Vue.use(Router);
+Vue.use(Router)
 
 // 开发环境不使用懒加载, 因为懒加载页面太多的话会造成webpack热更新太慢, 所以只有生产环境使用懒加载
-const _import = require("./import-" + process.env.NODE_ENV);
+const _import = require('./import-' + process.env.NODE_ENV)
 
 // 全局路由(无需嵌套上左右整体布局)
 const globalRoutes = [
   {
-    path: "/404",
-    component: _import("common/404"),
-    name: "404",
-    meta: { title: "404未找到" },
+    path: '/404',
+    component: _import('common/404'),
+    name: '404',
+    meta: { title: '404未找到' }
   },
   {
-    path: "/login",
-    component: _import("common/login"),
-    name: "login",
-    meta: { title: "登录" },
+    path: '/login',
+    component: _import('common/login'),
+    name: 'login',
+    meta: { title: '登录' }
   },
   {
-    path: "/test-member-detail",
-    component: _import("test-member-detail"),
-    name: "test-member-detail",
-    meta: { title: "会员详情样式测试" },
-  },
+    path: '/test-member-detail',
+    component: _import('test-member-detail'),
+    name: 'test-member-detail',
+    meta: { title: '会员详情样式测试' }
+  }
   //test用，会员管理
-];
+]
 
 // 主入口路由(需嵌套上左右整体布局)
 const mainRoutes = {
-  path: "/",
-  component: _import("main"),
-  name: "main",
-  redirect: { name: "home" },
-  meta: { title: "主入口整体布局" },
+  path: '/',
+  component: _import('main'),
+  name: 'main',
+  redirect: { name: 'home' },
+  meta: { title: '主入口整体布局' },
   children: [
     // 通过meta对象设置路由展示方式
     // 1. isTab: 是否通过tab展示内容, true: 是, false: 否
     // 2. iframeUrl: 是否通过iframe嵌套展示内容, '以http[s]://开头': 是, '': 否
     // 提示: 如需要通过iframe嵌套展示内容, 但不通过tab打开, 请自行创建组件使用iframe处理!
     {
-      path: "/home",
-      component: _import("common/home"),
-      name: "home",
-      meta: { title: "首页" },
+      path: '/home',
+      component: _import('common/home'),
+      name: 'home',
+      meta: { title: '首页' }
     },
     {
-      path: "/theme",
-      component: _import("common/theme"),
-      name: "theme",
-      meta: { title: "主题" },
+      path: '/theme',
+      component: _import('common/theme'),
+      name: 'theme',
+      meta: { title: '主题' }
     },
     {
-      path: "/demo-echarts",
-      component: _import("demo/echarts"),
-      name: "demo-echarts",
-      meta: { title: "demo-echarts", isTab: true },
-    },
+      path: '/demo-echarts',
+      component: _import('demo/echarts'),
+      name: 'demo-echarts',
+      meta: { title: 'demo-echarts', isTab: true }
+    }
   ],
   beforeEnter(to, from, next) {
-    let token = Vue.cookie.get("token");
+    let token = Vue.cookie.get('token')
     if (!token || !/\S/.test(token)) {
-      clearLoginInfo();
-      next({ name: "login" });
+      clearLoginInfo()
+      next({ name: 'login' })
     }
-    next();
-  },
-};
+    next()
+  }
+}
 
 const router = new Router({
-  mode: "hash",
+  mode: 'hash',
   // mode:"history",
   scrollBehavior: () => ({ y: 0 }),
   isAddDynamicMenuRoutes: false, // 是否已经添加动态(菜单)路由
-  routes: globalRoutes.concat(mainRoutes),
-});
+  routes: globalRoutes.concat(mainRoutes)
+})
 
 router.beforeEach((to, from, next) => {
-  console.log("beforeEach", to);
+  console.log('beforeEach', to)
   // 添加动态(菜单)路由
   // 1. 已经添加 or 全局路由, 直接访问
   // 2. 获取菜单列表, 添加并保存本地存储
   if (
     router.options.isAddDynamicMenuRoutes ||
-    fnCurrentRouteType(to, globalRoutes) === "global"
+    fnCurrentRouteType(to, globalRoutes) === 'global'
   ) {
-    next();
+    next()
   } else {
     let loadingInstance = Loading.service({
-      text: "正在初始化中...",
-      background: "rgba(255,255,255,0.7)",
-    });
+      text: '正在初始化中...',
+      background: 'rgba(255,255,255,0.7)'
+    })
     $api
       .getUserInfo()
       .then(async ({ data }) => {
         // 从后端获取的权限码 (只包含叶子节点)
-        const permissionCodes = data.data.permissions?.permissionCodes || [];
+        const permissionCodes = data.data.permissions?.permissionCodes || []
 
         const filterTreeData = (menuData, permissions) => {
-          const result = [];
-          menuData.forEach((node) => {
+          const result = []
+          menuData.forEach(node => {
             // 检查当前节点是否为叶子节点
-            const isLeaf = !node.list || node.list.length === 0;
+            const isLeaf = !node.list || node.list.length === 0
 
             if (isLeaf) {
               // 如果是叶子节点，检查其权限是否存在于权限码中
               if (permissions.includes(node.perms)) {
-                result.push({ ...node });
+                result.push({ ...node })
               }
             } else {
               // 如果是父节点，递归过滤其子节点
-              const filteredChildren = filterTreeData(node.list, permissions);
+              const filteredChildren = filterTreeData(node.list, permissions)
               // 如果过滤后的子节点列表不为空，则保留该父节点
               if (filteredChildren.length > 0) {
                 result.push({
                   ...node,
-                  list: filteredChildren,
-                });
+                  list: filteredChildren
+                })
               }
             }
-          });
-          return result;
-        };
-
-        console.log(data, "用户信息");
-        sessionStorage.setItem("role", JSON.stringify(data.data.role));
-        if (data.data.markets?.length > 0) {
-          // 存在多个市场
-          $api.mer_admin
-            .storeList({ marketId: data.data.markets[0].marketId })
-            .then((res) => {
-              store.commit("userData/setState", {
-                isMerchant: true,
-                marketList: data.data.markets,
-                storeList: res.data.data,
-                marketId: data.data.markets[0].marketId,
-                shopId: res.data.data[0].shopId,
-              });
-            });
-          console.log(data.data.markets);
-        } else if (data.data.shopId) {
-          // 存在单个店铺或云店
-          if (data.data.marketId) {
-            store.commit("userData/setState", {
-              isMerchant: true,
-              marketList: [],
-              storeList: [],
-              marketId: data.data.marketId,
-              shopId: data.data.shopId,
-            });
-          } else {
-            store.commit("userData/setState", {
-              isMerchant: true,
-              marketList: [],
-              storeList: [],
-              marketId: -1,
-              shopId: data.data.shopId,
-            });
-          }
-        } else {
-          // 不存在店铺
-          store.commit("userData/setState", {
-            isMerchant: false,
-            marketList: [],
-            storeList: [],
-            marketId: "",
-            shopId: "",
-          });
+          })
+          return result
         }
-        sessionStorage.setItem("userInfo", JSON.stringify(data.data));
-        sessionStorage.setItem(
-          "permissions",
-          JSON.stringify(permissionCodes || "[]")
-        );
 
-        let _menu = filterTreeData(FULL_ROUTERS.menuList, permissionCodes);
-        fnAddDynamicMenuRoutes(_menu);
-        sessionStorage.setItem("menuList", JSON.stringify(_menu));
-        router.options.isAddDynamicMenuRoutes = true;
-        next({ ...to, replace: true });
+        console.log(data, '用户信息')
+        sessionStorage.setItem('role', JSON.stringify(data.data.role))
+        store.commit('userData/setState', {
+          isMerchant: true,
+          ...data.data
+        })
+        sessionStorage.setItem('userInfo', JSON.stringify(data.data))
+        sessionStorage.setItem(
+          'permissions',
+          JSON.stringify(permissionCodes || '[]')
+        )
+
+        let _menu = filterTreeData(FULL_ROUTERS.menuList, permissionCodes)
+        fnAddDynamicMenuRoutes(_menu)
+        sessionStorage.setItem('menuList', JSON.stringify(_menu))
+        router.options.isAddDynamicMenuRoutes = true
+        next({ ...to, replace: true })
       })
-      .catch((e) => {
-        sessionStorage.setItem("menuList", "[]");
-        sessionStorage.setItem("permissions", "[]");
+      .catch(e => {
+        sessionStorage.setItem('menuList', '[]')
+        sessionStorage.setItem('permissions', '[]')
         console.log(
           `%c${e} 请求菜单列表和权限失败，跳转至登录页！！`,
-          "color:blue"
-        );
-        router.push({ name: "login" });
-        next();
+          'color:blue'
+        )
+        router.push({ name: 'login' })
+        next()
       })
       .finally(() => {
-        loadingInstance.close();
-      });
+        loadingInstance.close()
+      })
   }
-});
+})
 
 /**
  * 判断当前路由类型, global: 全局路由, main: 主入口路由
  * @param {*} route 当前路由
  */
 function fnCurrentRouteType(route, globalRoutes = []) {
-  var temp = [];
+  var temp = []
   for (var i = 0; i < globalRoutes.length; i++) {
     if (route.path === globalRoutes[i].path) {
-      return "global";
+      return 'global'
     } else if (
       globalRoutes[i].children &&
       globalRoutes[i].children.length >= 1
     ) {
-      temp = temp.concat(globalRoutes[i].children);
+      temp = temp.concat(globalRoutes[i].children)
     }
   }
-  return temp.length >= 1 ? fnCurrentRouteType(route, temp) : "main";
+  return temp.length >= 1 ? fnCurrentRouteType(route, temp) : 'main'
 }
 
 /**
@@ -236,59 +197,59 @@ function fnCurrentRouteType(route, globalRoutes = []) {
  * @param {*} routes 递归创建的动态(菜单)路由
  */
 function fnAddDynamicMenuRoutes(menuList = [], routes = []) {
-  var temp = [];
+  var temp = []
   for (var i = 0; i < menuList.length; i++) {
     if (menuList[i].list && menuList[i].list.length >= 1) {
-      temp = temp.concat(menuList[i].list);
+      temp = temp.concat(menuList[i].list)
     } else if (menuList[i].url && /\S/.test(menuList[i].url)) {
-      menuList[i].url = menuList[i].url.replace(/^\//, "");
+      menuList[i].url = menuList[i].url.replace(/^\//, '')
       var route = {
-        path: menuList[i].url.replace("/", "-"),
+        path: menuList[i].url.replace('/', '-'),
         component: null,
-        name: menuList[i].url.replace("/", "-"),
+        name: menuList[i].url.replace('/', '-'),
         meta: {
           menuId: menuList[i].menuId,
           title: menuList[i].name,
           isDynamic: true,
           isTab: true,
-          iframeUrl: "",
-          isMicroApp: menuList[i].isMicroApp,
-        },
-      };
+          iframeUrl: '',
+          isMicroApp: menuList[i].isMicroApp
+        }
+      }
       // url以http[s]://开头, 通过iframe展示,或者启用microApp框架
       if (isURL(menuList[i].url)) {
-        route["path"] = `i-${menuList[i].menuId}`;
-        route["name"] = `i-${menuList[i].menuId}`;
-        route["meta"]["iframeUrl"] = menuList[i].url;
+        route['path'] = `i-${menuList[i].menuId}`
+        route['name'] = `i-${menuList[i].menuId}`
+        route['meta']['iframeUrl'] = menuList[i].url
       } else {
         try {
-          route["component"] = _import(`modules/${menuList[i].url}`) || null;
+          route['component'] = _import(`modules/${menuList[i].url}`) || null
         } catch (e) {}
       }
-      routes.push(route);
+      routes.push(route)
     }
   }
   if (temp.length >= 1) {
-    fnAddDynamicMenuRoutes(temp, routes);
+    fnAddDynamicMenuRoutes(temp, routes)
   } else {
-    mainRoutes.name = "main-dynamic";
-    mainRoutes.children = routes;
-    router.addRoutes([mainRoutes, { path: "*", redirect: { name: "404" } }]);
+    mainRoutes.name = 'main-dynamic'
+    mainRoutes.children = routes
+    router.addRoutes([mainRoutes, { path: '*', redirect: { name: '404' } }])
     sessionStorage.setItem(
-      "dynamicMenuRoutes",
-      JSON.stringify(mainRoutes.children || "[]")
-    );
-    console.log("\n");
+      'dynamicMenuRoutes',
+      JSON.stringify(mainRoutes.children || '[]')
+    )
+    console.log('\n')
     console.log(
-      "%c!<-------------------- 动态(菜单)路由 s -------------------->",
-      "color:blue"
-    );
-    console.log(mainRoutes.children);
+      '%c!<-------------------- 动态(菜单)路由 s -------------------->',
+      'color:blue'
+    )
+    console.log(mainRoutes.children)
     console.log(
-      "%c!<-------------------- 动态(菜单)路由 e -------------------->",
-      "color:blue"
-    );
+      '%c!<-------------------- 动态(菜单)路由 e -------------------->',
+      'color:blue'
+    )
   }
 }
 
-export default router;
+export default router
diff --git a/src/views/modules/market/stall/index.vue b/src/views/modules/market/stall/index.vue
index 2a1aecd..329fd93 100644
--- a/src/views/modules/market/stall/index.vue
+++ b/src/views/modules/market/stall/index.vue
@@ -1,3 +1,1988 @@
 <template>
-  <div>摊位列表</div>
+  <div class="page-container">
+    <el-card class="search-card" shadow="never">
+      <el-form
+        :model="searchForm"
+        :inline="true"
+        ref="searchForm"
+        class="search-form"
+        size="small"
+      >
+        <el-form-item label="摊位名称" prop="shopName">
+          <el-input
+            v-model="searchForm.shopName"
+            placeholder="搜索摊位名称"
+            clearable
+            @clear="handleSearchClear"
+            style="width: 200px"
+          />
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-select
+            v-model="searchForm.status"
+            placeholder="请选择状态"
+            clearable
+            @change="handleStatusChange"
+            style="width: 150px"
+          >
+            <el-option
+              v-for="item in statusOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            @click="handleSearch"
+            icon="el-icon-search"
+            size="small"
+            >查询</el-button
+          >
+          <el-button @click="handleReset" icon="el-icon-refresh" size="small"
+            >重置</el-button
+          >
+        </el-form-item>
+      </el-form>
+    </el-card>
+
+    <div class="table-container">
+      <div style="margin-bottom: 15px">
+        <el-button type="primary" size="small" @click="handleAddStall"
+          >新增摊位</el-button
+        >
+        <el-button type="warning" size="small" @click="handleInviteMerchant"
+          >邀请摊主</el-button
+        >
+      </div>
+
+      <el-table
+        ref="multipleTable"
+        :data="dataList"
+        border
+        style="width: 100%"
+        v-loading="loading"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="60" fixed="left" />
+        <el-table-column type="index" width="60" align="center" label="序号" />
+        <el-table-column
+          prop="shopName"
+          label="摊位名称"
+          align="center"
+          min-width="120"
+        />
+        <el-table-column
+          prop="categoryName"
+          label="主营类目"
+          align="center"
+          min-width="120"
+        />
+        <el-table-column
+          prop="beneficiaryName"
+          label="收益人账号"
+          align="center"
+          min-width="120"
+        >
+          <template slot-scope="scope">
+            {{ scope.row.beneficiaryName || "-" }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="beneficiaryMobile"
+          label="收益人手机"
+          align="center"
+          min-width="130"
+        >
+          <template slot-scope="scope">
+            {{
+              scope.row.beneficiaryMobile
+                ? hidePhone(scope.row.beneficiaryMobile)
+                : "-"
+            }}
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" align="center" width="120">
+          <template slot-scope="scope">
+            <el-tag
+              v-if="
+                scope.row.businessStatus === -1 ||
+                  scope.row.businessStatus === null ||
+                  scope.row.businessStatus === undefined
+              "
+              type="info"
+              size="small"
+            >
+              待配置
+            </el-tag>
+            <el-tag
+              v-else-if="scope.row.businessStatus === 1"
+              type="success"
+              size="small"
+            >
+              营业中
+            </el-tag>
+            <el-tag v-else type="warning" size="small">
+              休息中
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="remark"
+          label="备注"
+          align="center"
+          min-width="150"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            {{ scope.row.remark || "-" }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" align="center" width="320">
+          <template slot-scope="scope">
+            <el-button
+              style="margin-right: 5px"
+              size="mini"
+              type="primary"
+              @click="handleViewDetail(scope.row)"
+              >详情</el-button
+            >
+            <el-button
+              style="margin-right: 5px"
+              size="mini"
+              type="success"
+              @click="handleEdit(scope.row)"
+              >编辑</el-button
+            >
+            <el-button
+              style="margin-right: 5px"
+              size="mini"
+              type="info"
+              @click="handleBindBeneficiary(scope.row)"
+              >配置收益人</el-button
+            >
+            <el-popconfirm
+              @onConfirm="handleDelete(scope.row)"
+              confirm-button-text="确定"
+              cancel-button-text="取消"
+              icon="el-icon-info"
+              icon-color="red"
+              title="确定删除吗？"
+            >
+              <el-button size="mini" type="danger" slot="reference"
+                >删除</el-button
+              >
+            </el-popconfirm>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="pageInfo.pageNumber"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="pageInfo.pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="pageInfo.total"
+        class="pagination-container"
+      ></el-pagination>
+    </div>
+
+    <!-- 邀请摊主弹窗 -->
+    <el-dialog
+      title="邀请摊主"
+      :visible.sync="inviteDialogVisible"
+      width="500px"
+      :close-on-click-modal="false"
+    >
+      <el-form
+        ref="inviteForm"
+        :model="inviteForm"
+        :rules="inviteRules"
+        label-width="100px"
+      >
+        <el-form-item label="操作类型" prop="beneficiaryOperationType">
+          <el-select
+            v-model="inviteForm.beneficiaryOperationType"
+            placeholder="请选择操作类型"
+            style="width: 100%"
+          >
+            <el-option label="绑定收益人是市场经营者" :value="1" />
+            <el-option label="创建新收益人（供货商）" :value="2" />
+            <el-option label="绑定已存在的供应商账号" :value="3" />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          v-if="
+            inviteForm.beneficiaryOperationType === 2 ||
+              inviteForm.beneficiaryOperationType === 3
+          "
+          label="收益人姓名"
+          prop="beneficiaryName"
+        >
+          <el-input
+            v-model="inviteForm.beneficiaryName"
+            placeholder="请输入收益人姓名"
+          />
+        </el-form-item>
+        <el-form-item
+          v-if="
+            inviteForm.beneficiaryOperationType === 2 ||
+              inviteForm.beneficiaryOperationType === 3
+          "
+          label="收益人账号"
+          prop="beneficiaryMobile"
+        >
+          <el-input
+            v-model="inviteForm.beneficiaryMobile"
+            placeholder="请输入收益人手机号"
+          />
+        </el-form-item>
+        <el-form-item
+          v-if="inviteForm.beneficiaryOperationType === 2"
+          label="登录密码"
+          prop="password"
+        >
+          <el-input
+            v-model="inviteForm.password"
+            type="password"
+            placeholder="请输入登录密码"
+            show-password
+          />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input
+            v-model="inviteForm.remark"
+            type="textarea"
+            :rows="3"
+            placeholder="请输入备注信息"
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="inviteDialogVisible = false">取消</el-button>
+        <el-button
+          type="primary"
+          @click="handleInviteSubmit"
+          :loading="inviteLoading"
+        >
+          确定
+        </el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 配置收益人弹窗 -->
+    <el-dialog
+      title="配置收益人"
+      :visible.sync="beneficiaryDialogVisible"
+      width="500px"
+      :close-on-click-modal="false"
+    >
+      <el-form
+        ref="beneficiaryForm"
+        :model="beneficiaryForm"
+        :rules="beneficiaryRules"
+        label-width="100px"
+      >
+        <el-form-item label="操作类型" prop="beneficiaryOperationType">
+          <el-select
+            v-model="beneficiaryForm.beneficiaryOperationType"
+            placeholder="请选择操作类型"
+            style="width: 100%"
+          >
+            <el-option label="绑定收益人是市场经营者" :value="1" />
+            <el-option label="创建新收益人（供货商）" :value="2" />
+            <el-option label="绑定已存在的供应商账号" :value="3" />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          v-if="
+            beneficiaryForm.beneficiaryOperationType === 2 ||
+              beneficiaryForm.beneficiaryOperationType === 3
+          "
+          label="收益人姓名"
+          prop="beneficiaryName"
+        >
+          <el-input
+            v-model="beneficiaryForm.beneficiaryName"
+            placeholder="请输入收益人姓名"
+          />
+        </el-form-item>
+        <el-form-item
+          v-if="
+            beneficiaryForm.beneficiaryOperationType === 2 ||
+              beneficiaryForm.beneficiaryOperationType === 3
+          "
+          label="收益人账号"
+          prop="beneficiaryMobile"
+        >
+          <el-input
+            v-model="beneficiaryForm.beneficiaryMobile"
+            placeholder="请输入收益人手机号"
+          />
+        </el-form-item>
+        <el-form-item
+          v-if="beneficiaryForm.beneficiaryOperationType === 2"
+          label="登录密码"
+          prop="password"
+        >
+          <el-input
+            v-model="beneficiaryForm.password"
+            type="password"
+            placeholder="请输入登录密码"
+            show-password
+          />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input
+            v-model="beneficiaryForm.remark"
+            type="textarea"
+            :rows="3"
+            placeholder="请输入备注信息"
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="beneficiaryDialogVisible = false">取消</el-button>
+        <el-button
+          type="primary"
+          @click="handleBeneficiarySubmit"
+          :loading="beneficiaryLoading"
+        >
+          确定
+        </el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 新增/编辑/查看摊位弹窗 -->
+    <el-dialog
+      :title="stallDialogTitle"
+      :visible.sync="stallDialogVisible"
+      width="900px"
+      :close-on-click-modal="false"
+      @opened="handleStallDialogOpened"
+      @closed="handleStallDialogClosed"
+    >
+      <el-form
+        ref="stallFormRef"
+        :model="stallForm"
+        :rules="stallRules"
+        label-width="120px"
+        size="small"
+        :disabled="isViewStall"
+      >
+        <!-- 收益人配置 -->
+        <el-divider content-position="left">收益人配置</el-divider>
+
+        <el-form-item label="操作类型" prop="beneficiaryOperationType">
+          <el-select
+            v-model="stallForm.beneficiaryOperationType"
+            placeholder="请选择操作类型"
+            style="width: 300px"
+            @change="handleStallOperationTypeChange"
+          >
+            <el-option label="绑定收益人是市场经营者" :value="1" />
+            <el-option label="创建新收益人（供货商）" :value="2" />
+            <el-option label="绑定已存在的供应商账号" :value="3" />
+          </el-select>
+        </el-form-item>
+
+        <template v-if="stallForm.beneficiaryOperationType === 2">
+          <el-form-item label="收益人手机号" prop="beneficiaryMobile">
+            <el-input
+              v-model="stallForm.beneficiaryMobile"
+              placeholder="请输入收益人手机号"
+              maxlength="11"
+              style="width: 300px"
+            />
+          </el-form-item>
+          <el-form-item label="收益人姓名" prop="beneficiaryName">
+            <el-input
+              v-model="stallForm.beneficiaryName"
+              placeholder="请输入收益人姓名"
+              style="width: 300px"
+            />
+          </el-form-item>
+          <el-form-item label="登录密码" prop="password">
+            <el-input
+              v-model="stallForm.password"
+              type="password"
+              placeholder="请输入登录密码"
+              show-password
+              style="width: 300px"
+            />
+          </el-form-item>
+        </template>
+
+        <template v-if="stallForm.beneficiaryOperationType === 3">
+          <el-form-item label="收益人手机号" prop="beneficiaryMobile">
+            <el-input
+              v-model="stallForm.beneficiaryMobile"
+              placeholder="请输入收益人手机号"
+              maxlength="11"
+              style="width: 300px"
+            />
+          </el-form-item>
+        </template>
+
+        <!-- 基础配置 -->
+        <el-divider content-position="left">基础配置</el-divider>
+
+        <el-form-item label="摊位名称" prop="name">
+          <el-input
+            v-model="stallForm.name"
+            placeholder="请输入摊位名称(25字符内)"
+            maxlength="25"
+            show-word-limit
+            style="width: 300px"
+          />
+        </el-form-item>
+
+        <el-form-item label="主营类目" prop="categoryId">
+          <el-select
+            v-model="stallForm.categoryId"
+            placeholder="请选择主营类目"
+            style="width: 300px"
+          >
+            <el-option
+              v-for="item in categoryOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="摊位背景图" prop="background">
+          <el-upload
+            :action="uploadUrl"
+            :headers="uploadHeaders"
+            :file-list="stallForm.backgroundList"
+            list-type="picture-card"
+            :on-success="handleStallBackgroundSuccess"
+            :on-remove="handleStallBackgroundRemove"
+            :before-upload="beforeUpload"
+            :limit="1"
+          >
+            <i class="el-icon-plus"></i>
+          </el-upload>
+        </el-form-item>
+
+        <el-form-item label="摊位联系电话" prop="contactPhone">
+          <el-input
+            v-model="stallForm.contactPhone"
+            placeholder="请输入摊位联系电话"
+            maxlength="11"
+            style="width: 300px"
+          />
+        </el-form-item>
+
+        <el-form-item label="摊位照片" prop="imgs">
+          <el-upload
+            :action="uploadUrl"
+            :headers="uploadHeaders"
+            :file-list="stallForm.imgs"
+            list-type="picture-card"
+            :on-success="handleStallImgsSuccess"
+            :on-remove="handleStallImgsRemove"
+            :limit="9"
+          >
+            <i class="el-icon-plus"></i>
+          </el-upload>
+        </el-form-item>
+
+        <!-- 地址配置 -->
+        <el-divider content-position="left">地址配置</el-divider>
+
+        <el-form-item label="摊位位置" prop="location">
+          <el-input
+            :value="stallLocationText"
+            placeholder="请在地图上选择定位"
+            readonly
+            :disabled="isViewStall"
+            style="width: 300px"
+            @focus="handleStallLocationClick"
+          >
+            <el-button
+              slot="append"
+              icon="el-icon-location"
+              :disabled="isViewStall"
+              @click="handleStallLocationClick"
+            >
+              选择位置
+            </el-button>
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="详细地址" prop="detailAddress">
+          <el-input
+            v-model="stallForm.detailAddress"
+            type="textarea"
+            :rows="2"
+            placeholder="请输入具体地址"
+            style="width: 400px"
+          />
+        </el-form-item>
+
+        <!-- 许可证 -->
+        <el-divider content-position="left">许可证</el-divider>
+
+        <el-form-item label="许可证" prop="permits">
+          <el-upload
+            :action="uploadUrl"
+            :headers="uploadHeaders"
+            :file-list="stallForm.permits"
+            list-type="picture-card"
+            :on-success="handleStallPermitsSuccess"
+            :on-remove="handleStallPermitsRemove"
+            :limit="9"
+          >
+            <i class="el-icon-plus"></i>
+          </el-upload>
+        </el-form-item>
+
+        <!-- 营业时间配置 -->
+        <el-divider content-position="left">营业时间配置</el-divider>
+
+        <el-form-item label="营业模式">
+          <el-radio-group v-model="stallForm.isAutoBusiness">
+            <el-radio :label="false">手动营业</el-radio>
+            <el-radio :label="true">自动营业</el-radio>
+          </el-radio-group>
+        </el-form-item>
+
+        <el-form-item v-if="stallForm.isAutoBusiness" label="营业日期">
+          <el-checkbox-group v-model="businessDaysArray">
+            <el-checkbox :label="1">周一</el-checkbox>
+            <el-checkbox :label="2">周二</el-checkbox>
+            <el-checkbox :label="3">周三</el-checkbox>
+            <el-checkbox :label="4">周四</el-checkbox>
+            <el-checkbox :label="5">周五</el-checkbox>
+            <el-checkbox :label="6">周六</el-checkbox>
+            <el-checkbox :label="7">周日</el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+
+        <el-form-item v-if="stallForm.isAutoBusiness" label="营业时段">
+          <el-time-picker
+            v-model="startTime"
+            placeholder="开始时间"
+            format="HH:mm"
+            value-format="HH:mm"
+            style="width: 150px"
+          />
+          <span style="margin: 0 10px">至</span>
+          <el-time-picker
+            v-model="endTime"
+            placeholder="结束时间"
+            format="HH:mm"
+            value-format="HH:mm"
+            style="width: 150px"
+          />
+        </el-form-item>
+
+        <el-form-item v-if="!stallForm.isAutoBusiness" label="营业状态">
+          <el-switch
+            v-model="stallForm.businessStatus"
+            :active-value="1"
+            :inactive-value="0"
+            active-text="营业中"
+            inactive-text="休息中"
+          />
+        </el-form-item>
+
+        <!-- 自提点配置 -->
+        <el-divider content-position="left">自提点配置</el-divider>
+
+        <el-form-item label="自提点名称">
+          <el-input
+            v-model="stallForm.pickName"
+            placeholder="请输入自提点名称"
+            style="width: 300px"
+          />
+        </el-form-item>
+
+        <el-form-item label="自提点位置">
+          <el-input
+            :value="pickLocationText"
+            placeholder="请在地图上选择定位"
+            readonly
+            :disabled="isViewStall"
+            style="width: 300px"
+            @focus="handlePickLocationClick"
+          >
+            <el-button
+              slot="append"
+              icon="el-icon-location"
+              :disabled="isViewStall"
+              @click="handlePickLocationClick"
+            >
+              选择位置
+            </el-button>
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="自提点详细地址">
+          <el-input
+            v-model="stallForm.pickAddress"
+            type="textarea"
+            :rows="2"
+            placeholder="请输入自提点具体地址"
+            style="width: 400px"
+          />
+        </el-form-item>
+
+        <el-form-item label="自提点照片">
+          <el-upload
+            :action="uploadUrl"
+            :headers="uploadHeaders"
+            :file-list="stallForm.pickImgList"
+            list-type="picture-card"
+            :on-success="handleStallPickImgSuccess"
+            :on-remove="handleStallPickImgRemove"
+            :before-upload="beforeUpload"
+            :limit="1"
+          >
+            <i class="el-icon-plus"></i>
+          </el-upload>
+        </el-form-item>
+
+        <el-form-item label="承诺送达时间">
+          <el-input-number
+            v-model="stallForm.promisePickDeliveryTime"
+            :min="0"
+            :max="24"
+            controls-position="right"
+          />
+          <span style="margin-left: 10px">小时以内</span>
+        </el-form-item>
+      </el-form>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="stallDialogVisible = false">
+          {{ isViewStall ? "关闭" : "取消" }}
+        </el-button>
+        <el-button
+          v-if="!isViewStall"
+          type="primary"
+          @click="handleStallSubmit"
+          :loading="stallLoading"
+        >
+          {{ isEditStall ? "保存" : "创建" }}
+        </el-button>
+      </div>
+    </el-dialog>
+    <!-- 地图选择弹窗 -->
+    <el-dialog
+      title="选择位置"
+      :visible.sync="showMapDialog"
+      width="80%"
+      append-to-body
+      @close="showMapDialog = false"
+    >
+      <InputMap
+        v-if="showMapDialog && currentMapType === 'stall'"
+        v-model="stallLocationValue"
+        @input="handleMapLocationChange"
+      />
+      <InputMap
+        v-if="showMapDialog && currentMapType === 'pick'"
+        v-model="pickLocationValue"
+        @input="handleMapLocationChange"
+      />
+    </el-dialog>
+  </div>
 </template>
+
+<script>
+import InputMap from "@/components/form/InputMap/index.vue";
+
+export default {
+  name: "StallManagement",
+  components: {
+    InputMap
+  },
+  data() {
+    return {
+      // 搜索表单
+      searchForm: {
+        shopName: "",
+        status: "all"
+      },
+      // 状态选项
+      statusOptions: [
+        { label: "全部状态", value: "all" },
+        { label: "营业中", value: "1" },
+        { label: "休息中", value: "0" },
+        { label: "待配置", value: "-1" }
+      ],
+      // 表格数据
+      dataList: [],
+      // 分页信息
+      pageInfo: {
+        pageNumber: 1,
+        pageSize: 10,
+        total: 0
+      },
+      // 加载状态
+      loading: false,
+      // 选中的数据
+      selectList: [],
+      // 邀请弹窗
+      inviteDialogVisible: false,
+      inviteLoading: false,
+      inviteForm: {
+        beneficiaryOperationType: 1,
+        beneficiaryName: "",
+        beneficiaryMobile: "",
+        password: "",
+        remark: ""
+      },
+      inviteRules: {
+        beneficiaryOperationType: [
+          { required: true, message: "请选择操作类型", trigger: "change" }
+        ],
+        beneficiaryName: [
+          { required: true, message: "请输入收益人姓名", trigger: "blur" }
+        ],
+        beneficiaryMobile: [
+          { required: true, message: "请输入收益人手机号", trigger: "blur" },
+          {
+            pattern: /^1[3-9]\d{9}$/,
+            message: "请输入正确的手机号",
+            trigger: "blur"
+          }
+        ],
+        password: [
+          { required: true, message: "请输入登录密码", trigger: "blur" },
+          { min: 6, message: "密码长度不能少于6位", trigger: "blur" }
+        ]
+      },
+      // 配置收益人弹窗
+      beneficiaryDialogVisible: false,
+      beneficiaryLoading: false,
+      beneficiaryForm: {
+        shopId: null,
+        beneficiaryOperationType: 1,
+        beneficiaryName: "",
+        beneficiaryMobile: "",
+        password: "",
+        remark: ""
+      },
+      beneficiaryRules: {
+        beneficiaryOperationType: [
+          { required: true, message: "请选择操作类型", trigger: "change" }
+        ],
+        beneficiaryName: [
+          { required: true, message: "请输入收益人姓名", trigger: "blur" }
+        ],
+        beneficiaryMobile: [
+          { required: true, message: "请输入收益人手机号", trigger: "blur" },
+          {
+            pattern: /^1[3-9]\d{9}$/,
+            message: "请输入正确的手机号",
+            trigger: "blur"
+          }
+        ],
+        password: [
+          { required: true, message: "请输入登录密码", trigger: "blur" },
+          { min: 6, message: "密码长度不能少于6位", trigger: "blur" }
+        ]
+      },
+      // 摊位管理弹窗
+      stallDialogVisible: false,
+      stallLoading: false,
+      isEditStall: false,
+      isViewStall: false, // 是否为查看模式
+      currentEditStallId: null,
+      stallForm: {
+        // 收益人配置
+        beneficiaryOperationType: 2,
+        beneficiaryName: "",
+        beneficiaryMobile: "",
+        password: "",
+        // 基础配置
+        name: "",
+        categoryId: "",
+        background: "",
+        backgroundList: [], // 用于上传组件显示
+        contactPhone: "",
+        imgs: [],
+        // 地址配置
+        longitude: 0,
+        latitude: 0,
+        detailAddress: "",
+        // 许可证
+        permits: [],
+        // 营业配置
+        isAutoBusiness: true,
+        businessDays: "1111111",
+        startBusinessTime: 480,
+        endBusinessTime: 1320,
+        businessStatus: 1,
+        // 自提点配置
+        pickName: "",
+        pickLongitude: 0,
+        pickLatitude: 0,
+        pickAddress: "",
+        pickImg: "",
+        pickImgList: [], // 用于上传组件显示
+        promisePickDeliveryTime: 2
+      },
+      stallRules: {
+        beneficiaryOperationType: [
+          { required: true, message: "请选择操作类型", trigger: "change" }
+        ],
+        beneficiaryMobile: [
+          { required: true, message: "请输入收益人手机号", trigger: "blur" },
+          {
+            pattern: /^1[3-9]\d{9}$/,
+            message: "请输入正确的手机号",
+            trigger: "blur"
+          }
+        ],
+        beneficiaryName: [
+          { required: true, message: "请输入收益人姓名", trigger: "blur" }
+        ],
+        password: [
+          { required: true, message: "请输入登录密码", trigger: "blur" },
+          { min: 6, message: "密码长度不能少于6位", trigger: "blur" }
+        ],
+        name: [{ required: true, message: "请输入摊位名称", trigger: "blur" }],
+        categoryId: [
+          { required: true, message: "请选择主营类目", trigger: "change" }
+        ],
+        background: [
+          { required: true, message: "请上传摊位背景图", trigger: "change" }
+        ],
+        contactPhone: [
+          { required: true, message: "请输入摊位联系电话", trigger: "blur" },
+          {
+            pattern: /^1[3-9]\d{9}$/,
+            message: "请输入正确的手机号",
+            trigger: "blur"
+          }
+        ],
+        imgs: [
+          {
+            required: true,
+            type: "array",
+            min: 1,
+            message: "请上传摊位照片",
+            trigger: "change"
+          }
+        ],
+        location: [
+          {
+            required: true,
+            validator: this.validateStallLocation,
+            trigger: "change"
+          }
+        ],
+        detailAddress: [
+          { required: true, message: "请输入详细地址", trigger: "blur" }
+        ],
+        permits: [
+          {
+            required: true,
+            type: "array",
+            min: 1,
+            message: "请上传许可证",
+            trigger: "change"
+          }
+        ]
+      },
+      // 类目选项
+      categoryOptions: [],
+      // 地图相关（已使用InputMap组件替代）
+      // 营业时间辅助字段
+      businessDaysArray: [], // 营业日期数组 [1,2,3,4,5,6,7]
+      startTime: "08:00", // 开始时间 HH:mm
+      endTime: "20:00", // 结束时间 HH:mm
+      // 地图组件数据
+      stallLocationValue: [], // 摊位位置 [lng, lat, address]
+      pickLocationValue: [], // 自提点位置 [lng, lat, address]
+      showMapDialog: false, // 显示地图弹窗
+      currentMapType: "" // 当前选择的地图类型：stall 或 pick
+    };
+  },
+  created() {
+    this.fetchData();
+    this.loadCategoryOptions();
+  },
+  methods: {
+    // 隐藏手机号中间4位
+    hidePhone(phone) {
+      if (!phone) return "";
+      return phone.replace(/(\d{3})\d{4}(\d{4})/, "$1****$2");
+    },
+
+    // 营业日期字符串转数组 "1111111" -> [1,2,3,4,5,6,7]
+    businessDaysToArray(businessDays) {
+      if (!businessDays) return [];
+      const days = [];
+      for (let i = 0; i < businessDays.length; i++) {
+        if (businessDays[i] === "1") {
+          days.push(i + 1);
+        }
+      }
+      return days;
+    },
+
+    // 营业日期数组转字符串 [1,2,3,4,5,6,7] -> "1111111"
+    businessDaysToString(daysArray) {
+      const result = ["0", "0", "0", "0", "0", "0", "0"];
+      daysArray.forEach(day => {
+        if (day >= 1 && day <= 7) {
+          result[day - 1] = "1";
+        }
+      });
+      return result.join("");
+    },
+
+    // 分钟数转时间字符串 480 -> "08:00"
+    minutesToTime(minutes) {
+      if (minutes === null || minutes === undefined) return "00:00";
+      const hours = Math.floor(minutes / 60);
+      const mins = minutes % 60;
+      return `${String(hours).padStart(2, "0")}:${String(mins).padStart(
+        2,
+        "0"
+      )}`;
+    },
+
+    // 时间字符串转分钟数 "08:00" -> 480
+    timeToMinutes(timeStr) {
+      if (!timeStr) return 0;
+      const [hours, minutes] = timeStr.split(":").map(Number);
+      return hours * 60 + minutes;
+    },
+
+    // 处理摊位位置点击
+    handleStallLocationClick() {
+      if (this.isViewStall) return;
+      this.currentMapType = "stall";
+      this.showMapDialog = true;
+    },
+
+    // 处理自提点位置点击
+    handlePickLocationClick() {
+      if (this.isViewStall) return;
+      this.currentMapType = "pick";
+      this.showMapDialog = true;
+    },
+
+    // 处理地图位置变化
+    handleMapLocationChange(value) {
+      if (value && value.length === 3) {
+        if (this.currentMapType === "stall") {
+          this.stallForm.longitude = value[0];
+          this.stallForm.latitude = value[1];
+          this.stallLocationValue = value;
+        } else if (this.currentMapType === "pick") {
+          this.stallForm.pickLongitude = value[0];
+          this.stallForm.pickLatitude = value[1];
+          this.pickLocationValue = value;
+        }
+      }
+      this.showMapDialog = false;
+    },
+
+    // 加载类目选项
+    async loadCategoryOptions() {
+      try {
+        const res = await this.$http({
+          url: "/merchant-api/category/list",
+          method: "get"
+        });
+        if (res.data && res.data.data) {
+          this.categoryOptions = res.data.data.map(item => ({
+            label: item.name,
+            value: item.id
+          }));
+        }
+      } catch (error) {
+        console.error("加载类目失败:", error);
+      }
+    },
+
+    // 获取数据
+    fetchData() {
+      this.loading = true;
+      const marketId = this.marketId;
+      if (!marketId) {
+        this.$message.error("获取市场ID失败，请重新登录");
+        this.$router.push("/login");
+        return;
+      }
+
+      const params = {
+        pageNumber: this.pageInfo.pageNumber,
+        pageSize: this.pageInfo.pageSize,
+        marketId,
+        ...this.buildSearchParams()
+      };
+
+      // 调用API获取摊位列表数据
+      this.$api.mer_admin
+        .pageShop(params)
+        .then(res => {
+          if (res.data && res.data.data) {
+            this.dataList = res.data.data.data || [];
+            this.pageInfo.total = Number(res.data.data.total) || 0;
+          } else {
+            this.dataList = [];
+            this.pageInfo.total = 0;
+          }
+        })
+        .catch(err => {
+          console.error("获取数据失败:", err);
+          this.$message.error("获取数据失败");
+          this.dataList = [];
+          this.pageInfo.total = 0;
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+
+    // 构建搜索参数
+    buildSearchParams() {
+      const params = {};
+      if (this.searchForm.shopName) {
+        params.shopName = this.searchForm.shopName;
+      }
+      if (this.searchForm.status !== "all") {
+        params.status = this.searchForm.status;
+      }
+      return params;
+    },
+
+    // 搜索
+    handleSearch() {
+      this.pageInfo.pageNumber = 1;
+      this.fetchData();
+    },
+
+    // 清除搜索
+    handleSearchClear() {
+      if (!this.searchForm.shopName) {
+        this.handleSearch();
+      }
+    },
+
+    // 状态改变
+    handleStatusChange() {
+      this.pageInfo.pageNumber = 1;
+      this.fetchData();
+    },
+
+    // 重置
+    handleReset() {
+      this.searchForm = {
+        shopName: "",
+        status: "all"
+      };
+      this.pageInfo.pageNumber = 1;
+      this.fetchData();
+    },
+
+    // 分页大小改变
+    handleSizeChange(val) {
+      this.pageInfo.pageSize = val;
+      this.pageInfo.pageNumber = 1;
+      this.fetchData();
+    },
+
+    // 当前页改变
+    handleCurrentChange(val) {
+      this.pageInfo.pageNumber = val;
+      this.fetchData();
+    },
+
+    // 选择改变
+    handleSelectionChange(val) {
+      this.selectList = val;
+    },
+
+    // 新增摊位
+    handleAddStall() {
+      this.isEditStall = false;
+      this.isViewStall = false;
+      this.currentEditStallId = null;
+      this.resetStallForm();
+      this.stallDialogVisible = true;
+    },
+
+    // 邀请摊主
+    handleInviteMerchant() {
+      this.inviteDialogVisible = true;
+    },
+
+    // 提交邀请
+    handleInviteSubmit() {
+      this.$refs.inviteForm.validate(valid => {
+        if (valid) {
+          this.inviteLoading = true;
+          const params = {
+            marketId: this.marketId,
+            ...this.inviteForm
+          };
+
+          this.$api.mer_admin
+            .inviteJoin(params)
+            .then(res => {
+              this.$message.success("邀请成功");
+              this.inviteDialogVisible = false;
+              this.resetInviteForm();
+              this.fetchData();
+            })
+            .catch(err => {
+              console.error("邀请失败:", err);
+              this.$message.error("邀请失败");
+            })
+            .finally(() => {
+              this.inviteLoading = false;
+            });
+        }
+      });
+    },
+
+    // 重置邀请表单
+    resetInviteForm() {
+      this.inviteForm = {
+        beneficiaryOperationType: 1,
+        beneficiaryName: "",
+        beneficiaryMobile: "",
+        password: "",
+        remark: ""
+      };
+      if (this.$refs.inviteForm) {
+        this.$refs.inviteForm.resetFields();
+      }
+    },
+
+    // 查看详情
+    handleViewDetail(row) {
+      this.isEditStall = false;
+      this.isViewStall = true;
+      this.currentEditStallId = row.shopId;
+      this.loadStallData(row.shopId);
+      this.stallDialogVisible = true;
+    },
+
+    // 编辑
+    handleEdit(row) {
+      this.isEditStall = true;
+      this.isViewStall = false;
+      this.currentEditStallId = row.shopId;
+      this.loadStallData(row.shopId);
+      this.stallDialogVisible = true;
+    },
+
+    // 配置收益人
+    handleBindBeneficiary(row) {
+      this.beneficiaryForm.shopId = row.shopId;
+      this.beneficiaryDialogVisible = true;
+    },
+
+    // 提交配置收益人
+    handleBeneficiarySubmit() {
+      this.$refs.beneficiaryForm.validate(valid => {
+        if (valid) {
+          this.beneficiaryLoading = true;
+          const params = {
+            marketId: this.marketId,
+            ...this.beneficiaryForm
+          };
+
+          this.$api.mer_admin
+            .bindShopBeneficiary(params)
+            .then(res => {
+              this.$message.success("配置收益人成功");
+              this.beneficiaryDialogVisible = false;
+              this.resetBeneficiaryForm();
+              this.fetchData();
+            })
+            .catch(err => {
+              console.error("配置收益人失败:", err);
+              this.$message.error("配置收益人失败");
+            })
+            .finally(() => {
+              this.beneficiaryLoading = false;
+            });
+        }
+      });
+    },
+
+    // 重置收益人表单
+    resetBeneficiaryForm() {
+      this.beneficiaryForm = {
+        shopId: null,
+        beneficiaryOperationType: 1,
+        beneficiaryName: "",
+        beneficiaryMobile: "",
+        password: "",
+        remark: ""
+      };
+      if (this.$refs.beneficiaryForm) {
+        this.$refs.beneficiaryForm.resetFields();
+      }
+    },
+
+    // 删除摊位
+    handleDelete(row) {
+      this.loading = true;
+      this.$api.mer_admin
+        .deleteShop({ shopId: row.shopId })
+        .then(res => {
+          this.$message.success("删除成功");
+          this.fetchData();
+        })
+        .catch(err => {
+          console.error("删除失败:", err);
+          this.$message.error("删除失败");
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+
+    // ==================== 摊位弹框相关方法 ====================
+
+    // 操作类型改变
+    handleStallOperationTypeChange(value) {
+      this.stallForm.beneficiaryName = "";
+      this.stallForm.beneficiaryMobile = "";
+      this.stallForm.password = "";
+    },
+
+    // 验证摊位位置
+    validateStallLocation(rule, value, callback) {
+      if (!this.stallForm.longitude || !this.stallForm.latitude) {
+        callback(new Error("请选择摊位位置"));
+      } else {
+        callback();
+      }
+    },
+
+    // 重置摊位表单
+    resetStallForm() {
+      this.stallForm = {
+        beneficiaryOperationType: 2,
+        beneficiaryName: "",
+        beneficiaryMobile: "",
+        password: "",
+        name: "",
+        categoryId: "",
+        background: "",
+        backgroundList: [],
+        contactPhone: "",
+        imgs: [],
+        longitude: 0,
+        latitude: 0,
+        detailAddress: "",
+        permits: [],
+        isAutoBusiness: true,
+        businessDays: "1111111",
+        startBusinessTime: 480,
+        endBusinessTime: 1320,
+        businessStatus: 1,
+        pickName: "",
+        pickLongitude: 0,
+        pickLatitude: 0,
+        pickAddress: "",
+        pickImg: "",
+        pickImgList: [],
+        promisePickDeliveryTime: 2
+      };
+      // 重置营业时间辅助字段
+      this.businessDaysArray = [1, 2, 3, 4, 5, 6, 7];
+      this.startTime = "08:00";
+      this.endTime = "22:00";
+      // 重置地图组件数据
+      this.stallLocationValue = [];
+      this.pickLocationValue = [];
+      if (this.$refs.stallFormRef) {
+        this.$refs.stallFormRef.resetFields();
+      }
+    },
+
+    // 加载摊位数据
+    async loadStallData(shopId) {
+      try {
+        this.stallLoading = true;
+        // 使用 shop/base_config 接口获取摊位详情
+        const res = await this.$api.mer_admin.getShopBaseConfig({ shopId });
+        const data = res.data.data;
+
+        // 注意：这里使用 lng/lat 字段名，与后端API返回的字段保持一致
+        Object.assign(this.stallForm, {
+          name: data.name || "",
+          categoryId: data.categoryId || "",
+          background: data.background || "",
+          backgroundList: data.background
+            ? [{ url: data.background, name: data.background.split("/").pop() }]
+            : [],
+          contactPhone: data.contactPhone || "",
+          imgs: data.imgs
+            ? data.imgs
+                .split(";")
+                .filter(Boolean)
+                .map(url => ({ url, name: url.split("/").pop() }))
+            : [],
+          longitude: data.lng || 0, // API返回字段为 lng
+          latitude: data.lat || 0, // API返回字段为 lat
+          detailAddress: data.detailAddress || "",
+          permits: data.permits
+            ? data.permits
+                .split(";")
+                .filter(Boolean)
+                .map(url => ({ url, name: url.split("/").pop() }))
+            : [],
+          isAutoBusiness: data.isAutoBusiness ?? true,
+          businessDays: data.businessDays || "1111111",
+          startBusinessTime: data.startBusinessTime || 480,
+          endBusinessTime: data.endBusinessTime || 1320,
+          businessStatus: data.businessStatus ?? 1,
+          pickName: data.pickName || "",
+          pickLongitude: data.pickLng || 0, // API返回字段为 pickLng
+          pickLatitude: data.pickLat || 0, // API返回字段为 pickLat
+          pickAddress: data.pickAddress || "",
+          pickImg: data.pickImg || "",
+          pickImgList: data.pickImg
+            ? [{ url: data.pickImg, name: data.pickImg.split("/").pop() }]
+            : [],
+          promisePickDeliveryTime: data.promisePickDeliveryTime || 2
+        });
+
+        // 转换营业时间数据到辅助字段
+        this.businessDaysArray = this.businessDaysToArray(
+          data.businessDays || "1111111"
+        );
+        this.startTime = this.minutesToTime(data.startBusinessTime || 480);
+        this.endTime = this.minutesToTime(data.endBusinessTime || 1320);
+
+        // 初始化地图组件的值
+        if (data.lng && data.lat) {
+          this.stallLocationValue = [
+            data.lng,
+            data.lat,
+            data.detailAddress || ""
+          ];
+        }
+        if (data.pickLng && data.pickLat) {
+          this.pickLocationValue = [
+            data.pickLng,
+            data.pickLat,
+            data.pickAddress || ""
+          ];
+        }
+
+        // 转换营业时间数据用于显示
+        this.businessDaysArray = this.businessDaysToArray(
+          data.businessDays || "1111111"
+        );
+        this.startTime = this.minutesToTime(data.startBusinessTime || 480);
+        this.endTime = this.minutesToTime(data.endBusinessTime || 1320);
+      } catch (error) {
+        console.error("加载摊位数据失败:", error);
+        this.$message.error("加载数据失败");
+      } finally {
+        this.stallLoading = false;
+      }
+    },
+
+    // 摊位弹窗打开
+    handleStallDialogOpened() {
+      // 可以在这里进行一些初始化操作
+    },
+
+    // 摊位弹窗关闭
+    handleStallDialogClosed() {
+      this.resetStallForm();
+    },
+
+    // 上传前验证
+    beforeUpload(file) {
+      const isJPG = file.type === "image/jpeg" || file.type === "image/png";
+      const isLt2M = file.size / 1024 / 1024 < 2;
+
+      if (!isJPG) {
+        this.$message.error("只能上传 JPG/PNG 格式的图片!");
+      }
+      if (!isLt2M) {
+        this.$message.error("图片大小不能超过 2MB!");
+      }
+      return isJPG && isLt2M;
+    },
+
+    // 背景图上传成功
+    handleStallBackgroundSuccess(res, file) {
+      if (res.code === 200) {
+        this.stallForm.background = res.data.url;
+        this.stallForm.backgroundList = [
+          {
+            name: file.name,
+            url: res.data.url
+          }
+        ];
+      } else {
+        this.$message.error("上传失败");
+      }
+    },
+
+    // 删除背景图
+    handleStallBackgroundRemove() {
+      this.stallForm.background = "";
+      this.stallForm.backgroundList = [];
+    },
+
+    // 摊位照片上传成功
+    handleStallImgsSuccess(res, file, fileList) {
+      if (res.code === 200) {
+        this.stallForm.imgs.push({
+          name: file.name,
+          url: res.data.url
+        });
+      } else {
+        this.$message.error("上传失败");
+      }
+    },
+
+    // 删除摊位照片
+    handleStallImgsRemove(file, fileList) {
+      this.stallForm.imgs = fileList;
+    },
+
+    // 许可证上传成功
+    handleStallPermitsSuccess(res, file, fileList) {
+      if (res.code === 200) {
+        this.stallForm.permits.push({
+          name: file.name,
+          url: res.data.url
+        });
+      } else {
+        this.$message.error("上传失败");
+      }
+    },
+
+    // 删除许可证
+    handleStallPermitsRemove(file, fileList) {
+      this.stallForm.permits = fileList;
+    },
+
+    // 自提点照片上传成功
+    handleStallPickImgSuccess(res, file) {
+      if (res.code === 200) {
+        this.stallForm.pickImg = res.data.url;
+        this.stallForm.pickImgList = [
+          {
+            name: file.name,
+            url: res.data.url
+          }
+        ];
+      } else {
+        this.$message.error("上传失败");
+      }
+    },
+
+    // 删除自提点照片
+    handleStallPickImgRemove() {
+      this.stallForm.pickImg = "";
+      this.stallForm.pickImgList = [];
+    },
+
+    // 摊位位置选择
+    handleStallLocationSelect() {
+      this.locationType = "stall";
+      this.openMapDialog();
+    },
+
+    // 自提点位置选择
+    handleStallPickLocationSelect() {
+      this.locationType = "pick";
+      this.openMapDialog();
+    },
+
+    // 打开地图弹窗
+    openMapDialog() {
+      this.mapDialogVisible = true;
+      this.selectedLocation = null;
+      this.mapSearchKeyword = "";
+    },
+
+    // 地图弹窗打开后初始化地图
+    handleMapDialogOpened() {
+      this.$nextTick(() => {
+        // 等待地图API加载完成
+        this.waitForAMap();
+      });
+    },
+
+    // 等待高德地图API加载
+    waitForAMap() {
+      if (window.AMap) {
+        this.initMap();
+      } else {
+        // 等待地图加载，最多等待5秒
+        let attempts = 0;
+        const maxAttempts = 50;
+        const checkInterval = setInterval(() => {
+          attempts++;
+          if (window.AMap) {
+            clearInterval(checkInterval);
+            this.initMap();
+          } else if (attempts >= maxAttempts) {
+            clearInterval(checkInterval);
+            this.$message.error("地图加载超时，请刷新页面重试");
+          }
+        }, 100);
+      }
+    },
+
+    // 初始化地图
+    initMap() {
+      // 检查是否已加载高德地图
+      if (!window.AMap) {
+        this.$message.error("地图加载失败，请刷新页面重试");
+        return;
+      }
+
+      console.log("开始初始化地图...");
+      console.log("AMap版本:", window.AMap.version);
+
+      // 销毁旧地图实例
+      if (this.mapInstance) {
+        this.mapInstance.destroy();
+        this.mapInstance = null;
+      }
+
+      // 确定初始中心点
+      let center = [119.306239, 26.075302]; // 默认福州中心
+      if (
+        this.locationType === "stall" &&
+        this.stallForm.longitude &&
+        this.stallForm.latitude
+      ) {
+        center = [this.stallForm.longitude, this.stallForm.latitude];
+      } else if (
+        this.locationType === "pick" &&
+        this.stallForm.pickLongitude &&
+        this.stallForm.pickLatitude
+      ) {
+        center = [this.stallForm.pickLongitude, this.stallForm.pickLatitude];
+      }
+
+      // 创建地图实例
+      this.mapInstance = new AMap.Map("mapContainer", {
+        zoom: 15,
+        center: center,
+        resizeEnable: true
+      });
+
+      // 创建标记
+      const marker = new AMap.Marker({
+        position: center,
+        draggable: true
+      });
+      marker.setMap(this.mapInstance);
+
+      // 创建地理编码实例
+      const geocoder = new AMap.Geocoder();
+
+      // 标记拖拽结束事件
+      marker.on("dragend", e => {
+        const position = marker.getPosition();
+        this.updateSelectedLocation(position, geocoder);
+      });
+
+      // 地图点击事件
+      this.mapInstance.on("click", e => {
+        marker.setPosition(e.lnglat);
+        this.updateSelectedLocation(e.lnglat, geocoder);
+      });
+
+      // 初始化选中位置
+      this.updateSelectedLocation(
+        new AMap.LngLat(center[0], center[1]),
+        geocoder
+      );
+    },
+
+    // 更新选中位置信息
+    updateSelectedLocation(lnglat, geocoder) {
+      const lng = lnglat.getLng();
+      const lat = lnglat.getLat();
+
+      // 逆地理编码获取地址
+      geocoder.getAddress([lng, lat], (status, result) => {
+        let address = "未知地址";
+        if (status === "complete" && result.info === "OK") {
+          address = result.regeocode.formattedAddress;
+        }
+
+        this.selectedLocation = {
+          lng: lng,
+          lat: lat,
+          address: address
+        };
+      });
+    },
+
+    // 地图搜索
+    handleMapSearch() {
+      if (!this.mapSearchKeyword) {
+        this.$message.warning("请输入搜索关键词");
+        return;
+      }
+
+      if (!window.AMap || !this.mapInstance) {
+        this.$message.error("地图未初始化");
+        return;
+      }
+
+      // 使用地点搜索服务
+      AMap.plugin("AMap.PlaceSearch", () => {
+        const placeSearch = new AMap.PlaceSearch({
+          city: "全国",
+          pageSize: 1
+        });
+
+        placeSearch.search(this.mapSearchKeyword, (status, result) => {
+          if (
+            status === "complete" &&
+            result.poiList &&
+            result.poiList.pois.length > 0
+          ) {
+            const poi = result.poiList.pois[0];
+            const location = poi.location;
+
+            // 移动地图中心和标记
+            this.mapInstance.setCenter([location.lng, location.lat]);
+            this.mapInstance.setZoom(15);
+
+            // 更新标记位置
+            const markers = this.mapInstance.getAllOverlays("marker");
+            if (markers.length > 0) {
+              markers[0].setPosition([location.lng, location.lat]);
+            }
+
+            // 更新选中位置
+            this.selectedLocation = {
+              lng: location.lng,
+              lat: location.lat,
+              address: poi.name + " - " + poi.address
+            };
+
+            this.$message.success("已定位到：" + poi.name);
+          } else {
+            this.$message.warning("未找到相关地点");
+          }
+        });
+      });
+    },
+
+    // 确认选择位置
+    confirmLocation() {
+      if (!this.selectedLocation) {
+        this.$message.warning("请先在地图上选择位置");
+        return;
+      }
+
+      if (this.locationType === "stall") {
+        this.stallForm.longitude = this.selectedLocation.lng;
+        this.stallForm.latitude = this.selectedLocation.lat;
+      } else if (this.locationType === "pick") {
+        this.stallForm.pickLongitude = this.selectedLocation.lng;
+        this.stallForm.pickLatitude = this.selectedLocation.lat;
+      }
+
+      this.mapDialogVisible = false;
+      this.$message.success("位置已选择");
+    },
+
+    // 提交摊位表单
+    handleStallSubmit() {
+      this.$refs.stallFormRef.validate(valid => {
+        if (valid) {
+          this.submitStallForm();
+        }
+      });
+    },
+
+    // 提交摊位表单
+    async submitStallForm() {
+      this.stallLoading = true;
+      try {
+        // 如果是自动营业，需要转换营业时间数据
+        let businessDays = this.stallForm.businessDays;
+        let startBusinessTime = this.stallForm.startBusinessTime;
+        let endBusinessTime = this.stallForm.endBusinessTime;
+
+        if (this.stallForm.isAutoBusiness) {
+          // 验证营业日期
+          if (!this.businessDaysArray || this.businessDaysArray.length === 0) {
+            this.$message.warning("请选择营业日期");
+            this.stallLoading = false;
+            return;
+          }
+          // 转换营业日期
+          businessDays = this.businessDaysToString(this.businessDaysArray);
+          // 转换营业时间
+          startBusinessTime = this.timeToMinutes(this.startTime);
+          endBusinessTime = this.timeToMinutes(this.endTime);
+        }
+
+        const params = {
+          marketId: this.marketId,
+          beneficiaryOperationType: this.stallForm.beneficiaryOperationType,
+          name: this.stallForm.name,
+          categoryId: this.stallForm.categoryId,
+          background: this.stallForm.background,
+          contactPhone: this.stallForm.contactPhone,
+          imgs: this.stallForm.imgs.map(item => item.url).join(";"),
+          lng: this.stallForm.longitude,
+          lat: this.stallForm.latitude,
+          detailAddress: this.stallForm.detailAddress,
+          permits: this.stallForm.permits.map(item => item.url).join(";"),
+          isAutoBusiness: this.stallForm.isAutoBusiness,
+          businessDays: businessDays,
+          startBusinessTime: startBusinessTime,
+          endBusinessTime: endBusinessTime,
+          businessStatus: this.stallForm.businessStatus,
+          pickName: this.stallForm.pickName,
+          pickLng: this.stallForm.pickLongitude,
+          pickLat: this.stallForm.pickLatitude,
+          pickAddress: this.stallForm.pickAddress,
+          pickImg: this.stallForm.pickImg,
+          promisePickDeliveryTime: this.stallForm.promisePickDeliveryTime
+        };
+
+        // 根据操作类型添加参数
+        if (this.stallForm.beneficiaryOperationType === 2) {
+          params.beneficiaryMobile = this.stallForm.beneficiaryMobile;
+          params.beneficiaryName = this.stallForm.beneficiaryName;
+          params.password = this.stallForm.password;
+        } else if (this.stallForm.beneficiaryOperationType === 3) {
+          params.beneficiaryMobile = this.stallForm.beneficiaryMobile;
+        }
+
+        if (this.isEditStall) {
+          // 编辑模式 - 使用 shop/base_config 接口
+          await this.$api.mer_admin.updateShopBaseConfig(
+            { shopId: this.currentEditStallId },
+            params
+          );
+          this.$message.success("保存成功");
+        } else {
+          // 新建模式 - 使用 shop/add 接口
+          await this.$api.mer_admin.addShop(params);
+          this.$message.success("创建成功");
+        }
+
+        this.stallDialogVisible = false;
+        this.fetchData(); // 刷新列表
+      } catch (error) {
+        console.error("提交失败:", error);
+        this.$message.error("提交失败，请重试");
+      } finally {
+        this.stallLoading = false;
+      }
+    }
+  },
+
+  computed: {
+    // 获取当前市场的ID
+    marketId() {
+      return this.$store.state.userData.marketId;
+    },
+
+    // 摊位弹窗标题
+    stallDialogTitle() {
+      if (this.isViewStall) return "查看摊位详情";
+      return this.isEditStall ? "编辑摊位" : "新建摊位";
+    },
+
+    // 摊位位置文本
+    stallLocationText() {
+      if (!this.stallForm.longitude || !this.stallForm.latitude) {
+        return "";
+      }
+      return `经度：${this.stallForm.longitude}，纬度：${this.stallForm.latitude}`;
+    },
+
+    // 自提点位置文本
+    pickLocationText() {
+      if (!this.stallForm.pickLongitude || !this.stallForm.pickLatitude) {
+        return "";
+      }
+      return `经度：${this.stallForm.pickLongitude}，纬度：${this.stallForm.pickLatitude}`;
+    },
+
+    // 上传地址
+    uploadUrl() {
+      return this.$api.mer_admin.uploadFile();
+    },
+
+    // 上传请求头（带token）
+    uploadHeaders() {
+      return {
+        token: "Bearer " + this.$cookie.get("token")
+      };
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.page-container {
+}
+
+.search-card {
+  margin-bottom: 15px;
+}
+
+.search-form .el-form-item {
+  margin-bottom: 0;
+}
+
+.table-container {
+}
+
+.product-counts {
+  font-size: 12px;
+  line-height: 1.4;
+  color: #666;
+
+  div {
+    margin-bottom: 2px;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+}
+
+.pagination-container {
+  margin-top: 20px;
+  text-align: right;
+}
+
+.dialog-footer {
+  text-align: right;
+}
+
+// 地图相关样式
+.map-dialog-container {
+  .map-search-box {
+    margin-bottom: 15px;
+  }
+
+  .map-container {
+    width: 100%;
+    height: 500px;
+    border: 1px solid #dcdfe6;
+    border-radius: 4px;
+  }
+
+  .selected-location-info {
+    margin-top: 15px;
+
+    p {
+      margin: 0;
+      font-size: 13px;
+      color: #606266;
+    }
+  }
+}
+
+// 上传组件样式已统一使用 picture-card 模式，无需额外样式
+
+// 只读模式样式优化 - 移除灰色背景
+::v-deep .el-form--disabled {
+  .el-input.is-disabled .el-input__inner,
+  .el-textarea.is-disabled .el-textarea__inner,
+  .el-select .el-input.is-disabled .el-input__inner,
+  .el-input__inner[disabled],
+  .el-textarea__inner[disabled] {
+    background-color: #fff !important;
+    color: #606266 !important;
+    cursor: not-allowed;
+    border-color: #dcdfe6;
+  }
+
+  .el-input-group__append {
+    background-color: #f5f7fa;
+  }
+
+  .el-radio.is-disabled,
+  .el-checkbox.is-disabled {
+    .el-radio__label,
+    .el-checkbox__label {
+      color: #606266 !important;
+    }
+
+    .el-radio__inner,
+    .el-checkbox__inner {
+      background-color: #fff !important;
+      border-color: #dcdfe6 !important;
+    }
+  }
+
+  .el-switch.is-disabled {
+    opacity: 0.6;
+  }
+
+  .el-input-number.is-disabled .el-input__inner {
+    background-color: #fff !important;
+    color: #606266 !important;
+  }
+
+  .el-upload--picture-card {
+    display: none;
+  }
+}
+
+// 全局禁用状态样式覆盖
+.el-input.is-disabled,
+.el-textarea.is-disabled,
+.el-select.is-disabled {
+  .el-input__inner,
+  .el-textarea__inner {
+    background-color: #fff !important;
+    color: #606266 !important;
+  }
+}
+
+// 针对弹窗内的表单禁用样式
+.el-dialog__body {
+  .el-form--disabled {
+    .el-input__inner,
+    .el-textarea__inner {
+      background-color: #fff !important;
+      color: #606266 !important;
+    }
+  }
+}
+</style>
+<style>
+.search-form .el-form-item__label {
+  padding-bottom: 0px !important;
+  font-size: 14px;
+  line-height: 32px;
+}
+
+/* 强制覆盖所有禁用输入框的灰色背景 */
+.el-input.is-disabled .el-input__inner,
+.el-textarea.is-disabled .el-textarea__inner,
+.el-input__inner[disabled],
+.el-textarea__inner[disabled],
+.el-select .el-input.is-disabled .el-input__inner {
+  background-color: #fff !important;
+  color: #606266 !important;
+}
+</style>
diff --git a/src/views/modules/operation-management/commodity/index.vue b/src/views/modules/operation-management/commodity/index.vue
index c5e03f9..8383b07 100644
--- a/src/views/modules/operation-management/commodity/index.vue
+++ b/src/views/modules/operation-management/commodity/index.vue
@@ -9,7 +9,7 @@
                 <el-input v-model="formInline.name" placeholder="请输入商品名称" clearable></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="6" v-if="marketList.length > 0">
+            <el-col :span="6" v-if="marketList?.length > 0">
               <el-form-item label="店铺" prop="shopId">
                 <el-select v-model="formInline.shopId" placeholder="请选择店铺" style="width: 100%;">
                   <el-option v-for="item in storeList" :key="item.shopId" :label="item.shopName" :value="item.shopId"></el-option>
@@ -74,7 +74,7 @@
       <div class="table-container">
         <div style="margin-bottom: 15px;">
           <el-button type="primary" size="small" @click="addProduct">添加商品</el-button>
-          <el-button :disabled="selectList.length <= 0" type="danger" size="small" @click="deleteProduct">批量删除</el-button>
+          <el-button :disabled="selectList?.length <= 0" type="danger" size="small" @click="deleteProduct">批量删除</el-button>
         </div>
         <el-table
           :data="dataList"
@@ -380,4 +380,4 @@ export default {
   font-size: 12px;
   line-height: 20px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/modules/operation-management/permission/sub-operator/index.vue b/src/views/modules/operation-management/permission/sub-operator/index.vue
index 8b690a7..a7e9a46 100644
--- a/src/views/modules/operation-management/permission/sub-operator/index.vue
+++ b/src/views/modules/operation-management/permission/sub-operator/index.vue
@@ -8,10 +8,18 @@
       :rules="rules"
       style="max-width: 600px"
     >
-      <el-form-item v-if="!marketId && markets && markets.length > 0" label="选择市场" prop="selectedMarketId">
-        <el-select v-model="form.selectedMarketId" placeholder="请选择市场" style="width: 100%">
+      <el-form-item
+        v-if="!marketId && marketList && marketList.length > 0"
+        label="选择市场"
+        prop="selectedMarketId"
+      >
+        <el-select
+          v-model="form.selectedMarketId"
+          placeholder="请选择市场"
+          style="width: 100%"
+        >
           <el-option
-            v-for="market in markets"
+            v-for="market in marketList"
             :key="market.marketId"
             :label="market.marketName"
             :value="market.marketId"
@@ -20,7 +28,11 @@
       </el-form-item>
 
       <el-form-item label="操作类型" prop="operationType">
-        <el-select v-model="form.operationType" placeholder="请选择操作类型" style="width: 100%">
+        <el-select
+          v-model="form.operationType"
+          placeholder="请选择操作类型"
+          style="width: 100%"
+        >
           <el-option label="创建新账号" value="create"></el-option>
           <el-option label="更新旧账号" value="update"></el-option>
         </el-select>
@@ -31,13 +43,22 @@
           <el-input v-model="form.username" placeholder="请输入账号"></el-input>
         </el-form-item>
         <el-form-item label="密码" prop="password">
-          <el-input v-model="form.password" type="password" placeholder="请输入密码"></el-input>
+          <el-input
+            v-model="form.password"
+            type="password"
+            placeholder="请输入密码"
+          ></el-input>
         </el-form-item>
       </template>
 
       <template v-if="form.operationType === 'update'">
         <el-form-item label="选择账号" prop="accountId">
-          <el-select v-model="form.accountId" placeholder="请选择要更新的账号" @change="handleAccountChange" style="width: 100%">
+          <el-select
+            v-model="form.accountId"
+            placeholder="请选择要更新的账号"
+            @change="handleAccountChange"
+            style="width: 100%"
+          >
             <el-option
               v-for="item in subAccountList"
               :key="item.accountId"
@@ -47,10 +68,16 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="warning" @click="openResetPasswordDialog">重置密码</el-button>
+          <el-button type="warning" @click="openResetPasswordDialog"
+            >重置密码</el-button
+          >
         </el-form-item>
         <el-form-item label="状态">
-          <el-switch v-model="form.enable" active-text="启用" inactive-text="禁用"></el-switch>
+          <el-switch
+            v-model="form.enable"
+            active-text="启用"
+            inactive-text="禁用"
+          ></el-switch>
         </el-form-item>
       </template>
 
@@ -61,7 +88,11 @@
         <el-input v-model="form.mobile" placeholder="请输入手机号"></el-input>
       </el-form-item>
       <el-form-item label="备注" prop="remark">
-        <el-input v-model="form.remark" type="textarea" placeholder="请输入备注"></el-input>
+        <el-input
+          v-model="form.remark"
+          type="textarea"
+          placeholder="请输入备注"
+        ></el-input>
       </el-form-item>
 
       <el-form-item label="权限分配" prop="permissionCodes">
@@ -89,7 +120,11 @@
     >
       <el-form label-width="80px">
         <el-form-item label="新密码">
-          <el-input v-model="newPassword" type="password" placeholder="请输入新密码"></el-input>
+          <el-input
+            v-model="newPassword"
+            type="password"
+            placeholder="请输入新密码"
+          ></el-input>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -116,55 +151,64 @@ import { mapState } from 'vuex'
 // Function to filter the full menu tree based on available permissions
 const filterTreeByPerms = (tree, availablePerms) => {
   if (!Array.isArray(tree)) {
-    return []; // Return empty array if tree is not an array
+    return [] // Return empty array if tree is not an array
   }
   return tree.reduce((acc, node) => {
     // Recursively filter children
-    const children = node.list && node.list.length > 0
-      ? filterTreeByPerms(node.list, availablePerms)
-      : [];
+    const children =
+      node.list && node.list.length > 0
+        ? filterTreeByPerms(node.list, availablePerms)
+        : []
 
     // A node is kept if its permission is in the available list,
     // or if it has children that are kept.
     if (availablePerms.includes(node.perms) || children.length > 0) {
       acc.push({
         ...node,
-        list: children, // Use the filtered list of children
-      });
+        list: children // Use the filtered list of children
+      })
     }
-    return acc;
-  }, []);
-};
+    return acc
+  }, [])
+}
 
 // Function to map the filtered tree to the format required by el-tree
-const mapTreeForElTree = (tree) => {
-  return tree.map((item) => ({
+const mapTreeForElTree = tree => {
+  return tree.map(item => ({
     id: item.perms, // Use perms as the id
     label: item.name,
-    children: item.list && item.list.length > 0 ? mapTreeForElTree(item.list) : [],
-  }));
-};
+    children:
+      item.list && item.list.length > 0 ? mapTreeForElTree(item.list) : []
+  }))
+}
 
 export default {
   name: 'SubOperator',
   data() {
     const validateUsername = (rule, value, callback) => {
       if (this.form.operationType !== 'create') {
-        return callback();
+        return callback()
       }
       if (!value) {
-        return callback(new Error('请输入账号'));
+        return callback(new Error('请输入账号'))
       }
-      checkUsername(value, this.form.selectedMarketId || this.marketId).then(res => {
-        if (res && res.data && res.data.data && res.data.data.available === true) {
-          callback();
-        } else {
-          callback(new Error('账号已被占用'));
-        }
-      }).catch(() => {
-        callback(new Error('账号校验失败'));
-      });
-    };
+      checkUsername(value, this.form.selectedMarketId || this.marketId)
+        .then(res => {
+          if (
+            res &&
+            res.data &&
+            res.data.data &&
+            res.data.data.available === true
+          ) {
+            callback()
+          } else {
+            callback(new Error('账号已被占用'))
+          }
+        })
+        .catch(() => {
+          callback(new Error('账号校验失败'))
+        })
+    }
 
     return {
       resetPasswordDialogVisible: false,
@@ -189,121 +233,132 @@ export default {
       },
       rules: {
         operationType: [
-          { required: true, message: "请选择操作类型", trigger: "change" },
+          { required: true, message: '请选择操作类型', trigger: 'change' }
         ],
         username: [
-          { required: true, validator: validateUsername, trigger: "blur" },
-        ],
-        password: [
-          { required: true, message: "请输入密码", trigger: "blur" },
-        ],
-        name: [
-          { required: true, message: "请输入姓名", trigger: "blur" },
-        ],
-        mobile: [
-          { required: true, message: "请输入手机号", trigger: "blur" },
+          { required: true, validator: validateUsername, trigger: 'blur' }
         ],
+        password: [{ required: true, message: '请输入密码', trigger: 'blur' }],
+        name: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
+        mobile: [{ required: true, message: '请输入手机号', trigger: 'blur' }],
         permissionCodes: [
-          { required: true, message: "请选择菜单权限", trigger: "change", type: 'array' },
+          {
+            required: true,
+            message: '请选择菜单权限',
+            trigger: 'change',
+            type: 'array'
+          }
         ],
         accountId: [
-          { required: true, message: "请选择要更新的账号", trigger: "change" },
-        ],
-      },
-    };
+          { required: true, message: '请选择要更新的账号', trigger: 'change' }
+        ]
+      }
+    }
   },
   computed: {
-    ...mapState("userData", [
-      "isMerchant",
-      "marketList",
-      "storeList",
-      "marketId",
-      "shopId",
-      "markets"
+    ...mapState('userData', [
+      'isMerchant',
+      'marketList',
+      'storeList',
+      'marketId',
+      'shopId'
     ])
   },
   watch: {
     'form.operationType'(newType) {
       // Manually reset form fields to avoid resetting the operationType
-      this.form.username = '';
-      this.form.password = '';
-      this.form.name = '';
-      this.form.mobile = '';
-      this.form.permissionCodes = [];
-      this.form.remark = '';
-      this.form.accountId = null;
+      this.form.username = ''
+      this.form.password = ''
+      this.form.name = ''
+      this.form.mobile = ''
+      this.form.permissionCodes = []
+      this.form.remark = ''
+      this.form.accountId = null
 
       // Clear validation messages after the DOM has updated
       this.$nextTick(() => {
-        this.$refs.ruleFormRef.clearValidate();
-      });
+        this.$refs.ruleFormRef.clearValidate()
+      })
 
       // Reset the tree's visual state
       if (this.$refs.permissionTree) {
-        this.$refs.permissionTree.setCheckedKeys([]);
+        this.$refs.permissionTree.setCheckedKeys([])
       }
 
       if (newType === 'update') {
-        this.loadSubAccountList();
+        this.loadSubAccountList()
       }
     }
   },
   created() {
-    this.getPermissions();
+    this.getPermissions()
   },
   methods: {
     getPermissions() {
-      getAvailablePermissions().then((res) => {
-        const availablePerms = (res && res.data && Array.isArray(res.data.data)) ? res.data.data : [];
-        const menuList = (routerConfig && Array.isArray(routerConfig.menuList)) ? routerConfig.menuList : [];
-        const filteredTree = filterTreeByPerms(menuList, availablePerms);
-        this.permissionList = mapTreeForElTree(filteredTree);
-      });
+      getAvailablePermissions().then(res => {
+        const availablePerms =
+          res && res.data && Array.isArray(res.data.data) ? res.data.data : []
+        const menuList =
+          routerConfig && Array.isArray(routerConfig.menuList)
+            ? routerConfig.menuList
+            : []
+        const filteredTree = filterTreeByPerms(menuList, availablePerms)
+        this.permissionList = mapTreeForElTree(filteredTree)
+      })
     },
     openResetPasswordDialog() {
       if (!this.form.accountId) {
-        this.$message.error('请先选择要更新的账号');
-        return;
+        this.$message.error('请先选择要更新的账号')
+        return
       }
-      this.resetPasswordDialogVisible = true;
+      this.resetPasswordDialogVisible = true
     },
     handleResetPassword() {
       if (!this.newPassword) {
-        this.$message.error('请输入新密码');
-        return;
+        this.$message.error('请输入新密码')
+        return
       }
-      resetPassword(this.form.accountId, this.newPassword, this.form.selectedMarketId || this.marketId).then(() => {
-        this.$message.success('密码重置成功');
-        this.resetPasswordDialogVisible = false;
-      });
+      resetPassword(
+        this.form.accountId,
+        this.newPassword,
+        this.form.selectedMarketId || this.marketId
+      ).then(() => {
+        this.$message.success('密码重置成功')
+        this.resetPasswordDialogVisible = false
+      })
     },
     handleTreeCheck() {
       // getCheckedKeys(true) will return an array of keys of the currently checked leaf nodes.
-      this.form.permissionCodes = this.$refs.permissionTree.getCheckedKeys(true);
+      this.form.permissionCodes = this.$refs.permissionTree.getCheckedKeys(true)
     },
     loadSubAccountList() {
-      getSubAccountList(this.form.selectedMarketId || this.marketId).then(res => {
-        this.subAccountList = res.data.data.data || [];
-      });
+      getSubAccountList(this.form.selectedMarketId || this.marketId).then(
+        res => {
+          this.subAccountList = res.data.data.data || []
+        }
+      )
     },
     handleAccountChange(accountId) {
-      if (!accountId) return;
-      getSubAccountDetail(accountId, this.form.selectedMarketId || this.marketId).then(res => {
-        const accountDetails = res.data.data;
-        this.form.name = accountDetails.name;
-        this.form.mobile = accountDetails.mobile;
-        this.form.remark = accountDetails.remark;
-        this.form.permissionCodes = accountDetails.permissionCodes || [];
-        this.form.enable = accountDetails.enabled;
+      if (!accountId) return
+      getSubAccountDetail(
+        accountId,
+        this.form.selectedMarketId || this.marketId
+      ).then(res => {
+        const accountDetails = res.data.data
+        this.form.name = accountDetails.name
+        this.form.mobile = accountDetails.mobile
+        this.form.remark = accountDetails.remark
+        this.form.permissionCodes = accountDetails.permissionCodes || []
+        this.form.enable = accountDetails.enabled
         this.$nextTick(() => {
-          this.$refs.permissionTree.setCheckedKeys(this.form.permissionCodes);
-        });
-      });
+          this.$refs.permissionTree.setCheckedKeys(this.form.permissionCodes)
+        })
+      })
     },
     save() {
-      this.$refs.ruleFormRef.validate((valid) => {
+      this.$refs.ruleFormRef.validate(valid => {
         if (valid) {
-          const marketId = this.form.selectedMarketId || this.marketId;
+          const marketId = this.form.selectedMarketId || this.marketId
           // if (!marketId) {
           //   this.$message.error('请选择市场');
           //   return;
@@ -311,32 +366,32 @@ export default {
 
           console.log(this.form.operationType)
           if (this.form.operationType === 'create') {
-            const createData = { ...this.form, marketId: marketId };
+            const createData = { ...this.form, marketId: marketId }
             if (createData.accountId === null) {
-              delete createData.accountId;
+              delete createData.accountId
             }
             createSubAccount(createData).then(() => {
-              this.$message.success('创建成功');
+              this.$message.success('创建成功')
               // 保留操作类型，只重置其他字段
-              const operationType = this.form.operationType;
-              this.form.username = '';
-              this.form.password = '';
-              this.form.name = '';
-              this.form.mobile = '';
-              this.form.remark = '';
-              this.form.permissionCodes = [];
-              this.form.accountId = null;
-              this.form.enable = true;
-              this.form.operationType = operationType; // 保留操作类型
+              const operationType = this.form.operationType
+              this.form.username = ''
+              this.form.password = ''
+              this.form.name = ''
+              this.form.mobile = ''
+              this.form.remark = ''
+              this.form.permissionCodes = []
+              this.form.accountId = null
+              this.form.enable = true
+              this.form.operationType = operationType // 保留操作类型
               // 重置权限树的勾选状态
               if (this.$refs.permissionTree) {
-                this.$refs.permissionTree.setCheckedKeys([]);
+                this.$refs.permissionTree.setCheckedKeys([])
               }
-            });
+            })
           } else if (this.form.operationType === 'update') {
             if (!this.form.accountId) {
-              this.$message.error('请先选择要更新的账号');
-              return;
+              this.$message.error('请先选择要更新的账号')
+              return
             }
             const updateData = {
               subAccountId: this.form.accountId,
@@ -346,25 +401,25 @@ export default {
               remark: this.form.remark,
               enabled: this.form.enable,
               marketId
-            };
+            }
             updateSubAccount(updateData).then(() => {
-              this.$message.success('更新成功');
+              this.$message.success('更新成功')
               // 只重置部分字段，保留accountId和operationType
-              this.form.name = '';
-              this.form.mobile = '';
-              this.form.remark = '';
-              this.form.permissionCodes = [];
-              this.form.enable = true;
+              this.form.name = ''
+              this.form.mobile = ''
+              this.form.remark = ''
+              this.form.permissionCodes = []
+              this.form.enable = true
               // 重置权限树的勾选状态
               if (this.$refs.permissionTree) {
-                this.$refs.permissionTree.setCheckedKeys([]);
+                this.$refs.permissionTree.setCheckedKeys([])
               }
-            });
+            })
           }
         }
-      });
+      })
     }
-  },
+  }
 }
 </script>